]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
animations, midi, etc
authorJack Humbert <jack.humb@gmail.com>
Tue, 15 Nov 2016 18:18:10 +0000 (13:18 -0500)
committerJack Humbert <jack.humb@gmail.com>
Tue, 15 Nov 2016 18:18:10 +0000 (13:18 -0500)
quantum/light_ws2812.c
tmk_core/protocol/lufa/lufa.c

index 6edbc0f2bd7b0c077551a5346ea6d486afd230c7..aac058f53438bb9a0f2da5a703e11ae82a55fa79 100755 (executable)
@@ -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
 
index fe466f6047e5da57d98369110714c679855ec297..b628cde370ae3de6b4c34161df5cafe0d1a323f8 100644 (file)
@@ -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