From b8229c14d4bb2d934be8e36bd678521a4f7786ac Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sun, 17 Sep 2023 17:12:09 -0400 Subject: [PATCH] Enable tramming with probe --- Marlin/Configuration.h | 20 +++++++++----------- Marlin/src/inc/SanityCheck.h | 1 + 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 8c12135b60..afe36b2b23 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -2237,18 +2237,16 @@ #endif // Add a menu item to move between bed corners for manual bed adjustment -//#define LCD_BED_TRAMMING - - #define BED_TRAMMING_INSET_LFRB { 22, 22, 22, 22 } // (mm) Left, Front, Right, Back insets - #define BED_TRAMMING_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points - #define BED_TRAMMING_Z_HOP 4.0 // (mm) Z height of nozzle between leveling points - +#define LCD_BED_TRAMMING #if ENABLED(LCD_BED_TRAMMING) - //#define BED_TRAMMING_INSET_LFRB { 22, 22, 22, 22 } // (mm) Left, Front, Right, Back insets - //#define BED_TRAMMING_HEIGHT 0.0 // (mm) Z height of nozzle at tramming points - //#define BED_TRAMMING_Z_HOP 4.0 // (mm) Z height of nozzle between tramming points - //#define BED_TRAMMING_INCLUDE_CENTER // Move to the center after the last corner - //#define BED_TRAMMING_USE_PROBE + #define BED_TRAMMING_HEIGHT 0.0 // (mm) Z height of nozzle at tramming points + #define BED_TRAMMING_Z_HOP 4.0 // (mm) Z height of nozzle between tramming points + #define BED_TRAMMING_INCLUDE_CENTER // Move to the center after the last corner + #if ENABLED(BL_Touch) + #define BED_TRAMMING_USE_PROBE + #else + #define BED_TRAMMING_INSET_LFRB { 22, 22, 22, 22 } // (mm) Left, Front, Right, Back insets + #endif #if ENABLED(BED_TRAMMING_USE_PROBE) #define BED_TRAMMING_PROBE_TOLERANCE 0.1 // (mm) #define BED_TRAMMING_VERIFY_RAISED // After adjustment triggers the probe, re-probe to verify diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 799981faba..b4801eefed 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -1546,6 +1546,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L #else #ifndef BED_TRAMMING_INSET_LFRB #error "LCD_BED_TRAMMING requires BED_TRAMMING_INSET_LFRB values." + #endif #endif #endif