V1.11.0

* Fixed an issue where the menus were wrong for the DELICIOUS COMMANDS which would cause the firmware to fail to compile * Added support for TH3D Multi-Mount BL/CR probe
ADeliciousMan · Sep 24, 2023 · 5a17e7f · 5a17e7f
1 parent db0cd59
commit 5a17e7f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 21 deletions.
diff --git a/Configuration.h b/Configuration.h
@@ -39,18 +39,19 @@
 //#define HAS_Z_PROBE //                                Say if you have a Z Probe, leave blank for Z axis switch
 
 #if ENABLED(HAS_Z_PROBE)                          
-//  #define HAS_BL_CR_TOUCH //                           BL Touch or CR Touch probe
-//  #define HAS_SPRITE //                                Creality Sprite Extruder
+//  #define HAS_BL_CR_TOUCH //                          BL Touch or CR Touch probe
+//  #define HAS_SPRITE //                               Creality Sprite Extruder
+//  #define TH3D_BL_CR_MULTIMOUNT //                    If you're using a BL_CR_MULTIMOUNT with TH3D Multi-Mount
 #endif
 
 //===========================================================================
 //================================ THERMISTOR ===============================
 //===========================================================================
 
 //#define THERMISTOR_01 //                               Default choice for Creality, if stock or unsure use this one
-//#define THERMISTOR_13 //                               Thermistor used in cREALITY Sprite hotends
+//#define THERMISTOR_13 //                               Thermistor used in Creality Sprite hotends
 //#define THERMISTOR_61 //                               Thermistor used in some Spider hotends, if unsure use thermistor 01
-//#define THERMISTOR_1047//                              Thermistor for Pt1000, 4.7kΩ pullup
+//#define THERMISTOR_1047  //                            Thermistor for Pt1000, 4.7kΩ pullup
 
 //===========================================================================
 //================================= E STEPS =================================
@@ -136,7 +137,7 @@ DO NOT TOUCH UNLESS IF YOU KNOW WHAT YOU ARE DOING
   #define BLTOUCH
   #define USE_PROBE_FOR_Z_HOMING
   #define AUTO_BED_LEVELING_BILINEAR
-  #define NOZZLE_TO_PROBE_OFFSET { -45, -19, 0 }
+  #define NOZZLE_TO_PROBE_OFFSET { -40, -8, 0 }
   #define ASSISTED_TRAMMING
   #define BED_TRAMMING_USE_PROBE
   #define BABYSTEP_ZPROBE_OFFSET
@@ -148,6 +149,14 @@ DO NOT TOUCH UNLESS IF YOU KNOW WHAT YOU ARE DOING
   #define ASSISTED_TRAMMING
   #define BED_TRAMMING_USE_PROBE
   #define BABYSTEP_ZPROBE_OFFSET
+#elif ENABLED(TH3D_BL_CR_MULTIMOUNT)
+  #define BLTOUCH
+  #define USE_PROBE_FOR_Z_HOMING
+  #define AUTO_BED_LEVELING_BILINEAR
+  #define NOZZLE_TO_PROBE_OFFSET { -45, -19, 0 }
+  #define ASSISTED_TRAMMING
+  #define BED_TRAMMING_USE_PROBE
+  #define BABYSTEP_ZPROBE_OFFSET
 #endif
 
 // Thermistor section
@@ -254,7 +263,7 @@ DO NOT TOUCH UNLESS IF YOU KNOW WHAT YOU ARE DOING
   #define HEATER_0_MAXTEMP 350
 
   // EXTRAS
-  #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 97 }
+  #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 95.10 }
   //#define LIN_ADVANCE
   //#define NO_CREALITY_422_DRIVER_WARNING
 

diff --git a/Configuration_adv.h b/Configuration_adv.h
@@ -3332,25 +3332,25 @@
   #define CONFIG_MENU_ITEM_3_GCODE "M106 S255\nM303 E0 C10 S210 U\nM500\nM106 S0\nM117 PID E TEMP 200 DONE"
   #define CONFIG_MENU_ITEM_3_CONFIRM        // Show a confirmation dialog before this action
 
