Added support for CMSIS_5, so upstream Synth_Dexed can be used (#41)

* Fixes for using standard Synth_Dexed.
Added support for CMSIS.

* Fix for branch of Synth_Dexed

* Submodules for Synth_Dexed and CMSIS_5 added.

Co-authored-by: Holger Wirtz <[email protected]>

.gitmodules

@@ -3,4 +3,7 @@
 	url = https://github.com/smuehlst/circle-stdlib
 [submodule "Synth_Dexed"]
 	path = Synth_Dexed
-	url = https://github.com/probonopd/Synth_Dexed
+	url = https://codeberg.org/dcoredump/Synth_Dexed.git
+[submodule "CMSIS_5"]
+	path = CMSIS_5
+	url = https://github.com/ARM-software/CMSIS_5

README.md

@@ -104,6 +104,9 @@ cd -
 
 # Make zip that contains Raspberry Pi 4 boot files. The contents can be copied to a FAT32 formatted partition on a microSD card
 mkdir -p sdcard
+cd sdcard
+../getsysex.sh
+cd ..
 cp -r ./circle-stdlib/libs/circle/boot/* sdcard
 mv sdcard/config64.txt sdcard/config.txt
 rm -rf sdcard/config32.txt sdcard/README sdcard/Makefile sdcard/armstub sdcard/COPYING.linux
@@ -120,7 +123,7 @@ DEV=`sudo losetup --find --partscan --show "${IMG}"`
 sudo mkfs.vfat -F 32 -n BOOT "${DEV}p1"
 mkdir boot
 sudo mount "${DEV}p1" boot
-sudo cp sdcard/* boot
+sudo cp -R sdcard/* boot
 sudo umount boot
 sudo losetup -d "${DEV}"
 rm -r boot

src/Makefile

@@ -4,14 +4,33 @@
 
 CIRCLE_STDLIB_DIR = ../circle-stdlib
 SYNTH_DEXED_DIR = ../Synth_Dexed/src
+CMSIS_CORE_INCLUDE_DIR = ../CMSIS_5/CMSIS/Core/Include
+CMSIS_DSP_INCLUDE_DIR = ../CMSIS_5/CMSIS/DSP/Include
+CMSIS_DSP_PRIVATE_INCLUDE_DIR = ../CMSIS_5/CMSIS/DSP/PrivateInclude
+CMSIS_DSP_SOURCE_DIR = ../CMSIS_5/CMSIS/DSP/Source
 
 OBJS = main.o kernel.o minidexed.o config.o userinterface.o \
        mididevice.o midikeyboard.o serialmididevice.o pckeyboard.o \
        sysexfileloader.o perftimer.o ky040.o \
-       $(SYNTH_DEXED_DIR)/synth_dexed.o
+       $(SYNTH_DEXED_DIR)/PluginFx.o \
+       $(SYNTH_DEXED_DIR)/dexed.o \
+       $(SYNTH_DEXED_DIR)/dx7note.o \
+       $(SYNTH_DEXED_DIR)/env.o \
+       $(SYNTH_DEXED_DIR)/exp2.o \
+       $(SYNTH_DEXED_DIR)/fm_core.o \
+       $(SYNTH_DEXED_DIR)/fm_op_kernel.o \
+       $(SYNTH_DEXED_DIR)/freqlut.o \
+       $(SYNTH_DEXED_DIR)/lfo.o \
+       $(SYNTH_DEXED_DIR)/pitchenv.o \
+       $(SYNTH_DEXED_DIR)/porta.o \
+       $(SYNTH_DEXED_DIR)/sin.o \
+       $(CMSIS_DSP_SOURCE_DIR)/SupportFunctions/SupportFunctions.o
 
 INCLUDE += -I $(SYNTH_DEXED_DIR)
+INCLUDE += -I $(CMSIS_CORE_INCLUDE_DIR)
+INCLUDE += -I $(CMSIS_DSP_INCLUDE_DIR)
+INCLUDE += -I $(CMSIS_DSP_PRIVATE_INCLUDE_DIR)
 
-EXTRACLEAN = $(SYNTH_DEXED_DIR)/*.o $(SYNTH_DEXED_DIR)/*.d
+EXTRACLEAN = $(SYNTH_DEXED_DIR)/*.o $(SYNTH_DEXED_DIR)/*.d $(CMSIS_DSP_SOURCE_DIR)/SupportFunctions/*.d
 
 include ./Rules.mk