Merge pull request #181 from th3dstudio/2.0.x

2.0.x

Author: houseofbugs

Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h

@@ -5,6 +5,9 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010200
 
+#define UNIFIED_VERSION "UF 2.83"
+#define STRING_DISTRIBUTION_DATE "2023-12-14"
+
 //#@CONFIGURATION_START_FLAG
 
 //===========================================================================

Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h

@@ -7,6 +7,9 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010200
 
+#define UNIFIED_VERSION "UF 2.83"
+#define STRING_DISTRIBUTION_DATE "2023-12-14"
+
 //#@CONFIGURATION_START_FLAG
 
 //===========================================================================

Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h

@@ -5,6 +5,9 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010200
 
+#define UNIFIED_VERSION "UF 2.83"
+#define STRING_DISTRIBUTION_DATE "2023-12-14"
+
 //#@CONFIGURATION_START_FLAG
 
 //===========================================================================

Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h

@@ -7,6 +7,9 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010200
 
+#define UNIFIED_VERSION "UF 2.83"
+#define STRING_DISTRIBUTION_DATE "2023-12-14"
+
 //#@CONFIGURATION_START_FLAG
 
 //===========================================================================

Firmware/How to Check Firmware Version.txt

@@ -1 +1 @@
-The firmware version is located in the Marlin\Configuration_backend.h file at the top of the file
+The firmware version is located at the top of each Configuration.h file.

Firmware/Marlin/Configuration_backend.h

@@ -6,8 +6,7 @@
 //======================= DO NOT MODIFY THIS FILE ===========================
 //===========================================================================
 
-#define UNIFIED_VERSION "TH3D UFW 2.82"
-#define STRING_DISTRIBUTION_DATE "12-12-2023"
+// Version and Date information is now in the Configuration.h files at the top.
 
 /**
  * ABL Probe Settings
@@ -16,6 +15,10 @@
 #if ENABLED(CUSTOM_PROBE)
   #define ABL_ENABLE
 #endif
+#if ENABLED(ENDER5_S1_OEM)
+  #define ABL_ENABLE
+  #define NOZZLE_TO_PROBE_OFFSET { -35, -2, 0 }
+#endif
 #if ENABLED(KP3S_PRO_OEM_MOUNT)
   #define ABL_ENABLE
   #define NOZZLE_TO_PROBE_OFFSET { -54, -9, 0 }
@@ -312,8 +315,8 @@
     #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) || (ANY(SOVOL_SV06, SOVOL_SV06_PLUS) && DISABLED(SV06_EZABL_INSTALLED))
-    //Ender 3 S1 J713 header for Z Endstop is reverse logic via hardware for some reason. Need to invert the EZABL logic for it here.
+  #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))
+    //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
     #undef Z_MIN_ENDSTOP_INVERTING

Internal Tools/STEP1-UpdateVersion.py

@@ -0,0 +1,41 @@
+import os
+import re
+from datetime import datetime
+
+def update_version_info(file_path, new_version, new_build_date):
+    with open(file_path, 'r') as file:
+        content = file.read()
+
+    # Update UNIFIED_VERSION
+    content = re.sub(r'#define UNIFIED_VERSION "(.*?)"', f'#define UNIFIED_VERSION "UF {new_version}"', content)
+
+    # Update STRING_DISTRIBUTION_DATE
+    content = re.sub(r'#define STRING_DISTRIBUTION_DATE "(.*?)"', f'#define STRING_DISTRIBUTION_DATE "{new_build_date}"', content)
+
+    with open(file_path, 'w') as file:
+        file.write(content)
+
+def update_version_in_folders(root_directories, new_version, new_build_date):
+    for root_directory in root_directories:
+        # Iterate through files in the directory
+        for root, dirs, files in os.walk(root_directory):
+            for filename in files:
+                if filename.endswith("Configuration.h"):
+                    file_path = os.path.join(root, filename)
+                    update_version_info(file_path, new_version, new_build_date)
+                    print(f"Updated {file_path}")
+
+def main():
+    new_version = input("Enter the new version number: ")
+    new_build_date = datetime.now().strftime("%Y-%m-%d")
+
+    # Specify the root directories containing Configuration.h files
+    root_directories = [
+        r'D:\Work\GitHub\UnifiedFirmware\Board_Configs',
+        r'D:\Work\GitHub\UnifiedPaidConfigs\Board_Configs'
+    ]
+
+    update_version_in_folders(root_directories, new_version, new_build_date)
+
+if __name__ == "__main__":
+    main()