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 /build_keyboard.mk | |
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 'build_keyboard.mk')
-rw-r--r-- | build_keyboard.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index bee8fcc87..921159a5d 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk | |||
@@ -121,7 +121,6 @@ else | |||
121 | endif | 121 | endif |
122 | 122 | ||
123 | ifeq ($(PLATFORM),CHIBIOS) | 123 | ifeq ($(PLATFORM),CHIBIOS) |
124 | include $(TMK_PATH)/protocol/chibios.mk | ||
125 | include $(TMK_PATH)/chibios.mk | 124 | include $(TMK_PATH)/chibios.mk |
126 | OPT_OS = chibios | 125 | OPT_OS = chibios |
127 | ifneq ("$(wildcard $(KEYBOARD_PATH_5)/bootloader_defs.h)","") | 126 | ifneq ("$(wildcard $(KEYBOARD_PATH_5)/bootloader_defs.h)","") |
@@ -197,7 +196,7 @@ else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.c)","") | |||
197 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1) | 196 | KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1) |
198 | else ifneq ($(LAYOUTS),) | 197 | else ifneq ($(LAYOUTS),) |
199 | include build_layout.mk | 198 | include build_layout.mk |
200 | else | 199 | else |
201 | $(error Could not find keymap) | 200 | $(error Could not find keymap) |
202 | # this state should never be reached | 201 | # this state should never be reached |
203 | endif | 202 | endif |
@@ -247,6 +246,10 @@ endif | |||
247 | include $(TMK_PATH)/avr.mk | 246 | include $(TMK_PATH)/avr.mk |
248 | endif | 247 | endif |
249 | 248 | ||
249 | ifeq ($(PLATFORM),CHIBIOS) | ||
250 | include $(TMK_PATH)/protocol/chibios.mk | ||
251 | endif | ||
252 | |||
250 | ifeq ($(strip $(VISUALIZER_ENABLE)), yes) | 253 | ifeq ($(strip $(VISUALIZER_ENABLE)), yes) |
251 | VISUALIZER_DIR = $(QUANTUM_DIR)/visualizer | 254 | VISUALIZER_DIR = $(QUANTUM_DIR)/visualizer |
252 | VISUALIZER_PATH = $(QUANTUM_PATH)/visualizer | 255 | VISUALIZER_PATH = $(QUANTUM_PATH)/visualizer |