From 1000563d80c01e6795ef693dd783b543faa4d3d8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 14 Jun 2016 18:05:20 -0700 Subject: [PATCH] Make M851 standard with a bed probe --- Marlin/Configuration.h | 12 --------- Marlin/Marlin.h | 2 +- Marlin/Marlin_main.cpp | 15 ++++++----- Marlin/configuration_store.cpp | 25 +++++++------------ .../Cartesio/Configuration.h | 12 --------- .../Felix/Configuration.h | 12 --------- .../Felix/DUAL/Configuration.h | 12 --------- .../Hephestos/Configuration.h | 12 --------- .../Hephestos_2/Configuration.h | 15 +++-------- .../K8200/Configuration.h | 12 --------- .../RepRapWorld/Megatronics/Configuration.h | 12 --------- .../RigidBot/Configuration.h | 12 --------- .../SCARA/Configuration.h | 12 --------- .../TAZ4/Configuration.h | 12 --------- .../WITBOX/Configuration.h | 12 --------- .../adafruit/ST7565/Configuration.h | 12 --------- .../delta/biv2.5/Configuration.h | 12 --------- .../delta/generic/Configuration.h | 12 --------- .../delta/kossel_mini/Configuration.h | 12 --------- .../delta/kossel_pro/Configuration.h | 15 +++-------- .../delta/kossel_xl/Configuration.h | 12 --------- .../makibox/Configuration.h | 12 --------- .../tvrrug/Round2/Configuration.h | 12 --------- Marlin/ultralcd.cpp | 2 +- 24 files changed, 28 insertions(+), 262 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 509427b61b..c0aab3ee1e 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -719,18 +719,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index f7c51e2526..b99c3fb9b0 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -319,7 +319,7 @@ float code_value_temp_diff(); extern float z_endstop_adj; #endif -#if ENABLED(AUTO_BED_LEVELING_FEATURE) +#if HAS_BED_PROBE extern float zprobe_zoffset; #endif diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 3d63bec3df..2b6816488a 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -364,9 +364,12 @@ static millis_t stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL static uint8_t target_extruder; +#if HAS_BED_PROBE + float zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER; +#endif + #if ENABLED(AUTO_BED_LEVELING_FEATURE) int xy_travel_speed = XY_TRAVEL_SPEED; - float zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER; bool bed_leveling_in_progress = false; #endif @@ -1490,7 +1493,7 @@ static void set_axis_is_at_home(AxisEnum axis) { current_position[axis] = base_home_pos(axis) + home_offset[axis]; update_software_endstops(axis); - #if ENABLED(AUTO_BED_LEVELING_FEATURE) && Z_HOME_DIR < 0 + #if HAS_BED_PROBE && Z_HOME_DIR < 0 if (axis == Z_AXIS) { current_position[Z_AXIS] -= zprobe_zoffset; #if ENABLED(DEBUG_LEVELING_FEATURE) @@ -6263,9 +6266,9 @@ inline void gcode_M503() { #endif // ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED -#ifdef CUSTOM_M_CODE_SET_Z_PROBE_OFFSET +#if HAS_BED_PROBE - inline void gcode_SET_Z_PROBE_OFFSET() { + inline void gcode_M851() { SERIAL_ECHO_START; SERIAL_ECHOPGM(MSG_ZPROBE_ZOFFSET); @@ -6291,7 +6294,7 @@ inline void gcode_M503() { SERIAL_EOL; } -#endif // CUSTOM_M_CODE_SET_Z_PROBE_OFFSET +#endif // HAS_BED_PROBE #if ENABLED(FILAMENTCHANGEENABLE) @@ -7400,7 +7403,7 @@ void process_next_command() { #ifdef CUSTOM_M_CODE_SET_Z_PROBE_OFFSET case CUSTOM_M_CODE_SET_Z_PROBE_OFFSET: - gcode_SET_Z_PROBE_OFFSET(); + gcode_M851(); break; #endif // CUSTOM_M_CODE_SET_Z_PROBE_OFFSET diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp index 130763123d..4bad3ce0ce 100644 --- a/Marlin/configuration_store.cpp +++ b/Marlin/configuration_store.cpp @@ -210,7 +210,7 @@ void Config_StoreSettings() { for (uint8_t q = 0; q < mesh_num_x * mesh_num_y; q++) EEPROM_WRITE_VAR(i, dummy); #endif // MESH_BED_LEVELING - #if DISABLED(AUTO_BED_LEVELING_FEATURE) + #if !HAS_BED_PROBE float zprobe_zoffset = 0; #endif EEPROM_WRITE_VAR(i, zprobe_zoffset); @@ -389,7 +389,7 @@ void Config_RetrieveSettings() { for (uint8_t q = 0; q < mesh_num_x * mesh_num_y; q++) EEPROM_READ_VAR(i, dummy); #endif // MESH_BED_LEVELING - #if DISABLED(AUTO_BED_LEVELING_FEATURE) + #if !HAS_BED_PROBE float zprobe_zoffset = 0; #endif EEPROM_READ_VAR(i, zprobe_zoffset); @@ -554,7 +554,7 @@ void Config_ResetDefault() { mbl.reset(); #endif - #if ENABLED(AUTO_BED_LEVELING_FEATURE) + #if HAS_BED_PROBE zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER; #endif @@ -927,20 +927,13 @@ void Config_PrintSettings(bool forReplay) { /** * Auto Bed Leveling */ - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #if ENABLED(CUSTOM_M_CODES) - if (!forReplay) { - CONFIG_ECHO_START; - SERIAL_ECHOLNPGM("Z-Probe Offset (mm):"); - } + #if HAS_BED_PROBE + if (!forReplay) { CONFIG_ECHO_START; - SERIAL_ECHOPAIR(" M" STRINGIFY(CUSTOM_M_CODE_SET_Z_PROBE_OFFSET) " Z", zprobe_zoffset); - #else - if (!forReplay) { - CONFIG_ECHO_START; - SERIAL_ECHOPAIR("Z-Probe Offset (mm):", zprobe_zoffset); - } - #endif + SERIAL_ECHOLNPGM("Z-Probe Offset (mm):"); + } + CONFIG_ECHO_START; + SERIAL_ECHOPAIR(" M851 Z", zprobe_zoffset); SERIAL_EOL; #endif } diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index d5fddbbd0b..d86161a58f 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -718,18 +718,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index f92302db53..cad842c35e 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -702,18 +702,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index c243209d5e..c08e57e3c4 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -700,18 +700,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 34ee387ee5..a2f17dd2d7 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -711,18 +711,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index d5e6a0df04..64f39854dc 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -713,17 +713,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -5 - #define Z_PROBE_OFFSET_RANGE_MAX 0 - #endif -#endif +// @section probes + +#define Z_PROBE_OFFSET_RANGE_MIN -5 +#define Z_PROBE_OFFSET_RANGE_MAX 0 // @section extras diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 6797fcd89f..ababf64bb2 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -736,18 +736,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 9a4a2c7fbd..66af697dd0 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -719,18 +719,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index dff38c635e..2b544085bf 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -714,18 +714,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 5ac806382b..4e2792a1d2 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -727,18 +727,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -//#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 5c1742d68c..a015b7559c 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -740,18 +740,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 4055e15a3f..0977bc207c 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -711,18 +711,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index fdbf9a8697..f9f04744ef 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -719,18 +719,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index d6b783a95b..1a4a5b3641 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -808,18 +808,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 6f2963c37b..a555b60053 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -802,18 +802,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 5b4436647e..cfb9ef3545 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -805,18 +805,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 9ec47259dd..22308c4588 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -805,17 +805,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -15 - #define Z_PROBE_OFFSET_RANGE_MAX -5 - #endif -#endif +// @section probes + +#define Z_PROBE_OFFSET_RANGE_MIN -15 +#define Z_PROBE_OFFSET_RANGE_MAX 5 // @section extras diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 646c894163..f871b083f1 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -807,18 +807,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 2ad761ce59..d0ac688f97 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -722,18 +722,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 4d8b04e38c..8e40a5c5b5 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -713,18 +713,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //============================= Additional Features =========================== //============================================================================= -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - // @section extras // diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index add6cb0292..5372626849 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1684,7 +1684,7 @@ static void lcd_status_screen() { static void lcd_control_motion_menu() { START_MENU(); MENU_ITEM(back, MSG_CONTROL); - #if ENABLED(AUTO_BED_LEVELING_FEATURE) + #if HAS_BED_PROBE MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX); #endif // Manual bed leveling, Bed Z: