Browse Source

Move MIDI code out of tmk_core (#19704)

pull/19718/head
Ryan 1 year ago
committed by GitHub
parent
commit
242b80c63f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 11 additions and 23 deletions
  1. +7
    -0
      builddefs/common_features.mk
  2. +4
    -4
      docs/feature_midi.md
  3. +0
    -0
      quantum/midi/Config/LUFAConfig.h
  4. +0
    -0
      quantum/midi/bytequeue/COPYING
  5. +0
    -0
      quantum/midi/bytequeue/bytequeue.c
  6. +0
    -0
      quantum/midi/bytequeue/bytequeue.h
  7. +0
    -0
      quantum/midi/bytequeue/interrupt_setting.c
  8. +0
    -0
      quantum/midi/bytequeue/interrupt_setting.h
  9. +0
    -0
      quantum/midi/midi.c
  10. +0
    -0
      quantum/midi/midi.h
  11. +0
    -0
      quantum/midi/midi_device.c
  12. +0
    -0
      quantum/midi/midi_device.h
  13. +0
    -0
      quantum/midi/midi_function_types.h
  14. +0
    -0
      quantum/midi/qmk_midi.c
  15. +0
    -0
      quantum/midi/qmk_midi.h
  16. +0
    -0
      quantum/midi/sysex_tools.c
  17. +0
    -0
      quantum/midi/sysex_tools.h
  18. +0
    -4
      tmk_core/protocol/chibios.mk
  19. +0
    -4
      tmk_core/protocol/lufa.mk
  20. +0
    -11
      tmk_core/protocol/midi.mk

+ 7
- 0
builddefs/common_features.mk View File

@ -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


+ 4
- 4
docs/feature_midi.md 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/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`
<!--
#### QMK Internals (Autogenerated)


tmk_core/protocol/midi/Config/LUFAConfig.h → quantum/midi/Config/LUFAConfig.h View File


tmk_core/protocol/midi/bytequeue/COPYING → quantum/midi/bytequeue/COPYING View File


tmk_core/protocol/midi/bytequeue/bytequeue.c → quantum/midi/bytequeue/bytequeue.c View File


tmk_core/protocol/midi/bytequeue/bytequeue.h → quantum/midi/bytequeue/bytequeue.h View File


tmk_core/protocol/midi/bytequeue/interrupt_setting.c → quantum/midi/bytequeue/interrupt_setting.c View File


tmk_core/protocol/midi/bytequeue/interrupt_setting.h → quantum/midi/bytequeue/interrupt_setting.h View File


tmk_core/protocol/midi/midi.c → quantum/midi/midi.c View File


tmk_core/protocol/midi/midi.h → quantum/midi/midi.h View File


tmk_core/protocol/midi/midi_device.c → quantum/midi/midi_device.c View File


tmk_core/protocol/midi/midi_device.h → quantum/midi/midi_device.h View File


tmk_core/protocol/midi/midi_function_types.h → quantum/midi/midi_function_types.h View File


tmk_core/protocol/midi/qmk_midi.c → quantum/midi/qmk_midi.c View File


tmk_core/protocol/midi/qmk_midi.h → quantum/midi/qmk_midi.h View File


tmk_core/protocol/midi/sysex_tools.c → quantum/midi/sysex_tools.c View File


tmk_core/protocol/midi/sysex_tools.h → quantum/midi/sysex_tools.h View File


+ 0
- 4
tmk_core/protocol/chibios.mk View File

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

+ 0
- 4
tmk_core/protocol/lufa.mk View File

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


+ 0
- 11
tmk_core/protocol/midi.mk 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)

Loading…
Cancel
Save