|
|
@ -721,14 +721,7 @@ void get_command()
|
|
|
|
case 1:
|
|
|
|
case 1:
|
|
|
|
case 2:
|
|
|
|
case 2:
|
|
|
|
case 3:
|
|
|
|
case 3:
|
|
|
|
if(Stopped == false) { // If printer is stopped by an error the G[0-3] codes are ignored.
|
|
|
|
if (Stopped == true) {
|
|
|
|
#ifdef SDSUPPORT
|
|
|
|
|
|
|
|
if(card.saving)
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
#endif //SDSUPPORT
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLLNPGM(MSG_OK);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
SERIAL_ERRORLNPGM(MSG_ERR_STOPPED);
|
|
|
|
SERIAL_ERRORLNPGM(MSG_ERR_STOPPED);
|
|
|
|
LCD_MESSAGEPGM(MSG_STOPPED);
|
|
|
|
LCD_MESSAGEPGM(MSG_STOPPED);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1357,7 +1350,6 @@ void process_commands()
|
|
|
|
#endif //FWRETRACT
|
|
|
|
#endif //FWRETRACT
|
|
|
|
prepare_move();
|
|
|
|
prepare_move();
|
|
|
|
//ClearToSend();
|
|
|
|
//ClearToSend();
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
#ifndef SCARA //disable arc support
|
|
|
|
#ifndef SCARA //disable arc support
|
|
|
@ -1365,14 +1357,12 @@ void process_commands()
|
|
|
|
if(Stopped == false) {
|
|
|
|
if(Stopped == false) {
|
|
|
|
get_arc_coordinates();
|
|
|
|
get_arc_coordinates();
|
|
|
|
prepare_arc_move(true);
|
|
|
|
prepare_arc_move(true);
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case 3: // G3 - CCW ARC
|
|
|
|
case 3: // G3 - CCW ARC
|
|
|
|
if(Stopped == false) {
|
|
|
|
if(Stopped == false) {
|
|
|
|
get_arc_coordinates();
|
|
|
|
get_arc_coordinates();
|
|
|
|
prepare_arc_move(false);
|
|
|
|
prepare_arc_move(false);
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|