diff options
author | fredizzimo <fsundvik@gmail.com> | 2018-02-08 22:07:46 +0200 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-02-08 15:07:46 -0500 |
commit | 53ff8a31b61952d9675558149d927f7942071df9 (patch) | |
tree | a57b9e6f7d6494c9ef903f886a660dd43f4e5044 /quantum/process_keycode/process_midi.h | |
parent | 63c16f4b632a2a82a775f51a3ad0cc690cca1fc9 (diff) | |
download | qmk_firmware-53ff8a31b61952d9675558149d927f7942071df9.tar.gz qmk_firmware-53ff8a31b61952d9675558149d927f7942071df9.zip |
Merge ChibiOS and LUFA descriptor support (#2362)
* Move lufa descriptor to protocol/usb_descriptor
* Try to compile usb_descriptor on ChibiOS
* Add lufa_utils for ChibiOS
Lufa USB descriptors for ChibiOS
* More lufa_util compatibility fixes
* First compiling version of shared USB descriptor
* Send the usb descriptors
* Fix the CONSOLE output on ChibiOS
* Add errors for unsupported interfaces
* Enable support for vitual serial port USB descriptors
* Implement virtual serial port for ChibiOS
* Cleanup the lufa_utils
Use the default lufa header files
* Add raw hid support for ChibiOS
This is completely untested
* Enable midi compilation on ChibiOS
* Move midi functionality out of lufa.c
* Don't register sysex callback when not needed
* ChibiOS compilation fixes
* Update ChibiOS submodule
* Fix the Midi USB descriptor
It didn't work properly when both Midi and Virtual serial port was enabled.
* Add MIDI support for ChibiOS
* Fix USB descriptor strings on ChibiOS
* Use serial usb driver for raw hid
* Generalize the ChibiOS stream like drivers
This makes the initialization much more simple and eliminates a lot of
the code duplication.
* Convert console output to chibios stream driver
* Fixes for ChibiOS update
* Update the ChibiOS contrib submodule
To include the usb data toggle synchronization fixes
* Fix duplicate reset enumeration on ChibiOS
* Add missing include
* Add number of endpoints check for ChibiOS
* Enable serial USB driver on all keyboards
* Add missing includes when API is enabled withot midi
* Add another missing inlcude
Diffstat (limited to 'quantum/process_keycode/process_midi.h')
-rw-r--r-- | quantum/process_keycode/process_midi.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/quantum/process_keycode/process_midi.h b/quantum/process_keycode/process_midi.h index ccac8981a..1968fbe3f 100644 --- a/quantum/process_keycode/process_midi.h +++ b/quantum/process_keycode/process_midi.h | |||
@@ -27,6 +27,8 @@ void process_midi_basic_noteoff(uint8_t note); | |||
27 | void process_midi_all_notes_off(void); | 27 | void process_midi_all_notes_off(void); |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | void midi_task(void); | ||
31 | |||
30 | #ifdef MIDI_ADVANCED | 32 | #ifdef MIDI_ADVANCED |
31 | typedef union { | 33 | typedef union { |
32 | uint32_t raw; | 34 | uint32_t raw; |
@@ -39,10 +41,9 @@ typedef union { | |||
39 | }; | 41 | }; |
40 | } midi_config_t; | 42 | } midi_config_t; |
41 | 43 | ||
42 | midi_config_t midi_config; | 44 | extern midi_config_t midi_config; |
43 | 45 | ||
44 | void midi_init(void); | 46 | void midi_init(void); |
45 | void midi_task(void); | ||
46 | bool process_midi(uint16_t keycode, keyrecord_t *record); | 47 | bool process_midi(uint16_t keycode, keyrecord_t *record); |
47 | 48 | ||
48 | #define MIDI_INVALID_NOTE 0xFF | 49 | #define MIDI_INVALID_NOTE 0xFF |