|
@ -272,17 +272,10 @@ void menu_mixer() { |
|
|
#endif |
|
|
#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 |
|
|
#if DUAL_MIXING_EXTRUDER |
|
|
{ |
|
|
{ |
|
|
char tmp[10]; |
|
|
char tmp[10]; |
|
|
|
|
|
MENU_ITEM(submenu, MSG_MIX, lcd_mixer_mix_edit); |
|
|
MENU_ITEM_ADDON_START(10); |
|
|
MENU_ITEM_ADDON_START(10); |
|
|
mixer.update_mix_from_vtool(); |
|
|
mixer.update_mix_from_vtool(); |
|
|
sprintf_P(tmp, PSTR("%3d;%3d%%"), int(mixer.mix[0]), int(mixer.mix[1])); |
|
|
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_ADDON_END(); |
|
|
MENU_ITEM(function, MSG_TOGGLE_MIX, _lcd_mixer_toggle_mix); |
|
|
MENU_ITEM(function, MSG_TOGGLE_MIX, _lcd_mixer_toggle_mix); |
|
|
} |
|
|
} |
|
|
|
|
|
#else |
|
|
|
|
|
MENU_ITEM(submenu, MSG_MIX, _lcd_goto_mix_edit); |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
MENU_ITEM(submenu, MSG_RESET_VTOOLS, menu_mixer_vtools_reset_confirm); |
|
|
MENU_ITEM(submenu, MSG_RESET_VTOOLS, menu_mixer_vtools_reset_confirm); |
|
|