-  #define CONFIG_MENU_ITEM_3_DESC "PID E C10  TEMP 260"
-  #define CONFIG_MENU_ITEM_3_GCODE "M106 S255\nM303 E0 C10 S260 U\nM500\nM106 S0\nM117 PID E TEMP 260 DONE"
-  #define CONFIG_MENU_ITEM_3_CONFIRM        // Show a confirmation dialog before this action
-
-  #define CONFIG_MENU_ITEM_4_DESC "PID BED C10  TEMP 50"
-  #define CONFIG_MENU_ITEM_4_GCODE "M303 E-1 C10 S50 U\nM500\nM106 S0\nM117 PID BED TEMP 50 DONE"
-  #define CONFIG_MENU_ITEM_4_CONFIRM
+  #define CONFIG_MENU_ITEM_4_DESC "PID E C10  TEMP 260"
+  #define CONFIG_MENU_ITEM_4_GCODE "M106 S255\nM303 E0 C10 S260 U\nM500\nM106 S0\nM117 PID E TEMP 260 DONE"
+  #define CONFIG_MENU_ITEM_4_CONFIRM        // Show a confirmation dialog before this action
 
-  #define CONFIG_MENU_ITEM_5_DESC "PID BED C10  TEMP 60"
-  #define CONFIG_MENU_ITEM_5_GCODE "M303 E-1 C10 S60 U\nM500\nM106 S0\nM117 PID BED TEMP 60 DONE"
+  #define CONFIG_MENU_ITEM_5_DESC "PID BED C10  TEMP 50"
+  #define CONFIG_MENU_ITEM_5_GCODE "M303 E-1 C10 S50 U\nM500\nM106 S0\nM117 PID BED TEMP 50 DONE"
   #define CONFIG_MENU_ITEM_5_CONFIRM
 
-  #define CONFIG_MENU_ITEM_6_DESC "PID BED C10  TEMP 70"
-  #define CONFIG_MENU_ITEM_6_GCODE "M303 E-1 C10 S70 U\nM500\nM106 S0\nM117 PID BED TEMP 70 DONE"
+  #define CONFIG_MENU_ITEM_6_DESC "PID BED C10  TEMP 60"
+  #define CONFIG_MENU_ITEM_6_GCODE "M303 E-1 C10 S60 U\nM500\nM106 S0\nM117 PID BED TEMP 60 DONE"
   #define CONFIG_MENU_ITEM_6_CONFIRM
 
-  #define CONFIG_MENU_ITEM_6_DESC "PID BED C10  TEMP 90"
-  #define CONFIG_MENU_ITEM_6_GCODE "M303 E-1 C10 S90 U\nM500\nM106 S0\nM117 PID BED TEMP 90 DONE"
-  #define CONFIG_MENU_ITEM_6_CONFIRM
+  #define CONFIG_MENU_ITEM_7_DESC "PID BED C10  TEMP 70"
+  #define CONFIG_MENU_ITEM_7_GCODE "M303 E-1 C10 S70 U\nM500\nM106 S0\nM117 PID BED TEMP 70 DONE"
+  #define CONFIG_MENU_ITEM_7_CONFIRM
+
+  #define CONFIG_MENU_ITEM_8_DESC "PID BED C10  TEMP 90"
+  #define CONFIG_MENU_ITEM_8_GCODE "M303 E-1 C10 S90 U\nM500\nM106 S0\nM117 PID BED TEMP 90 DONE"
+  #define CONFIG_MENU_ITEM_8_CONFIRM
 #endif
 
 // @section custom buttons

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I8PI401)
 
-#### Date of Latest Build: 2023-09-24 - V1.10.0
+#### Date of Latest Build: 2023-09-24 - V1.11.0
 #### Latest Marlin Version: 2.1.2.1
 
 ![LOGO](https://raw.githubusercontent.com/ADeliciousMan/A-Delicious-Marlin-Ender-3-Firmware/master/images/bootscreen.png?raw=true)
@@ -81,6 +81,10 @@ I **ONLY** own a Ender 3 Pro with a 4.2.7 512k board so it's the only one I can
 
 ## CHANGELOG:
 
+#### 2023-09-24 - V1.11.0
+* Fixed an issue where the menus were wrong for the DELICIOUS COMMANDS which would cause the firmware to fail to compile
+* Added support for TH3D Multi-Mount BL/CR probe
+
 #### 2023-09-24 - V1.10.0
 * Added FILAMENT_RUNOUT_SENSOR - Customize Printer section
 * Added support for these boards - Customize printer section