Move MIDI code out of tmk_core (#19704)

This commit is contained in:
Ryan 2023-01-30 18:47:50 +11:00 committed by GitHub
parent 968cc1fe7b
commit 242b80c63f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 11 additions and 23 deletions

View File

@ -84,6 +84,13 @@ endif
ifeq ($(strip $(MIDI_ENABLE)), yes) ifeq ($(strip $(MIDI_ENABLE)), yes)
OPT_DEFS += -DMIDI_ENABLE OPT_DEFS += -DMIDI_ENABLE
MUSIC_ENABLE = yes 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 SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c
endif endif

View File

@ -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/process_keycode/process_midi.c`
* `quantum/quantum_keycodes.h` * `quantum/quantum_keycodes.h`
* `tmk_core/protocol/midi.h` * `quantum/midi/midi.h`
* `tmk_core/protocol/midi.c` * `quantum/midi/midi.c`
* `tmk_core/protocol/qmk_midi.c` * `quantum/midi/qmk_midi.c`
* `tmk_core/protocol/midi_device.h` * `quantum/midi/midi_device.h`
<!-- <!--
#### QMK Internals (Autogenerated) #### QMK Internals (Autogenerated)

View File

@ -15,7 +15,3 @@ VPATH += $(TMK_PATH)/$(CHIBIOS_DIR)/lufa_utils
OPT_DEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=64 OPT_DEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=64
OPT_DEFS += -DFIXED_NUM_CONFIGURATIONS=1 OPT_DEFS += -DFIXED_NUM_CONFIGURATIONS=1
ifeq ($(strip $(MIDI_ENABLE)), yes)
include $(TMK_PATH)/protocol/midi.mk
endif

View File

@ -17,10 +17,6 @@ LUFA_SRC = lufa.c \
usb_descriptor.c \ usb_descriptor.c \
$(LUFA_SRC_USB) $(LUFA_SRC_USB)
ifeq ($(strip $(MIDI_ENABLE)), yes)
include $(TMK_PATH)/protocol/midi.mk
endif
ifeq ($(strip $(VIRTSER_ENABLE)), yes) ifeq ($(strip $(VIRTSER_ENABLE)), yes)
LUFA_SRC += $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c LUFA_SRC += $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c
endif endif

View File

@ -1,11 +0,0 @@
MIDI_DIR = protocol/midi
SRC += midi.c \
midi_device.c \
bytequeue/bytequeue.c \
bytequeue/interrupt_setting.c \
sysex_tools.c \
qmk_midi.c \
$(LUFA_SRC_USBCLASS)
VPATH += $(TMK_PATH)/$(MIDI_DIR)