diff --git a/config/examples/Two Trees/BlueR/readme.md b/config/examples/Two Trees/BlueR/readme.md index a134a64d2a..7fe3d1e319 100644 --- a/config/examples/Two Trees/BlueR/readme.md +++ b/config/examples/Two Trees/BlueR/readme.md @@ -12,4 +12,4 @@ Extra options are provided for BlueR stepper driver variants: - Enable `BLUER_TMC2209` if your board has TMC2209 drivers. - Enable `BLUER_INVERTED_E` for the BlueR V2 if the E motor goes in reverse. -- Enable `BLUER_BLTOUCH` if you want to enable BLTOUCH. +- Enable `BLUER_BLTOUCH` if you want to enable BLTOUCH. (BLTOUCH Will Replace Z_Min_Plug) diff --git a/config/examples/Two Trees/Sapphire Pro/Configuration.h b/config/examples/Two Trees/Sapphire Pro/Configuration.h index 96e801b2dc..d8cc168cc6 100644 --- a/config/examples/Two Trees/Sapphire Pro/Configuration.h +++ b/config/examples/Two Trees/Sapphire Pro/Configuration.h @@ -22,6 +22,8 @@ #pragma once //#define SPRO_INVERTED_E // Enable if the extruder runs the wrong way +//#define SPRO_TMC2209 // Enable for the TMC2209 driver version +//#define SPRO_BLTOUCH // Enable if you want to use BLTOUCH /** * Configuration.h @@ -674,15 +676,25 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -#define X_DRIVER_TYPE TMC2208_STANDALONE -#define Y_DRIVER_TYPE TMC2208_STANDALONE -#define Z_DRIVER_TYPE A4988 +#if ENABLED(SPRO_TMC2209) + #define X_DRIVER_TYPE TMC2209_STANDALONE + #define Y_DRIVER_TYPE TMC2209_STANDALONE + #define Z_DRIVER_TYPE TMC2209_STANDALONE +#else + #define X_DRIVER_TYPE TMC2208_STANDALONE + #define Y_DRIVER_TYPE TMC2208_STANDALONE + #define Z_DRIVER_TYPE A4988 +#endif //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 //#define Z3_DRIVER_TYPE A4988 //#define Z4_DRIVER_TYPE A4988 -#define E0_DRIVER_TYPE A4988 +#if ENABLED(SPRO_TMC2209) + #define E0_DRIVER_TYPE TMC2209_STANDALONE +#else + #define E0_DRIVER_TYPE A4988 +#endif //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -837,7 +849,9 @@ * The probe replaces the Z-MIN endstop and is used for Z homing. * (Automatically enables USE_PROBE_FOR_Z_HOMING.) */ -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +#if ENABLED(SPRO_BLTOUCH) + #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +#endif // Force the use of the probe for Z-axis homing //#define USE_PROBE_FOR_Z_HOMING @@ -901,7 +915,9 @@ /** * The BLTouch probe uses a Hall effect sensor and emulates a servo. */ -//#define BLTOUCH +#if ENABLED(SPRO_BLTOUCH) + #define BLTOUCH +#endif /** * Pressure sensor with a BLTouch-like interface @@ -1100,13 +1116,21 @@ // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. #define INVERT_X_DIR true #define INVERT_Y_DIR true -#define INVERT_Z_DIR false +#if ENABLED(SPRO_TMC2209) + #define INVERT_Z_DIR true +#else + #define INVERT_Z_DIR false +#endif // @section extruder // For direct drive extruder v9 set to true, for geared extruder set to false. #ifdef SPRO_INVERTED_E - #define INVERT_E0_DIR true + #if ENABLED(SPRO_TMC2209) + #define INVERT_E0_DIR false + #else + #define INVERT_E0_DIR true + #endif #else #define INVERT_E0_DIR false #endif @@ -1290,9 +1314,12 @@ */ //#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_LINEAR -//#define AUTO_BED_LEVELING_BILINEAR //#define AUTO_BED_LEVELING_UBL -#define MESH_BED_LEVELING +#if ENABLED(SPRO_BLTOUCH) + #define AUTO_BED_LEVELING_BILINEAR +#else + #define MESH_BED_LEVELING +#endif /** * Normally G28 leaves leveling disabled on completion. Enable @@ -1349,7 +1376,7 @@ #if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR) // Set the number of grid points per dimension. - #define GRID_MAX_POINTS_X 4 + #define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X // Probe along the Y axis, advancing X after each column @@ -1459,7 +1486,9 @@ // - Move the Z probe (or nozzle) to a defined XY point before Z Homing. // - Prevent Z homing when the Z probe is outside bed area. // -//#define Z_SAFE_HOMING +#if ENABLED(SPRO_BLTOUCH) + #define Z_SAFE_HOMING +#endif #if ENABLED(Z_SAFE_HOMING) #define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing diff --git a/config/examples/Two Trees/Sapphire Pro/Configuration_adv.h b/config/examples/Two Trees/Sapphire Pro/Configuration_adv.h index 2ab06bbdc0..9433ff2f1e 100644 --- a/config/examples/Two Trees/Sapphire Pro/Configuration_adv.h +++ b/config/examples/Two Trees/Sapphire Pro/Configuration_adv.h @@ -728,7 +728,7 @@ * This feature was designed for Delta's with very fast Z moves however higher speed cartesians may function * If the machine cannot raise the probe fast enough after a trigger, it may enter a fault state. */ - #define BLTOUCH_HS_MODE + //#define BLTOUCH_HS_MODE // Safety: Enable voltage mode settings in the LCD menu. //#define BLTOUCH_LCD_VOLTAGE_MENU @@ -1653,7 +1653,9 @@ //#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28 - //#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping + #if ENABLED(SPRO_BLTOUCH) + #define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping + #endif #if ENABLED(BABYSTEP_ZPROBE_OFFSET) //#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets //#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor diff --git a/config/examples/Two Trees/Sapphire Pro/readme.md b/config/examples/Two Trees/Sapphire Pro/readme.md index 6a7a1bbdd3..1cb98b1641 100644 --- a/config/examples/Two Trees/Sapphire Pro/readme.md +++ b/config/examples/Two Trees/Sapphire Pro/readme.md @@ -7,3 +7,4 @@ Extra options are provided for Sapphire Pro Steppers: - Enable `SPRO_INVERTED_E` if the E motor goes in reverse. - Enable `SPRO_TMC2209` if your board has TMC2209 drivers. +- Enable `SPRO_BLTOUCH` if you want to enable BLTOUCH. (BLTOUCH Will Replace Z_Min_Plug) \ No newline at end of file