Merge branch 'main' into setVelocityScale

.github/workflows/build.yml

@@ -64,12 +64,18 @@ jobs:
            rm -rf sdcard/config*.txt sdcard/README sdcard/Makefile sdcard/armstub sdcard/COPYING.linux
            cp ./src/config.txt ./src/minidexed.ini ./src/*img ./src/performance.ini sdcard/
            cp ./getsysex.sh sdcard/
-           cp -r ./performance sdcard/
            echo "usbspeed=full" > sdcard/cmdline.txt
            cd sdcard
            cp ../kernels/* . || true
+           cd -
+    - name: Get performance files
+      run: |
+           git clone https://github.com/Banana71/Soundplantage --depth 1 # depth 1 means only the latest commit
+           cp -r ./Soundplantage/performance ./Soundplantage/*.pdf ./sdcard/
+           cd sdcard
            zip -r ../MiniDexed_$GITHUB_RUN_NUMBER_$(date +%Y-%m-%d)-$(git rev-parse --short HEAD).zip *
            echo "artifactName=MiniDexed_$GITHUB_RUN_NUMBER_$(date +%Y-%m-%d)-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+           cd -
     - uses: actions/upload-artifact@v3
       with:
         name: ${{ env.artifactName }} # Exported above

.github/workflows/pr-comment.yml

@@ -0,0 +1,64 @@
+# https://nightly.link/
+# https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml
+
+name: Comment on pull request
+on:
+  workflow_run:
+    workflows: ['Build']
+    types: [completed]
+jobs:
+  pr_comment:
+    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v6
+        with:
+          # This snippet is public-domain, taken from
+          # https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml
+          script: |
+            async function upsertComment(owner, repo, issue_number, purpose, body) {
+              const {data: comments} = await github.rest.issues.listComments(
+                {owner, repo, issue_number});
+
+              const marker = `<!-- bot: ${purpose} -->`;
+              body = marker + "\n" + body;
+
+              const existing = comments.filter((c) => c.body.includes(marker));
+              if (existing.length > 0) {
+                const last = existing[existing.length - 1];
+                core.info(`Updating comment ${last.id}`);
+                await github.rest.issues.updateComment({
+                  owner, repo,
+                  body,
+                  comment_id: last.id,
+                });
+              } else {
+                core.info(`Creating a comment in issue / PR #${issue_number}`);
+                await github.rest.issues.createComment({issue_number, body, owner, repo});
+              }
+            }
+
+            const {owner, repo} = context.repo;
+            const run_id = ${{github.event.workflow_run.id}};
+
+            const pull_requests = ${{ toJSON(github.event.workflow_run.pull_requests) }};
+            if (!pull_requests.length) {
+              return core.error("This workflow doesn't match any pull requests!");
+            }
+
+            const artifacts = await github.paginate(
+              github.rest.actions.listWorkflowRunArtifacts, {owner, repo, run_id});
+            if (!artifacts.length) {
+              return core.error(`No artifacts found`);
+            }
+            let body = `Download the artifacts for this pull request:\n`;
+            for (const art of artifacts) {
+              body += `\n* [${art.name}.zip](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
+            }
+
+            core.info("Review thread message body:", body);
+
+            for (const pr of pull_requests) {
+              await upsertComment(owner, repo, pr.number,
+                "nightly-link", body);
+            }

.gitignore

@@ -45,3 +45,7 @@ sdcard
 # Editor related files
 *.swp
 *.swo
+
+CMSIS_5/
+Synth_Dexed/
+circle-stdlib/

README.md

@@ -15,7 +15,7 @@ MiniDexed is a FM synthesizer closely modeled on the famous DX7 by a well-known
 - [x] Menu structure on optional [HD44780 display](https://www.berrybase.de/sensoren-module/displays/alphanumerische-displays/alphanumerisches-lcd-16x2-gr-252-n/gelb) and rotary encoder
 - [x] Runs up to 8 Dexed instances simultaneously (like in a TX816) and mixes their output together
 - [x] Allows for each Dexed instance to be detuned and stereo shifted
-- [x] Allows to configure multiple Dexed instances through `performance.ini` files
+- [x] Allows to configure multiple Dexed instances through `performance.ini` files (e.g., [converted](https://github.com/BobanSpasic/MDX_Vault) from DX1, DX5, TX816, DX7II, TX802)
 - [x] Compressor effect
 - [x] Reverb effect
 - [x] Voices can be edited over MIDI, e.g., using the [synthmata](https://synthmata.github.io/volca-fm/) online editor (requires [additional hardware](https://github.com/probonopd/MiniDexed/wiki/Hardware#usb-midi-device))
@@ -90,5 +90,5 @@ This project stands on the shoulders of giants. Special thanks to:
 * [dcoredump](https://github.com/dcoredump) for https://codeberg.org/dcoredump/Synth_Dexed, a port of Dexed for embedded systems
 * [rsta2](https://github.com/rsta2) for https://github.com/rsta2/circle, the library to run code on bare metal Raspberry Pi (without a Linux kernel or operating system) and for the bulk of the MiniDexed code 
 * [smuehlst](https://github.com/smuehlst) for https://github.com/smuehlst/circle-stdlib, a version with Standard C and C++ library support
-* [Banana71](https://github.com/Banana71) for the sound design of the performances shipped with MiniDexed
-* [BobanSpasic](https://github.com/BobanSpasic) for the [MiniDexedLibrarian](https://github.com/BobanSpasic/MiniDexedLibrarian) software
+* [Banana71](https://github.com/Banana71) for the sound design of the [Soundplantage](https://github.com/Banana71/Soundplantage) performances shipped with MiniDexed
+* [BobanSpasic](https://github.com/BobanSpasic) for the [MiniDexedLibrarian](https://github.com/BobanSpasic/MiniDexedLibrarian) software, [MiniDexed performance converter](https://github.com/BobanSpasic/MDX_PerfConv) and [collection of performances for MiniDexed](https://github.com/BobanSpasic/MDX_Vault)

USBID.sh

@@ -0,0 +1,2 @@
+USB_VID=0x1209
+USB_DID=0xF043

build.sh

@@ -20,6 +20,15 @@ if [ "${RPI}" -gt "1" ]; then
     OPTIONS="${OPTIONS} -o ARM_ALLOW_MULTI_CORE"
 fi
 
+# USB Vendor and Device ID for use with USB Gadget Mode
+source USBID.sh
+if [ "${USB_VID}" ] ; then
+	OPTIONS="${OPTIONS} -o USB_GADGET_VENDOR_ID=${USB_VID}"
+fi
+if [ "${USB_DID}" ] ; then
+	OPTIONS="${OPTIONS} -o USB_GADGET_DEVICE_ID_BASE=${USB_DID}"
+fi
+
 # Build circle-stdlib library
 cd circle-stdlib/
 make mrproper || true