From 9e221849365d2ad22662687ee3338a18652751a6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 13 Mar 2017 00:24:22 -0500 Subject: [PATCH 1/3] Add a "manual" option for ABL --- Marlin/Conditionals_LCD.h | 4 +-- Marlin/Conditionals_post.h | 2 +- Marlin/Configuration.h | 29 +++++++++++------ Marlin/SanityCheck.h | 16 ++++++---- .../Cartesio/Configuration.h | 32 ++++++++++++------- .../Felix/Configuration.h | 32 ++++++++++++------- .../Felix/DUAL/Configuration.h | 32 ++++++++++++------- .../Hephestos/Configuration.h | 32 ++++++++++++------- .../Hephestos_2/Configuration.h | 32 ++++++++++++------- .../K8200/Configuration.h | 32 ++++++++++++------- .../K8400/Configuration.h | 32 ++++++++++++------- .../K8400/Dual-head/Configuration.h | 32 ++++++++++++------- .../RepRapWorld/Megatronics/Configuration.h | 32 ++++++++++++------- .../RigidBot/Configuration.h | 32 ++++++++++++------- .../SCARA/Configuration.h | 32 ++++++++++++------- .../TAZ4/Configuration.h | 32 ++++++++++++------- .../WITBOX/Configuration.h | 32 ++++++++++++------- .../adafruit/ST7565/Configuration.h | 32 ++++++++++++------- .../delta/flsun_kossel_mini/Configuration.h | 31 +++++++++++------- .../delta/generic/Configuration.h | 32 ++++++++++++------- .../delta/kossel_mini/Configuration.h | 32 ++++++++++++------- .../delta/kossel_pro/Configuration.h | 32 ++++++++++++------- .../delta/kossel_xl/Configuration.h | 32 ++++++++++++------- .../makibox/Configuration.h | 32 ++++++++++++------- .../tvrrug/Round2/Configuration.h | 32 ++++++++++++------- 25 files changed, 451 insertions(+), 271 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index 9f27bd29ca..862e4827b8 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -371,12 +371,12 @@ /** * Set a flag for any enabled probe */ - #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED)) + #define PROBE_SELECTED (ENABLED(PROBE_MANUALLY) || ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED)) /** * Clear probe pin settings when no probe is selected */ - #if !PROBE_SELECTED + #if !PROBE_SELECTED || ENABLED(PROBE_MANUALLY) #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN #undef Z_MIN_PROBE_ENDSTOP #endif diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h index 6594840808..b189af507c 100644 --- a/Marlin/Conditionals_post.h +++ b/Marlin/Conditionals_post.h @@ -589,7 +589,7 @@ #define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN))) - #define HAS_BED_PROBE (PROBE_SELECTED && PROBE_PIN_CONFIGURED) + #define HAS_BED_PROBE (PROBE_SELECTED && PROBE_PIN_CONFIGURED && DISABLED(PROBE_MANUALLY)) #if ENABLED(Z_PROBE_ALLEN_KEY) #define PROBE_IS_TRIGGERED_WHEN_STOWED_TEST diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d72e77d0e1..bb554fa86a 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -545,6 +545,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -876,15 +881,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1432,13 +1441,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 3941e6fb27..5ab7181c68 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -130,8 +130,12 @@ #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_CLEARANCE_DEPLOY_PROBE and Z_CLEARANCE_BETWEEN_PROBES. Please update your configuration." #elif defined(Z_PROBE_DEPLOY_HEIGHT) || defined(Z_PROBE_TRAVEL_HEIGHT) #error "Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT are now Z_CLEARANCE_DEPLOY_PROBE and Z_CLEARANCE_BETWEEN_PROBES. Please update your configuration." +#elif defined(MANUAL_BED_LEVELING) + #error "MANUAL_BED_LEVELING is now LCD_BED_LEVELING. Please update your configuration." #elif defined(MESH_HOME_SEARCH_Z) - #error "MESH_HOME_SEARCH_Z is now MANUAL_PROBE_Z_RANGE. Please update your configuration." + #error "MESH_HOME_SEARCH_Z is now LCD_PROBE_Z_RANGE. Please update your configuration." +#elif defined(MANUAL_PROBE_Z_RANGE) + #error "MANUAL_PROBE_Z_RANGE is now LCD_PROBE_Z_RANGE. Please update your configuration." #elif !defined(MIN_STEPS_PER_SEGMENT) #error Please replace "const int dropsegments" with "#define MIN_STEPS_PER_SEGMENT" (and increase by 1) in Configuration_adv.h. #elif defined(PREVENT_DANGEROUS_EXTRUDE) @@ -408,8 +412,6 @@ static_assert(1 >= 0 #elif MESH_NUM_X_POINTS > 9 || MESH_NUM_Y_POINTS > 9 #error "MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS must be less than 10." #endif -#elif ENABLED(MANUAL_BED_LEVELING) - #error "MANUAL_BED_LEVELING only applies to MESH_BED_LEVELING." #endif /** @@ -492,7 +494,7 @@ static_assert(1 >= 0 #if !HAS_Z_MIN_PROBE_PIN #error "Z_MIN_PROBE_ENDSTOP requires the Z_MIN_PROBE_PIN to be defined." #endif - #else + #elif DISABLED(PROBE_MANUALLY) #error "You must enable either Z_MIN_PROBE_ENDSTOP or Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use a probe." #endif @@ -523,10 +525,10 @@ static_assert(1 >= 0 #endif /** - * MANUAL_BED_LEVELING requirements + * LCD_BED_LEVELING requirements */ -#if ENABLED(MANUAL_BED_LEVELING) && DISABLED(MESH_BED_LEVELING) - #error "MANUAL_BED_LEVELING requires MESH_BED_LEVELING." +#if ENABLED(LCD_BED_LEVELING) && DISABLED(MESH_BED_LEVELING) && !(HAS_ABL && ENABLED(PROBE_MANUALLY)) + #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or PROBE_MANUALLY." #endif /** diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index 22cf260ffe..3fd0a7b4a0 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -232,7 +232,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -545,6 +545,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -741,7 +746,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -877,15 +881,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1433,13 +1441,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) #define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index b7cea166ec..0c7d070f77 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -528,6 +528,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -724,7 +729,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -860,15 +864,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1416,13 +1424,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index fe23cecac7..1b73fd4087 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -528,6 +528,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -724,7 +729,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -860,15 +864,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1416,13 +1424,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 7427ddd02f..9ea0b4b234 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -234,7 +234,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -537,6 +537,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -733,7 +738,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -869,15 +873,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1425,13 +1433,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 920c160b4e..8001b300d9 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -539,6 +539,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -735,7 +740,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -871,15 +875,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1427,13 +1435,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 240514fa66..d490c9bbf5 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -251,7 +251,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -574,6 +574,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -770,7 +775,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -906,15 +910,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1467,13 +1475,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index 55bbf2b0b1..a76a149ba8 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -545,6 +545,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -741,7 +746,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -877,15 +881,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1433,13 +1441,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index 53515a7ab3..784af8ef6a 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -545,6 +545,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -741,7 +746,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -877,15 +881,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1433,13 +1441,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 787adad89a..53634f5f5e 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -545,6 +545,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -741,7 +746,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -877,15 +881,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1433,13 +1441,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 554b9940df..77a19b7e01 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -234,7 +234,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -544,6 +544,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -740,7 +745,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -876,15 +880,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1434,13 +1442,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 2b88b983e6..9ae75f3914 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -263,7 +263,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -560,6 +560,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -756,7 +761,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -892,15 +896,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1448,13 +1456,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index b484352edc..9e1466db8a 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -566,6 +566,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -762,7 +767,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -898,15 +902,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1454,13 +1462,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index b7e5f255ab..2375986b75 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -234,7 +234,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -537,6 +537,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -733,7 +738,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -869,15 +873,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1425,13 +1433,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index b392667a0a..57e23c03ec 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -545,6 +545,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -741,7 +746,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -877,15 +881,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1433,13 +1441,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h b/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h index 5097bd3e4c..e3851c9291 100644 --- a/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -603,6 +603,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -982,15 +987,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1538,13 +1547,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 893b002fbb..4682962f40 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -590,6 +590,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -831,7 +836,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -968,15 +972,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1523,13 +1531,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 40181a3c28..fbb17466ba 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -590,6 +590,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -834,7 +839,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -972,15 +976,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1527,13 +1535,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index e6b76b50bc..81d935c9cb 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -235,7 +235,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -584,6 +584,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -833,7 +838,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -971,15 +975,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1526,13 +1534,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 88a613b92f..9403f44310 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -603,6 +603,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -844,7 +849,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -981,15 +985,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1536,13 +1544,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 3023e20597..3f4a978daa 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -548,6 +548,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -744,7 +749,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -880,15 +884,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1436,13 +1444,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 0c7331fc98..da09617910 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -231,7 +231,7 @@ * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 * 66 : 4.7M High Temperature thermistor from Dyze Design * 70 : the 100K thermistor found in the bq Hephestos 2 - * 75 : 100k Generic Silicon Heat Pad typically a NTC 100K MGB18-104F39050L32 thermistor + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor * * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. * (but gives greater accuracy and more stable PID) @@ -541,6 +541,11 @@ // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // +// The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. +// Use G29 repeatedly, adjusting the Z height at each point with movement commands +// or (with LCD_BED_LEVELING) the LCD controller. +//#define PROBE_MANUALLY + // A Fix-Mounted Probe either doesn't deploy or needs manual deployment. // For example an inductive probe, or a setup that uses the nozzle to probe. // An inductive probe must be deactivated to go below @@ -737,7 +742,6 @@ #define FILAMENT_RUNOUT_SCRIPT "M600" #endif - //=========================================================================== //=============================== Bed Leveling ============================== //=========================================================================== @@ -873,15 +877,19 @@ //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS - //#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. - #define MANUAL_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment - - #if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. - #endif - #endif // BED_LEVELING +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + /** * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. @@ -1429,13 +1437,13 @@ // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can // be used to mitigate the associated resolution loss. If enabled, -// some of the PWM cycles are stretched so on average the wanted +// some of the PWM cycles are stretched so on average the desired // duty cycle is attained. //#define SOFT_PWM_DITHER // Temperature status LEDs that display the hotend and bed temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) //#define TEMP_STAT_LEDS // M240 Triggers a camera by emulating a Canon RC-1 Remote From fcadc7bb1af0db940b01fa617fd1669779483128 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 15 Mar 2017 03:32:00 -0500 Subject: [PATCH 2/3] Implement the "manual" option for ABL --- .travis.yml | 21 +- Marlin/Marlin_main.cpp | 739 +++++++++++++++++++++++++++++------------ Marlin/enum.h | 10 - Marlin/ultralcd.cpp | 16 +- 4 files changed, 549 insertions(+), 237 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33af669821..5bfb6809bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -124,24 +124,17 @@ script: - build_marlin # # Test a Sled Z Probe - # - - restore_configs - - opt_enable Z_PROBE_SLED - - build_marlin - # # ...with AUTO_BED_LEVELING_LINEAR, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, and EEPROM_CHITCHAT # - - opt_enable AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT + - restore_configs + - opt_enable Z_PROBE_SLED AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT - build_marlin # # Test a Servo Probe + # ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES # - restore_configs - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE - - build_marlin - # - # ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES - # - opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT - opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES - build_marlin @@ -149,7 +142,13 @@ script: # Test MESH_BED_LEVELING feature, with LCD # - restore_configs - - opt_enable MESH_BED_LEVELING MESH_G28_REST_ORIGIN MANUAL_BED_LEVELING ULTIMAKERCONTROLLER + - opt_enable MESH_BED_LEVELING MESH_G28_REST_ORIGIN LCD_BED_LEVELING ULTIMAKERCONTROLLER + - build_marlin + # + # Test PROBE_MANUALLY feature + # + - restore_configs + - opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR - build_marlin # # Test EEPROM_SETTINGS, EEPROM_CHITCHAT, M100_FREE_MEMORY_WATCHER, diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d1ae914ad6..7be9be703b 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -353,10 +353,10 @@ static long gcode_N, gcode_LastN, Stopped_gcode_LastN = 0; * the main loop. The process_next_command function parses the next * command and hands off execution to individual handler functions. */ -static char command_queue[BUFSIZE][MAX_CMD_SIZE]; +uint8_t commands_in_queue = 0; // Count of commands in the queue static uint8_t cmd_queue_index_r = 0, // Ring buffer read position - cmd_queue_index_w = 0, // Ring buffer write position - commands_in_queue = 0; // Count of commands in the queue + cmd_queue_index_w = 0; // Ring buffer write position +static char command_queue[BUFSIZE][MAX_CMD_SIZE]; /** * Current GCode Command @@ -3502,6 +3502,12 @@ inline void gcode_G4() { #endif // Z_SAFE_HOMING +#if ENABLED(PROBE_MANUALLY) + static bool g29_in_progress = false; +#else + constexpr bool g29_in_progress = false; +#endif + /** * G28: Home all axes according to settings * @@ -3529,6 +3535,11 @@ inline void gcode_G28() { // Wait for planner moves to finish! stepper.synchronize(); + // Cancel the active G29 session + #if ENABLED(PROBE_MANUALLY) + g29_in_progress = false; + #endif + // Disable the leveling matrix before homing #if PLANNER_LEVELING #if ENABLED(AUTO_BED_LEVELING_UBL) @@ -3719,9 +3730,9 @@ inline void gcode_G28() { #endif -#if ENABLED(MESH_BED_LEVELING) +#if ENABLED(MESH_BED_LEVELING) || ENABLED(PROBE_MANUALLY) - inline void _mbl_goto_xy(const float &x, const float &y) { + inline void _manual_goto_xy(const float &x, const float &y) { const float old_feedrate_mm_s = feedrate_mm_s; #if MANUAL_PROBE_HEIGHT > 0 @@ -3745,6 +3756,10 @@ inline void gcode_G28() { stepper.synchronize(); } +#endif + +#if ENABLED(MESH_BED_LEVELING) + // Save 130 bytes with non-duplication of PSTR void say_not_entered() { SERIAL_PROTOCOLLNPGM(" not entered."); } @@ -3835,7 +3850,7 @@ inline void gcode_G28() { // If there's another point to sample, move there with optional lift. if (mbl_probe_index < (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)) { mbl.zigzag(mbl_probe_index, px, py); - _mbl_goto_xy(mbl.index_to_xpos[px], mbl.index_to_ypos[py]); + _manual_goto_xy(mbl.index_to_xpos[px], mbl.index_to_ypos[py]); #if HAS_SOFTWARE_ENDSTOPS // Disable software endstops to allow manual adjustment @@ -3917,50 +3932,86 @@ inline void gcode_G28() { #elif HAS_ABL && DISABLED(AUTO_BED_LEVELING_UBL) + #if ABL_GRID + #if ENABLED(PROBE_Y_FIRST) + #define PR_OUTER_VAR xCount + #define PR_OUTER_END abl_grid_points_x + #define PR_INNER_VAR yCount + #define PR_INNER_END abl_grid_points_y + #else + #define PR_OUTER_VAR yCount + #define PR_OUTER_END abl_grid_points_y + #define PR_INNER_VAR xCount + #define PR_INNER_END abl_grid_points_x + #endif + #endif + /** * G29: Detailed Z probe, probes the bed at 3 or more points. * Will fail if the printer has not been homed with G28. * * Enhanced G29 Auto Bed Leveling Probe Routine * - * Parameters With LINEAR and BILINEAR: - * - * P Set the size of the grid that will be probed (P x P points). - * Not supported by non-linear delta printer bed leveling. - * Example: "G29 P4" - * - * S Set the XY travel speed between probe points (in units/min) - * * D Dry-Run mode. Just evaluate the bed Topology - Don't apply - * or clean the rotation Matrix. Useful to check the topology + * or alter the bed level data. Useful to check the topology * after a first run of G29. * + * J Jettison current bed leveling data + * * V Set the verbose level (0-4). Example: "G29 V3" * + * Parameters With LINEAR leveling only: + * + * P Set the size of the grid that will be probed (P x P points). + * Example: "G29 P4" + * + * X Set the X size of the grid that will be probed (X x Y points). + * Example: "G29 X7 Y5" + * + * Y Set the Y size of the grid that will be probed (X x Y points). + * * T Generate a Bed Topology Report. Example: "G29 P5 T" for a detailed report. * This is useful for manual bed leveling and finding flaws in the bed (to * assist with part placement). * Not supported by non-linear delta printer bed leveling. * + * Parameters With LINEAR and BILINEAR leveling only: + * + * S Set the XY travel speed between probe points (in units/min) + * * F Set the Front limit of the probing grid * B Set the Back limit of the probing grid * L Set the Left limit of the probing grid * R Set the Right limit of the probing grid * - * Parameters with BILINEAR only: + * Parameters with BILINEAR leveling only: * * Z Supply an additional Z probe offset * - * Global Parameters: + * Extra parameters with PROBE_MANUALLY: * - * E/e By default G29 will engage the Z probe, test the bed, then disengage. + * To do manual probing simply repeat G29 until the procedure is complete. + * The first G29 accepts parameters. 'G29 Q' for status, 'G29 A' to abort. + * + * Q Query leveling and G29 state + * + * A Abort current leveling procedure + * + * W Write a mesh point. (Ignored during leveling.) + * X Required X for mesh point + * Y Required Y for mesh point + * Z Required Z for mesh point + * + * Without PROBE_MANUALLY: + * + * E By default G29 will engage the Z probe, test the bed, then disengage. * Include "E" to engage/disengage the Z probe for each sample. * There's no extra effect if you have a fixed Z probe. - * Usage: "G29 E" or "G29 e" * */ inline void gcode_G29() { + // G29 Q is also available if debugging #if ENABLED(DEBUG_LEVELING_FEATURE) const bool query = code_seen('Q'); const uint8_t old_debug_flags = marlin_debug_flags; @@ -3970,37 +4021,148 @@ inline void gcode_G28() { log_machine_info(); } marlin_debug_flags = old_debug_flags; - if (query) return; + #if DISABLED(PROBE_MANUALLY) + if (query) return; + #endif #endif // Don't allow auto-leveling without homing first if (axis_unhomed_error(true, true, true)) return; - const int verbose_level = code_seen('V') ? code_value_int() : 1; - if (verbose_level < 0 || verbose_level > 4) { - SERIAL_PROTOCOLLNPGM("?(V)erbose Level is implausible (0-4)."); - return; - } + // Define local vars 'static' for manual probing, 'auto' otherwise + #if ENABLED(PROBE_MANUALLY) + #define ABL_VAR static + #else + #define ABL_VAR + #endif - bool dryrun = code_seen('D'), - stow_probe_after_each = code_seen('E'); + ABL_VAR int verbose_level, abl_probe_index; + ABL_VAR float xProbe, yProbe, measured_z; + ABL_VAR bool dryrun, abl_should_enable; + + #if HAS_SOFTWARE_ENDSTOPS + ABL_VAR bool enable_soft_endstops = true; + #endif #if ABL_GRID + ABL_VAR uint8_t PR_OUTER_VAR; + ABL_VAR int8_t PR_INNER_VAR; + ABL_VAR int left_probe_bed_position, right_probe_bed_position, front_probe_bed_position, back_probe_bed_position; + ABL_VAR float xGridSpacing, yGridSpacing; - if (verbose_level > 0) { - SERIAL_PROTOCOLLNPGM("G29 Auto Bed Leveling"); - if (dryrun) SERIAL_PROTOCOLLNPGM("Running in DRY-RUN mode"); - } + #define ABL_GRID_MAX (ABL_GRID_MAX_POINTS_X) * (ABL_GRID_MAX_POINTS_Y) #if ABL_PLANAR + ABL_VAR uint8_t abl_grid_points_x = ABL_GRID_MAX_POINTS_X, + abl_grid_points_y = ABL_GRID_MAX_POINTS_Y; + ABL_VAR int abl2; + ABL_VAR bool do_topography_map; + #else // 3-point + uint8_t constexpr abl_grid_points_x = ABL_GRID_MAX_POINTS_X, + abl_grid_points_y = ABL_GRID_MAX_POINTS_Y; - bool do_topography_map = verbose_level > 2 || code_seen('T'); + int constexpr abl2 = ABL_GRID_MAX; + #endif + + #if ENABLED(AUTO_BED_LEVELING_BILINEAR) + + ABL_VAR float zoffset; + + #elif ENABLED(AUTO_BED_LEVELING_LINEAR) + + ABL_VAR int indexIntoAB[ABL_GRID_MAX_POINTS_X][ABL_GRID_MAX_POINTS_Y]; + + ABL_VAR float eqnAMatrix[ABL_GRID_MAX * 3], // "A" matrix of the linear system of equations + eqnBVector[ABL_GRID_MAX], // "B" vector of Z points + mean; + #endif + + #elif ENABLED(AUTO_BED_LEVELING_3POINT) + + // Probe at 3 arbitrary points + ABL_VAR vector_3 points[3] = { + vector_3(ABL_PROBE_PT_1_X, ABL_PROBE_PT_1_Y, 0), + vector_3(ABL_PROBE_PT_2_X, ABL_PROBE_PT_2_Y, 0), + vector_3(ABL_PROBE_PT_3_X, ABL_PROBE_PT_3_Y, 0) + }; + + #endif // AUTO_BED_LEVELING_3POINT + + /** + * On the initial G29 fetch command parameters. + */ + if (!g29_in_progress) { + + abl_probe_index = 0; + abl_should_enable = planner.abl_enabled; + + #if ENABLED(AUTO_BED_LEVELING_BILINEAR) + + if (code_seen('W')) { + if (!bilinear_grid_spacing[X_AXIS]) { + SERIAL_ERROR_START; + SERIAL_ERRORLNPGM("No bilinear grid"); + return; + } + + const float z = code_seen('Z') && code_has_value() ? code_value_float() : 99999; + if (!WITHIN(z, -10, 10)) { + SERIAL_ERROR_START; + SERIAL_ERRORLNPGM("Bad Z value"); + return; + } + + const float x = code_seen('X') && code_has_value() ? code_value_float() : 99999, + y = code_seen('Y') && code_has_value() ? code_value_float() : 99999; + int8_t i = code_seen('I') && code_has_value() ? code_value_byte() : -1, + j = code_seen('J') && code_has_value() ? code_value_byte() : -1; + + if (x < 99998 && y < 99998) { + // Get nearest i / j from x / y + i = (x - LOGICAL_X_POSITION(bilinear_start[X_AXIS]) + 0.5 * xGridSpacing) / xGridSpacing; + j = (y - LOGICAL_Y_POSITION(bilinear_start[Y_AXIS]) + 0.5 * yGridSpacing) / yGridSpacing; + i = constrain(i, 0, ABL_GRID_MAX_POINTS_X - 1); + j = constrain(j, 0, ABL_GRID_MAX_POINTS_Y - 1); + } + if (WITHIN(i, 0, ABL_GRID_MAX_POINTS_X - 1) && WITHIN(j, 0, ABL_GRID_MAX_POINTS_Y)) { + set_bed_leveling_enabled(false); + bed_level_grid[i][j] = z; + #if ENABLED(ABL_BILINEAR_SUBDIVISION) + bed_level_virt_interpolate(); + #endif + set_bed_leveling_enabled(abl_should_enable); + } + return; + } // code_seen('W') + + #endif + + #if PLANNER_LEVELING + + // Jettison bed leveling data + if (code_seen('J')) { + reset_bed_level(); + return; + } + + #endif + + verbose_level = code_seen('V') && code_has_value() ? code_value_int() : 0; + if (!WITHIN(verbose_level, 0, 4)) { + SERIAL_PROTOCOLLNPGM("?(V)erbose Level is implausible (0-4)."); + return; + } + + dryrun = code_seen('D') ? code_value_bool() : false; + + #if ENABLED(AUTO_BED_LEVELING_LINEAR) + + do_topography_map = verbose_level > 2 || code_seen('T'); // X and Y specify points in each direction, overriding the default // These values may be saved with the completed mesh - int abl_grid_points_x = code_seen('X') ? code_value_int() : ABL_GRID_MAX_POINTS_X, - abl_grid_points_y = code_seen('Y') ? code_value_int() : ABL_GRID_MAX_POINTS_Y; - + abl_grid_points_x = code_seen('X') ? code_value_int() : ABL_GRID_MAX_POINTS_X; + abl_grid_points_y = code_seen('Y') ? code_value_int() : ABL_GRID_MAX_POINTS_Y; if (code_seen('P')) abl_grid_points_x = abl_grid_points_y = code_value_int(); if (abl_grid_points_x < 2 || abl_grid_points_y < 2) { @@ -4008,91 +4170,98 @@ inline void gcode_G28() { return; } - #else + abl2 = abl_grid_points_x * abl_grid_points_y; - const uint8_t abl_grid_points_x = ABL_GRID_MAX_POINTS_X, abl_grid_points_y = ABL_GRID_MAX_POINTS_Y; + #elif ENABLED(AUTO_BED_LEVELING_BILINEAR) + + zoffset = code_seen('Z') ? code_value_axis_units(Z_AXIS) : 0; + #if HAS_BED_PROBE + zoffset += zprobe_zoffset; + #endif #endif - xy_probe_feedrate_mm_s = MMM_TO_MMS(code_seen('S') ? code_value_linear_units() : XY_PROBE_SPEED); + #if ABL_GRID - int left_probe_bed_position = code_seen('L') ? (int)code_value_axis_units(X_AXIS) : LOGICAL_X_POSITION(LEFT_PROBE_BED_POSITION), - right_probe_bed_position = code_seen('R') ? (int)code_value_axis_units(X_AXIS) : LOGICAL_X_POSITION(RIGHT_PROBE_BED_POSITION), - front_probe_bed_position = code_seen('F') ? (int)code_value_axis_units(Y_AXIS) : LOGICAL_Y_POSITION(FRONT_PROBE_BED_POSITION), - back_probe_bed_position = code_seen('B') ? (int)code_value_axis_units(Y_AXIS) : LOGICAL_Y_POSITION(BACK_PROBE_BED_POSITION); + xy_probe_feedrate_mm_s = MMM_TO_MMS(code_seen('S') ? code_value_linear_units() : XY_PROBE_SPEED); - const bool left_out_l = left_probe_bed_position < LOGICAL_X_POSITION(MIN_PROBE_X), - left_out = left_out_l || left_probe_bed_position > right_probe_bed_position - (MIN_PROBE_EDGE), - right_out_r = right_probe_bed_position > LOGICAL_X_POSITION(MAX_PROBE_X), - right_out = right_out_r || right_probe_bed_position < left_probe_bed_position + MIN_PROBE_EDGE, - front_out_f = front_probe_bed_position < LOGICAL_Y_POSITION(MIN_PROBE_Y), - front_out = front_out_f || front_probe_bed_position > back_probe_bed_position - (MIN_PROBE_EDGE), - back_out_b = back_probe_bed_position > LOGICAL_Y_POSITION(MAX_PROBE_Y), - back_out = back_out_b || back_probe_bed_position < front_probe_bed_position + MIN_PROBE_EDGE; + left_probe_bed_position = code_seen('L') ? (int)code_value_axis_units(X_AXIS) : LOGICAL_X_POSITION(LEFT_PROBE_BED_POSITION); + right_probe_bed_position = code_seen('R') ? (int)code_value_axis_units(X_AXIS) : LOGICAL_X_POSITION(RIGHT_PROBE_BED_POSITION); + front_probe_bed_position = code_seen('F') ? (int)code_value_axis_units(Y_AXIS) : LOGICAL_Y_POSITION(FRONT_PROBE_BED_POSITION); + back_probe_bed_position = code_seen('B') ? (int)code_value_axis_units(Y_AXIS) : LOGICAL_Y_POSITION(BACK_PROBE_BED_POSITION); - if (left_out || right_out || front_out || back_out) { - if (left_out) { - out_of_range_error(PSTR("(L)eft")); - left_probe_bed_position = left_out_l ? LOGICAL_X_POSITION(MIN_PROBE_X) : right_probe_bed_position - (MIN_PROBE_EDGE); + const bool left_out_l = left_probe_bed_position < LOGICAL_X_POSITION(MIN_PROBE_X), + left_out = left_out_l || left_probe_bed_position > right_probe_bed_position - (MIN_PROBE_EDGE), + right_out_r = right_probe_bed_position > LOGICAL_X_POSITION(MAX_PROBE_X), + right_out = right_out_r || right_probe_bed_position < left_probe_bed_position + MIN_PROBE_EDGE, + front_out_f = front_probe_bed_position < LOGICAL_Y_POSITION(MIN_PROBE_Y), + front_out = front_out_f || front_probe_bed_position > back_probe_bed_position - (MIN_PROBE_EDGE), + back_out_b = back_probe_bed_position > LOGICAL_Y_POSITION(MAX_PROBE_Y), + back_out = back_out_b || back_probe_bed_position < front_probe_bed_position + MIN_PROBE_EDGE; + + if (left_out || right_out || front_out || back_out) { + if (left_out) { + out_of_range_error(PSTR("(L)eft")); + left_probe_bed_position = left_out_l ? LOGICAL_X_POSITION(MIN_PROBE_X) : right_probe_bed_position - (MIN_PROBE_EDGE); + } + if (right_out) { + out_of_range_error(PSTR("(R)ight")); + right_probe_bed_position = right_out_r ? LOGICAL_Y_POSITION(MAX_PROBE_X) : left_probe_bed_position + MIN_PROBE_EDGE; + } + if (front_out) { + out_of_range_error(PSTR("(F)ront")); + front_probe_bed_position = front_out_f ? LOGICAL_Y_POSITION(MIN_PROBE_Y) : back_probe_bed_position - (MIN_PROBE_EDGE); + } + if (back_out) { + out_of_range_error(PSTR("(B)ack")); + back_probe_bed_position = back_out_b ? LOGICAL_Y_POSITION(MAX_PROBE_Y) : front_probe_bed_position + MIN_PROBE_EDGE; + } + return; } - if (right_out) { - out_of_range_error(PSTR("(R)ight")); - right_probe_bed_position = right_out_r ? LOGICAL_Y_POSITION(MAX_PROBE_X) : left_probe_bed_position + MIN_PROBE_EDGE; - } - if (front_out) { - out_of_range_error(PSTR("(F)ront")); - front_probe_bed_position = front_out_f ? LOGICAL_Y_POSITION(MIN_PROBE_Y) : back_probe_bed_position - (MIN_PROBE_EDGE); - } - if (back_out) { - out_of_range_error(PSTR("(B)ack")); - back_probe_bed_position = back_out_b ? LOGICAL_Y_POSITION(MAX_PROBE_Y) : front_probe_bed_position + MIN_PROBE_EDGE; - } - return; + + // probe at the points of a lattice grid + xGridSpacing = (right_probe_bed_position - left_probe_bed_position) / (abl_grid_points_x - 1); + yGridSpacing = (back_probe_bed_position - front_probe_bed_position) / (abl_grid_points_y - 1); + + #endif // ABL_GRID + + if (verbose_level > 0) { + SERIAL_PROTOCOLLNPGM("G29 Auto Bed Leveling"); + if (dryrun) SERIAL_PROTOCOLLNPGM("Running in DRY-RUN mode"); } - #endif // ABL_GRID + stepper.synchronize(); - stepper.synchronize(); + // Disable auto bed leveling during G29 + planner.abl_enabled = false; - // Disable auto bed leveling during G29 - bool abl_should_enable = planner.abl_enabled; + if (!dryrun) { + // Re-orient the current position without leveling + // based on where the steppers are positioned. + set_current_from_steppers_for_axis(ALL_AXES); - planner.abl_enabled = false; + // Sync the planner to where the steppers stopped + SYNC_PLAN_POSITION_KINEMATIC(); + } - if (!dryrun) { - // Re-orient the current position without leveling - // based on where the steppers are positioned. - set_current_from_steppers_for_axis(ALL_AXES); + setup_for_endstop_or_probe_move(); - // Sync the planner to where the steppers stopped - SYNC_PLAN_POSITION_KINEMATIC(); - } + //xProbe = yProbe = measured_z = 0; - setup_for_endstop_or_probe_move(); - - // Deploy the probe. Probe will raise if needed. - if (DEPLOY_PROBE()) { - planner.abl_enabled = abl_should_enable; - return; - } - - float xProbe = 0, yProbe = 0, measured_z = 0; - - #if ABL_GRID - - // probe at the points of a lattice grid - const float xGridSpacing = (right_probe_bed_position - left_probe_bed_position) / (abl_grid_points_x - 1), - yGridSpacing = (back_probe_bed_position - front_probe_bed_position) / (abl_grid_points_y - 1); + #if HAS_BED_PROBE + // Deploy the probe. Probe will raise if needed. + if (DEPLOY_PROBE()) { + planner.abl_enabled = abl_should_enable; + return; + } + #endif #if ENABLED(AUTO_BED_LEVELING_BILINEAR) - float zoffset = zprobe_zoffset; - if (code_seen('Z')) zoffset += code_value_axis_units(Z_AXIS); - if ( xGridSpacing != bilinear_grid_spacing[X_AXIS] || yGridSpacing != bilinear_grid_spacing[Y_AXIS] - || left_probe_bed_position != bilinear_start[X_AXIS] - || front_probe_bed_position != bilinear_start[Y_AXIS] + || left_probe_bed_position != LOGICAL_X_POSITION(bilinear_start[X_AXIS]) + || front_probe_bed_position != LOGICAL_Y_POSITION(bilinear_start[Y_AXIS]) ) { if (dryrun) { // Before reset bed level, re-enable to correct the position @@ -4101,164 +4270,311 @@ inline void gcode_G28() { // Reset grid to 0.0 or "not probed". (Also disables ABL) reset_bed_level(); - #if ENABLED(ABL_BILINEAR_SUBDIVISION) - bilinear_grid_spacing_virt[X_AXIS] = xGridSpacing / (BILINEAR_SUBDIVISIONS); - bilinear_grid_spacing_virt[Y_AXIS] = yGridSpacing / (BILINEAR_SUBDIVISIONS); - #endif + // Initialize a grid with the given dimensions bilinear_grid_spacing[X_AXIS] = xGridSpacing; bilinear_grid_spacing[Y_AXIS] = yGridSpacing; bilinear_start[X_AXIS] = RAW_X_POSITION(left_probe_bed_position); bilinear_start[Y_AXIS] = RAW_Y_POSITION(front_probe_bed_position); + #if ENABLED(ABL_BILINEAR_SUBDIVISION) + bilinear_grid_spacing_virt[X_AXIS] = xGridSpacing / (BILINEAR_SUBDIVISIONS); + bilinear_grid_spacing_virt[Y_AXIS] = yGridSpacing / (BILINEAR_SUBDIVISIONS); + #endif + // Can't re-enable (on error) until the new grid is written abl_should_enable = false; } #elif ENABLED(AUTO_BED_LEVELING_LINEAR) - /** - * solve the plane equation ax + by + d = z - * A is the matrix with rows [x y 1] for all the probed points - * B is the vector of the Z positions - * the normal vector to the plane is formed by the coefficients of the - * plane equation in the standard form, which is Vx*x+Vy*y+Vz*z+d = 0 - * so Vx = -a Vy = -b Vz = 1 (we want the vector facing towards positive Z - */ - - const int abl2 = abl_grid_points_x * abl_grid_points_y; - - int indexIntoAB[abl_grid_points_x][abl_grid_points_y], - probe_index = -1; - - float eqnAMatrix[abl2 * 3], // "A" matrix of the linear system of equations - eqnBVector[abl2], // "B" vector of Z points - mean = 0.0; + mean = 0.0; #endif // AUTO_BED_LEVELING_LINEAR - #if ENABLED(PROBE_Y_FIRST) - #define PR_OUTER_VAR xCount - #define PR_OUTER_NUM abl_grid_points_x - #define PR_INNER_VAR yCount - #define PR_INNER_NUM abl_grid_points_y - #else - #define PR_OUTER_VAR yCount - #define PR_OUTER_NUM abl_grid_points_y - #define PR_INNER_VAR xCount - #define PR_INNER_NUM abl_grid_points_x - #endif + #if ENABLED(AUTO_BED_LEVELING_3POINT) - bool zig = PR_OUTER_NUM & 1; // Always end at RIGHT and BACK_PROBE_BED_POSITION + #if ENABLED(DEBUG_LEVELING_FEATURE) + if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> 3-point Leveling"); + #endif - // Outer loop is Y with PROBE_Y_FIRST disabled - for (uint8_t PR_OUTER_VAR = 0; PR_OUTER_VAR < PR_OUTER_NUM; PR_OUTER_VAR++) { + // Probe at 3 arbitrary points + points[0].z = points[1].z = points[2].z = 0; - int8_t inStart, inStop, inInc; + #endif // AUTO_BED_LEVELING_3POINT - if (zig) { // away from origin - inStart = 0; - inStop = PR_INNER_NUM; - inInc = 1; - } - else { // towards origin - inStart = PR_INNER_NUM - 1; - inStop = -1; - inInc = -1; + } // !g29_in_progress + + #if ENABLED(PROBE_MANUALLY) + + // Abort current G29 procedure, go back to ABLStart + if (code_seen('A') && g29_in_progress) { + SERIAL_PROTOCOLLNPGM("Manual G29 aborted"); + #if HAS_SOFTWARE_ENDSTOPS + soft_endstops_enabled = enable_soft_endstops; + #endif + planner.abl_enabled = abl_should_enable; + g29_in_progress = false; + } + + // Query G29 status + if (code_seen('Q')) { + if (!g29_in_progress) + SERIAL_PROTOCOLLNPGM("Manual G29 idle"); + else { + SERIAL_PROTOCOLPAIR("Manual G29 point ", abl_probe_index + 1); + SERIAL_PROTOCOLLNPAIR(" of ", abl2); } + } - zig = !zig; // zag + if (code_seen('A') || code_seen('Q')) return; - // Inner loop is Y with PROBE_Y_FIRST enabled - for (int8_t PR_INNER_VAR = inStart; PR_INNER_VAR != inStop; PR_INNER_VAR += inInc) { + // Fall through to probe the first point + g29_in_progress = true; - float xBase = left_probe_bed_position + xGridSpacing * xCount, - yBase = front_probe_bed_position + yGridSpacing * yCount; + if (abl_probe_index == 0) { + // For the initial G29 S2 save software endstop state + #if HAS_SOFTWARE_ENDSTOPS + enable_soft_endstops = soft_endstops_enabled; + #endif + } + else { + // For G29 after adjusting Z. + // Save the previous Z before going to the next point + measured_z = current_position[Z_AXIS]; + + #if ENABLED(AUTO_BED_LEVELING_LINEAR) + + mean += measured_z; + eqnBVector[abl_probe_index] = measured_z; + eqnAMatrix[abl_probe_index + 0 * abl2] = xProbe; + eqnAMatrix[abl_probe_index + 1 * abl2] = yProbe; + eqnAMatrix[abl_probe_index + 2 * abl2] = 1; + + #elif ENABLED(AUTO_BED_LEVELING_BILINEAR) + + bed_level_grid[xCount][yCount] = measured_z + zoffset; + + #elif ENABLED(AUTO_BED_LEVELING_3POINT) + + points[i].z = measured_z; + + #endif + } + + // + // If there's another point to sample, move there with optional lift. + // + + #if ABL_GRID + + // Find a next point to probe + // On the first G29 this will be the first probe point + while (abl_probe_index < abl2) { + + // Set xCount, yCount based on abl_probe_index, with zig-zag + PR_OUTER_VAR = abl_probe_index / PR_INNER_END; + PR_INNER_VAR = abl_probe_index - (PR_OUTER_VAR * PR_INNER_END); + + bool zig = (PR_OUTER_VAR & 1) != ((PR_OUTER_END) & 1); + + if (zig) PR_INNER_VAR = (PR_INNER_END - 1) - PR_INNER_VAR; + + const float xBase = left_probe_bed_position + xGridSpacing * xCount, + yBase = front_probe_bed_position + yGridSpacing * yCount; xProbe = floor(xBase + (xBase < 0 ? 0 : 0.5)); yProbe = floor(yBase + (yBase < 0 ? 0 : 0.5)); #if ENABLED(AUTO_BED_LEVELING_LINEAR) - indexIntoAB[xCount][yCount] = ++probe_index; + indexIntoAB[xCount][yCount] = abl_probe_index; #endif - #if IS_KINEMATIC - // Avoid probing outside the round or hexagonal area - float pos[XYZ] = { xProbe, yProbe, 0 }; - if (!position_is_reachable(pos, true)) continue; + float pos[XYZ] = { xProbe, yProbe, 0 }; + if (position_is_reachable(pos)) break; + ++abl_probe_index; + } + + // Is there a next point to move to? + if (abl_probe_index < abl2) { + _manual_goto_xy(xProbe, yProbe); // Can be used here too! + ++abl_probe_index; + #if HAS_SOFTWARE_ENDSTOPS + // Disable software endstops to allow manual adjustment + // If G29 is not completed, they will not be re-enabled + soft_endstops_enabled = false; + #endif + return; + } + else { + // Then leveling is done! + // G29 finishing code goes here + + // After recording the last point, activate abl + SERIAL_PROTOCOLLNPGM("Grid probing done."); + g29_in_progress = false; + + // Re-enable software endstops, if needed + #if HAS_SOFTWARE_ENDSTOPS + soft_endstops_enabled = enable_soft_endstops; + #endif + } + + #elif ENABLED(AUTO_BED_LEVELING_3POINT) + + // Probe at 3 arbitrary points + if (abl_probe_index < 3) { + xProbe = LOGICAL_X_POSITION(points[i].x); + yProbe = LOGICAL_Y_POSITION(points[i].y); + ++abl_probe_index; + #if HAS_SOFTWARE_ENDSTOPS + // Disable software endstops to allow manual adjustment + // If G29 is not completed, they will not be re-enabled + soft_endstops_enabled = false; + #endif + return; + } + else { + + SERIAL_PROTOCOLLNPGM("3-point probing done."); + g29_in_progress = false; + + // Re-enable software endstops, if needed + #if HAS_SOFTWARE_ENDSTOPS + soft_endstops_enabled = enable_soft_endstops; #endif - measured_z = probe_pt(xProbe, yProbe, stow_probe_after_each, verbose_level); + if (!dryrun) { + vector_3 planeNormal = vector_3::cross(points[0] - points[1], points[2] - points[1]).get_normal(); + if (planeNormal.z < 0) { + planeNormal.x *= -1; + planeNormal.y *= -1; + planeNormal.z *= -1; + } + planner.bed_level_matrix = matrix_3x3::create_look_at(planeNormal); - if (measured_z == NAN) { - planner.abl_enabled = abl_should_enable; - return; + // Can't re-enable (on error) until the new grid is written + abl_should_enable = false; } - #if ENABLED(AUTO_BED_LEVELING_LINEAR) + } - mean += measured_z; - eqnBVector[probe_index] = measured_z; - eqnAMatrix[probe_index + 0 * abl2] = xProbe; - eqnAMatrix[probe_index + 1 * abl2] = yProbe; - eqnAMatrix[probe_index + 2 * abl2] = 1; + #endif // AUTO_BED_LEVELING_3POINT - #elif ENABLED(AUTO_BED_LEVELING_BILINEAR) - bed_level_grid[xCount][yCount] = measured_z + zoffset; + #else // !PROBE_MANUALLY - #endif - idle(); + bool stow_probe_after_each = code_seen('E'); - } // inner - } // outer + #if ABL_GRID - #elif ENABLED(AUTO_BED_LEVELING_3POINT) + bool zig = PR_OUTER_END & 1; // Always end at RIGHT and BACK_PROBE_BED_POSITION - #if ENABLED(DEBUG_LEVELING_FEATURE) - if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> 3-point Leveling"); - #endif + // Outer loop is Y with PROBE_Y_FIRST disabled + for (uint8_t PR_OUTER_VAR = 0; PR_OUTER_VAR < PR_OUTER_END; PR_OUTER_VAR++) { - // Probe at 3 arbitrary points - vector_3 points[3] = { - vector_3(ABL_PROBE_PT_1_X, ABL_PROBE_PT_1_Y, 0), - vector_3(ABL_PROBE_PT_2_X, ABL_PROBE_PT_2_Y, 0), - vector_3(ABL_PROBE_PT_3_X, ABL_PROBE_PT_3_Y, 0) - }; + int8_t inStart, inStop, inInc; - for (uint8_t i = 0; i < 3; ++i) { - // Retain the last probe position - xProbe = LOGICAL_X_POSITION(points[i].x); - yProbe = LOGICAL_Y_POSITION(points[i].y); - measured_z = points[i].z = probe_pt(xProbe, yProbe, stow_probe_after_each, verbose_level); - } + if (zig) { // away from origin + inStart = 0; + inStop = PR_INNER_END; + inInc = 1; + } + else { // towards origin + inStart = PR_INNER_END - 1; + inStop = -1; + inInc = -1; + } - if (measured_z == NAN) { + zig = !zig; // zag + + // Inner loop is Y with PROBE_Y_FIRST enabled + for (int8_t PR_INNER_VAR = inStart; PR_INNER_VAR != inStop; PR_INNER_VAR += inInc) { + + float xBase = left_probe_bed_position + xGridSpacing * xCount, + yBase = front_probe_bed_position + yGridSpacing * yCount; + + xProbe = floor(xBase + (xBase < 0 ? 0 : 0.5)); + yProbe = floor(yBase + (yBase < 0 ? 0 : 0.5)); + + #if ENABLED(AUTO_BED_LEVELING_LINEAR) + indexIntoAB[xCount][yCount] = ++abl_probe_index; + #endif + + #if IS_KINEMATIC + // Avoid probing outside the round or hexagonal area + float pos[XYZ] = { xProbe, yProbe, 0 }; + if (!position_is_reachable(pos, true)) continue; + #endif + + measured_z = probe_pt(xProbe, yProbe, stow_probe_after_each, verbose_level); + + if (measured_z == NAN) { + planner.abl_enabled = abl_should_enable; + return; + } + + #if ENABLED(AUTO_BED_LEVELING_LINEAR) + + mean += measured_z; + eqnBVector[abl_probe_index] = measured_z; + eqnAMatrix[abl_probe_index + 0 * abl2] = xProbe; + eqnAMatrix[abl_probe_index + 1 * abl2] = yProbe; + eqnAMatrix[abl_probe_index + 2 * abl2] = 1; + + #elif ENABLED(AUTO_BED_LEVELING_BILINEAR) + + bed_level_grid[xCount][yCount] = measured_z + zoffset; + + #endif + + abl_should_enable = false; + idle(); + + } // inner + } // outer + + #elif ENABLED(AUTO_BED_LEVELING_3POINT) + + // Probe at 3 arbitrary points + + for (uint8_t i = 0; i < 3; ++i) { + // Retain the last probe position + xProbe = LOGICAL_X_POSITION(points[i].x); + yProbe = LOGICAL_Y_POSITION(points[i].y); + measured_z = points[i].z = probe_pt(xProbe, yProbe, stow_probe_after_each, verbose_level); + } + + if (measured_z == NAN) { + planner.abl_enabled = abl_should_enable; + return; + } + + if (!dryrun) { + vector_3 planeNormal = vector_3::cross(points[0] - points[1], points[2] - points[1]).get_normal(); + if (planeNormal.z < 0) { + planeNormal.x *= -1; + planeNormal.y *= -1; + planeNormal.z *= -1; + } + planner.bed_level_matrix = matrix_3x3::create_look_at(planeNormal); + + // Can't re-enable (on error) until the new grid is written + abl_should_enable = false; + } + + #endif // AUTO_BED_LEVELING_3POINT + + // Raise to _Z_CLEARANCE_DEPLOY_PROBE. Stow the probe. + if (STOW_PROBE()) { planner.abl_enabled = abl_should_enable; return; } - if (!dryrun) { - vector_3 planeNormal = vector_3::cross(points[0] - points[1], points[2] - points[1]).get_normal(); - if (planeNormal.z < 0) { - planeNormal.x *= -1; - planeNormal.y *= -1; - planeNormal.z *= -1; - } - planner.bed_level_matrix = matrix_3x3::create_look_at(planeNormal); - - // Can't re-enable (on error) until the new grid is written - abl_should_enable = false; - } - - #endif // AUTO_BED_LEVELING_3POINT - - // Raise to _Z_CLEARANCE_DEPLOY_PROBE. Stow the probe. - if (STOW_PROBE()) { - planner.abl_enabled = abl_should_enable; - return; - } + #endif // !PROBE_MANUALLY + // + // G29 Finishing Code // // Unless this is a dry run, auto bed leveling will // definitely be enabled after this point @@ -4286,7 +4602,14 @@ inline void gcode_G28() { // For LINEAR leveling calculate matrix, print reports, correct the position - // solve lsq problem + /** + * solve the plane equation ax + by + d = z + * A is the matrix with rows [x y 1] for all the probed points + * B is the vector of the Z positions + * the normal vector to the plane is formed by the coefficients of the + * plane equation in the standard form, which is Vx*x+Vy*y+Vz*z+d = 0 + * so Vx = -a Vy = -b Vz = 1 (we want the vector facing towards positive Z + */ float plane_equation_coefficients[3]; qr_solve(plane_equation_coefficients, abl2, 3, eqnAMatrix, eqnBVector); diff --git a/Marlin/enum.h b/Marlin/enum.h index 70d7256488..542f10f8d3 100755 --- a/Marlin/enum.h +++ b/Marlin/enum.h @@ -165,16 +165,6 @@ enum TempState { }; #endif -#if ENABLED(PROBE_MANUALLY) - enum ABLState { - ABLReport, - ABLStart, - ABLNext, - ABLSet, - ABLReset - }; -#endif - /** * SD Card */ diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 551d7879fe..f8cdec5f5a 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -181,7 +181,7 @@ uint16_t max_display_update_time = 0; void lcd_delta_calibrate_menu(); #endif - #if ENABLED(MANUAL_BED_LEVELING) + #if ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING) #include "mesh_bed_leveling.h" #endif @@ -982,7 +982,7 @@ void kill_screen(const char* lcd_msg) { MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_percentage, 10, 999); // Manual bed leveling, Bed Z: - #if ENABLED(MANUAL_BED_LEVELING) + #if ENABLED(LCD_BED_LEVELING) MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1); #endif @@ -1321,7 +1321,7 @@ void kill_screen(const char* lcd_msg) { #endif - #if ENABLED(MANUAL_BED_LEVELING) + #if ENABLED(LCD_BED_LEVELING) /** * @@ -1367,8 +1367,8 @@ void kill_screen(const char* lcd_msg) { if (encoderPosition) { refresh_cmd_timeout(); current_position[Z_AXIS] += float((int32_t)encoderPosition) * (MBL_Z_STEP); - NOLESS(current_position[Z_AXIS], -(MANUAL_PROBE_Z_RANGE) * 0.5); - NOMORE(current_position[Z_AXIS], (MANUAL_PROBE_Z_RANGE) * 0.5); + NOLESS(current_position[Z_AXIS], -(LCD_PROBE_Z_RANGE) * 0.5); + NOMORE(current_position[Z_AXIS], (LCD_PROBE_Z_RANGE) * 0.5); line_to_current(Z_AXIS); lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING; encoderPosition = 0; @@ -1483,7 +1483,7 @@ KeepDrawing: END_MENU(); } - #endif // MANUAL_BED_LEVELING + #endif // LCD_BED_LEVELING /** * @@ -1524,7 +1524,7 @@ KeepDrawing: MENU_ITEM(gcode, MSG_LEVEL_BED, axis_homed[X_AXIS] && axis_homed[Y_AXIS] ? PSTR("G29") : PSTR("G28\nG29") ); - #elif ENABLED(MANUAL_BED_LEVELING) + #elif ENABLED(LCD_BED_LEVELING) MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed); #endif @@ -2253,7 +2253,7 @@ KeepDrawing: 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: - #if ENABLED(MANUAL_BED_LEVELING) + #if ENABLED(LCD_BED_LEVELING) MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1); #endif MENU_ITEM_EDIT(float5, MSG_ACC, &planner.acceleration, 10, 99000); From 73e193da1dfc65d26d7c9fbbdeae58ef26cac321 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 25 Mar 2017 04:43:30 -0500 Subject: [PATCH 3/3] Implement LCD_BED_LEVELING for PROBE_MANUALLY --- .travis.yml | 4 +- Marlin/Marlin_main.cpp | 2 +- Marlin/ultralcd.cpp | 240 +++++++++++++++++++++++++++++------------ 3 files changed, 177 insertions(+), 69 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bfb6809bc..16bf750430 100644 --- a/.travis.yml +++ b/.travis.yml @@ -145,10 +145,10 @@ script: - opt_enable MESH_BED_LEVELING MESH_G28_REST_ORIGIN LCD_BED_LEVELING ULTIMAKERCONTROLLER - build_marlin # - # Test PROBE_MANUALLY feature + # Test PROBE_MANUALLY feature, with LCD support # - restore_configs - - opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR + - opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR LCD_BED_LEVELING ULTIMAKERCONTROLLER - build_marlin # # Test EEPROM_SETTINGS, EEPROM_CHITCHAT, M100_FREE_MEMORY_WATCHER, diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 7be9be703b..67e97dd786 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -3503,7 +3503,7 @@ inline void gcode_G4() { #endif // Z_SAFE_HOMING #if ENABLED(PROBE_MANUALLY) - static bool g29_in_progress = false; + bool g29_in_progress = false; #else constexpr bool g29_in_progress = false; #endif diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index f8cdec5f5a..f407424427 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -457,13 +457,18 @@ uint16_t max_display_update_time = 0; * Synchronize safely while holding the current screen * This blocks all further screen or stripe updates once called */ + extern uint8_t commands_in_queue; + inline void lcd_synchronize() { lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, PSTR(MSG_MOVING)); if (no_reentrance) return; no_reentrance = true; screenFunc_t old_screen = currentScreen; lcd_goto_screen(lcd_synchronize); - stepper.synchronize(); + while (commands_in_queue) { + idle(); + stepper.synchronize(); + } no_reentrance = false; lcd_goto_screen(old_screen); } @@ -982,7 +987,7 @@ void kill_screen(const char* lcd_msg) { MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_percentage, 10, 999); // Manual bed leveling, Bed Z: - #if ENABLED(LCD_BED_LEVELING) + #if ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING) MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1); #endif @@ -1325,30 +1330,53 @@ void kill_screen(const char* lcd_msg) { /** * - * "Prepare" > "Bed Leveling" handlers + * "Prepare" > "Level Bed" handlers * */ static uint8_t manual_probe_index; - // Utility to go to the next mesh point - inline void _manual_probe_xy(float x, float y) { - if (no_reentrance) return; - #if MANUAL_PROBE_HEIGHT > 0 - current_position[Z_AXIS] = LOGICAL_Z_POSITION(Z_MIN_POS) + MANUAL_PROBE_HEIGHT; - line_to_current(Z_AXIS); - #endif - current_position[X_AXIS] = LOGICAL_X_POSITION(x); - current_position[Y_AXIS] = LOGICAL_Y_POSITION(y); - planner.buffer_line_kinematic(current_position, MMM_TO_MMS(XY_PROBE_SPEED), active_extruder); - #if MANUAL_PROBE_HEIGHT > 0 - current_position[Z_AXIS] = LOGICAL_Z_POSITION(Z_MIN_POS) + 0.2; - line_to_current(Z_AXIS); - #endif - lcd_synchronize(); - } + #if ENABLED(PROBE_MANUALLY) + extern bool g29_in_progress; + #endif - void _lcd_level_goto_next_point(); + // LCD probed points are from defaults + constexpr uint8_t total_probe_points = + #if ABL_GRID + (ABL_GRID_MAX_POINTS_X) * (ABL_GRID_MAX_POINTS_Y) + #elif ENABLED(AUTO_BED_LEVELING_3POINT) + int(3) + #elif ENABLED(AUTO_BED_LEVELING_UBL) + (UBL_MESH_NUM_X_POINTS) * (UBL_MESH_NUM_Y_POINTS) + #elif ENABLED(MESH_BED_LEVELING) + (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS) + #endif + ; + + #if ENABLED(MESH_BED_LEVELING) + + // Utility to go to the next mesh point + inline void _manual_probe_goto_xy(float x, float y) { + if (no_reentrance) return; + #if MANUAL_PROBE_HEIGHT > 0 + current_position[Z_AXIS] = LOGICAL_Z_POSITION(Z_MIN_POS) + MANUAL_PROBE_HEIGHT; + line_to_current(Z_AXIS); + #endif + current_position[X_AXIS] = LOGICAL_X_POSITION(x); + current_position[Y_AXIS] = LOGICAL_Y_POSITION(y); + planner.buffer_line_kinematic(current_position, MMM_TO_MMS(XY_PROBE_SPEED), active_extruder); + #if MANUAL_PROBE_HEIGHT > 0 + current_position[Z_AXIS] = LOGICAL_Z_POSITION(Z_MIN_POS) + 0.2; + line_to_current(Z_AXIS); + #endif + lcd_synchronize(); + } + + #endif // MESH_BED_LEVELING + + #if ENABLED(MESH_BED_LEVELING) || ENABLED(PROBE_MANUALLY) + void _lcd_level_goto_next_point(); + #endif void _lcd_level_bed_done() { if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_DONE)); @@ -1356,7 +1384,19 @@ void kill_screen(const char* lcd_msg) { } /** - * Step 7: Get the Z coordinate, then goto next point or exit + * Step 6: Display "Next point: 1 / 9" while waiting for move to finish + */ + void _lcd_level_bed_moving() { + if (lcdDrawUpdate) { + char msg[10]; + sprintf_P(msg, PSTR("%i / %u"), (int)(manual_probe_index + 1), total_probe_points); + lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_NEXT_POINT), msg); + } + lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING; + } + + /** + * Step 7: Get the Z coordinate, click goes to the next point or exits */ void _lcd_level_bed_get_z() { ENCODER_DIRECTION_NORMAL(); @@ -1368,77 +1408,129 @@ void kill_screen(const char* lcd_msg) { refresh_cmd_timeout(); current_position[Z_AXIS] += float((int32_t)encoderPosition) * (MBL_Z_STEP); NOLESS(current_position[Z_AXIS], -(LCD_PROBE_Z_RANGE) * 0.5); - NOMORE(current_position[Z_AXIS], (LCD_PROBE_Z_RANGE) * 0.5); + NOMORE(current_position[Z_AXIS], (LCD_PROBE_Z_RANGE) * 0.5); line_to_current(Z_AXIS); lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING; encoderPosition = 0; } if (lcd_clicked) { - mbl.set_zigzag_z(manual_probe_index++, current_position[Z_AXIS]); - if (manual_probe_index == (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)) { + + // Use a hook to set the probe point z + // (zigzag arranges in XY order) + #if ENABLED(AUTO_BED_LEVELING_UBL) + + // UBL set-z handling goes here + + #elif ENABLED(PROBE_MANUALLY) + + // G29 helpfully records Z and goes to the next + // point (or beeps if done) + enqueue_and_echo_commands_P(PSTR("G29")); + manual_probe_index++; + + #elif ENABLED(MESH_BED_LEVELING) + + mbl.set_zigzag_z(manual_probe_index++, current_position[Z_AXIS]); + + #endif + + // If done... + if (manual_probe_index == total_probe_points) { + + // Say "Done!" lcd_goto_screen(_lcd_level_bed_done); + // Raise Z to the "manual probe height" #if MANUAL_PROBE_HEIGHT > 0 current_position[Z_AXIS] = LOGICAL_Z_POSITION(Z_MIN_POS) + MANUAL_PROBE_HEIGHT; line_to_current(Z_AXIS); lcd_synchronize(); #endif - mbl.set_has_mesh(true); - mbl.set_reactivate(true); - enqueue_and_echo_commands_P(PSTR("G28")); + // Enable leveling, if needed + #if ENABLED(MESH_BED_LEVELING) + + mbl.set_has_mesh(true); + mbl.set_reactivate(true); + enqueue_and_echo_commands_P(PSTR("G28")); + + #elif ENABLED(AUTO_BED_LEVELING_UBL) + + // UBL enable goes here + + #elif ENABLED(PROBE_MANUALLY) + + // ABL will be enabled due to "G29". + + #endif + lcd_return_to_status(); //LCD_MESSAGEPGM(MSG_LEVEL_BED_DONE); lcd_completion_feedback(); } else { - lcd_goto_screen(_lcd_level_goto_next_point); + + // Move to the next probe point, if needed + #if ENABLED(MESH_BED_LEVELING) || ENABLED(PROBE_MANUALLY) + + _lcd_level_goto_next_point(); + + #elif ENABLED(AUTO_BED_LEVELING_UBL) + + // UBL goto-next-point goes here + + #endif } } -KeepDrawing: + KeepDrawing: + // Update on first display, then only on updates to Z position // Show message above on clicks instead if (lcdDrawUpdate) { const float v = current_position[Z_AXIS]; lcd_implementation_drawedit(PSTR(MSG_MOVE_Z), ftostr43sign(v + (v < 0 ? -0.0001 : 0.0001), '+')); } - } - /** - * Step 6: Display "Next point: 1 / 9" while waiting for move to finish - */ - void _lcd_level_bed_moving() { - if (lcdDrawUpdate) { - char msg[10]; + #if ENABLED(MESH_BED_LEVELING) || ENABLED(PROBE_MANUALLY) + + /** + * Step 5: Initiate a move to the next point + */ + void _lcd_level_goto_next_point() { + + // Set the menu to display ahead of blocking call + lcd_goto_screen(_lcd_level_bed_moving); + #if ENABLED(MESH_BED_LEVELING) - sprintf_P(msg, PSTR("%i / %u"), (int)(manual_probe_index + 1), (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)); + + int8_t px, py; + mbl.zigzag(manual_probe_index, px, py); + + // Controls the loop until the move is done + _manual_probe_goto_xy( + LOGICAL_X_POSITION(mbl.index_to_xpos[px]), + LOGICAL_Y_POSITION(mbl.index_to_ypos[py]) + ); + #elif ENABLED(AUTO_BED_LEVELING_UBL) - sprintf_P(msg, PSTR("%i / %u"), (int)(manual_probe_index + 1), (UBL_MESH_NUM_X_POINTS) * (UBL_MESH_NUM_Y_POINTS)); + + // UBL may have its own methodology + + #elif ENABLED(PROBE_MANUALLY) + + // Just wait for the G29 move to complete + lcd_synchronize(); + #endif - lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_NEXT_POINT), msg); + + // After the blocking function returns, change menus + lcd_goto_screen(_lcd_level_bed_get_z); } - lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING; - } - - /** - * Step 5: Initiate a move to the next point - */ - void _lcd_level_goto_next_point() { - // Set the menu to display ahead of blocking call - lcd_goto_screen(_lcd_level_bed_moving); - - // _manual_probe_xy runs the menu loop until the move is done - int8_t px, py; - mbl.zigzag(manual_probe_index, px, py); - _manual_probe_xy(mbl.index_to_xpos[px], mbl.index_to_ypos[py]); - - // After the blocking function returns, change menus - lcd_goto_screen(_lcd_level_bed_get_z); - } + #endif // MESH_BED_LEVELING /** * Step 4: Display "Click to Begin", wait for click @@ -1448,7 +1540,14 @@ KeepDrawing: if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_WAITING)); if (lcd_clicked) { manual_probe_index = 0; - lcd_goto_screen(_lcd_level_goto_next_point); + #if ENABLED(MESH_BED_LEVELING) + _lcd_level_goto_next_point(); + #elif ENABLED(AUTO_BED_LEVELING_UBL) + // UBL click handling should go here + #elif ENABLED(PROBE_MANUALLY) + enqueue_and_echo_commands_P(PSTR("G29")); + _lcd_level_goto_next_point(); + #endif } } @@ -1466,15 +1565,17 @@ KeepDrawing: * Step 2: Continue Bed Leveling... */ void _lcd_level_bed_continue() { + #if PLANNER_LEVELING && DISABLED(AUTO_BED_LEVELING_UBL) + reset_bed_level(); + #endif defer_return_to_status = true; axis_homed[X_AXIS] = axis_homed[Y_AXIS] = axis_homed[Z_AXIS] = false; - mbl.reset(); - enqueue_and_echo_commands_P(PSTR("G28")); lcd_goto_screen(_lcd_level_bed_homing); + enqueue_and_echo_commands_P(PSTR("G28")); } /** - * Step 1: MBL entry-point: "Cancel" or "Level Bed" + * Step 1: Bed Level entry-point: "Cancel" or "Level Bed" */ void lcd_level_bed() { START_MENU(); @@ -1483,7 +1584,7 @@ KeepDrawing: END_MENU(); } - #endif // LCD_BED_LEVELING + #endif // LCD_BED_LEVELING /** * @@ -1520,12 +1621,19 @@ KeepDrawing: // // Level Bed // - #if HAS_ABL + #if ENABLED(LCD_BED_LEVELING) + + #if ENABLED(PROBE_MANUALLY) + if (!g29_in_progress) + #endif + MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed); + + #elif HAS_ABL + MENU_ITEM(gcode, MSG_LEVEL_BED, axis_homed[X_AXIS] && axis_homed[Y_AXIS] ? PSTR("G29") : PSTR("G28\nG29") ); - #elif ENABLED(LCD_BED_LEVELING) - MENU_ITEM(submenu, MSG_LEVEL_BED, lcd_level_bed); + #endif #if DISABLED(NO_WORKSPACE_OFFSETS) @@ -2253,7 +2361,7 @@ KeepDrawing: 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: - #if ENABLED(LCD_BED_LEVELING) + #if ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING) MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1); #endif MENU_ITEM_EDIT(float5, MSG_ACC, &planner.acceleration, 10, 99000);