MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Move Z Probe Z Offset from Advanced to basic Configuration (#13056)

Browse Source
This commit is contained in:
InsanityAutomation 2019-01-30 22:08:36 -05:00 committed by Scott Lahteine
parent 31e213e427
commit 7d927b6691
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -558,12 +558,6 @@ void menu_advanced_settings() {
START_MENU(); START_MENU();
MENU_BACK(MSG_CONFIGURATION); MENU_BACK(MSG_CONFIGURATION);
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
#elif HAS_BED_PROBE
MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
#endif
#if DISABLED(SLIM_LCD_MENUS) #if DISABLED(SLIM_LCD_MENUS)
#if HAS_M206_COMMAND #if HAS_M206_COMMAND

10
Marlin/src/lcd/menu/menu_configuration.cpp
View File

@ -40,6 +40,10 @@
#include "../../feature/power_loss_recovery.h" #include "../../feature/power_loss_recovery.h"
#endif #endif
#if HAS_BED_PROBE
#include "../../module/probe.h"
#endif
#define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST) #define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST)
void menu_advanced_settings(); void menu_advanced_settings();
@ -306,6 +310,12 @@ void menu_configuration() {
MENU_ITEM(submenu, MSG_ADVANCED_SETTINGS, menu_advanced_settings); MENU_ITEM(submenu, MSG_ADVANCED_SETTINGS, menu_advanced_settings);
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
#elif HAS_BED_PROBE
MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
#endif
const bool busy = printer_busy(); const bool busy = printer_busy();
if (!busy) { if (!busy) {
// //

3
Marlin/src/lcd/menu/menu_main.cpp
View File

@ -61,7 +61,8 @@ void lcd_pause() {
void lcd_resume() { void lcd_resume() {
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
if (card.isPaused()) enqueue_and_echo_commands_P(PSTR("M24")); if (card.isPaused()) enqueue_and_echo_commands_P(PSTR("M24"));
#elif defined(ACTION_ON_RESUME) #endif
#ifdef ACTION_ON_RESUME
host_action_resume(); host_action_resume();
#endif #endif
} }