diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fc5ae062..d8c38401 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,18 +39,18 @@ jobs: - name: Install intelhex run: pip install --upgrade intelhex - - name: Build NRF firmware - run: | - cd ARM_Tag_FW/Newton_M3_nRF52811 - pio run --environment Newton_M3_22_BWR - pio run --environment Newton_M3_29_BWR - pio run --environment Newton_M3_75_BWR - cp Newton_M3_22_BWR-ota.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_22_BWR-ota.bin - cp Newton_M3_22_BWR-full-flash.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_22_BWR-full-flash.bin - cp Newton_M3_29_BWR-ota.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_29_BWR-ota.bin - cp Newton_M3_29_BWR-full-flash.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_29_BWR-full-flash.bin - cp Newton_M3_75_BWR-ota.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_75_BWR-ota.bin - cp Newton_M3_75_BWR-full-flash.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_75_BWR-full-flash.bin +# - name: Build NRF firmware +# run: | +# cd ARM_Tag_FW/Newton_M3_nRF52811 +# pio run --environment Newton_M3_22_BWR +# pio run --environment Newton_M3_29_BWR +# pio run --environment Newton_M3_75_BWR +# cp Newton_M3_22_BWR-ota.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_22_BWR-ota.bin +# cp Newton_M3_22_BWR-full-flash.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_22_BWR-full-flash.bin +# cp Newton_M3_29_BWR-ota.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_29_BWR-ota.bin +# cp Newton_M3_29_BWR-full-flash.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_29_BWR-full-flash.bin +# cp Newton_M3_75_BWR-ota.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_75_BWR-ota.bin +# cp Newton_M3_75_BWR-full-flash.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_75_BWR-full-flash.bin - name: Install esptool run: pip install esptool @@ -199,14 +199,14 @@ jobs: file_glob: true overwrite: true - - name: Add tag bins to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: binaries/* - tag: ${{ github.ref }} - file_glob: true - overwrite: true +# - name: Add tag bins to release +# uses: svenstaro/upload-release-action@v2 +# with: +# repo_token: ${{ secrets.GITHUB_TOKEN }} +# file: binaries/* +# tag: ${{ github.ref }} +# file_glob: true +# overwrite: true # this is down here intentionally to be able to modify the binary folder before adding it to the Tag_Flasher later (ota binaries can be removed) diff --git a/binaries/ESP32-C6/.gitignore b/binaries/.gitignore similarity index 100% rename from binaries/ESP32-C6/.gitignore rename to binaries/.gitignore diff --git a/binaries/Tag_FW_1.54_battery_checker.bin b/binaries/Other/Tag_FW_1.54_battery_checker.bin similarity index 100% rename from binaries/Tag_FW_1.54_battery_checker.bin rename to binaries/Other/Tag_FW_1.54_battery_checker.bin diff --git a/binaries/Tag_FW_1.54.bin b/binaries/Tag/SOLUM_154_SSD1619-tag-00-0019.bin similarity index 100% rename from binaries/Tag_FW_1.54.bin rename to binaries/Tag/SOLUM_154_SSD1619-tag-00-0019.bin diff --git a/binaries/Tag_FW_2.9.bin b/binaries/Tag/SOLUM_29_SSD1619-tag-01-0019.bin similarity index 100% rename from binaries/Tag_FW_2.9.bin rename to binaries/Tag/SOLUM_29_SSD1619-tag-01-0019.bin diff --git a/binaries/Tag_FW_2.9-uc8151.bin b/binaries/Tag/SOLUM_29_UC8151-tag-11-0019.bin similarity index 100% rename from binaries/Tag_FW_2.9-uc8151.bin rename to binaries/Tag/SOLUM_29_UC8151-tag-11-0019.bin diff --git a/binaries/Tag_FW_4.2.bin b/binaries/Tag/SOLUM_42_SSD1619-tag-02-0019.bin similarity index 100% rename from binaries/Tag_FW_4.2.bin rename to binaries/Tag/SOLUM_42_SSD1619-tag-02-0019.bin diff --git a/binaries/Tag/SOLUM_M2_BWR_75-tag-26-0004-full.bin b/binaries/Tag/SOLUM_M2_BWR_75-tag-26-0004-full.bin new file mode 100644 index 00000000..458083f1 Binary files /dev/null and b/binaries/Tag/SOLUM_M2_BWR_75-tag-26-0004-full.bin differ diff --git a/binaries/Tag/SOLUM_M2_BWR_75-tag-26-0004-ota.bin b/binaries/Tag/SOLUM_M2_BWR_75-tag-26-0004-ota.bin new file mode 100644 index 00000000..f0478194 Binary files /dev/null and b/binaries/Tag/SOLUM_M2_BWR_75-tag-26-0004-ota.bin differ diff --git a/binaries/Tag/SOLUM_M3_22_BWR-tag-31-0016-full.bin b/binaries/Tag/SOLUM_M3_22_BWR-tag-31-0016-full.bin new file mode 100644 index 00000000..f7d53956 Binary files /dev/null and b/binaries/Tag/SOLUM_M3_22_BWR-tag-31-0016-full.bin differ diff --git a/binaries/Tag/SOLUM_M3_22_BWR-tag-31-0016-ota.bin b/binaries/Tag/SOLUM_M3_22_BWR-tag-31-0016-ota.bin new file mode 100644 index 00000000..bd1b2a14 Binary files /dev/null and b/binaries/Tag/SOLUM_M3_22_BWR-tag-31-0016-ota.bin differ diff --git a/binaries/Tag/SOLUM_M3_29_BWR-tag-33-0016-full.bin b/binaries/Tag/SOLUM_M3_29_BWR-tag-33-0016-full.bin new file mode 100644 index 00000000..350e7f52 Binary files /dev/null and b/binaries/Tag/SOLUM_M3_29_BWR-tag-33-0016-full.bin differ diff --git a/binaries/Tag/SOLUM_M3_29_BWR-tag-33-0016-ota.bin b/binaries/Tag/SOLUM_M3_29_BWR-tag-33-0016-ota.bin new file mode 100644 index 00000000..7362837e Binary files /dev/null and b/binaries/Tag/SOLUM_M3_29_BWR-tag-33-0016-ota.bin differ diff --git a/binaries/Tag/SOLUM_M3_43_BWR-tag-34-0016-full.bin b/binaries/Tag/SOLUM_M3_43_BWR-tag-34-0016-full.bin new file mode 100644 index 00000000..c09a0e7e Binary files /dev/null and b/binaries/Tag/SOLUM_M3_43_BWR-tag-34-0016-full.bin differ diff --git a/binaries/Tag/SOLUM_M3_43_BWR-tag-34-0016-ota.bin b/binaries/Tag/SOLUM_M3_43_BWR-tag-34-0016-ota.bin new file mode 100644 index 00000000..264830cb Binary files /dev/null and b/binaries/Tag/SOLUM_M3_43_BWR-tag-34-0016-ota.bin differ diff --git a/binaries/Tag/SOLUM_M3_60_BWR-tag-35-0016-full.bin b/binaries/Tag/SOLUM_M3_60_BWR-tag-35-0016-full.bin new file mode 100644 index 00000000..a06eec1c Binary files /dev/null and b/binaries/Tag/SOLUM_M3_60_BWR-tag-35-0016-full.bin differ diff --git a/binaries/Tag/SOLUM_M3_60_BWR-tag-35-0016-ota.bin b/binaries/Tag/SOLUM_M3_60_BWR-tag-35-0016-ota.bin new file mode 100644 index 00000000..d2cb6cda Binary files /dev/null and b/binaries/Tag/SOLUM_M3_60_BWR-tag-35-0016-ota.bin differ diff --git a/binaries/Tag/SOLUM_M3_75_BWR-tag-36-0016-full.bin b/binaries/Tag/SOLUM_M3_75_BWR-tag-36-0016-full.bin new file mode 100644 index 00000000..10654704 Binary files /dev/null and b/binaries/Tag/SOLUM_M3_75_BWR-tag-36-0016-full.bin differ diff --git a/binaries/Tag/SOLUM_M3_75_BWR-tag-36-0016-ota.bin b/binaries/Tag/SOLUM_M3_75_BWR-tag-36-0016-ota.bin new file mode 100644 index 00000000..71afc632 Binary files /dev/null and b/binaries/Tag/SOLUM_M3_75_BWR-tag-36-0016-ota.bin differ diff --git a/binaries/Tag_FW_Pack.bin b/binaries/Tag_FW_Pack.bin deleted file mode 100644 index c7633ddd..00000000 Binary files a/binaries/Tag_FW_Pack.bin and /dev/null differ diff --git a/binaries/AP_FW_Pack.bin b/binaries/ZBS-AP/AP_FW_Pack.bin similarity index 100% rename from binaries/AP_FW_Pack.bin rename to binaries/ZBS-AP/AP_FW_Pack.bin diff --git a/binaries/AP_FW_1.54.bin b/binaries/ZBS-AP/SOLUM_154_SSD1619-ap-00-0017.bin similarity index 100% rename from binaries/AP_FW_1.54.bin rename to binaries/ZBS-AP/SOLUM_154_SSD1619-ap-00-0017.bin diff --git a/binaries/AP_FW_2.9.bin b/binaries/ZBS-AP/SOLUM_29_SSD1619-ap-01-0017.bin similarity index 100% rename from binaries/AP_FW_2.9.bin rename to binaries/ZBS-AP/SOLUM_29_SSD1619-ap-01-0017.bin diff --git a/binaries/AP_FW_Nodisplay.bin b/binaries/ZBS-AP/SOLUM_NODISPLAY-ap-FF-0017.bin similarity index 100% rename from binaries/AP_FW_Nodisplay.bin rename to binaries/ZBS-AP/SOLUM_NODISPLAY-ap-FF-0017.bin diff --git a/binaries/AP_FW_Segmented_UK.bin b/binaries/ZBS-AP/SOLUM_SEG_UK-ap-F0-0017.bin similarity index 100% rename from binaries/AP_FW_Segmented_UK.bin rename to binaries/ZBS-AP/SOLUM_SEG_UK-ap-F0-0017.bin diff --git a/genfilelist.py b/genfilelist.py index 51d1ed2c..8ffcea13 100644 --- a/genfilelist.py +++ b/genfilelist.py @@ -52,7 +52,7 @@ dt_string = now.strftime("%d/%m/%Y %H:%M:%S") tag = sys.argv[1] binaries = generate_file_hashes2(rp + "/espbinaries",tag) -tagota = generate_file_hashes2(rp + "/binaries",tag) +#tagota = generate_file_hashes2(rp + "/binaries",tag) files1 = generate_file_hashes(rp + "/ESP32_AP-Flasher/data/www","/www/",tag) files1.extend(generate_file_hashes(rp + "/ESP32_AP-Flasher/data","/",tag)) files1.extend(generate_file_hashes(rp + "/ESP32_AP-Flasher/data/fonts","/fonts/",tag)) @@ -65,7 +65,7 @@ jsonarray = { "builddate": dt_string, "binaries": binaries, "files": files1, - "tagota": tagota, +# "tagota": tagota, } with open("jsonfiles/binaries.json", "w") as json_file: @@ -74,8 +74,8 @@ with open("jsonfiles/binaries.json", "w") as json_file: with open("jsonfiles/files.json", "w") as json_file: json.dump(jsonarray, json_file, indent=4) -with open("jsonfiles/tagota.json", "w") as json_file: - json.dump(tagota, json_file, indent=4) +#with open("jsonfiles/tagota.json", "w") as json_file: +# json.dump(tagota, json_file, indent=4) with open("jsonfiles/filesystem.json", "w") as json_file: json.dump(files1, json_file, indent=4)