diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-11-15 13:18:10 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-11-15 13:18:10 -0500 |
| commit | 530dd3377e4d409a7ca2fee7e47b60b735ebc0fa (patch) | |
| tree | 963e57722ed33012c57af2f28c60fb00ab4e227e | |
| parent | e9f748751808de2f1e85cf7fb670d78773bd5e76 (diff) | |
| download | qmk_firmware-530dd3377e4d409a7ca2fee7e47b60b735ebc0fa.tar.gz qmk_firmware-530dd3377e4d409a7ca2fee7e47b60b735ebc0fa.zip | |
animations, midi, etc
| -rwxr-xr-x | quantum/light_ws2812.c | 1 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 5 |
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) | |||
| 171 | } | 171 | } |
| 172 | I2C_Stop(); | 172 | I2C_Stop(); |
| 173 | SREG=sreg_prev; | 173 | SREG=sreg_prev; |
| 174 | // TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN); | ||
| 175 | TWCR=twcr_prev; | 174 | TWCR=twcr_prev; |
| 176 | #endif | 175 | #endif |
| 177 | 176 | ||
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) | |||
| 1043 | } | 1043 | } |
| 1044 | #endif | 1044 | #endif |
| 1045 | 1045 | ||
| 1046 | keyboard_task(); | ||
| 1047 | |||
| 1046 | #ifdef MIDI_ENABLE | 1048 | #ifdef MIDI_ENABLE |
| 1047 | midi_device_process(&midi_device); | 1049 | midi_device_process(&midi_device); |
| 1048 | // MIDI_Task(); | 1050 | // MIDI_Task(); |
| 1049 | #endif | 1051 | #endif |
| 1050 | keyboard_task(); | 1052 | |
| 1051 | |||
| 1052 | #ifdef RGBLIGHT_ENABLE | 1053 | #ifdef RGBLIGHT_ENABLE |
| 1053 | rgblight_task(); | 1054 | rgblight_task(); |
| 1054 | #endif | 1055 | #endif |
