From 842466f4d982b56614e5051c7a1a2dd5ce439c76 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 29 Jul 2019 21:57:02 -0500 Subject: [PATCH] Mixer patch, etc. --- Marlin/src/feature/I2CPositionEncoder.cpp | 1 - Marlin/src/lcd/menu/menu_mixer.cpp | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Marlin/src/feature/I2CPositionEncoder.cpp b/Marlin/src/feature/I2CPositionEncoder.cpp index 254ba01eff..7d225b8e08 100644 --- a/Marlin/src/feature/I2CPositionEncoder.cpp +++ b/Marlin/src/feature/I2CPositionEncoder.cpp @@ -424,7 +424,6 @@ void I2CPositionEncoder::calibrate_steps_mm(const uint8_t iter) { travelledDistance = mm_from_count(ABS(stopCount - startCount)); SERIAL_ECHOLNPAIR("Attempted travel: ", travelDistance, "mm"); - SERIAL_ECHOLNPAIR(" Actual travel: ", travelledDistance, "mm"); //Calculate new axis steps per unit diff --git a/Marlin/src/lcd/menu/menu_mixer.cpp b/Marlin/src/lcd/menu/menu_mixer.cpp index 31f5107837..cd23282044 100644 --- a/Marlin/src/lcd/menu/menu_mixer.cpp +++ b/Marlin/src/lcd/menu/menu_mixer.cpp @@ -272,17 +272,10 @@ void menu_mixer() { #endif ); - MENU_ITEM(submenu, MSG_MIX, - #if CHANNEL_MIX_EDITING - _lcd_goto_mix_edit - #elif DUAL_MIXING_EXTRUDER - lcd_mixer_mix_edit - #endif - ); - #if DUAL_MIXING_EXTRUDER { char tmp[10]; + MENU_ITEM(submenu, MSG_MIX, lcd_mixer_mix_edit); MENU_ITEM_ADDON_START(10); mixer.update_mix_from_vtool(); sprintf_P(tmp, PSTR("%3d;%3d%%"), int(mixer.mix[0]), int(mixer.mix[1])); @@ -290,6 +283,8 @@ void menu_mixer() { MENU_ITEM_ADDON_END(); MENU_ITEM(function, MSG_TOGGLE_MIX, _lcd_mixer_toggle_mix); } + #else + MENU_ITEM(submenu, MSG_MIX, _lcd_goto_mix_edit); #endif MENU_ITEM(submenu, MSG_RESET_VTOOLS, menu_mixer_vtools_reset_confirm);