Browse Source

Re-enable filament menu with recalc fix when enabling/disabling mm3

wgm4321 9 years ago
parent
commit
067b509479
1 changed files with 7 additions and 2 deletions
  1. 7
    2
      Marlin/ultralcd.cpp

+ 7
- 2
Marlin/ultralcd.cpp View File

745
     MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
745
     MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
746
     MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu);
746
     MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu);
747
     MENU_ITEM(submenu, MSG_MOTION, lcd_control_motion_menu);
747
     MENU_ITEM(submenu, MSG_MOTION, lcd_control_motion_menu);
748
-	//MENU_ITEM(submenu, MSG_VOLUMETRIC, lcd_control_volumetric_menu);
748
+	MENU_ITEM(submenu, MSG_VOLUMETRIC, lcd_control_volumetric_menu);
749
 
749
 
750
 #ifdef DOGLCD
750
 #ifdef DOGLCD
751
 //    MENU_ITEM_EDIT(int3, MSG_CONTRAST, &lcd_contrast, 0, 63);
751
 //    MENU_ITEM_EDIT(int3, MSG_CONTRAST, &lcd_contrast, 0, 63);
880
 	START_MENU();
880
 	START_MENU();
881
 	MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
881
 	MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
882
 
882
 
883
-	MENU_ITEM_EDIT(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled);
883
+	MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled, calculate_volumetric_multipliers);
884
 
884
 
885
 	if (volumetric_enabled) {
885
 	if (volumetric_enabled) {
886
 		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);
886
 		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
 {
1114
 {
1115
     *ptr = !(*ptr);
1115
     *ptr = !(*ptr);
1116
 }
1116
 }
1117
+static void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, menuFunc_t callback)
1118
+{
1119
+	menu_action_setting_edit_bool(pstr, ptr);
1120
+	(*callback)();
1121
+}
1117
 #endif//ULTIPANEL
1122
 #endif//ULTIPANEL
1118
 
1123
 
1119
 /** LCD API **/
1124
 /** LCD API **/

Loading…
Cancel
Save