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 /tmk_core/protocol/chibios/main.c | |
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 'tmk_core/protocol/chibios/main.c')
-rw-r--r-- | tmk_core/protocol/chibios/main.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c index 47a7eb09a..f2abc438d 100644 --- a/tmk_core/protocol/chibios/main.c +++ b/tmk_core/protocol/chibios/main.c | |||
@@ -41,6 +41,9 @@ | |||
41 | #ifdef VISUALIZER_ENABLE | 41 | #ifdef VISUALIZER_ENABLE |
42 | #include "visualizer/visualizer.h" | 42 | #include "visualizer/visualizer.h" |
43 | #endif | 43 | #endif |
44 | #ifdef MIDI_ENABLE | ||
45 | #include "qmk_midi.h" | ||
46 | #endif | ||
44 | #include "suspend.h" | 47 | #include "suspend.h" |
45 | #include "wait.h" | 48 | #include "wait.h" |
46 | 49 | ||
@@ -65,6 +68,17 @@ host_driver_t chibios_driver = { | |||
65 | send_consumer | 68 | send_consumer |
66 | }; | 69 | }; |
67 | 70 | ||
71 | #ifdef VIRTSER_ENABLE | ||
72 | void virtser_task(void); | ||
73 | #endif | ||
74 | |||
75 | #ifdef RAW_HID_ENABLE | ||
76 | void raw_hid_task(void); | ||
77 | #endif | ||
78 | |||
79 | #ifdef CONSOLE_ENABLE | ||
80 | void console_task(void); | ||
81 | #endif | ||
68 | 82 | ||
69 | /* TESTING | 83 | /* TESTING |
70 | * Amber LED blinker thread, times are in milliseconds. | 84 | * Amber LED blinker thread, times are in milliseconds. |
@@ -104,6 +118,10 @@ int main(void) { | |||
104 | /* init printf */ | 118 | /* init printf */ |
105 | init_printf(NULL,sendchar_pf); | 119 | init_printf(NULL,sendchar_pf); |
106 | 120 | ||
121 | #ifdef MIDI_ENABLE | ||
122 | setup_midi(); | ||
123 | #endif | ||
124 | |||
107 | #ifdef SERIAL_LINK_ENABLE | 125 | #ifdef SERIAL_LINK_ENABLE |
108 | init_serial_link(); | 126 | init_serial_link(); |
109 | #endif | 127 | #endif |
@@ -182,5 +200,14 @@ int main(void) { | |||
182 | } | 200 | } |
183 | 201 | ||
184 | keyboard_task(); | 202 | keyboard_task(); |
203 | #ifdef CONSOLE_ENABLE | ||
204 | console_task(); | ||
205 | #endif | ||
206 | #ifdef VIRTSER_ENABLE | ||
207 | virtser_task(); | ||
208 | #endif | ||
209 | #ifdef RAW_HID_ENABLE | ||
210 | raw_hid_task(); | ||
211 | #endif | ||
185 | } | 212 | } |
186 | } | 213 | } |