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

Merge pull request #8912 from thinkyhead/bf2_no_vol_fix

Browse source 
[2.0.x] No sub-menu if NO_VOLUMETRICS
This commit is contained in:
Scott Lahteine 2017-12-26 18:46:39 -06:00 committed by GitHub
commit fb6966f2b5
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Marlin/src/lcd/ultralcd.cpp
View file

@ -177,7 +177,10 @@ uint16_t max_display_update_time = 0;
void lcd_control_temperature_preheat_material1_settings_menu();
void lcd_control_temperature_preheat_material2_settings_menu();
void lcd_control_motion_menu();
void lcd_control_filament_menu();
#if DISABLED(NO_VOLUMETRICS)
void lcd_control_filament_menu();
#endif
#if ENABLED(LCD_INFO_MENU)
#if ENABLED(PRINTCOUNTER)
@ -3134,7 +3137,12 @@ void kill_screen(const char* lcd_msg) {
MENU_BACK(MSG_MAIN);
MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu);
MENU_ITEM(submenu, MSG_MOTION, lcd_control_motion_menu);
MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu);
#if DISABLED(NO_VOLUMETRICS)
MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu);
#elif ENABLED(LIN_ADVANCE)
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
#endif
#if HAS_LCD_CONTRAST
MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, &lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true);
@ -3623,20 +3631,19 @@ void kill_screen(const char* lcd_msg) {
END_MENU();
}
/**
*
* "Control" > "Filament" submenu
*
*/
void lcd_control_filament_menu() {
START_MENU();
MENU_BACK(MSG_CONTROL);
#if DISABLED(NO_VOLUMETRICS)
/**
*
* "Control" > "Filament" submenu
*
*/
void lcd_control_filament_menu() {
START_MENU();
MENU_BACK(MSG_CONTROL);
#if ENABLED(LIN_ADVANCE)
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
#endif
#if DISABLED(NO_VOLUMETRICS)
#if ENABLED(LIN_ADVANCE)
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
#endif
MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &parser.volumetric_enabled, planner.calculate_volumetric_multipliers);
@ -3659,10 +3666,9 @@ void kill_screen(const char* lcd_msg) {
#endif // EXTRUDERS > 1
}
#endif // !NO_VOLUMETRICS
END_MENU();
}
END_MENU();
}
#endif // !NO_VOLUMETRICS
/**
*