diff --git a/.gitignore b/.gitignore index fccb4e4..e8ba8b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.d *.o +.* Release/* !Release/RepRapFirmware*.bin *~ diff --git a/GCodes.cpp b/GCodes.cpp index 1b744b9..eb1207e 100644 --- a/GCodes.cpp +++ b/GCodes.cpp @@ -1512,6 +1512,7 @@ bool GCodes::ActOnGcode(GCodeBuffer *gb) break; case 112: // Emergency stop - acted upon in Webserver + reprap.EmergencyStop(); break; case 114: // Deprecated diff --git a/Platform.h b/Platform.h index f2d95b6..a465873 100644 --- a/Platform.h +++ b/Platform.h @@ -551,7 +551,7 @@ class Platform uint16_t zProbeReadings[NumZProbeReadingsAveraged]; int zProbeADValue; float zProbeStopHeight; - + bool zProbeEnable; // AXES void InitZProbe();