Rough out being able to merge image files & firmware files

.github/workflows/push.yml

@@ -14,12 +14,13 @@ 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 py3-intelhex
+        run: apk add --no-cache git python3 py3-pip zlib py3-pillow
 
       - uses: actions/checkout@v3
         with:

.github/workflows/release.yml

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

Bootup Logos/README.md

@@ -53,8 +53,6 @@ This just overwrites individual bytes in the output buffer.
 |![Alt text](https://github.com/Ralim/IronOS-Meta/blob/main/Bootup%20Logos/Images/wh_40k.png)|wh_40k.png||
 |![Alt text](https://github.com/Ralim/IronOS-Meta/blob/main/Bootup%20Logos/Images/wwii_kilroy.png)|wwii_kilroy.png||
 |![Alt text](https://github.com/Ralim/IronOS-Meta/blob/main/Bootup%20Logos/Images/hack_the_planet.png)|hack_the_planet.png||
-|![No. 2 Pinecil](https://github.com/Ralim/IronOS-Meta/blob/main/Bootup%20Logos/Images/no2pinecil.png)|no2pinecil.png||
-|![Lain](https://github.com/Ralim/IronOS-Meta/blob/main/Bootup%20Logos/Images/lain.png)|lain.png||
 
 **Animated logos**
 |Logo \*          |Filename       |Note   |
@@ -63,8 +61,5 @@ This just overwrites individual bytes in the output buffer.
 |![IronOS](https://github.com/Ralim/IronOS-Meta/blob/main/Bootup%20Logos/Images/IronOS.gif)|IronOS.gif||
 |![Alt text](https://github.com/Ralim/IronOS-Meta/blob/main/Bootup%20Logos/Images/terminal.gif)|terminal.gif||
 |![Alt text](https://github.com/Ralim/IronOS-Meta/blob/main/Bootup%20Logos/Images/hack_the_planet.gif)|hack_the_planet.gif||
-|![No. 2 Pinecil](https://github.com/Ralim/IronOS-Meta/blob/main/Bootup%20Logos/Images/no2pinecil.gif)|no2pinecil.gif||
-|![Nyancat](https://github.com/Ralim/IronOS-Meta/blob/main/Bootup%20Logos/Images/nyan.gif)|nyan.gif||
-|![Lain](https://github.com/Ralim/IronOS-Meta/blob/main/Bootup%20Logos/Images/lain.gif)|lain.gif||
 
 _* Click the individual logo to see its animation, if you missed it here._

Bootup Logos/img2logo.py

@@ -4,7 +4,6 @@ from __future__ import division
 import argparse
 import copy
 import os, sys
-from typing import Optional
 from intelhex import IntelHex
 from output_hex import HexOutput
 from output_dfu import DFUOutput
@@ -51,7 +50,7 @@ class S60Settings:
 
 
 class TS101Settings:
-    IMAGE_ADDRESS = 0x08000000 + (99 * 1024)
+    IMAGE_ADDRESS = 0x08000000 + (126 * 1024)
     DFU_TARGET_NAME = b"IronOS-dfu"
     DFU_ALT = 0
     DFU_VENDOR = 0x1209
@@ -244,7 +243,7 @@ def animated_image_to_bytes(
 def img2hex(
     input_filename,
     device_model_name: str,
-    merge_hex_file: Optional[str],
+    merge_hex_file: str | None,
     preview_filename=None,
     threshold=128,
     dither=False,
@@ -307,11 +306,6 @@ def img2hex(
         deviceSettings = Pinecilv2Settings
     elif device_name == "ts101":
         deviceSettings = TS101Settings
-        if merge_hex_file is None:
-            print(
-                "For the TS101 for compatibility with bugs in the Miniware Loader, you must merge the main firmware with the logo to flash it"
-            )
-            exit(1)
     elif device_name == "s60":
         deviceSettings = S60Settings
     elif device_name == "mhp30":
@@ -365,7 +359,7 @@ def read_merge_write(
     # Merge in the image data, error if collision
     base_hex_file.merge(logo_hex_file, overlap="error")
     binary_base = base_hex_file.minaddr()
-    base_hex_file.padding = 0xFF
+    base_hex_file.padding = 0xA5
     binary_blob = base_hex_file.tobinarray(start=binary_base)
     print(
         f"Post-merge output image starts at 0x{binary_base:x}, len {len(binary_blob)}"
@@ -379,17 +373,13 @@ def read_merge_write(
         deviceSettings.DFU_PRODUCT,
         deviceSettings.DFU_VENDOR,
     )
-    # Gap fill any missing segments
-    # This is required for the TS101 bootloader
-    segments = base_hex_file.segments()
-    for seg_pair in zip(segments, segments[1:]):
-        start = seg_pair[0][1]
-        end = seg_pair[1][0]
-        filler = [0xFE] * (end - start)
-        base_hex_file.frombytes(filler, start)
 
-    with open(output_filename + ".hex", "w") as output:
+    HexOutput.writeFile(
-        base_hex_file.write_hex_file(output, eolstyle="CRLF")
+        output_filename + ".hex",
+        binary_blob,
+        binary_base,
+        deviceSettings.MINIMUM_HEX_SIZE,
+    )
 
 
 def parse_commandline():

Bootup Logos/output_hex.py

@@ -65,6 +65,13 @@ class HexOutput:
             def write(generator):
                 output.write("".join(generator))
 
+            if len(data) % cls.INTELHEX_BYTES_PER_LINE != 0:
+                raise ValueError(
+                    "Program error: Size of LCD data is not evenly divisible by {}".format(
+                        cls.INTELHEX_BYTES_PER_LINE
+                    )
+                )
+
             address_lo = data_address & 0xFFFF
             address_hi = (data_address >> 16) & 0xFFFF
 

Documents/Install_Logo

@@ -0,0 +1 @@
+

README.md

@@ -7,6 +7,7 @@ This includes photographs of hardware, datasheets, schematics, original propriet
 This repository uses github actions to automagically build the logos for each device.
 Periodically a "release" will be tagged and pre-compiled logo's will be put there as well to make it easy.
 
+
 # Boot-Up Logos
 
 The IronOS firmware supports a user created bootup logo.
@@ -21,3 +22,4 @@ There are community logo's already converted and ready to use in [IronOS-Meta/re
 Download the zip for Pinecil or Miniware and then install using the instructions on the [main IronOS documentation](https://ralim.github.io/IronOS/Logo/).
 
 Alternatively if you want to make your own logo files, there is also documentation on how best to do this in the [main IronOS documentation](https://ralim.github.io/IronOS/Logo/).
+