From 6d526c6412c9dfb81b11f10ec75d9fd54ab35bb5 Mon Sep 17 00:00:00 2001 From: probonopd Date: Wed, 6 Dec 2023 22:28:38 +0100 Subject: [PATCH 1/3] Soundplantage [ci skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 955e279..bcae7c0 100644 --- a/README.md +++ b/README.md @@ -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 +* [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 From 06be0a533c38b9c40c562f0f20317e4cd01ec2d3 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 9 Dec 2023 16:44:57 +0100 Subject: [PATCH 2/3] MDX_Vault [ci skip] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bcae7c0..8623d9b 100644 --- a/README.md +++ b/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)) @@ -91,4 +91,4 @@ This project stands on the shoulders of giants. Special thanks to: * [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 [Soundplantage](https://github.com/Banana71/Soundplantage) performances shipped with MiniDexed -* [BobanSpasic](https://github.com/BobanSpasic) for the [MiniDexedLibrarian](https://github.com/BobanSpasic/MiniDexedLibrarian) software +* [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) From 9bc36800b905e2ea6fc93dde0a1d76be80b49e82 Mon Sep 17 00:00:00 2001 From: Kevin <68612569+diyelectromusic@users.noreply.github.com> Date: Sat, 30 Dec 2023 12:06:10 +0000 Subject: [PATCH 3/3] Set USB Gadget name to MiniDexed and fix setting of USB product (device) ID. Fixes #416 (#593) --- build.sh | 2 +- src/kernel.cpp | 4 +- src/usbminidexedmidigadget.h | 86 ++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 src/usbminidexedmidigadget.h diff --git a/build.sh b/build.sh index 9e8fc7a..b69ba6b 100755 --- a/build.sh +++ b/build.sh @@ -26,7 +26,7 @@ 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=${USB_DID}" + OPTIONS="${OPTIONS} -o USB_GADGET_DEVICE_ID_BASE=${USB_DID}" fi # Build circle-stdlib library diff --git a/src/kernel.cpp b/src/kernel.cpp index e7a3738..c06c386 100644 --- a/src/kernel.cpp +++ b/src/kernel.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include "usbminidexedmidigadget.h" LOGMODULE ("kernel"); @@ -69,7 +69,7 @@ bool CKernel::Initialize (void) if (m_Config.GetUSBGadgetMode()) { // Run the USB stack in USB Gadget (device) mode - m_pUSB = new CUSBMIDIGadget (&mInterrupt); + m_pUSB = new CUSBMiniDexedMIDIGadget (&mInterrupt); } else { diff --git a/src/usbminidexedmidigadget.h b/src/usbminidexedmidigadget.h new file mode 100644 index 0000000..bbb5f44 --- /dev/null +++ b/src/usbminidexedmidigadget.h @@ -0,0 +1,86 @@ +// +// usbminidexedmidigadget.h +// +// MiniDexed - Dexed FM synthesizer for bare metal Raspberry Pi +// Copyright (C) 2022 The MiniDexed Team +// +// Based on circle/usb/gadget/usbmidigadget.h +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +#ifndef _usbminidexedmidigadget_h +#define _usbminidexedmidigadget_h + +#include +#include +#include +#include + +class CUSBMiniDexedMIDIGadget : public CUSBMIDIGadget +{ +private: +#define MDSTRINGDESCRIPTORS 3 + const char *const s_MiniDexedStringDescriptor[MDSTRINGDESCRIPTORS] = + { + "\x04\x03\x09\x04", // Language ID + "probonopd", + "MiniDexed" + }; + +public: + CUSBMiniDexedMIDIGadget (CInterruptSystem *pInterruptSystem) + : CUSBMIDIGadget (pInterruptSystem) + { + } + + ~CUSBMiniDexedMIDIGadget (void) + { + assert(0); + } + +protected: + // Override GetDescriptor frmo CUSBMIDIGadget. + // See CUSBMIDIGadget for details. + // This will only act on the DESCRIPOR_STRING. + // All other descriptors are returned from USBMIDIGadget. + // + const void *GetDescriptor (u16 wValue, u16 wIndex, size_t *pLength) override + { + assert (pLength); + + u8 uchDescIndex = wValue & 0xFF; + + switch (wValue >> 8) + { + case DESCRIPTOR_STRING: + if (!uchDescIndex) + { + *pLength = (u8) s_MiniDexedStringDescriptor[0][0]; + return s_MiniDexedStringDescriptor[0]; + } + else if (uchDescIndex < MDSTRINGDESCRIPTORS) + { + return CUSBMIDIGadget::ToStringDescriptor (s_MiniDexedStringDescriptor[uchDescIndex], pLength); + } + break; + + default: + break; + } + + return CUSBMIDIGadget::GetDescriptor(wValue, wIndex, pLength); + } +}; + +#endif