animations, midi, etc

master
Jack Humbert 2016-11-15 13:18:10 -05:00
parent e9f7487518
commit 530dd3377e
2 changed files with 3 additions and 3 deletions

View File

@ -171,7 +171,6 @@ void inline ws2812_setleds_rgbw(LED_TYPE *ledarray, uint16_t leds)
} }
I2C_Stop(); I2C_Stop();
SREG=sreg_prev; SREG=sreg_prev;
// TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
TWCR=twcr_prev; TWCR=twcr_prev;
#endif #endif

View File

@ -1043,11 +1043,12 @@ int main(void)
} }
#endif #endif
keyboard_task();
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE
midi_device_process(&midi_device); midi_device_process(&midi_device);
// MIDI_Task(); // MIDI_Task();
#endif #endif
keyboard_task();
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
rgblight_task(); rgblight_task();