From 242b80c63ffff022172755da35fb4767d5f837c2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 30 Jan 2023 18:47:50 +1100 Subject: Move MIDI code out of tmk_core (#19704) --- builddefs/common_features.mk | 7 + docs/feature_midi.md | 8 +- quantum/midi/Config/LUFAConfig.h | 91 +++ quantum/midi/bytequeue/COPYING | 674 +++++++++++++++++++++ quantum/midi/bytequeue/bytequeue.c | 64 ++ quantum/midi/bytequeue/bytequeue.h | 55 ++ quantum/midi/bytequeue/interrupt_setting.c | 47 ++ quantum/midi/bytequeue/interrupt_setting.h | 35 ++ quantum/midi/midi.c | 247 ++++++++ quantum/midi/midi.h | 487 +++++++++++++++ quantum/midi/midi_device.c | 277 +++++++++ quantum/midi/midi_device.h | 148 +++++ quantum/midi/midi_function_types.h | 47 ++ quantum/midi/qmk_midi.c | 135 +++++ quantum/midi/qmk_midi.h | 10 + quantum/midi/sysex_tools.c | 97 +++ quantum/midi/sysex_tools.h | 92 +++ tmk_core/protocol/chibios.mk | 4 - tmk_core/protocol/lufa.mk | 4 - tmk_core/protocol/midi.mk | 11 - tmk_core/protocol/midi/Config/LUFAConfig.h | 91 --- tmk_core/protocol/midi/bytequeue/COPYING | 674 --------------------- tmk_core/protocol/midi/bytequeue/bytequeue.c | 64 -- tmk_core/protocol/midi/bytequeue/bytequeue.h | 55 -- .../protocol/midi/bytequeue/interrupt_setting.c | 47 -- .../protocol/midi/bytequeue/interrupt_setting.h | 35 -- tmk_core/protocol/midi/midi.c | 247 -------- tmk_core/protocol/midi/midi.h | 487 --------------- tmk_core/protocol/midi/midi_device.c | 277 --------- tmk_core/protocol/midi/midi_device.h | 148 ----- tmk_core/protocol/midi/midi_function_types.h | 47 -- tmk_core/protocol/midi/qmk_midi.c | 135 ----- tmk_core/protocol/midi/qmk_midi.h | 10 - tmk_core/protocol/midi/sysex_tools.c | 97 --- tmk_core/protocol/midi/sysex_tools.h | 92 --- 35 files changed, 2517 insertions(+), 2529 deletions(-) create mode 100644 quantum/midi/Config/LUFAConfig.h create mode 100755 quantum/midi/bytequeue/COPYING create mode 100644 quantum/midi/bytequeue/bytequeue.c create mode 100644 quantum/midi/bytequeue/bytequeue.h create mode 100644 quantum/midi/bytequeue/interrupt_setting.c create mode 100644 quantum/midi/bytequeue/interrupt_setting.h create mode 100644 quantum/midi/midi.c create mode 100644 quantum/midi/midi.h create mode 100644 quantum/midi/midi_device.c create mode 100644 quantum/midi/midi_device.h create mode 100644 quantum/midi/midi_function_types.h create mode 100644 quantum/midi/qmk_midi.c create mode 100644 quantum/midi/qmk_midi.h create mode 100644 quantum/midi/sysex_tools.c create mode 100644 quantum/midi/sysex_tools.h delete mode 100644 tmk_core/protocol/midi.mk delete mode 100644 tmk_core/protocol/midi/Config/LUFAConfig.h delete mode 100755 tmk_core/protocol/midi/bytequeue/COPYING delete mode 100644 tmk_core/protocol/midi/bytequeue/bytequeue.c delete mode 100644 tmk_core/protocol/midi/bytequeue/bytequeue.h delete mode 100644 tmk_core/protocol/midi/bytequeue/interrupt_setting.c delete mode 100644 tmk_core/protocol/midi/bytequeue/interrupt_setting.h delete mode 100644 tmk_core/protocol/midi/midi.c delete mode 100644 tmk_core/protocol/midi/midi.h delete mode 100644 tmk_core/protocol/midi/midi_device.c delete mode 100644 tmk_core/protocol/midi/midi_device.h delete mode 100644 tmk_core/protocol/midi/midi_function_types.h delete mode 100644 tmk_core/protocol/midi/qmk_midi.c delete mode 100644 tmk_core/protocol/midi/qmk_midi.h delete mode 100644 tmk_core/protocol/midi/sysex_tools.c delete mode 100644 tmk_core/protocol/midi/sysex_tools.h diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index dbcfcb7145..4e032f9dcf 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -84,6 +84,13 @@ endif ifeq ($(strip $(MIDI_ENABLE)), yes) OPT_DEFS += -DMIDI_ENABLE MUSIC_ENABLE = yes + COMMON_VPATH += $(QUANTUM_PATH)/midi + SRC += $(QUANTUM_DIR)/midi/midi.c + SRC += $(QUANTUM_DIR)/midi/midi_device.c + SRC += $(QUANTUM_DIR)/midi/qmk_midi.c + SRC += $(QUANTUM_DIR)/midi/sysex_tools.c + SRC += $(QUANTUM_DIR)/midi/bytequeue/bytequeue.c + SRC += $(QUANTUM_DIR)/midi/bytequeue/interrupt_setting.c SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c endif diff --git a/docs/feature_midi.md b/docs/feature_midi.md index 1f0809ef14..775a5e34ee 100644 --- a/docs/feature_midi.md +++ b/docs/feature_midi.md @@ -250,10 +250,10 @@ For the above, the `MI_C` keycode will produce a C3 (note number 48), and so on. * `quantum/process_keycode/process_midi.c` * `quantum/quantum_keycodes.h` - * `tmk_core/protocol/midi.h` - * `tmk_core/protocol/midi.c` - * `tmk_core/protocol/qmk_midi.c` - * `tmk_core/protocol/midi_device.h` + * `quantum/midi/midi.h` + * `quantum/midi/midi.c` + * `quantum/midi/qmk_midi.c` + * `quantum/midi/midi_device.h`