Pull in changes from dev

.github/workflows/build.yml

@@ -32,24 +32,56 @@ jobs:
               directory: pico,
               pico_board: pico,
               pico_platform: rp2040,
+              withemulator: 0,
             }
           - {
               buildname: Pico_W,
               directory: picow,
               pico_board: pico_w,
               pico_platform: rp2040,
+              withemulator: 0,
             }
           - {
               buildname: Pico2,
               directory: pico2,
               pico_board: pico2,
               pico_platform: rp2350-arm-s,
+              withemulator: 0,
             }
           - {
               buildname: Pico2_W,
               directory: pico2w,
               pico_board: pico2_w,
               pico_platform: rp2350-arm-s,
+              withemulator: 0,
+            }
+          - {
+              buildname: Pico_Emulator,
+              directory: pico_em,
+              pico_board: pico,
+              pico_platform: rp2040,
+              withemulator: 1,
+            }
+          - {
+              buildname: Pico2_Emulator,
+              directory: pico2_em,
+              pico_board: pico2,
+              pico_platform: rp2350-arm-s,
+              withemulator: 1,
+            }
+          - {
+              buildname: Pico_W_Emulator,
+              directory: pico_w_em,
+              pico_board: pico_w,
+              pico_platform: rp2040,
+              withemulator: 1,
+            }
+          - {
+              buildname: Pico2_W_Emulator,
+              directory: pico2_w_em,
+              pico_board: pico2_w,
+              pico_platform: rp2350-arm-s,
+              withemulator: 1,
             }
 
       fail-fast: false
@@ -146,6 +178,13 @@ jobs:
         with:
           path: master
 
+      - name: 📇 Checkout emudore-embedded
+        if: ${{matrix.withemulator == 1 }}
+        uses: actions/checkout@v4
+        with:
+          repository: loudnl/emudore-embedded
+          path: master/lib/emudore-embedded
+
       - name: 🏭 Create build directory
         run: |
           mkdir -p ${{github.workspace}}/master/build_${{matrix.directory}}
@@ -154,7 +193,7 @@ jobs:
         run: |
           unset PICO_PLATFORM
           unset PICO_BOARD
