fixed Bug in version-define
This commit is contained in:
parent
e4770f2fa2
commit
3d090dceb1
@ -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()
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user