Merge branch 'master' of https://github.com/MaslowCNC/Firmware

MaslowCNC · Jul 11, 2018 · 19737ff · 19737ff
2 parents beae569 + 6c941eb
commit 19737ff
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/cnc_ctrl_v1/GCode.cpp b/cnc_ctrl_v1/GCode.cpp
@@ -251,6 +251,7 @@ byte  executeBcodeLine(const String& gcodeLine){
         double begin = millis();
 
         int i = 0;
+        sys.state = (sys.state | STATE_POS_ERR_IGNORE);
         while (millis() - begin < ms){
             if (gcodeLine.indexOf('L') != -1){
                 leftAxis.motorGearboxEncoder.motor.directWrite(speed);
@@ -263,6 +264,7 @@ byte  executeBcodeLine(const String& gcodeLine){
             execSystemRealtime();
             if (sys.stop){return STATUS_OK;}
         }
+        sys.state = (sys.state | (!STATE_POS_ERR_IGNORE));
         return STATUS_OK;
     }