Skip to content

Commit

Permalink
Merge pull request #456 from blurfl/B11-should-not-trigger-position-e…
Browse files Browse the repository at this point in the history
…rror-alarm

B11 should not trigger position error alarm
  • Loading branch information
MaslowCommunityGardenRobot authored Jul 9, 2018
2 parents 3ec93bd + faedeec commit 6c941eb
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions cnc_ctrl_v1/GCode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}

Expand Down

0 comments on commit 6c941eb

Please sign in to comment.