-          cmake -S master -B ${{github.workspace}}/master/build_${{matrix.directory}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_PLATFORM=${{matrix.pico_platform}} -DPICO_BOARD=${{matrix.pico_board}} -Dpicotool_DIR=${{github.workspace}}/picotool/picotool $extra_arg
+          cmake -S master -B ${{github.workspace}}/master/build_${{matrix.directory}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_PLATFORM=${{matrix.pico_platform}} -DPICO_BOARD=${{matrix.pico_board}} -Dpicotool_DIR=${{github.workspace}}/picotool/picotool -DONBOARD_EMULATOR=${{matrix.withemulator}} $extra_arg
 
       - name: 🏭 Build ${{matrix.name}}
         run: |
@@ -181,5 +220,5 @@ jobs:
       - name: 💾 Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: usbsid${{matrix.pico_board}}-${{env.BRANCHNAME}}-autobuild-${{github.run_number}}-${{env.DATETIME}}
+          name: usbsid${{matrix.directory}}-${{env.BRANCHNAME}}-autobuild-${{github.run_number}}-${{env.DATETIME}}
           path: ${{github.workspace}}/master/dist

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
           pattern: releasebuild-usbsid*
           merge-multiple: true
 
-      - name: View folder content
+      - name: View directory content
         env:
           IS_TAG: ${{ steps.branch_name.outputs.IS_TAG }}
           SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
@@ -96,24 +96,56 @@ jobs:
               directory: pico,
               pico_board: pico,
               pico_platform: rp2040,
+              withemulator: 0,
             }
           - {
               buildname: Pico_W,
               directory: picow,
               pico_board: pico_w,
               pico_platform: rp2040,
+              withemulator: 0,
             }
           - {
               buildname: Pico2,
               directory: pico2,
               pico_board: pico2,
               pico_platform: rp2350-arm-s,
+              withemulator: 0,
             }
           - {
               buildname: Pico2_W,
               directory: pico2w,
               pico_board: pico2_w,
               pico_platform: rp2350-arm-s,
+              withemulator: 0,
+            }
+          - {
+              buildname: Pico_Emulator,
+              directory: pico_em,
+              pico_board: pico,
+              pico_platform: rp2040,
+              withemulator: 1,
+            }
+          - {
+              buildname: Pico2_Emulator,
+              directory: pico2_em,
+              pico_board: pico2,
+              pico_platform: rp2350-arm-s,
+              withemulator: 1,
+            }
+          - {
+              buildname: Pico_W_Emulator,
+              directory: pico_w_em,
+              pico_board: pico_w,
+              pico_platform: rp2040,
+              withemulator: 1,
+            }
+          - {
+              buildname: Pico2_W_Emulator,
+              directory: pico2_w_em,
+              pico_board: pico2_w,
+              pico_platform: rp2350-arm-s,
+              withemulator: 1,
             }
 
       fail-fast: false
@@ -211,15 +243,22 @@ jobs:
         with:
           path: master
 
-      - name: 🏭 Create build folders
+      - name: 📇 Checkout emudore-embedded
+        if: ${{matrix.withemulator == 1 }}
+        uses: actions/checkout@v4
+        with:
+          repository: loudnl/emudore-embedded
+          path: master/lib/emudore-embedded
+
+      - name: 🏭 Create build directory
         run: |
           mkdir -p ${{github.workspace}}/master/build_${{matrix.directory}}
 
       - name: 🏭 Setup CMAKE
         run: |
           unset PICO_PLATFORM
           unset PICO_BOARD
-          cmake -S master -B ${{github.workspace}}/master/build_${{matrix.directory}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_PLATFORM=${{matrix.pico_platform}} -DPICO_BOARD=${{matrix.pico_board}} -Dpicotool_DIR=${{github.workspace}}/picotool/picotool $extra_arg
+          cmake -S master -B ${{github.workspace}}/master/build_${{matrix.directory}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_PLATFORM=${{matrix.pico_platform}} -DPICO_BOARD=${{matrix.pico_board}} -Dpicotool_DIR=${{github.workspace}}/picotool/picotool -DONBOARD_EMULATOR=${{matrix.withemulator}} $extra_arg
 
       - name: 🏭 Build ${{matrix.name}}
         run: |
@@ -246,5 +285,5 @@ jobs:
       - name: 💾 Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: releasebuild-usbsid${{matrix.pico_board}}
+          name: releasebuild-usbsid${{matrix.directory}}
           path: ${{github.workspace}}/master/dist

.github/workflows/tagged_build.yml

@@ -134,24 +134,56 @@ jobs:
               directory: pico,
               pico_board: pico,
               pico_platform: rp2040,
+              withemulator: 0,
             }
           - {
               buildname: Pico_W,
-              directory: picow,
+              directory: pico_w,
               pico_board: pico_w,
               pico_platform: rp2040,
+              withemulator: 0,
             }
           - {
               buildname: Pico2,
               directory: pico2,
               pico_board: pico2,
               pico_platform: rp2350-arm-s,
+              withemulator: 0,
             }
           - {
               buildname: Pico2_W,
-              directory: pico2w,
+              directory: pico2_w,
               pico_board: pico2_w,
               pico_platform: rp2350-arm-s,
+              withemulator: 0,
+            }
+          - {
+              buildname: Pico_Emulator,
+              directory: pico_em,
+              pico_board: pico,
+              pico_platform: rp2040,
+              withemulator: 1,
+            }
+          - {
+              buildname: Pico2_Emulator,
+              directory: pico2_em,
+              pico_board: pico2,
+              pico_platform: rp2350-arm-s,
+              withemulator: 1,
+            }
+          - {
+              buildname: Pico_W_Emulator,
+              directory: pico_w_em,
+              pico_board: pico_w,
+              pico_platform: rp2040,
+              withemulator: 1,
+            }
+          - {
+              buildname: Pico2_W_Emulator,
+              directory: pico2_w_em,
+              pico_board: pico2_w,
+              pico_platform: rp2350-arm-s,
+              withemulator: 1,
             }
       fail-fast: false
     steps:
@@ -257,6 +289,13 @@ jobs:
         with:
           path: master
 
+      - name: 📇 Checkout emudore-embedded
+        if: ${{matrix.withemulator == 1 }}
+        uses: actions/checkout@v4
+        with:
+          repository: loudnl/emudore-embedded
+          path: master/lib/emudore-embedded
+
       - name: 🏭 Create build directory
         run: |
           mkdir -p ${{github.workspace}}/master/build_${{matrix.directory}}
@@ -265,7 +304,7 @@ jobs:
         run: |
           unset PICO_PLATFORM
           unset PICO_BOARD
-          cmake -S master -B ${{github.workspace}}/master/build_${{matrix.directory}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_PLATFORM=${{matrix.pico_platform}} -DPICO_BOARD=${{matrix.pico_board}} -Dpicotool_DIR=${{github.workspace}}/picotool/picotool $extra_arg
+          cmake -S master -B ${{github.workspace}}/master/build_${{matrix.directory}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_PLATFORM=${{matrix.pico_platform}} -DPICO_BOARD=${{matrix.pico_board}} -Dpicotool_DIR=${{github.workspace}}/picotool/picotool -DONBOARD_EMULATOR=${{matrix.withemulator}} $extra_arg
 
       - name: 🏭 Build ${{matrix.buildname}}
         run: |
@@ -278,9 +317,9 @@ jobs:
       - name: 💾 Gather Artifact Files
         working-directory: ${{github.workspace}}/master
         run: |
-          mkdir usbsid${{matrix.pico_board}}
-          cp -av build_${{matrix.directory}}/*.uf2 usbsid${{matrix.pico_board}}/
-          zip -r usbsid${{matrix.pico_board}}-taggedbuild-${{ steps.vars.outputs.tag }}.zip usbsid${{matrix.pico_board}}/
+          mkdir usbsid${{matrix.directory}}
+          cp -av build_${{matrix.directory}}/*.uf2 usbsid${{matrix.directory}}/
+          zip -r usbsid${{matrix.directory}}-taggedbuild-${{ steps.vars.outputs.tag }}.zip usbsid${{matrix.directory}}/
 
       - name: Get current branch
         run: |
@@ -295,8 +334,8 @@ jobs:
         uses: actions/github-script@v7
         env:
           UPLOAD_URL: ${{ needs.create_release.outputs.upload_url }}
-          ASSET_PATH: ${{github.workspace}}/master/usbsid${{matrix.pico_board}}-taggedbuild-${{ steps.vars.outputs.tag }}.zip
-          ASSET_NAME: usbsid${{matrix.pico_board}}-taggedbuild-${{ steps.vars.outputs.tag }}.zip
+          ASSET_PATH: ${{github.workspace}}/master/usbsid${{matrix.directory}}-taggedbuild-${{ steps.vars.outputs.tag }}.zip
+          ASSET_NAME: usbsid${{matrix.directory}}-taggedbuild-${{ steps.vars.outputs.tag }}.zip
           ASSET_CONTENT_TYPE: application/zip
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}

.gitignore

@@ -30,6 +30,10 @@
 !.github/**
 !src
 !src/pio
+!lib
+!lib/emulator
+!lib/emulator/flash
+!lib/emulator/sidtunes
 !doc
 !doc/images
 !doc/images/firmware