aboutsummaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-10-29 22:53:11 +0000
committerDrashna Jaelre <drashna@live.com>2019-10-29 15:53:11 -0700
commit64b7cfe735339193ae78fe0f13029b0e027af7a7 (patch)
tree2fcad9781c786061dae9b4dec7d799f7072ad600 /tmk_core
parent908aede957a66e65d37601fa67548c369137b57b (diff)
downloadqmk_firmware-64b7cfe735339193ae78fe0f13029b0e027af7a7.tar.gz
qmk_firmware-64b7cfe735339193ae78fe0f13029b0e027af7a7.zip
Refactor ps2avrgb i2c ws2812 to core (#7183)
* Refactor ps2avrgb i2c ws2812 to core * Refactor jj40 to use ws2812 i2c driver * Refactor ps2avrgb template to use ws2812 i2c driver * Add ws2812 stub files * clang-format and driver config * Add ws2812 driver docs * Fix default config values * Update tmk_core/protocol/vusb/main.c Co-Authored-By: Drashna Jaelre <drashna@live.com>
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/protocol/vusb/main.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/tmk_core/protocol/vusb/main.c b/tmk_core/protocol/vusb/main.c
index f8322d94a..8cc736497 100644
--- a/tmk_core/protocol/vusb/main.c
+++ b/tmk_core/protocol/vusb/main.c
@@ -20,6 +20,11 @@
20#include "timer.h" 20#include "timer.h"
21#include "uart.h" 21#include "uart.h"
22#include "debug.h" 22#include "debug.h"
23#include "rgblight_reconfig.h"
24
25#if (defined(RGB_MIDI) | defined(RGBLIGHT_ANIMATIONS)) & defined(RGBLIGHT_ENABLE)
26# include "rgblight.h"
27#endif
23 28
24#define UART_BAUD_RATE 115200 29#define UART_BAUD_RATE 115200
25 30
@@ -94,6 +99,10 @@ int main(void) {
94 // To prevent failing to configure NOT scan keyboard during configuration 99 // To prevent failing to configure NOT scan keyboard during configuration
95 if (usbConfiguration && usbInterruptIsReady()) { 100 if (usbConfiguration && usbInterruptIsReady()) {
96 keyboard_task(); 101 keyboard_task();
102
103#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE)
104 rgblight_task();
105#endif
97 } 106 }
98 vusb_transfer_keyboard(); 107 vusb_transfer_keyboard();
99 } 108 }