aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-11-15 13:18:10 -0500
committerJack Humbert <jack.humb@gmail.com>2016-11-15 13:18:10 -0500
commit530dd3377e4d409a7ca2fee7e47b60b735ebc0fa (patch)
tree963e57722ed33012c57af2f28c60fb00ab4e227e
parente9f748751808de2f1e85cf7fb670d78773bd5e76 (diff)
downloadfirmware-530dd3377e4d409a7ca2fee7e47b60b735ebc0fa.tar.gz
firmware-530dd3377e4d409a7ca2fee7e47b60b735ebc0fa.tar.bz2
firmware-530dd3377e4d409a7ca2fee7e47b60b735ebc0fa.zip
animations, midi, etc
-rwxr-xr-xquantum/light_ws2812.c1
-rw-r--r--tmk_core/protocol/lufa/lufa.c5
2 files changed, 3 insertions, 3 deletions
diff --git a/quantum/light_ws2812.c b/quantum/light_ws2812.c
index 6edbc0f2b..aac058f53 100755
--- a/quantum/light_ws2812.c
+++ b/quantum/light_ws2812.c
@@ -171,7 +171,6 @@ void inline ws2812_setleds_rgbw(LED_TYPE *ledarray, uint16_t leds)
}
I2C_Stop();
SREG=sreg_prev;
- // TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
TWCR=twcr_prev;
#endif
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index fe466f604..b628cde37 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -1043,12 +1043,13 @@ int main(void)
}
#endif
+ keyboard_task();
+
#ifdef MIDI_ENABLE
midi_device_process(&midi_device);
// MIDI_Task();
#endif
- keyboard_task();
-
+
#ifdef RGBLIGHT_ENABLE
rgblight_task();
#endif