From 79cdccf81ff7b223698286cdfec7fd29ec049b92 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Sun, 26 Jan 2020 23:33:46 -0800 Subject: [PATCH 1/3] Remove return_to_status from tool_change --- Marlin/src/module/tool_change.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index 45c5805f4daf..324b979570e0 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -821,10 +821,6 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) { if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("No move (not homed)"); } - #if HAS_LCD_MENU - ui.return_to_status(); - #endif - #if ENABLED(DUAL_X_CARRIAGE) const bool idex_full_control = dual_x_carriage_mode == DXC_FULL_CONTROL_MODE; #else From 6e3daec6f90f72e15210ad0e826d8deeb8c6c4b1 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Sun, 26 Jan 2020 23:43:03 -0800 Subject: [PATCH 2/3] Fix buffer overflow warning --- Marlin/src/lcd/menu/menu_filament.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp index 894d8de238b0..5248cbbab1aa 100644 --- a/Marlin/src/lcd/menu/menu_filament.cpp +++ b/Marlin/src/lcd/menu/menu_filament.cpp @@ -119,7 +119,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) { SUBMENU_N_P(s, msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, MenuItemBase::itemIndex); }); else { ACTION_ITEM_N_P(s, msg, []{ - char cmd[12]; + char cmd[13]; sprintf_P(cmd, PSTR("M600 B0 T%i"), int(MenuItemBase::itemIndex)); lcd_enqueue_one_now(cmd); }); From 55a8ac7659f29f5597d2181c3757a0908cf532c6 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Mon, 27 Jan 2020 00:13:13 -0800 Subject: [PATCH 3/3] Remove duplicate G60/G61 calls in gcode.h --- Marlin/src/gcode/gcode.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index 955e62e80e11..0c0ab4c24c61 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -332,9 +332,6 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) { case 76: G76(); break; // G76: Calibrate first layer compensation values #endif - case 60: G60(); break; // G60: save current position - case 61: G61(); break; // G61: Apply/restore saved coordinates. - #if ENABLED(GCODE_MOTION_MODES) case 80: G80(); break; // G80: Reset the current motion mode #endif