Airsoft/DarkEmergency-Timer
1
0
Fork 0
Code Issues Pull Requests Releases 10 Wiki Activity

fixed Bug in version-define

Browse Source
This commit is contained in:
Marcel Peterkau
2024-06-03 16:36:48 +02:00
parent e4770f2fa2
commit 3d090dceb1
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Software/codegen/run_pre.py
View File

@@ -15,6 +15,11 @@ custom_flash_version = env.GetProjectOption("custom_flash_version", "0.99")
fw_major, fw_minor = custom_firmware_version.split('.') fw_major, fw_minor = custom_firmware_version.split('.')
fl_major, fl_minor = custom_flash_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 # Version in Datei "version" im Ordner "data_src" überschreiben
with open('data_src/version', 'w') as version_file: with open('data_src/version', 'w') as version_file:
version_file.write(custom_flash_version) 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.Replace(PROGNAME="firmware_%s_%s.fw" % (custom_firmware_version, git_revision))
env.Append(CPPDEFINES=[ env.Append(CPPDEFINES=[
('GIT_REV', '\\"{}\\"'.format(git_revision)), ('GIT_REV', '\\"{}\\"'.format(git_revision)),
('FW_MAJOR', fw_major), ('FW_MAJOR', fw_major_int),
('FW_MINOR', fw_minor), ('FW_MINOR', fw_minor_int),
('FL_MAJOR', fl_major), ('FL_MAJOR', fl_major_int),
('FL_MINOR', fl_minor) ('FL_MINOR', fl_minor_int)
]) ])
struct2json.struct2json() struct2json.struct2json()

4
Software/platformio.ini
View File

@@ -17,8 +17,8 @@ platform = espressif8266
framework = arduino framework = arduino
board = d1_mini board = d1_mini
custom_firmware_version = 1.07 custom_firmware_version = 1.08
custom_flash_version = 1.07 custom_flash_version = 1.08
upload_protocol = esptool upload_protocol = esptool
upload_speed = 921600 upload_speed = 921600