Skip to content

Commit e57f4a9

Browse files
committed
Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro
2 parents 06acb0c + 131acf3 commit e57f4a9

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

Marlin/src/gcode/gcode.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,6 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
332332
case 76: G76(); break; // G76: Calibrate first layer compensation values
333333
#endif
334334

335-
case 60: G60(); break; // G60: save current position
336-
case 61: G61(); break; // G61: Apply/restore saved coordinates.
337-
338335
#if ENABLED(GCODE_MOTION_MODES)
339336
case 80: G80(); break; // G80: Reset the current motion mode
340337
#endif

Marlin/src/lcd/menu/menu_filament.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
119119
SUBMENU_N_P(s, msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, MenuItemBase::itemIndex); });
120120
else {
121121
ACTION_ITEM_N_P(s, msg, []{
122-
char cmd[12];
122+
char cmd[13];
123123
sprintf_P(cmd, PSTR("M600 B0 T%i"), int(MenuItemBase::itemIndex));
124124
lcd_enqueue_one_now(cmd);
125125
});

Marlin/src/module/tool_change.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -821,10 +821,6 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
821821
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("No move (not homed)");
822822
}
823823

824-
#if HAS_LCD_MENU
825-
ui.return_to_status();
826-
#endif
827-
828824
#if ENABLED(DUAL_X_CARRIAGE)
829825
const bool idex_full_control = dual_x_carriage_mode == DXC_FULL_CONTROL_MODE;
830826
#else

0 commit comments

Comments
 (0)