Merge pull request #202 from th3dstudio/2.0.x

2.0.x
th3dstudio · Dec 5, 2024 · ca83afd · ca83afd
2 parents 03b1991 + d6f738d
commit ca83afd
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 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.94"
-#define STRING_DISTRIBUTION_DATE "2024-12-03"
+#define UNIFIED_VERSION "TH3D UFW 2.94a"
+#define STRING_DISTRIBUTION_DATE "2024-12-05"
 
 //#@CONFIGURATION_START_FLAG
 

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.94"
-#define STRING_DISTRIBUTION_DATE "2024-12-03"
+#define UNIFIED_VERSION "TH3D UFW 2.94a"
+#define STRING_DISTRIBUTION_DATE "2024-12-05"
 
 //#@CONFIGURATION_START_FLAG
 

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.94"
-#define STRING_DISTRIBUTION_DATE "2024-12-03"
+#define UNIFIED_VERSION "TH3D UFW 2.94a"
+#define STRING_DISTRIBUTION_DATE "2024-12-05"
 
 //#@CONFIGURATION_START_FLAG
 

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.94"
-#define STRING_DISTRIBUTION_DATE "2024-12-03"
+#define UNIFIED_VERSION "TH3D UFW 2.94a"
+#define STRING_DISTRIBUTION_DATE "2024-12-05"
 
 //#@CONFIGURATION_START_FLAG
 

diff --git a/Firmware/Marlin/Configuration_adv.h b/Firmware/Marlin/Configuration_adv.h
@@ -1855,7 +1855,7 @@
    * Use 'M503 C' to write the settings out to the SD Card as 'mc.zip'.
    * See docs/ConfigEmbedding.md for details on how to use 'mc-apply.py'.
    */
-  #if DISABLED(SPAVE_SAVER_2560)
+  #if DISABLED(SPACE_SAVER_2560)
     #define CONFIGURATION_EMBEDDING
   #endif
 
@@ -1971,7 +1971,9 @@
   //#define STATUS_HOTEND_NUMBERLESS  // Use plain hotend icons instead of numbered ones (with 2+ hotends)
   #define STATUS_HOTEND_INVERTED      // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM for numbered hotends)
   #define STATUS_HOTEND_ANIM          // Use a second bitmap to indicate hotend heating
-  #define STATUS_BED_ANIM             // Use a second bitmap to indicate bed heating
+  #if NONE(DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE)
+    #define STATUS_BED_ANIM           // Use a second bitmap to indicate bed heating
+  #endif
   #define STATUS_CHAMBER_ANIM         // Use a second bitmap to indicate chamber heating
   //#define STATUS_CUTTER_ANIM        // Use a second bitmap to indicate spindle / laser active
   //#define STATUS_COOLER_ANIM        // Use a second bitmap to indicate laser cooling

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.94"
+  #define UNIFIED_VERSION "TH3D UFW 2.94a"
 #endif
 
 /**
@@ -288,6 +288,7 @@
 
 #define NO_CREALITY_422_DRIVER_WARNING
 #define NO_AUTO_ASSIGN_WARNING
+#define DIAG_JUMPERS_REMOVED
 
 #if ENABLED(G26_MESH_VALIDATION)
   #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
@@ -672,4 +673,9 @@
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
   #define XY_PROBE_FEEDRATE (50*60)
   #define MESH_EDIT_MENU
+
+  #undef Z_PROBE_OFFSET_RANGE_MIN
+  #define Z_PROBE_OFFSET_RANGE_MIN    -10
+  #undef Z_PROBE_OFFSET_RANGE_MAX
+  #define Z_PROBE_OFFSET_RANGE_MAX     1
 #endif