Merge pull request #185 from th3dstudio/2.0.x

2.0.x
th3dstudio · Mar 10, 2024 · e89f5d0 · e89f5d0
2 parents 60e8eb0 + 112a8c0
commit e89f5d0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 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 02010200
 
-#define UNIFIED_VERSION "TH3D UFW 2.84"
-#define STRING_DISTRIBUTION_DATE "2024-03-08"
+#define UNIFIED_VERSION "TH3D UFW 2.85"
+#define STRING_DISTRIBUTION_DATE "2024-03-09"
 
 //#@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 02010200
 
-#define UNIFIED_VERSION "TH3D UFW 2.84"
-#define STRING_DISTRIBUTION_DATE "2024-03-08"
+#define UNIFIED_VERSION "TH3D UFW 2.85"
+#define STRING_DISTRIBUTION_DATE "2024-03-09"
 
 //#@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 02010200
 
-#define UNIFIED_VERSION "TH3D UFW 2.84"
-#define STRING_DISTRIBUTION_DATE "2024-03-08"
+#define UNIFIED_VERSION "TH3D UFW 2.85"
+#define STRING_DISTRIBUTION_DATE "2024-03-09"
 
 //#@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 02010200
 
-#define UNIFIED_VERSION "TH3D UFW 2.84"
-#define STRING_DISTRIBUTION_DATE "2024-03-08"
+#define UNIFIED_VERSION "TH3D UFW 2.85"
+#define STRING_DISTRIBUTION_DATE "2024-03-09"
 
 //#@CONFIGURATION_START_FLAG
 

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.84"
+  #define UNIFIED_VERSION "TH3D UFW 2.85"
 #endif
 
 /**
@@ -317,7 +317,7 @@
     #define Z_MIN_PROBE_ENDSTOP_INVERTING false
     #undef Z_MIN_ENDSTOP_INVERTING
     #define Z_MIN_ENDSTOP_INVERTING false
-  #elif (ENABLED(CR10S_PRO_STOCK_ABL) && ENABLED(CR10S_PRO)) || ANY(ENDER3_S1, ENDER3_S1_PRO, ENDER3_S1_PLUS, ENDER5_S1) || (ANY(SOVOL_SV06, SOVOL_SV06_PLUS) && DISABLED(SV06_EZABL_INSTALLED))
+  #elif (ENABLED(CR10S_PRO_STOCK_ABL) && ENABLED(CR10S_PRO)) || (ANY(ENDER3_S1, ENDER3_S1_PRO, ENDER3_S1_PLUS, ENDER5_S1) && DISABLED(INVERT_EZABL_LOGIC)) || (ANY(SOVOL_SV06, SOVOL_SV06_PLUS) && DISABLED(SV06_EZABL_INSTALLED)) || (NONE(ENDER3_S1, ENDER3_S1_PRO, ENDER3_S1_PLUS, ENDER5_S1) && ENABLED(INVERT_EZABL_LOGIC))
     //Ender 3 S1 & 5 S1 J713 header for Z Endstop is reverse logic via hardware for some reason. Need to invert the EZABL logic for it here.
     #undef Z_MIN_PROBE_ENDSTOP_INVERTING
     #define Z_MIN_PROBE_ENDSTOP_INVERTING false