Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Mar 12, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12ddbcc
Fixes for using standard Synth_Dexed.
Mar 12, 2022
e687c5f
Fix for branch of Synth_Dexed
Mar 12, 2022
ac52481
Submodules for Synth_Dexed and CMSIS_5 added.
Mar 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions CMSIS_5
Open in desktop
Submodule CMSIS_5 added at 18205c
5 changes: 4 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Synth_Dexed
Open in desktop
Submodule Synth_Dexed updated from 038ce2 to 3b9d12
23 changes: 21 additions & 2 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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