Pārlūkot izejas kodu

Merge pull request #1313 from wgm4321/Development

Re-enable filament menu with recalc fix when enabling/disabling mm3
Bo Herrmannsen 10 gadus atpakaļ
vecāks
revīzija
4ffecdbf7d
1 mainītis faili ar 6 papildinājumiem un 1 dzēšanām
  1. 6
    1
      Marlin/ultralcd.cpp

+ 6
- 1
Marlin/ultralcd.cpp Parādīt failu

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 **/

Notiek ielāde…
Atcelt
Saglabāt