Merge pull request #197 from th3dstudio/2.0.x

2.92 Release
th3dstudio · Oct 3, 2024 · cfc5e50 · cfc5e50
2 parents 4f2bd5f + 165c8ac
commit cfc5e50
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 20 deletions.
diff --git a/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h
@@ -5,8 +5,8 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.91b"
-#define STRING_DISTRIBUTION_DATE "2024-09-23"
+#define UNIFIED_VERSION "TH3D UFW 2.92"
+#define STRING_DISTRIBUTION_DATE "2024-10-03"
 
 //#@CONFIGURATION_START_FLAG
 
@@ -149,7 +149,7 @@
 // Fast Probing - Works with most machines and all EZABL sensors (8mm/s)
 #define EZABL_FASTPROBE
 
-// Superfast Probing - Only works with the EZABL Pro Sensors (15mm/s)
+// Superfast Probing - Works with Pro/NG EZABL Probes (15mm/s) & BLTouch/CRTouch (10mm/s)
 //#define EZABL_SUPERFASTPROBE
 
 // Heaters on During Probing - Heaters will stay on during probing - May reduce accuracy do not use unless told to by support

diff --git a/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h
@@ -7,8 +7,8 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.91b"
-#define STRING_DISTRIBUTION_DATE "2024-09-23"
+#define UNIFIED_VERSION "TH3D UFW 2.92"
+#define STRING_DISTRIBUTION_DATE "2024-10-03"
 
 //#@CONFIGURATION_START_FLAG
 
@@ -247,7 +247,7 @@
 // Fast Probing - Works with most machines and all EZABL sensors (8mm/s)
 #define EZABL_FASTPROBE
 
-// Superfast Probing - Only works with the EZABL Pro Sensors (15mm/s)
+// Superfast Probing - Works with Pro/NG EZABL Probes (15mm/s) & BLTouch/CRTouch (10mm/s)
 //#define EZABL_SUPERFASTPROBE
 
 // Heaters on During Probing - Heaters will stay on during probing - May reduce accuracy do not use unless told to by support

diff --git a/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h
@@ -5,8 +5,8 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.91b"
-#define STRING_DISTRIBUTION_DATE "2024-09-23"
+#define UNIFIED_VERSION "TH3D UFW 2.92"
+#define STRING_DISTRIBUTION_DATE "2024-10-03"
 
 //#@CONFIGURATION_START_FLAG
 
@@ -184,7 +184,7 @@
 // Fast Probing - Works with most machines and all EZABL sensors (8mm/s)
 #define EZABL_FASTPROBE
 
-// Superfast Probing - Only works with the EZABL Pro Sensors (15mm/s)
+// Superfast Probing - Works with Pro/NG EZABL Probes (15mm/s) & BLTouch/CRTouch (10mm/s)
 //#define EZABL_SUPERFASTPROBE
 
 // Heaters on During Probing - Heaters will stay on during probing - May reduce accuracy do not use unless told to by support

diff --git a/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h
@@ -7,8 +7,8 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.91b"
-#define STRING_DISTRIBUTION_DATE "2024-09-23"
+#define UNIFIED_VERSION "TH3D UFW 2.92"
+#define STRING_DISTRIBUTION_DATE "2024-10-03"
 
 //#@CONFIGURATION_START_FLAG
 
@@ -251,7 +251,7 @@
 // Fast Probing - Works with most machines and all EZABL sensors (8mm/s)
 #define EZABL_FASTPROBE
 
-// Superfast Probing - Only works with the EZABL Pro Sensors (15mm/s)
+// Superfast Probing - Works with Pro/NG EZABL Probes (15mm/s) & BLTouch/CRTouch (10mm/s)
 //#define EZABL_SUPERFASTPROBE
 
 // Heaters on During Probing - Heaters will stay on during probing - May reduce accuracy do not use unless told to by support

diff --git a/Firmware/Marlin/Configuration_adv.h b/Firmware/Marlin/Configuration_adv.h
@@ -1058,8 +1058,9 @@
    *
    * Set the default state here, change with 'M401 S' or UI, use M500 to save, M502 to reset.
    */
