jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add larger flash variants of FreeTouchDeck and WT-SC01

Browse Source
This commit is contained in:
fvanroie 2022-01-18 17:53:34 +01:00
parent c2a5359603
commit 5777066821
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yaml vendored
View File

@ -32,6 +32,8 @@ jobs:
out: esp32-touchdown out: esp32-touchdown
- env: freetouchdeck - env: freetouchdeck
out: freetouchdeck out: freetouchdeck
- env: freetouchdeck_8MB
out: freetouchdeck
- out: featherwing - out: featherwing
env: "huzzah32-featherwing-24 -e huzzah32-featherwing-35" env: "huzzah32-featherwing-24 -e huzzah32-featherwing-35"
- env: lanbon_l8 - env: lanbon_l8
@ -46,6 +48,8 @@ jobs:
out: ttgo-t7 out: ttgo-t7
- env: wt32-sc01 - env: wt32-sc01
out: wt32-sc01 out: wt32-sc01
- env: wt32-sc01_16MB
out: wt32-sc01
- env: yeacreate-nscreen32 - env: yeacreate-nscreen32
out: yeacreate out: yeacreate

4
tools/esp_merge_bin.py
View File

@ -29,7 +29,8 @@ def get_fw_version(source, target, env):
def copy_merge_bins(source, target, env): def copy_merge_bins(source, target, env):
version = 'v' + str(HASP_VER_MAJ) + '.' + str(HASP_VER_MIN) + '.' + str(HASP_VER_REV) version = 'v' + str(HASP_VER_MAJ) + '.' + str(HASP_VER_MIN) + '.' + str(HASP_VER_REV)
name =str(target[0]).split(os.path.sep)[2] name = str(target[0]).split(os.path.sep)[2]
name = name.replace('_8MB', '').replace('_16MB', '')
flash_size = env.GetProjectOption("board_upload.flash_size") flash_size = env.GetProjectOption("board_upload.flash_size")
bootloader = "{}tools{}sdk{}esp32{}bin{}bootloader_dio_40m.bin".format(FRAMEWORK_DIR, os.path.sep, os.path.sep, os.path.sep, os.path.sep, os.path.sep) bootloader = "{}tools{}sdk{}esp32{}bin{}bootloader_dio_40m.bin".format(FRAMEWORK_DIR, os.path.sep, os.path.sep, os.path.sep, os.path.sep, os.path.sep)
@ -69,6 +70,7 @@ def copy_merge_bins(source, target, env):
def copy_ota(source, target, env): def copy_ota(source, target, env):
version = 'v' + str(HASP_VER_MAJ) + '.' + str(HASP_VER_MIN) + '.' + str(HASP_VER_REV) version = 'v' + str(HASP_VER_MAJ) + '.' + str(HASP_VER_MIN) + '.' + str(HASP_VER_REV)
name =str(target[0]).split(os.path.sep)[2] name =str(target[0]).split(os.path.sep)[2]
name = name.replace('_8MB', '').replace('_16MB', '')
firmware_src = str(target[0]) firmware_src = str(target[0])
firmware_dst ="{}firmware{}{}_ota_{}.bin".format(OUTPUT_DIR, os.path.sep, name, version) firmware_dst ="{}firmware{}{}_ota_{}.bin".format(OUTPUT_DIR, os.path.sep, name, version)