CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move steps/mm out of slim menus (#16603)

Browse Source
This commit is contained in:
InsanityAutomation 2020-01-20 01:43:19 -05:00 committed by Scott Lahteine
parent 451062553e
commit d9cdb4ae19
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Marlin/src/lcd/menu/menu_advanced.cpp
View File

@ -480,6 +480,20 @@ void menu_cancelobject();
END_MENU(); END_MENU();
} }
// M851 - Z Probe Offsets
#if HAS_BED_PROBE
void menu_probe_offsets() {
START_MENU();
BACK_ITEM(MSG_ADVANCED_SETTINGS);
EDIT_ITEM(float51sign, MSG_ZPROBE_XOFFSET, &probe_offset.x, -(X_BED_SIZE), X_BED_SIZE);
EDIT_ITEM(float51sign, MSG_ZPROBE_YOFFSET, &probe_offset.y, -(Y_BED_SIZE), Y_BED_SIZE);
EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
END_MENU();
}
#endif
#endif // !SLIM_LCD_MENUS
// M92 Steps-per-mm // M92 Steps-per-mm
void menu_advanced_steps_per_mm() { void menu_advanced_steps_per_mm() {
START_MENU(); START_MENU();
@ -501,20 +515,6 @@ void menu_cancelobject();
END_MENU(); END_MENU();
} }
// M851 - Z Probe Offsets
#if HAS_BED_PROBE
void menu_probe_offsets() {
START_MENU();
BACK_ITEM(MSG_ADVANCED_SETTINGS);
EDIT_ITEM(float51sign, MSG_ZPROBE_XOFFSET, &probe_offset.x, -(X_BED_SIZE), X_BED_SIZE);
EDIT_ITEM(float51sign, MSG_ZPROBE_YOFFSET, &probe_offset.y, -(Y_BED_SIZE), Y_BED_SIZE);
EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe_offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
END_MENU();
}
#endif
#endif // !SLIM_LCD_MENUS
void menu_advanced_settings() { void menu_advanced_settings() {
#if ENABLED(FILAMENT_RUNOUT_SENSOR) && FILAMENT_RUNOUT_DISTANCE_MM #if ENABLED(FILAMENT_RUNOUT_SENSOR) && FILAMENT_RUNOUT_DISTANCE_MM
lcd_runout_distance_mm = runout.runout_distance(); lcd_runout_distance_mm = runout.runout_distance();
@ -540,17 +540,17 @@ void menu_advanced_settings() {
// M205 - Max Jerk // M205 - Max Jerk
SUBMENU(MSG_JERK, menu_advanced_jerk); SUBMENU(MSG_JERK, menu_advanced_jerk);
if (!printer_busy()) {
// M92 - Steps Per mm
SUBMENU(MSG_STEPS_PER_MM, menu_advanced_steps_per_mm);
#if HAS_BED_PROBE
// M851 - Z Probe Offsets // M851 - Z Probe Offsets
#if HAS_BED_PROBE
if (!printer_busy())
SUBMENU(MSG_ZPROBE_OFFSETS, menu_probe_offsets); SUBMENU(MSG_ZPROBE_OFFSETS, menu_probe_offsets);
#endif #endif
}
#endif // !SLIM_LCD_MENUS #endif // !SLIM_LCD_MENUS
// M92 - Steps Per mm
if (!printer_busy())
SUBMENU(MSG_STEPS_PER_MM, menu_advanced_steps_per_mm);
#if ENABLED(BACKLASH_GCODE) #if ENABLED(BACKLASH_GCODE)
SUBMENU(MSG_BACKLASH, menu_backlash); SUBMENU(MSG_BACKLASH, menu_backlash);
#endif #endif