Patch 1.6.0: Support for Raspberry Pi PICO2 (#17)

* Initial commit Refactoring installer

* Adding multimaterial case

* Adding support for PICO2

* Adding hardware ID for PICO2

* Changing versions

* Changing docker image

* Fixing version

* Changing platform

* Fixing docker image name

* Changing back name

* Removing ref

* Further removing references

* Updating README.md

Author: ifilot

.github/workflows/build.yml

@@ -12,6 +12,7 @@ env:
   BUILD_TYPE: Release
   PROGNAME: pico-sst39sf0x0-programmer
   FIRMWARE: pico-sst39sf0x0-programmer-firmware
+  FIRMWARE2: pico2-sst39sf0x0-programmer-firmware
   EXEC: pico-sst39sf0x0-programmer.exe
 
 jobs:
@@ -113,7 +114,9 @@ jobs:
     - name: Copy assets
       run: copy gui\assets\icon\eeprom_icon.ico gui\packaging\packages\com.vendor.product\data\eeprom_icon.ico
     - name: Create installer
-      run: ${{github.workspace}}\..\Qt\Tools\QtInstallerFramework\4.7\bin\binarycreator.exe -c config\config.xml -p packages ${{env.PROGNAME}}-installer-win64.exe
+      run: |
+        dir ${{github.workspace}}\..\Qt\Tools\QtInstallerFramework
+        ${{github.workspace}}\..\Qt\Tools\QtInstallerFramework\4.7\bin\binarycreator.exe -c config\config.xml -p packages ${{env.PROGNAME}}-installer-win64.exe
       working-directory: gui/packaging
     - name: Upload installer
       uses: actions/upload-artifact@v3
@@ -164,7 +167,7 @@ jobs:
   build-firmware:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ifilot/pico:latest
+      image: ghcr.io/ifilot/pico:v0.2.0
     steps:
     - uses: actions/checkout@v3
     - name: Compile firmware
@@ -199,4 +202,49 @@ jobs:
         upload_url: ${{ needs.create-release.outputs.upload_url }}
         asset_path: ${{env.FIRMWARE}}.uf2
         asset_name: ${{env.FIRMWARE}}.uf2
+        asset_content_type: application/octet-stream
+
+
+  #
+  # PICO2 firmware
+  #
+  build-firmware-pico2:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/ifilot/pico:v0.2.0
+    steps:
+    - uses: actions/checkout@v3
+    - name: Compile firmware
+      shell: bash
+      run: |
+        mkdir build && cd build
+        cmake -DPICO_PLATFORM=rp2350-arm-s -DPICO_BOARD=pico2 ../firmware
+        make -j
+        cp -v ${{env.FIRMWARE}}.uf2 ${{env.FIRMWARE2}}.uf2
+    - name: Upload firmware .uf2 file
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{env.FIRMWARE2}}.uf2
+        path: ./build/${{env.FIRMWARE2}}.uf2
+
+  deploy-firmware-pico2:
+    runs-on: ubuntu-latest
+    needs: [build-firmware-pico2, create-release]
+    permissions: write-all
+    if: startsWith(github.ref, 'refs/tags/v')
+    steps:
+    - name: Download artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: ${{env.FIRMWARE2}}.uf2
+        path: ./
+    - name: Upload Release Asset
+      id: upload-release-asset 
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.create-release.outputs.upload_url }}
+        asset_path: ${{env.FIRMWARE2}}.uf2
+        asset_name: ${{env.FIRMWARE2}}.uf2
         asset_content_type: application/octet-stream

README.md

@@ -98,7 +98,8 @@ below.
 
 Download the latest version of the binaries via the links below.
 
-* [Firmware (.uf2 file)](https://github.com/ifilot/pico-sst39sf0x0-programmer/releases/latest/download/pico-sst39sf0x0-programmer-firmware.uf2)
+* [Firmware PICO (.uf2 file)](https://github.com/ifilot/pico-sst39sf0x0-programmer/releases/latest/download/pico-sst39sf0x0-programmer-firmware.uf2)
+* [Firmware PICO2 (.uf2 file)](https://github.com/ifilot/pico-sst39sf0x0-programmer/releases/latest/download/pico2-sst39sf0x0-programmer-firmware.uf2)
 * [GUI Installer](https://github.com/ifilot/pico-sst39sf0x0-programmer/releases/latest/download/pico-sst39sf0x0-programmer-installer-win64.exe)
 
 ## License

case/multi-material/pico-case-bottom.stl

@@ -45,7 +45,7 @@ GPIO19 - LOAD for A16-A19
 #define DELAY_READ_VERIFY 1
 #define DELAY_WRITE 1
 #define DELAY_ADDR 1
-#define BOARD_ID "PICOSST39-v1.5.2"
+#define BOARD_ID "PICOSST39-v1.6.0"
 
 #define BLOCK_SIZE  0x100
 #define SECTOR_SIZE 0x1000

case/multi-material/pico-case-top.stl

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <Name>PICO SST39SF0x0 Programmer</Name>
+    <Version>1.5.3</Version>
+    <Title>PICO SST39SF0x0 Programmer Installer</Title>
+    <Publisher>retrohacks.nl</Publisher>
+    <StartMenuDir>retrohacks.nl</StartMenuDir>
+    <TargetDir>@HomeDir@/retrohacks.nl/pico-sst39sf0x0-programmer-1.5.3</TargetDir>
+    <RunProgram>@TargetDir@/pico-sst39sf0x0-programmer/</RunProgram>
+    <RunProgramDescription>PICO SST39SF0x0 Programmer</RunProgramDescription>
+</Installer>