From 5777066821bcc10b63f1f9529755587fc3c493b4 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Tue, 18 Jan 2022 17:53:34 +0100 Subject: [PATCH] Add larger flash variants of FreeTouchDeck and WT-SC01 --- .github/workflows/build.yaml | 4 ++++ tools/esp_merge_bin.py | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9535ab2c..69a353b1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -32,6 +32,8 @@ jobs: out: esp32-touchdown - env: freetouchdeck out: freetouchdeck + - env: freetouchdeck_8MB + out: freetouchdeck - out: featherwing env: "huzzah32-featherwing-24 -e huzzah32-featherwing-35" - env: lanbon_l8 @@ -46,6 +48,8 @@ jobs: out: ttgo-t7 - env: wt32-sc01 out: wt32-sc01 + - env: wt32-sc01_16MB + out: wt32-sc01 - env: yeacreate-nscreen32 out: yeacreate diff --git a/tools/esp_merge_bin.py b/tools/esp_merge_bin.py index 8e460aac..ff2f4e01 100644 --- a/tools/esp_merge_bin.py +++ b/tools/esp_merge_bin.py @@ -29,7 +29,8 @@ def get_fw_version(source, target, env): def copy_merge_bins(source, target, env): 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") 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): version = 'v' + str(HASP_VER_MAJ) + '.' + str(HASP_VER_MIN) + '.' + str(HASP_VER_REV) name =str(target[0]).split(os.path.sep)[2] + name = name.replace('_8MB', '').replace('_16MB', '') firmware_src = str(target[0]) firmware_dst ="{}firmware{}{}_ota_{}.bin".format(OUTPUT_DIR, os.path.sep, name, version)