From 5a87cbac3c10c1927b71f50dbbd1d270e039e0bd Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Wed, 20 Dec 2023 00:41:10 -0600 Subject: [PATCH 1/5] Update Configuration_backend.h --- Firmware/Marlin/Configuration_backend.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin/Configuration_backend.h b/Firmware/Marlin/Configuration_backend.h index adf58cc69568..0ac06ac95600 100644 --- a/Firmware/Marlin/Configuration_backend.h +++ b/Firmware/Marlin/Configuration_backend.h @@ -6,7 +6,7 @@ //======================= DO NOT MODIFY THIS FILE =========================== //=========================================================================== -// Version and Date information is now in the Configuration.h files at the top. +#define UNIFIED_VERSION "UF 2.83" /** * ABL Probe Settings From f0d6f70bbd8a90acf6ce5448a37bc263b7bee25e Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Wed, 20 Dec 2023 00:44:57 -0600 Subject: [PATCH 2/5] file name updates for ezfirmware site --- .../TH3D_EZBoardLite/Firmware/Marlin/Configuration.h | 4 ++-- .../Firmware/Marlin/Configuration.h | 4 ++-- .../TH3D_EZBoardV2/Firmware/Marlin/Configuration.h | 4 ++-- .../TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h | 4 ++-- Firmware/Marlin/Configuration_backend.h | 4 +++- Internal Tools/STEP1-UpdateVersion.py | 10 +++++++++- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h index c675867c350c..491bab39a0c7 100644 --- 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 "UF 2.83" -#define STRING_DISTRIBUTION_DATE "2023-12-14" +#define UNIFIED_VERSION "UFW 2.83" +#define STRING_DISTRIBUTION_DATE "2023-12-20" //#@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 index 06b99c155b05..f476753d0232 100644 --- 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 "UF 2.83" -#define STRING_DISTRIBUTION_DATE "2023-12-14" +#define UNIFIED_VERSION "UFW 2.83" +#define STRING_DISTRIBUTION_DATE "2023-12-20" //#@CONFIGURATION_START_FLAG diff --git a/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h index aabac1caf611..8b72066518e9 100644 --- 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 "UF 2.83" -#define STRING_DISTRIBUTION_DATE "2023-12-14" +#define UNIFIED_VERSION "UFW 2.83" +#define STRING_DISTRIBUTION_DATE "2023-12-20" //#@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 index 6c537fd48a50..231739e41985 100644 --- 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 "UF 2.83" -#define STRING_DISTRIBUTION_DATE "2023-12-14" +#define UNIFIED_VERSION "UFW 2.83" +#define STRING_DISTRIBUTION_DATE "2023-12-20" //#@CONFIGURATION_START_FLAG diff --git a/Firmware/Marlin/Configuration_backend.h b/Firmware/Marlin/Configuration_backend.h index 0ac06ac95600..bc41fb4e551a 100644 --- a/Firmware/Marlin/Configuration_backend.h +++ b/Firmware/Marlin/Configuration_backend.h @@ -6,7 +6,9 @@ //======================= DO NOT MODIFY THIS FILE =========================== //=========================================================================== -#define UNIFIED_VERSION "UF 2.83" +#ifndef UNIFIED_VERSION + #define UNIFIED_VERSION "UFW 2.83" +#endif /** * ABL Probe Settings diff --git a/Internal Tools/STEP1-UpdateVersion.py b/Internal Tools/STEP1-UpdateVersion.py index d47af2a1fc71..cc81e1f98404 100644 --- a/Internal Tools/STEP1-UpdateVersion.py +++ b/Internal Tools/STEP1-UpdateVersion.py @@ -7,7 +7,7 @@ def update_version_info(file_path, new_version, new_build_date): content = file.read() # Update UNIFIED_VERSION - content = re.sub(r'#define UNIFIED_VERSION "(.*?)"', f'#define UNIFIED_VERSION "UF {new_version}"', content) + content = re.sub(r'#define UNIFIED_VERSION "(.*?)"', f'#define UNIFIED_VERSION "UFW {new_version}"', content) # Update STRING_DISTRIBUTION_DATE content = re.sub(r'#define STRING_DISTRIBUTION_DATE "(.*?)"', f'#define STRING_DISTRIBUTION_DATE "{new_build_date}"', content) @@ -25,6 +25,10 @@ def update_version_in_folders(root_directories, new_version, new_build_date): update_version_info(file_path, new_version, new_build_date) print(f"Updated {file_path}") +def update_version_in_file(file_path, new_version, new_build_date): + 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") @@ -35,7 +39,11 @@ def main(): r'D:\Work\GitHub\UnifiedPaidConfigs\Board_Configs' ] + # Additional file to update + additional_file_path = r'D:\Work\GitHub\UnifiedFirmware\Firmware\Marlin\Configuration_backend.h' + update_version_in_folders(root_directories, new_version, new_build_date) + update_version_in_file(additional_file_path, new_version, new_build_date) if __name__ == "__main__": main() From cdd37dfc55de9b5c2eb0ba65efacc0dab387b9db Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Wed, 20 Dec 2023 00:45:58 -0600 Subject: [PATCH 3/5] testing --- Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h | 2 +- .../TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h | 2 +- Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h | 2 +- .../TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h | 2 +- Firmware/Marlin/Configuration_backend.h | 2 +- Internal Tools/STEP1-UpdateVersion.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h index 491bab39a0c7..33691f2c6b03 100644 --- a/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h @@ -5,7 +5,7 @@ #pragma once #define CONFIGURATION_H_VERSION 02010200 -#define UNIFIED_VERSION "UFW 2.83" +#define UNIFIED_VERSION "TH3D UFW 2.83" #define STRING_DISTRIBUTION_DATE "2023-12-20" //#@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 index f476753d0232..035322fa6293 100644 --- a/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h @@ -7,7 +7,7 @@ #pragma once #define CONFIGURATION_H_VERSION 02010200 -#define UNIFIED_VERSION "UFW 2.83" +#define UNIFIED_VERSION "TH3D UFW 2.83" #define STRING_DISTRIBUTION_DATE "2023-12-20" //#@CONFIGURATION_START_FLAG diff --git a/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h index 8b72066518e9..3c6acd355e0f 100644 --- a/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h @@ -5,7 +5,7 @@ #pragma once #define CONFIGURATION_H_VERSION 02010200 -#define UNIFIED_VERSION "UFW 2.83" +#define UNIFIED_VERSION "TH3D UFW 2.83" #define STRING_DISTRIBUTION_DATE "2023-12-20" //#@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 index 231739e41985..fb4e76cc409b 100644 --- a/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h +++ b/Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h @@ -7,7 +7,7 @@ #pragma once #define CONFIGURATION_H_VERSION 02010200 -#define UNIFIED_VERSION "UFW 2.83" +#define UNIFIED_VERSION "TH3D UFW 2.83" #define STRING_DISTRIBUTION_DATE "2023-12-20" //#@CONFIGURATION_START_FLAG diff --git a/Firmware/Marlin/Configuration_backend.h b/Firmware/Marlin/Configuration_backend.h index bc41fb4e551a..7c5d331143d6 100644 --- a/Firmware/Marlin/Configuration_backend.h +++ b/Firmware/Marlin/Configuration_backend.h @@ -7,7 +7,7 @@ //=========================================================================== #ifndef UNIFIED_VERSION - #define UNIFIED_VERSION "UFW 2.83" + #define UNIFIED_VERSION "TH3D UFW 2.83" #endif /** diff --git a/Internal Tools/STEP1-UpdateVersion.py b/Internal Tools/STEP1-UpdateVersion.py index cc81e1f98404..cf5cfa7f4cf0 100644 --- a/Internal Tools/STEP1-UpdateVersion.py +++ b/Internal Tools/STEP1-UpdateVersion.py @@ -7,7 +7,7 @@ def update_version_info(file_path, new_version, new_build_date): content = file.read() # Update UNIFIED_VERSION - content = re.sub(r'#define UNIFIED_VERSION "(.*?)"', f'#define UNIFIED_VERSION "UFW {new_version}"', content) + content = re.sub(r'#define UNIFIED_VERSION "(.*?)"', f'#define UNIFIED_VERSION "TH3D UFW {new_version}"', content) # Update STRING_DISTRIBUTION_DATE content = re.sub(r'#define STRING_DISTRIBUTION_DATE "(.*?)"', f'#define STRING_DISTRIBUTION_DATE "{new_build_date}"', content) From 60511635945074883f1ec2134fc9b623ea6bfba7 Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Wed, 27 Dec 2023 13:48:27 -0600 Subject: [PATCH 4/5] Fix GLIB compile errors. Lock in on 0.5.2 --- Firmware/ini/features.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ini/features.ini b/Firmware/ini/features.ini index c9af541cd4a1..bc4b273bebb6 100644 --- a/Firmware/ini/features.ini +++ b/Firmware/ini/features.ini @@ -37,7 +37,7 @@ USES_LIQUIDCRYSTAL_I2C = marcoschwartz/LiquidCrystal_I2C@1.1.4 USES_LIQUIDTWI2 = LiquidTWI2@1.2.7 HAS_LCDPRINT = src_filter=+ HAS_MARLINUI_HD44780 = src_filter=+ -HAS_MARLINUI_U8GLIB = marlinfirmware/U8glib-HAL@~0.5.2 +HAS_MARLINUI_U8GLIB = marlinfirmware/U8glib-HAL@0.5.2 src_filter=+ HAS_(FSMC|SPI|LTDC)_TFT = src_filter=+ + + HAS_FSMC_TFT = src_filter=+ + From 7f5f2da573c7dce7154f649a08a130f9e947be32 Mon Sep 17 00:00:00 2001 From: Timothy Hoogland Date: Wed, 27 Dec 2023 13:49:33 -0600 Subject: [PATCH 5/5] Fix u8 GLIB errors --- .../TH3D_EZBoardLite/Firmware/Marlin/Configuration.h | 4 ++-- .../TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h | 4 ++-- Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h | 4 ++-- .../TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h | 4 ++-- Firmware/Marlin/Configuration_backend.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h index 33691f2c6b03..2a61611506fd 100644 --- 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.83" -#define STRING_DISTRIBUTION_DATE "2023-12-20" +#define UNIFIED_VERSION "TH3D UFW 2.83a" +#define STRING_DISTRIBUTION_DATE "2023-12-27" //#@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 index 035322fa6293..b79303d8a4af 100644 --- 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.83" -#define STRING_DISTRIBUTION_DATE "2023-12-20" +#define UNIFIED_VERSION "TH3D UFW 2.83a" +#define STRING_DISTRIBUTION_DATE "2023-12-27" //#@CONFIGURATION_START_FLAG diff --git a/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h b/Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h index 3c6acd355e0f..cd4c71117d0d 100644 --- 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.83" -#define STRING_DISTRIBUTION_DATE "2023-12-20" +#define UNIFIED_VERSION "TH3D UFW 2.83a" +#define STRING_DISTRIBUTION_DATE "2023-12-27" //#@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 index fb4e76cc409b..977f4986f9af 100644 --- 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.83" -#define STRING_DISTRIBUTION_DATE "2023-12-20" +#define UNIFIED_VERSION "TH3D UFW 2.83a" +#define STRING_DISTRIBUTION_DATE "2023-12-27" //#@CONFIGURATION_START_FLAG diff --git a/Firmware/Marlin/Configuration_backend.h b/Firmware/Marlin/Configuration_backend.h index 7c5d331143d6..272eb4c05040 100644 --- 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.83" + #define UNIFIED_VERSION "TH3D UFW 2.83a" #endif /**