Merge pull request #37 from T3P3/Emergency_stop

M112 Emergency stop
2014-04-06 23:44:17 +01:00 · 2014-04-06 23:44:17 +01:00 · 61bfc38979
commit 61bfc38979
parent 1c749dba9e 81df66e438
3 changed files with 3 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,6 @@
 *.d
 *.o
+.*
 Release/*
 !Release/RepRapFirmware*.bin
 *~
--- 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
--- 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();