-  //#define BLTOUCH_HS_MODE true
-
+  #if ALL(EZABL_SUPERFASTPROBE, BLTOUCH)
+    #define BLTOUCH_HS_MODE true
+  #endif
 
 #endif // BLTOUCH
 

diff --git a/Firmware/Marlin/Configuration_backend.h b/Firmware/Marlin/Configuration_backend.h
@@ -7,7 +7,7 @@
 //===========================================================================
 
 #ifndef UNIFIED_VERSION
-  #define UNIFIED_VERSION "TH3D UFW 2.91b"
+  #define UNIFIED_VERSION "TH3D UFW 2.92"
 #endif
 
 /**
@@ -460,6 +460,9 @@
   #if ALL(EZABL_SUPERFASTPROBE, ABL_ENABLE) && NONE(BLTOUCH)
     #define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (15*60) }
     #define Z_PROBE_FEEDRATE_FAST (15*60)
+  #elif ALL(EZABL_SUPERFASTPROBE, ABL_ENABLE, BLTOUCH)
+    #define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (15*60) }
+    #define Z_PROBE_FEEDRATE_FAST (10*60)
   #elif ALL(EZABL_FASTPROBE, ABL_ENABLE)
     #define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (8*60) }
     #define Z_PROBE_FEEDRATE_FAST (8*60)

diff --git a/Internal Tools/STEP2-UpdatePackages.bat b/Internal Tools/STEP2-UpdatePackages.bat
@@ -187,11 +187,6 @@
 "C:\Program Files\7-Zip\7z.exe" a -tZip "D:\Work\TH3D Studio LLC\TH3D Internal Site - Shared Folders\Web Downloads\Unified 2 Firmware\TH3D_Unified2_MKS_Monster_8_V2_DIY.zip" "D:\Work\GitHub\UnifiedFirmware\Install Guides and STL Files.txt"
 "C:\Program Files\7-Zip\7z.exe" a -tZip "D:\Work\TH3D Studio LLC\TH3D Internal Site - Shared Folders\Web Downloads\Unified 2 Firmware\TH3D_Unified2_MKS_Monster_8_V2_DIY.zip" "D:\Work\GitHub\UnifiedPaidConfigs\Board_Configs\MKS_Monster_8_V2_DIY\Firmware"
 
-
-"C:\Program Files\7-Zip\7z.exe" d -tZip "D:\Work\TH3D Studio LLC\TH3D Internal Site - Shared Folders\Web Downloads\Unified 2 Firmware\TH3D_Unified2_BTT_SKR_2_ALL_DIY.zip"
-"C:\Program Files\7-Zip\7z.exe" a -tZip "D:\Work\TH3D Studio LLC\TH3D Internal Site - Shared Folders\Web Downloads\Unified 2 Firmware\TH3D_Unified2_BTT_SKR_2_ALL_DIY.zip" "D:\Work\TH3D Studio LLC\TH3D Internal Site - Shared Folders\Web Downloads\Unified 2 Firmware\TH3D_Unified2_BTT_SKR_2_DIY.zip"
-"C:\Program Files\7-Zip\7z.exe" a -tZip "D:\Work\TH3D Studio LLC\TH3D Internal Site - Shared Folders\Web Downloads\Unified 2 Firmware\TH3D_Unified2_BTT_SKR_2_ALL_DIY.zip" "D:\Work\TH3D Studio LLC\TH3D Internal Site - Shared Folders\Web Downloads\Unified 2 Firmware\TH3D_Unified2_BTT_SKR_2_F429_DIY.zip"
-
 del "D:\Work\TH3D Studio LLC\TH3D Internal Site - Shared Folders\Web Downloads\Unified 2 Firmware\TH3D_Unified2_BTT_SKR_2_DIY.zip"
 del "D:\Work\TH3D Studio LLC\TH3D Internal Site - Shared Folders\Web Downloads\Unified 2 Firmware\TH3D_Unified2_BTT_SKR_2_F429_DIY.zip"