Fixed a bug preventing lasering multiple objects in one file

parent 591c6a69
...@@ -4405,7 +4405,6 @@ inline void gcode_G28() { ...@@ -4405,7 +4405,6 @@ inline void gcode_G28() {
enqueue_and_echo_commands_P(PSTR(Z_PROBE_END_SCRIPT)); enqueue_and_echo_commands_P(PSTR(Z_PROBE_END_SCRIPT));
st_synchronize(); st_synchronize();
#endif #endif
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
if (DEBUGGING(INFO)) ECHO_LM(INFO, "<<< gcode_G29"); if (DEBUGGING(INFO)) ECHO_LM(INFO, "<<< gcode_G29");
...@@ -4901,10 +4900,11 @@ inline void gcode_G92() { ...@@ -4901,10 +4900,11 @@ inline void gcode_G92() {
laser_ttl_modulation = 0; laser_ttl_modulation = 0;
#endif #endif
#if ENABLED(LASER) && ENABLED(LASER_FIRE_SPINDLE) #if ENABLED(LASER) && ENABLED(LASER_FIRE_SPINDLE)
if(laser.status != LASER_OFF) {
laser.status = LASER_OFF; laser.status = LASER_OFF;
lcd_update(); lcd_update();
prepare_move(); prepare_move();
KEEPALIVE_STATE(NOT_BUSY); }
#endif #endif
} }
#endif //LASERBEAM #endif //LASERBEAM
...@@ -6644,7 +6644,6 @@ inline void gcode_M226() { ...@@ -6644,7 +6644,6 @@ inline void gcode_M226() {
KEEPALIVE_STATE(NOT_BUSY); // don't send "busy: processing" messages during autotune output KEEPALIVE_STATE(NOT_BUSY); // don't send "busy: processing" messages during autotune output
PID_autotune(temp, h, c, u); PID_autotune(temp, h, c, u);
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
} }
#endif #endif
...@@ -7348,7 +7347,6 @@ inline void gcode_M503() { ...@@ -7348,7 +7347,6 @@ inline void gcode_M503() {
#else #else
#define RUNPLAN line_to_destination(FILAMENT_CHANGE_XY_FEEDRATE * 60); #define RUNPLAN line_to_destination(FILAMENT_CHANGE_XY_FEEDRATE * 60);
#endif #endif
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
// Initial retract before move to filament change position // Initial retract before move to filament change position
...@@ -7477,7 +7475,6 @@ inline void gcode_M503() { ...@@ -7477,7 +7475,6 @@ inline void gcode_M503() {
#endif #endif
lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_RESUME); lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_RESUME);
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
// Set extruder to saved position // Set extruder to saved position
...@@ -8154,7 +8151,6 @@ void process_next_command() { ...@@ -8154,7 +8151,6 @@ void process_next_command() {
// The command's arguments (if any) start here, for sure! // The command's arguments (if any) start here, for sure!
current_command_args = cmd_ptr; current_command_args = cmd_ptr;
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
// Handle a known G, M, or T // Handle a known G, M, or T
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment