From 3d090dceb1ba042ecc4bf7910812efbc92282611 Mon Sep 17 00:00:00 2001 From: Marcel Peterkau Date: Mon, 3 Jun 2024 16:36:48 +0200 Subject: [PATCH] fixed Bug in version-define --- Software/codegen/run_pre.py | 13 +++++++++---- Software/platformio.ini | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Software/codegen/run_pre.py b/Software/codegen/run_pre.py index 070fa90..1090506 100644 --- a/Software/codegen/run_pre.py +++ b/Software/codegen/run_pre.py @@ -15,6 +15,11 @@ custom_flash_version = env.GetProjectOption("custom_flash_version", "0.99") fw_major, fw_minor = custom_firmware_version.split('.') fl_major, fl_minor = custom_flash_version.split('.') +fw_major_int = int(fw_major) +fw_minor_int = int(fw_minor) +fl_major_int = int(fl_major) +fl_minor_int = int(fl_minor) + # Version in Datei "version" im Ordner "data_src" überschreiben with open('data_src/version', 'w') as version_file: version_file.write(custom_flash_version) @@ -23,10 +28,10 @@ with open('data_src/version', 'w') as version_file: env.Replace(PROGNAME="firmware_%s_%s.fw" % (custom_firmware_version, git_revision)) env.Append(CPPDEFINES=[ ('GIT_REV', '\\"{}\\"'.format(git_revision)), - ('FW_MAJOR', fw_major), - ('FW_MINOR', fw_minor), - ('FL_MAJOR', fl_major), - ('FL_MINOR', fl_minor) + ('FW_MAJOR', fw_major_int), + ('FW_MINOR', fw_minor_int), + ('FL_MAJOR', fl_major_int), + ('FL_MINOR', fl_minor_int) ]) struct2json.struct2json() diff --git a/Software/platformio.ini b/Software/platformio.ini index 39328cc..00f6ae3 100644 --- a/Software/platformio.ini +++ b/Software/platformio.ini @@ -17,8 +17,8 @@ platform = espressif8266 framework = arduino board = d1_mini -custom_firmware_version = 1.07 -custom_flash_version = 1.07 +custom_firmware_version = 1.08 +custom_flash_version = 1.08 upload_protocol = esptool upload_speed = 921600