A specific option to SLIM_LCD_MENUS
This commit is contained in:
parent
10edb469bb
commit
2929c9e56f
2 changed files with 240 additions and 222 deletions
|
@ -473,6 +473,9 @@
|
||||||
// Include a page of printer information in the LCD Main Menu
|
// Include a page of printer information in the LCD Main Menu
|
||||||
//#define LCD_INFO_MENU
|
//#define LCD_INFO_MENU
|
||||||
|
|
||||||
|
// Leave out seldom-used LCD menu items to recover some Program Memory
|
||||||
|
//#define SLIM_LCD_MENUS
|
||||||
|
|
||||||
// Scroll a longer status message into view
|
// Scroll a longer status message into view
|
||||||
//#define STATUS_MESSAGE_SCROLLING
|
//#define STATUS_MESSAGE_SCROLLING
|
||||||
|
|
||||||
|
|
|
@ -176,9 +176,12 @@ uint16_t max_display_update_time = 0;
|
||||||
void lcd_move_menu();
|
void lcd_move_menu();
|
||||||
void lcd_control_menu();
|
void lcd_control_menu();
|
||||||
void lcd_control_temperature_menu();
|
void lcd_control_temperature_menu();
|
||||||
|
void lcd_control_motion_menu();
|
||||||
|
|
||||||
|
#if DISABLED(SLIM_LCD_MENUS)
|
||||||
void lcd_control_temperature_preheat_material1_settings_menu();
|
void lcd_control_temperature_preheat_material1_settings_menu();
|
||||||
void lcd_control_temperature_preheat_material2_settings_menu();
|
void lcd_control_temperature_preheat_material2_settings_menu();
|
||||||
void lcd_control_motion_menu();
|
#endif
|
||||||
|
|
||||||
#if DISABLED(NO_VOLUMETRICS)
|
#if DISABLED(NO_VOLUMETRICS)
|
||||||
void lcd_control_filament_menu();
|
void lcd_control_filament_menu();
|
||||||
|
@ -2627,7 +2630,7 @@ void kill_screen(const char* lcd_msg) {
|
||||||
lcd_bed_leveling
|
lcd_bed_leveling
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
#elif PLANNER_LEVELING && DISABLED(PROBE_MANUALLY)
|
#elif PLANNER_LEVELING && DISABLED(PROBE_MANUALLY) && DISABLED(SLIM_LCD_MENUS)
|
||||||
MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29"));
|
MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29"));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -2636,7 +2639,7 @@ void kill_screen(const char* lcd_msg) {
|
||||||
MENU_ITEM(function, MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
|
MENU_ITEM(function, MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAS_M206_COMMAND
|
#if HAS_M206_COMMAND && DISABLED(SLIM_LCD_MENUS)
|
||||||
//
|
//
|
||||||
// Set Home Offsets
|
// Set Home Offsets
|
||||||
//
|
//
|
||||||
|
@ -3250,8 +3253,10 @@ void kill_screen(const char* lcd_msg) {
|
||||||
MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
|
MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
|
||||||
MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
|
MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
MENU_ITEM(function, MSG_RESTORE_FAILSAFE, lcd_factory_settings);
|
MENU_ITEM(function, MSG_RESTORE_FAILSAFE, lcd_factory_settings);
|
||||||
#if ENABLED(EEPROM_SETTINGS)
|
|
||||||
|
#if ENABLED(EEPROM_SETTINGS) && DISABLED(SLIM_LCD_MENUS)
|
||||||
MENU_ITEM(submenu, MSG_INIT_EEPROM, lcd_init_eeprom_confirm);
|
MENU_ITEM(submenu, MSG_INIT_EEPROM, lcd_init_eeprom_confirm);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -3463,6 +3468,7 @@ void kill_screen(const char* lcd_msg) {
|
||||||
|
|
||||||
#endif // PIDTEMP
|
#endif // PIDTEMP
|
||||||
|
|
||||||
|
#if DISABLED(SLIM_LCD_MENUS)
|
||||||
//
|
//
|
||||||
// Preheat Material 1 conf
|
// Preheat Material 1 conf
|
||||||
//
|
//
|
||||||
|
@ -3472,9 +3478,13 @@ void kill_screen(const char* lcd_msg) {
|
||||||
// Preheat Material 2 conf
|
// Preheat Material 2 conf
|
||||||
//
|
//
|
||||||
MENU_ITEM(submenu, MSG_PREHEAT_2_SETTINGS, lcd_control_temperature_preheat_material2_settings_menu);
|
MENU_ITEM(submenu, MSG_PREHEAT_2_SETTINGS, lcd_control_temperature_preheat_material2_settings_menu);
|
||||||
|
#endif
|
||||||
|
|
||||||
END_MENU();
|
END_MENU();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if DISABLED(SLIM_LCD_MENUS)
|
||||||
|
|
||||||
void _lcd_control_temperature_preheat_settings_menu(uint8_t material) {
|
void _lcd_control_temperature_preheat_settings_menu(uint8_t material) {
|
||||||
#if HOTENDS > 4
|
#if HOTENDS > 4
|
||||||
#define MINTEMP_ALL MIN5(HEATER_0_MINTEMP, HEATER_1_MINTEMP, HEATER_2_MINTEMP, HEATER_3_MINTEMP, HEATER_4_MINTEMP)
|
#define MINTEMP_ALL MIN5(HEATER_0_MINTEMP, HEATER_1_MINTEMP, HEATER_2_MINTEMP, HEATER_3_MINTEMP, HEATER_4_MINTEMP)
|
||||||
|
@ -3521,13 +3531,6 @@ void kill_screen(const char* lcd_msg) {
|
||||||
*/
|
*/
|
||||||
void lcd_control_temperature_preheat_material2_settings_menu() { _lcd_control_temperature_preheat_settings_menu(1); }
|
void lcd_control_temperature_preheat_material2_settings_menu() { _lcd_control_temperature_preheat_settings_menu(1); }
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* "Control" > "Motion" submenu
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
void _reset_acceleration_rates() { planner.reset_acceleration_rates(); }
|
void _reset_acceleration_rates() { planner.reset_acceleration_rates(); }
|
||||||
#if ENABLED(DISTINCT_E_FACTORS)
|
#if ENABLED(DISTINCT_E_FACTORS)
|
||||||
void _reset_e_acceleration_rate(const uint8_t e) { if (e == active_extruder) _reset_acceleration_rates(); }
|
void _reset_e_acceleration_rate(const uint8_t e) { if (e == active_extruder) _reset_acceleration_rates(); }
|
||||||
|
@ -3686,6 +3689,14 @@ void kill_screen(const char* lcd_msg) {
|
||||||
END_MENU();
|
END_MENU();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // !SLIM_LCD_MENUS
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* "Control" > "Motion" submenu
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
void lcd_control_motion_menu() {
|
void lcd_control_motion_menu() {
|
||||||
START_MENU();
|
START_MENU();
|
||||||
MENU_BACK(MSG_CONTROL);
|
MENU_BACK(MSG_CONTROL);
|
||||||
|
@ -3696,6 +3707,8 @@ void kill_screen(const char* lcd_msg) {
|
||||||
MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
|
MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if DISABLED(SLIM_LCD_MENUS)
|
||||||
|
|
||||||
// M203 / M205 - Feedrate items
|
// M203 / M205 - Feedrate items
|
||||||
MENU_ITEM(submenu, MSG_VELOCITY, lcd_control_motion_velocity_menu);
|
MENU_ITEM(submenu, MSG_VELOCITY, lcd_control_motion_velocity_menu);
|
||||||
|
|
||||||
|
@ -3708,6 +3721,8 @@ void kill_screen(const char* lcd_msg) {
|
||||||
// M92 - Steps Per mm
|
// M92 - Steps Per mm
|
||||||
MENU_ITEM(submenu, MSG_STEPS_PER_MM, lcd_control_motion_steps_per_mm_menu);
|
MENU_ITEM(submenu, MSG_STEPS_PER_MM, lcd_control_motion_steps_per_mm_menu);
|
||||||
|
|
||||||
|
#endif // !SLIM_LCD_MENUS
|
||||||
|
|
||||||
// M540 S - Abort on endstop hit when SD printing
|
// M540 S - Abort on endstop hit when SD printing
|
||||||
#if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
|
#if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
|
||||||
MENU_ITEM_EDIT(bool, MSG_ENDSTOP_ABORT, &stepper.abort_on_endstop_hit);
|
MENU_ITEM_EDIT(bool, MSG_ENDSTOP_ABORT, &stepper.abort_on_endstop_hit);
|
||||||
|
|
Reference in a new issue