From 2b9722f38713bbe4bb664013fa157e5a32ec3e16 Mon Sep 17 00:00:00 2001 From: wgm4321 Date: Sun, 4 Jan 2015 21:42:16 -0500 Subject: [PATCH 1/6] Add "Detailed Z Probe" menu item with ABL is defined. --- Marlin/language_an.h | 1 + Marlin/language_ca.h | 1 + Marlin/language_de.h | 1 + Marlin/language_en.h | 1 + Marlin/language_es.h | 1 + Marlin/language_eu.h | 1 + Marlin/language_fi.h | 1 + Marlin/language_fr.h | 1 + Marlin/language_it.h | 1 + Marlin/language_nl.h | 1 + Marlin/language_pl.h | 1 + Marlin/language_pt.h | 1 + Marlin/language_ru.h | 1 + Marlin/ultralcd.cpp | 3 +++ 14 files changed, 16 insertions(+) diff --git a/Marlin/language_an.h b/Marlin/language_an.h index f0b3fa2738..26cda9bce5 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART " Autostart" #define MSG_DISABLE_STEPPERS "Amortar motors" #define MSG_AUTO_HOME "Levar a l'orichen" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Establir zero" #define MSG_PREHEAT_PLA "Precalentar PLA" diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h index ba5d37127f..b5612a5c15 100644 --- a/Marlin/language_ca.h +++ b/Marlin/language_ca.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART "Inici automatic" #define MSG_DISABLE_STEPPERS "Apagar motors" #define MSG_AUTO_HOME "Home global" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Establir origen" #define MSG_PREHEAT_PLA "Preescalfar PLA" diff --git a/Marlin/language_de.h b/Marlin/language_de.h index e442448af6..5521ad6f0a 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Stepper abschalt." #define MSG_AUTO_HOME "Auto Nullpunkt" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Setze Nullpunkt" #define MSG_PREHEAT_PLA "Vorwärmen PLA" diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 014b42e51e..e05b0a3a1b 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Disable steppers" #define MSG_AUTO_HOME "Auto home" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Set origin" #define MSG_PREHEAT_PLA "Preheat PLA" diff --git a/Marlin/language_es.h b/Marlin/language_es.h index 064c770604..8b56e0245d 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART " Autostart" #define MSG_DISABLE_STEPPERS "Apagar motores" #define MSG_AUTO_HOME "Llevar al origen" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Ajustar offsets" #define MSG_SET_ORIGIN "Establecer cero" #define MSG_PREHEAT_PLA "Precalentar PLA" diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index 7e65ca59d1..207c6c0e9b 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART "Auto hasiera" #define MSG_DISABLE_STEPPERS "Itzali motoreak" #define MSG_AUTO_HOME "Hasierara joan" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Hasiera ipini" #define MSG_PREHEAT_PLA "Aurreberotu PLA" diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index 0b1ac9cad9..77c2ce59c9 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART "Automaatti" #define MSG_DISABLE_STEPPERS "Vapauta moottorit" #define MSG_AUTO_HOME "Aja referenssiin" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Aseta origo" #define MSG_PREHEAT_PLA "Esilammita PLA" diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index 59066b1268..c70d3de432 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART "Demarrage auto" #define MSG_DISABLE_STEPPERS "Arreter moteurs" #define MSG_AUTO_HOME "Home auto." +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Regler origine" #define MSG_PREHEAT_PLA "Prechauffage PLA" diff --git a/Marlin/language_it.h b/Marlin/language_it.h index 76845e3bcd..1ae525eb79 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Disabilita Motori" #define MSG_AUTO_HOME "Auto Home" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Imposta Origine" #define MSG_PREHEAT_PLA "Preriscalda PLA" diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index e9dc380605..5e3b1f1c3a 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Motoren uit" #define MSG_AUTO_HOME "Auto home" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Nulpunt instellen" #define MSG_PREHEAT_PLA "PLA voorverwarmen" diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h index 55ec20ee36..bea39aae7c 100644 --- a/Marlin/language_pl.h +++ b/Marlin/language_pl.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Wylacz silniki" #define MSG_AUTO_HOME "Auto. poz. zerowa" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Ustaw punkt zero" #define MSG_PREHEAT_PLA "Rozgrzej PLA" diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h index 09e346748f..9b386e1626 100644 --- a/Marlin/language_pt.h +++ b/Marlin/language_pt.h @@ -15,6 +15,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS " Apagar motores" #define MSG_AUTO_HOME "Ir para origen" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Estabelecer orig." #define MSG_PREHEAT_PLA "Pre-aquecer PLA" diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h index ec666f186b..38f0dbef85 100644 --- a/Marlin/language_ru.h +++ b/Marlin/language_ru.h @@ -17,6 +17,7 @@ #define MSG_AUTOSTART "Автостарт" #define MSG_DISABLE_STEPPERS "Выкл. двигатели" #define MSG_AUTO_HOME "Парковка" +#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Запомнить ноль" #define MSG_PREHEAT_PLA "Преднагрев PLA" diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 42d4979583..8a38c82a5e 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -614,6 +614,9 @@ static void lcd_prepare_menu() #endif MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84")); MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28")); +#ifdef ENABLE_AUTO_BED_LEVELING + MENU_ITEM(gcode, MSG_DETAILED_Z_PROBE, PSTR("G29")); +#endif MENU_ITEM(function, MSG_SET_HOME_OFFSETS, lcd_set_home_offsets); //MENU_ITEM(gcode, MSG_SET_ORIGIN, PSTR("G92 X0 Y0 Z0")); #if TEMP_SENSOR_0 != 0 From dd7e4ee97f69c835aa26b92fa42056502bd3eac9 Mon Sep 17 00:00:00 2001 From: wgm4321 Date: Sun, 4 Jan 2015 21:44:55 -0500 Subject: [PATCH 2/6] Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3 --- Marlin/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 8a38c82a5e..b97a5b5d68 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -883,7 +883,7 @@ static void lcd_control_volumetric_menu() START_MENU(); MENU_ITEM(back, MSG_CONTROL, lcd_control_menu); - MENU_ITEM_EDIT(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled); + MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled, calculate_volumetric_multipliers); if (volumetric_enabled) { MENU_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_0, &filament_size[0], DEFAULT_NOMINAL_FILAMENT_DIA - .5, DEFAULT_NOMINAL_FILAMENT_DIA + .5, calculate_volumetric_multipliers); From ec4681ab6b7d50ae80ea72f7964e51ea563cd019 Mon Sep 17 00:00:00 2001 From: wgm4321 Date: Sun, 4 Jan 2015 21:53:37 -0500 Subject: [PATCH 3/6] Revert "Add "Detailed Z Probe" menu item with ABL is defined." This reverts commit 2b9722f38713bbe4bb664013fa157e5a32ec3e16. --- Marlin/language_an.h | 1 - Marlin/language_ca.h | 1 - Marlin/language_de.h | 1 - Marlin/language_en.h | 1 - Marlin/language_es.h | 1 - Marlin/language_eu.h | 1 - Marlin/language_fi.h | 1 - Marlin/language_fr.h | 1 - Marlin/language_it.h | 1 - Marlin/language_nl.h | 1 - Marlin/language_pl.h | 1 - Marlin/language_pt.h | 1 - Marlin/language_ru.h | 1 - Marlin/ultralcd.cpp | 3 --- 14 files changed, 16 deletions(-) diff --git a/Marlin/language_an.h b/Marlin/language_an.h index 26cda9bce5..f0b3fa2738 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART " Autostart" #define MSG_DISABLE_STEPPERS "Amortar motors" #define MSG_AUTO_HOME "Levar a l'orichen" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Establir zero" #define MSG_PREHEAT_PLA "Precalentar PLA" diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h index b5612a5c15..ba5d37127f 100644 --- a/Marlin/language_ca.h +++ b/Marlin/language_ca.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART "Inici automatic" #define MSG_DISABLE_STEPPERS "Apagar motors" #define MSG_AUTO_HOME "Home global" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Establir origen" #define MSG_PREHEAT_PLA "Preescalfar PLA" diff --git a/Marlin/language_de.h b/Marlin/language_de.h index 5521ad6f0a..e442448af6 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Stepper abschalt." #define MSG_AUTO_HOME "Auto Nullpunkt" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Setze Nullpunkt" #define MSG_PREHEAT_PLA "Vorwärmen PLA" diff --git a/Marlin/language_en.h b/Marlin/language_en.h index e05b0a3a1b..014b42e51e 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Disable steppers" #define MSG_AUTO_HOME "Auto home" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Set origin" #define MSG_PREHEAT_PLA "Preheat PLA" diff --git a/Marlin/language_es.h b/Marlin/language_es.h index 8b56e0245d..064c770604 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART " Autostart" #define MSG_DISABLE_STEPPERS "Apagar motores" #define MSG_AUTO_HOME "Llevar al origen" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Ajustar offsets" #define MSG_SET_ORIGIN "Establecer cero" #define MSG_PREHEAT_PLA "Precalentar PLA" diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index 207c6c0e9b..7e65ca59d1 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART "Auto hasiera" #define MSG_DISABLE_STEPPERS "Itzali motoreak" #define MSG_AUTO_HOME "Hasierara joan" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Hasiera ipini" #define MSG_PREHEAT_PLA "Aurreberotu PLA" diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index 77c2ce59c9..0b1ac9cad9 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART "Automaatti" #define MSG_DISABLE_STEPPERS "Vapauta moottorit" #define MSG_AUTO_HOME "Aja referenssiin" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Aseta origo" #define MSG_PREHEAT_PLA "Esilammita PLA" diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index c70d3de432..59066b1268 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART "Demarrage auto" #define MSG_DISABLE_STEPPERS "Arreter moteurs" #define MSG_AUTO_HOME "Home auto." -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Regler origine" #define MSG_PREHEAT_PLA "Prechauffage PLA" diff --git a/Marlin/language_it.h b/Marlin/language_it.h index 1ae525eb79..76845e3bcd 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Disabilita Motori" #define MSG_AUTO_HOME "Auto Home" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Imposta Origine" #define MSG_PREHEAT_PLA "Preriscalda PLA" diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index 5e3b1f1c3a..e9dc380605 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Motoren uit" #define MSG_AUTO_HOME "Auto home" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Nulpunt instellen" #define MSG_PREHEAT_PLA "PLA voorverwarmen" diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h index bea39aae7c..55ec20ee36 100644 --- a/Marlin/language_pl.h +++ b/Marlin/language_pl.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Wylacz silniki" #define MSG_AUTO_HOME "Auto. poz. zerowa" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Ustaw punkt zero" #define MSG_PREHEAT_PLA "Rozgrzej PLA" diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h index 9b386e1626..09e346748f 100644 --- a/Marlin/language_pt.h +++ b/Marlin/language_pt.h @@ -15,7 +15,6 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS " Apagar motores" #define MSG_AUTO_HOME "Ir para origen" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Estabelecer orig." #define MSG_PREHEAT_PLA "Pre-aquecer PLA" diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h index 38f0dbef85..ec666f186b 100644 --- a/Marlin/language_ru.h +++ b/Marlin/language_ru.h @@ -17,7 +17,6 @@ #define MSG_AUTOSTART "Автостарт" #define MSG_DISABLE_STEPPERS "Выкл. двигатели" #define MSG_AUTO_HOME "Парковка" -#define MSG_DETAILED_Z_PROBE "Detailed Z probe" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Запомнить ноль" #define MSG_PREHEAT_PLA "Преднагрев PLA" diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index b97a5b5d68..795d9f2c82 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -614,9 +614,6 @@ static void lcd_prepare_menu() #endif MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84")); MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28")); -#ifdef ENABLE_AUTO_BED_LEVELING - MENU_ITEM(gcode, MSG_DETAILED_Z_PROBE, PSTR("G29")); -#endif MENU_ITEM(function, MSG_SET_HOME_OFFSETS, lcd_set_home_offsets); //MENU_ITEM(gcode, MSG_SET_ORIGIN, PSTR("G92 X0 Y0 Z0")); #if TEMP_SENSOR_0 != 0 From f24dda970054ffd03842ca2a473faea1332db9d8 Mon Sep 17 00:00:00 2001 From: wgm4321 Date: Sun, 4 Jan 2015 22:08:41 -0500 Subject: [PATCH 4/6] Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3" This reverts commit dd7e4ee97f69c835aa26b92fa42056502bd3eac9. --- Marlin/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 795d9f2c82..42d4979583 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -880,7 +880,7 @@ static void lcd_control_volumetric_menu() START_MENU(); MENU_ITEM(back, MSG_CONTROL, lcd_control_menu); - MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled, calculate_volumetric_multipliers); + MENU_ITEM_EDIT(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled); if (volumetric_enabled) { MENU_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_0, &filament_size[0], DEFAULT_NOMINAL_FILAMENT_DIA - .5, DEFAULT_NOMINAL_FILAMENT_DIA + .5, calculate_volumetric_multipliers); From a19f2f8ae72552b40af7789d2f31e5120da45e18 Mon Sep 17 00:00:00 2001 From: wgm4321 Date: Sun, 4 Jan 2015 22:15:16 -0500 Subject: [PATCH 5/6] Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled --- Marlin/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 42d4979583..b1c61e80f0 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -745,7 +745,7 @@ static void lcd_control_menu() MENU_ITEM(back, MSG_MAIN, lcd_main_menu); MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu); MENU_ITEM(submenu, MSG_MOTION, lcd_control_motion_menu); - MENU_ITEM(submenu, MSG_VOLUMETRIC, lcd_control_volumetric_menu); + //MENU_ITEM(submenu, MSG_VOLUMETRIC, lcd_control_volumetric_menu); #ifdef DOGLCD // MENU_ITEM_EDIT(int3, MSG_CONTRAST, &lcd_contrast, 0, 63); From 067b509479f8114d47693551c87a3a90c4295da9 Mon Sep 17 00:00:00 2001 From: wgm4321 Date: Mon, 5 Jan 2015 22:29:29 -0500 Subject: [PATCH 6/6] Re-enable filament menu with recalc fix when enabling/disabling mm3 --- Marlin/ultralcd.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index b1c61e80f0..d790266d92 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -745,7 +745,7 @@ static void lcd_control_menu() MENU_ITEM(back, MSG_MAIN, lcd_main_menu); MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu); MENU_ITEM(submenu, MSG_MOTION, lcd_control_motion_menu); - //MENU_ITEM(submenu, MSG_VOLUMETRIC, lcd_control_volumetric_menu); + MENU_ITEM(submenu, MSG_VOLUMETRIC, lcd_control_volumetric_menu); #ifdef DOGLCD // MENU_ITEM_EDIT(int3, MSG_CONTRAST, &lcd_contrast, 0, 63); @@ -880,7 +880,7 @@ static void lcd_control_volumetric_menu() START_MENU(); MENU_ITEM(back, MSG_CONTROL, lcd_control_menu); - MENU_ITEM_EDIT(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled); + MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled, calculate_volumetric_multipliers); if (volumetric_enabled) { MENU_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_0, &filament_size[0], DEFAULT_NOMINAL_FILAMENT_DIA - .5, DEFAULT_NOMINAL_FILAMENT_DIA + .5, calculate_volumetric_multipliers); @@ -1114,6 +1114,11 @@ static void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { *ptr = !(*ptr); } +static void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, menuFunc_t callback) +{ + menu_action_setting_edit_bool(pstr, ptr); + (*callback)(); +} #endif//ULTIPANEL /** LCD API **/