TS101 rework for Miniware DFU (#44)

* Refactor output to allow turning hex duplication on/off

* Rough out being able to merge image files & firmware files

* Update output_hex.py

* Update TS101 to require merge

* Remove TS101 from CI

* .

* add py3-intelhex

* Update img2logo.py

.github/workflows/push.yml

@@ -14,13 +14,12 @@ jobs:
           - model: "pinecilv1"
           - model: "pinecilv2"
           - model: "mhp30"
-          - model: "ts101"
           - model: "s60"
       fail-fast: true
 
     steps:
       - name: Install dependencies (apk)
-        run: apk add --no-cache git python3 py3-pip zlib py3-pillow
+        run: apk add --no-cache git python3 py3-pip zlib py3-pillow py3-intelhex
 
       - uses: actions/checkout@v3
         with:

.github/workflows/release.yml

@@ -1,69 +1,63 @@
 ---
-  name: "release"
-
-  on:
-    push:
-      branches:
-        - "main"
-
-  jobs:
-    release:
-      name: "Release"
-      runs-on: "ubuntu-22.04"
-
-      steps:
-        - name: Install dependencies (apk)
-          run: sudo apt update && sudo apt-get install -y git python3 python3-pillow
-
-        - uses: actions/checkout@v3
-          with:
-            submodules: true
-
-        - name: prep
-          run: |
-            mkdir -p /tmp/pinecilv1 && \
-            mkdir -p /tmp/pinecilv2 && \
-            mkdir -p /tmp/miniware && \
-            mkdir -p /tmp/ts101 && \
-            mkdir -p /tmp/mhp30 && \
-            mkdir -p /tmp/s60
-  
-        - name: build all files for the device
-          run: |
-            cd Bootup\ Logos && \
-            ./run.sh /tmp/pinecilv1/ -m pinecilv1 && \
-            ./run.sh /tmp/pinecilv2/ -m pinecilv2 && \
-            ./run.sh /tmp/miniware/ -m miniware && \
-            ./run.sh /tmp/ts101/ -m ts101 && \
-            ./run.sh /tmp/mhp30/ -m mhp30 && \
-            ./run.sh /tmp/s60/ -m s60 
-  
-        - name: build logo erase file
-          run: |
-            cd Bootup\ Logos && \
-            python3 img2logo.py -E erase_stored_image /tmp/pinecilv1/ -m pinecilv1 && \
-            python3 img2logo.py -E erase_stored_image /tmp/pinecilv2/ -m pinecilv2 && \
-            python3 img2logo.py -E erase_stored_image /tmp/miniware/ -m miniware && \
-            python3 img2logo.py -E erase_stored_image /tmp/ts101/ -m ts101 && \
-            python3 img2logo.py -E erase_stored_image /tmp/mhp30/ -m mhp30 && \
-            python3 img2logo.py -E erase_stored_image /tmp/s60/ -m s60 
-  
-
-        - name: compress logo files
-          run: |
-            zip -rj pinecilv1.zip /tmp/pinecilv1/* && \
-            zip -rj miniware.zip /tmp/miniware/* && \
-            zip -rj pinecilv2.zip /tmp/pinecilv2/* && \
-            zip -rj ts101.zip /tmp/ts101/* && \
-            zip -rj mhp30.zip /tmp/mhp30/* && \
-            zip -rj s60_s60p.zip /tmp/s60/* 
-  
-        - uses: "marvinpinto/action-automatic-releases@latest"
-          with:
-            repo_token: "${{ secrets.GITHUB_TOKEN }}"
-            automatic_release_tag: "latest"
-            prerelease: false
-            title: "Release"
-            files: |
-              *.zip
-  
+name: "release"
+
+on:
+  push:
+    branches:
+      - "main"
+
+jobs:
+  release:
+    name: "Release"
+    runs-on: "ubuntu-22.04"
+
+    steps:
+      - name: Install dependencies (apk)
+        run: sudo apt update && sudo apt-get install -y git python3 python3-pillow py3-intelhex
+
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: prep
+        run: |
+          mkdir -p /tmp/pinecilv1 && \
+          mkdir -p /tmp/pinecilv2 && \
+          mkdir -p /tmp/miniware && \
+          mkdir -p /tmp/mhp30 && \
+          mkdir -p /tmp/s60
+
+      - name: build all files for the device
+        run: |
+          cd Bootup\ Logos && \
+          ./run.sh /tmp/pinecilv1/ -m pinecilv1 && \
+          ./run.sh /tmp/pinecilv2/ -m pinecilv2 && \
+          ./run.sh /tmp/miniware/ -m miniware && \
+          ./run.sh /tmp/mhp30/ -m mhp30 && \
+          ./run.sh /tmp/s60/ -m s60
+
+      - name: build logo erase file
+        run: |
+          cd Bootup\ Logos && \
+          python3 img2logo.py -E erase_stored_image /tmp/pinecilv1/ -m pinecilv1 && \
+          python3 img2logo.py -E erase_stored_image /tmp/pinecilv2/ -m pinecilv2 && \
+          python3 img2logo.py -E erase_stored_image /tmp/miniware/ -m miniware && \
+          python3 img2logo.py -E erase_stored_image /tmp/mhp30/ -m mhp30 && \
+          python3 img2logo.py -E erase_stored_image /tmp/s60/ -m s60
+
+      - name: compress logo files
+        run: |
+          zip -rj pinecilv1.zip /tmp/pinecilv1/* && \
+          zip -rj miniware.zip /tmp/miniware/* && \
+          zip -rj pinecilv2.zip /tmp/pinecilv2/* && \
+          zip -rj mhp30.zip /tmp/mhp30/* && \
+          zip -rj s60_s60p.zip /tmp/s60/*
+
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "latest"
+          prerelease: false
+          title: "Release"
+          files: |
+            *.zip