From 2b764561fd29d45c3ccfe547ec083aa7d674dd6e Mon Sep 17 00:00:00 2001 From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Wed, 10 Nov 2021 06:59:13 -0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Biqu=20B1=20with=20BTT=20SKR=202=20?= =?UTF-8?q?(#605)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BIQU/{B1 => B1 - SKR 1.4}/Configuration.h | 29 +++++++++++---- .../{B1 => B1 - SKR 1.4}/Configuration_adv.h | 0 config/examples/BIQU/B1 - SKR 1.4/README.md | 9 +++++ .../Configuration.h | 35 +++++++++++++------ .../Configuration_adv.h | 4 +-- config/examples/BIQU/B1 - SKR 2/README.md | 9 +++++ config/examples/BIQU/B1-BLTouch/README.md | 3 -- 7 files changed, 67 insertions(+), 22 deletions(-) rename config/examples/BIQU/{B1 => B1 - SKR 1.4}/Configuration.h (99%) rename config/examples/BIQU/{B1 => B1 - SKR 1.4}/Configuration_adv.h (100%) create mode 100644 config/examples/BIQU/B1 - SKR 1.4/README.md rename config/examples/BIQU/{B1-BLTouch => B1 - SKR 2}/Configuration.h (99%) rename config/examples/BIQU/{B1-BLTouch => B1 - SKR 2}/Configuration_adv.h (99%) create mode 100644 config/examples/BIQU/B1 - SKR 2/README.md delete mode 100644 config/examples/BIQU/B1-BLTouch/README.md diff --git a/config/examples/BIQU/B1/Configuration.h b/config/examples/BIQU/B1 - SKR 1.4/Configuration.h similarity index 99% rename from config/examples/BIQU/B1/Configuration.h rename to config/examples/BIQU/B1 - SKR 1.4/Configuration.h index 340de09098..21c179675d 100644 --- a/config/examples/BIQU/B1/Configuration.h +++ b/config/examples/BIQU/B1 - SKR 1.4/Configuration.h @@ -21,6 +21,8 @@ */ #pragma once +//#define B1_WITH_BLTOUCH + /** * Configuration.h * @@ -830,7 +832,11 @@ // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). #define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. -#define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. +#ifdef B1_WITH_BLTOUCH + #define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. +#else + #define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. +#endif #define I_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define J_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define K_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. @@ -1029,7 +1035,7 @@ * 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 +//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN // Force the use of the probe for Z-axis homing //#define USE_PROBE_FOR_Z_HOMING @@ -1086,7 +1092,9 @@ /** * The BLTouch probe uses a Hall effect sensor and emulates a servo. */ -//#define BLTOUCH +#ifdef B1_WITH_BLTOUCH + #define BLTOUCH +#endif /** * Touch-MI Probe by hotends.fr @@ -1238,7 +1246,9 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -//#define MULTIPLE_PROBING 2 +#ifdef B1_WITH_BLTOUCH + #define MULTIPLE_PROBING 2 +#endif //#define EXTRA_PROBING 1 /** @@ -1408,7 +1418,9 @@ #if ENABLED(MIN_SOFTWARE_ENDSTOPS) #define MIN_SOFTWARE_ENDSTOP_X #define MIN_SOFTWARE_ENDSTOP_Y - #define MIN_SOFTWARE_ENDSTOP_Z + #ifndef B1_WITH_BLTOUCH + #define MIN_SOFTWARE_ENDSTOP_Z + #endif #define MIN_SOFTWARE_ENDSTOP_I #define MIN_SOFTWARE_ENDSTOP_J #define MIN_SOFTWARE_ENDSTOP_K @@ -1544,9 +1556,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 +#ifdef B1_WITH_BLTOUCH + #define AUTO_BED_LEVELING_BILINEAR +#else + #define MESH_BED_LEVELING +#endif /** * Normally G28 leaves leveling disabled on completion. Enable one of diff --git a/config/examples/BIQU/B1/Configuration_adv.h b/config/examples/BIQU/B1 - SKR 1.4/Configuration_adv.h similarity index 100% rename from config/examples/BIQU/B1/Configuration_adv.h rename to config/examples/BIQU/B1 - SKR 1.4/Configuration_adv.h diff --git a/config/examples/BIQU/B1 - SKR 1.4/README.md b/config/examples/BIQU/B1 - SKR 1.4/README.md new file mode 100644 index 0000000000..968eb198a1 --- /dev/null +++ b/config/examples/BIQU/B1 - SKR 1.4/README.md @@ -0,0 +1,9 @@ +# BIQU B1 (SKR 1.4) Firmware + +Compile with the `LPC1768` environment. + +## BLTouch Probe Support + +Enable `B1_USE_BLTOUCH` for probe customizations. + +This configuration retains the use of homing with a Z limit switch. If you want to home with the BLTouch probe, remove your Z limit switch & bracket and enable (uncomment) `USE_PROBE_FOR_Z_HOMING` and `Z_SAFE_HOMING`. Change `Z_MIN_ENDSTOP_INVERTING` from `true` to `false`. diff --git a/config/examples/BIQU/B1-BLTouch/Configuration.h b/config/examples/BIQU/B1 - SKR 2/Configuration.h similarity index 99% rename from config/examples/BIQU/B1-BLTouch/Configuration.h rename to config/examples/BIQU/B1 - SKR 2/Configuration.h index 94df1bca77..0253f5fe01 100644 --- a/config/examples/BIQU/B1-BLTouch/Configuration.h +++ b/config/examples/BIQU/B1 - SKR 2/Configuration.h @@ -21,6 +21,8 @@ */ #pragma once +//#define B1_WITH_BLTOUCH + /** * Configuration.h * @@ -69,7 +71,7 @@ // @section info // Author info of this build printed to the host during boot and M115 -#define STRING_CONFIG_H_AUTHOR "(thisiskeithb, BIQU B1 BLTouch)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(thisiskeithb, BIQU B1)" // Who made the changes. //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) /** @@ -102,7 +104,7 @@ * * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] */ -#define SERIAL_PORT 0 +#define SERIAL_PORT 1 /** * Serial Port Baud Rate @@ -139,7 +141,7 @@ // Choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_BTT_SKR_V1_4 + #define MOTHERBOARD BOARD_BTT_SKR_V2_0_REV_B #endif // Name displayed in the LCD "Ready" message and Info menu @@ -830,7 +832,11 @@ // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). #define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. -#define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. +#ifdef B1_WITH_BLTOUCH + #define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. +#else + #define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. +#endif #define I_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define J_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define K_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. @@ -1086,7 +1092,9 @@ /** * The BLTouch probe uses a Hall effect sensor and emulates a servo. */ -#define BLTOUCH +#ifdef B1_WITH_BLTOUCH + #define BLTOUCH +#endif /** * Touch-MI Probe by hotends.fr @@ -1238,7 +1246,9 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -#define MULTIPLE_PROBING 2 +#ifdef B1_WITH_BLTOUCH + #define MULTIPLE_PROBING 2 +#endif //#define EXTRA_PROBING 1 /** @@ -1408,7 +1418,9 @@ #if ENABLED(MIN_SOFTWARE_ENDSTOPS) #define MIN_SOFTWARE_ENDSTOP_X #define MIN_SOFTWARE_ENDSTOP_Y - //#define MIN_SOFTWARE_ENDSTOP_Z + #ifndef B1_WITH_BLTOUCH + #define MIN_SOFTWARE_ENDSTOP_Z + #endif #define MIN_SOFTWARE_ENDSTOP_I #define MIN_SOFTWARE_ENDSTOP_J #define MIN_SOFTWARE_ENDSTOP_K @@ -1544,9 +1556,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 +#ifdef B1_WITH_BLTOUCH + #define AUTO_BED_LEVELING_BILINEAR +#else + #define MESH_BED_LEVELING +#endif /** * Normally G28 leaves leveling disabled on completion. Enable one of @@ -2966,7 +2981,7 @@ * Set this manually if there are extra servos needing manual control. * Set to 0 to turn off servo support. */ -#define NUM_SERVOS 1 // Note: Servo index starts with 0 for M280-M282 commands +//#define NUM_SERVOS 3 // Note: Servo index starts with 0 for M280-M282 commands // (ms) Delay before the next move will start, to give the servo time to reach its target angle. // 300ms is a good value but you can try less delay. diff --git a/config/examples/BIQU/B1-BLTouch/Configuration_adv.h b/config/examples/BIQU/B1 - SKR 2/Configuration_adv.h similarity index 99% rename from config/examples/BIQU/B1-BLTouch/Configuration_adv.h rename to config/examples/BIQU/B1 - SKR 2/Configuration_adv.h index e9163e8bab..2ca4823a45 100644 --- a/config/examples/BIQU/B1-BLTouch/Configuration_adv.h +++ b/config/examples/BIQU/B1 - SKR 2/Configuration_adv.h @@ -1490,7 +1490,7 @@ * * [1] On AVR an interrupt-capable pin is best for UHS3 compatibility. */ - //#define USB_FLASH_DRIVE_SUPPORT + #define USB_FLASH_DRIVE_SUPPORT #if ENABLED(USB_FLASH_DRIVE_SUPPORT) /** * USB Host Shield Library @@ -1508,7 +1508,7 @@ /** * Native USB Host supported by some boards (USB OTG) */ - //#define USE_OTG_USB_HOST + #define USE_OTG_USB_HOST #if DISABLED(USE_OTG_USB_HOST) #define USB_CS_PIN SDSS diff --git a/config/examples/BIQU/B1 - SKR 2/README.md b/config/examples/BIQU/B1 - SKR 2/README.md new file mode 100644 index 0000000000..f7e5571007 --- /dev/null +++ b/config/examples/BIQU/B1 - SKR 2/README.md @@ -0,0 +1,9 @@ +# BIQU B1 (SKR 2) Firmware + +Flash drive support is enabled, but jumpers to enable support may not have been installed correctly from the factory. [Follow Biqu's instructions, starting with Step 2](https://github.com/bigtreetech/BIQU-B1-SE-PLUS/blob/main/B1-SE%20fimware/B1-SE-U%20Disk%20Usage%20Tutorial-English.pdf) if flash drive support is not working correctly. + +## BLTouch Probe Support + +Enable `B1_USE_BLTOUCH` for probe customizations. + +This configuration retains the use of homing with a Z limit switch. If you want to home with the BLTouch probe, remove your Z limit switch & bracket and enable (uncomment) `USE_PROBE_FOR_Z_HOMING` and `Z_SAFE_HOMING`. Change `Z_MIN_ENDSTOP_INVERTING` from `true` to `false`. diff --git a/config/examples/BIQU/B1-BLTouch/README.md b/config/examples/BIQU/B1-BLTouch/README.md deleted file mode 100644 index faa8a9e00b..0000000000 --- a/config/examples/BIQU/B1-BLTouch/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# BIQU B1 BLTouch Firmware - -This firmware retains the use of homing with a Z limit switch. If you want to home with a BLTouch, enable (uncomment) `USE_PROBE_FOR_Z_HOMING` and `Z_SAFE_HOMING` and remove the adjustable Z limit switch bracket.