3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-03-01 12:27:13 +00:00
Code Issues Releases Wiki Activity

🚸 Reorder some Menu Items

Browse source
This commit is contained in:
Scott Lahteine 2023-05-05 19:31:18 -05:00
parent 2e06e05d7c
commit 9b883704bc
2 changed files with 39 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/lcd/menu/menu_bed_leveling.cpp
View file

@ -292,6 +292,10 @@ void menu_bed_leveling() {
EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX); EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
#endif #endif
#if ENABLED(PROBE_OFFSET_WIZARD)
SUBMENU(MSG_PROBE_WIZARD, goto_probe_offset_wizard);
#endif
#if ENABLED(LCD_BED_TRAMMING) #if ENABLED(LCD_BED_TRAMMING)
SUBMENU(MSG_BED_TRAMMING, _lcd_bed_tramming); SUBMENU(MSG_BED_TRAMMING, _lcd_bed_tramming);
#endif #endif

70
Marlin/src/lcd/menu/menu_motion.cpp
View file

@ -337,28 +337,6 @@ void menu_motion() {
#endif #endif
#endif #endif
//
// Auto-calibration
//
#if ENABLED(CALIBRATION_GCODE)
GCODES_ITEM(MSG_AUTO_CALIBRATE, F("G425"));
#endif
//
// Auto Z-Align
//
#if EITHER(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
GCODES_ITEM(MSG_AUTO_Z_ALIGN, F("G34"));
#endif
//
// Probe Deploy/Stow
//
#if ENABLED(PROBE_DEPLOY_STOW_MENU)
GCODES_ITEM(MSG_MANUAL_DEPLOY, F("M401"));
GCODES_ITEM(MSG_MANUAL_STOW, F("M402"));
#endif
// //
// Pen up/down menu // Pen up/down menu
// //
@ -367,19 +345,6 @@ void menu_motion() {
GCODES_ITEM(MSG_MANUAL_PENDOWN, F("M280 P0 S50")); GCODES_ITEM(MSG_MANUAL_PENDOWN, F("M280 P0 S50"));
#endif #endif
// Probe Offset Wizard
//
#if ENABLED(PROBE_OFFSET_WIZARD)
SUBMENU(MSG_PROBE_WIZARD, goto_probe_offset_wizard);
#endif
//
// Assisted Bed Tramming
//
#if ENABLED(ASSISTED_TRAMMING_WIZARD)
SUBMENU(MSG_TRAMMING_WIZARD, goto_tramming_wizard);
#endif
// //
// Level Bed // Level Bed
// //
@ -410,14 +375,49 @@ void menu_motion() {
#endif #endif
//
// Assisted Bed Tramming
//
#if ENABLED(ASSISTED_TRAMMING_WIZARD)
SUBMENU(MSG_TRAMMING_WIZARD, goto_tramming_wizard);
#endif
//
// Bed Tramming Submenu
//
#if ENABLED(LCD_BED_TRAMMING) && DISABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_TRAMMING) && DISABLED(LCD_BED_LEVELING)
SUBMENU(MSG_BED_TRAMMING, _lcd_bed_tramming); SUBMENU(MSG_BED_TRAMMING, _lcd_bed_tramming);
#endif #endif
//
// Auto Z-Align
//
#if EITHER(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
GCODES_ITEM(MSG_AUTO_Z_ALIGN, F("G34"));
#endif
//
// Probe Deploy/Stow
//
#if ENABLED(PROBE_DEPLOY_STOW_MENU)
GCODES_ITEM(MSG_MANUAL_DEPLOY, F("M401"));
GCODES_ITEM(MSG_MANUAL_STOW, F("M402"));
#endif
//
// Probe Repeatability Test
//
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST) #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
GCODES_ITEM(MSG_M48_TEST, F("G28O\nM48 P10")); GCODES_ITEM(MSG_M48_TEST, F("G28O\nM48 P10"));
#endif #endif
//
// Auto-calibration with Object
//
#if ENABLED(CALIBRATION_GCODE)
GCODES_ITEM(MSG_AUTO_CALIBRATE, F("G425"));
#endif
// //
// Disable Steppers // Disable Steppers
// //