SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Mixer patch, etc.

Browse source
This commit is contained in:
Scott Lahteine 2019-07-29 21:57:02 -05:00
parent 1165c26ab4
commit 842466f4d9
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/src/feature/I2CPositionEncoder.cpp
View file

@ -424,7 +424,6 @@ void I2CPositionEncoder::calibrate_steps_mm(const uint8_t iter) {
travelledDistance = mm_from_count(ABS(stopCount - startCount)); travelledDistance = mm_from_count(ABS(stopCount - startCount));
SERIAL_ECHOLNPAIR("Attempted travel: ", travelDistance, "mm"); SERIAL_ECHOLNPAIR("Attempted travel: ", travelDistance, "mm");
SERIAL_ECHOLNPAIR(" Actual travel: ", travelledDistance, "mm"); SERIAL_ECHOLNPAIR(" Actual travel: ", travelledDistance, "mm");
//Calculate new axis steps per unit //Calculate new axis steps per unit

11
Marlin/src/lcd/menu/menu_mixer.cpp
View file

@ -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);