cleaning up midid

quantum/config_common.h

@@ -5,6 +5,7 @@
 #define COL2ROW 0
 #define ROW2COL 1
 /* I/O pins */
+#ifndef F0
     #define B0 0x30
     #define B1 0x31
     #define B2 0x32
@@ -53,7 +54,7 @@
     #define A5 0x05
     #define A6 0x06
     #define A7 0x07
-
+#endif
 
 /* USART configuration */
 #ifdef BLUETOOTH_ENABLE

tmk_core/common/host_driver.h

@@ -20,7 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include "report.h"
-
+#ifdef MIDI_ENABLE
+	#include "midi.h"
+#endif
 
 typedef struct {
     uint8_t (*keyboard_leds)(void);
@@ -28,6 +30,11 @@ typedef struct {
     void (*send_mouse)(report_mouse_t *);
     void (*send_system)(uint16_t);
     void (*send_consumer)(uint16_t);
+#ifdef MIDI_ENABLE
+    void (*usb_send_func)(MidiDevice *, uint16_t, uint8_t, uint8_t, uint8_t);
+    void (*usb_get_midi)(MidiDevice *);
+    void (*midi_usb_init)(MidiDevice *);
+#endif
 } host_driver_t;
 
 #endif

tmk_core/protocol/lufa/lufa.c

@@ -1051,7 +1051,7 @@ int main(void)
         // MIDI_Task();
 #endif
         
-#ifdef RGBLIGHT_ENABLE
+#ifdef RGBLIGHT_ANIMATIONS
         rgblight_task();
 #endif