From e788b0d6a3d333629e7d3e0e5d6078a01bfab196 Mon Sep 17 00:00:00 2001
From: probonopd <probonopd@users.noreply.github.com>
Date: Sat, 12 Mar 2022 21:29:51 +0100
Subject: [PATCH] Revert "Added support for CMSIS_5, so upstream Synth_Dexed
can be used (#41)"
This reverts commit fb6507cb96b5bf438183c6cd4d51f2ace2fb4541.
---
.gitmodules | 5 +----
CMSIS_5 | 1 -
README.md | 5 +----
Synth_Dexed | 2 +-
src/Makefile | 23 ++---------------------
5 files changed, 5 insertions(+), 31 deletions(-)
delete mode 160000 CMSIS_5
diff --git a/.gitmodules b/.gitmodules
index 064ffe4..55f2aca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,4 @@
url = https://github.com/smuehlst/circle-stdlib
[submodule "Synth_Dexed"]
path = Synth_Dexed
- url = https://codeberg.org/dcoredump/Synth_Dexed.git
-[submodule "CMSIS_5"]
- path = CMSIS_5
- url = https://github.com/ARM-software/CMSIS_5
+ url = https://github.com/probonopd/Synth_Dexed
diff --git a/CMSIS_5 b/CMSIS_5
deleted file mode 160000
index 18205c6..0000000
--- a/CMSIS_5
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 18205c6c2b68e7e96f40dc941c47efdbdd9f7d01
diff --git a/README.md b/README.md
index dc8ecbf..e9a5f28 100644
--- a/README.md
+++ b/README.md
@@ -104,9 +104,6 @@ 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
@@ -123,7 +120,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 -R sdcard/* boot
+sudo cp sdcard/* boot
sudo umount boot
sudo losetup -d "${DEV}"
rm -r boot
diff --git a/Synth_Dexed b/Synth_Dexed
index 3b9d129..038ce2f 160000
--- a/Synth_Dexed
+++ b/Synth_Dexed
@@ -1 +1 @@
-Subproject commit 3b9d12946e8a6004f6764b7fffe7f89565be6b28
+Subproject commit 038ce2f020bbb5ca8a40a911071ccf638e7e68d8
diff --git a/src/Makefile b/src/Makefile
index 68fa891..0c06d88 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,33 +4,14 @@
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)/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
+ $(SYNTH_DEXED_DIR)/synth_dexed.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 $(CMSIS_DSP_SOURCE_DIR)/SupportFunctions/*.d
+EXTRACLEAN = $(SYNTH_DEXED_DIR)/*.o $(SYNTH_DEXED_DIR)/*.d
include ./Rules.mk