Rename bin files to the new standard (OpenEPaperLink#139)

* Update release.yml * Update genfilelist.py * Rename files * Create .gitignore
quack3d · Sep 27, 2023 · 7fe4a1e · 7fe4a1e
1 parent 29b8c9b
commit 7fe4a1e
Show file tree

Hide file tree

Showing 26 changed files with 24 additions and 24 deletions.
diff --git 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 → binaries/.gitignore b/binaries/ESP32-C6/.gitignore → binaries/.gitignore
diff --git a/binaries/Tag_FW_1.54_battery_checker.bin → ...ies/Other/Tag_FW_1.54_battery_checker.bin b/binaries/Tag_FW_1.54_battery_checker.bin → ...ies/Other/Tag_FW_1.54_battery_checker.bin
diff --git a/binaries/Tag_FW_1.54.bin → ...ies/Tag/SOLUM_154_SSD1619-tag-00-0019.bin b/binaries/Tag_FW_1.54.bin → ...ies/Tag/SOLUM_154_SSD1619-tag-00-0019.bin
diff --git a/binaries/Tag_FW_2.9.bin → ...ries/Tag/SOLUM_29_SSD1619-tag-01-0019.bin b/binaries/Tag_FW_2.9.bin → ...ries/Tag/SOLUM_29_SSD1619-tag-01-0019.bin
diff --git a/binaries/Tag_FW_2.9-uc8151.bin → binaries/Tag/SOLUM_29_UC8151-tag-11-0019.bin b/binaries/Tag_FW_2.9-uc8151.bin → binaries/Tag/SOLUM_29_UC8151-tag-11-0019.bin
diff --git a/binaries/Tag_FW_4.2.bin → ...ries/Tag/SOLUM_42_SSD1619-tag-02-0019.bin b/binaries/Tag_FW_4.2.bin → ...ries/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
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
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
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
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
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
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
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
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
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
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
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
diff --git a/binaries/Tag_FW_Pack.bin b/binaries/Tag_FW_Pack.bin
diff --git a/binaries/AP_FW_Pack.bin → binaries/ZBS-AP/AP_FW_Pack.bin b/binaries/AP_FW_Pack.bin → binaries/ZBS-AP/AP_FW_Pack.bin
diff --git a/binaries/AP_FW_1.54.bin → ...s/ZBS-AP/SOLUM_154_SSD1619-ap-00-0017.bin b/binaries/AP_FW_1.54.bin → ...s/ZBS-AP/SOLUM_154_SSD1619-ap-00-0017.bin
diff --git a/binaries/AP_FW_2.9.bin → ...es/ZBS-AP/SOLUM_29_SSD1619-ap-01-0017.bin b/binaries/AP_FW_2.9.bin → ...es/ZBS-AP/SOLUM_29_SSD1619-ap-01-0017.bin
diff --git a/binaries/AP_FW_Nodisplay.bin → ...ies/ZBS-AP/SOLUM_NODISPLAY-ap-FF-0017.bin b/binaries/AP_FW_Nodisplay.bin → ...ies/ZBS-AP/SOLUM_NODISPLAY-ap-FF-0017.bin
diff --git a/binaries/AP_FW_Segmented_UK.bin → binaries/ZBS-AP/SOLUM_SEG_UK-ap-F0-0017.bin b/binaries/AP_FW_Segmented_UK.bin → binaries/ZBS-AP/SOLUM_SEG_UK-ap-F0-0017.bin
diff --git a/genfilelist.py b/genfilelist.py
@@ -52,7 +52,7 @@ def calculate_md5(file_path):
 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 @@ def calculate_md5(file_path):
     "builddate": dt_string,
     "binaries": binaries,
     "files": files1,
-    "tagota": tagota,
+#    "tagota": tagota,
     }
 
 with open("jsonfiles/binaries.json", "w") as json_file:
@@ -74,8 +74,8 @@ def calculate_md5(file_path):
 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)