3 files changed, 224 insertions, 16 deletions

diff --git a/tmk_core/common/host_driver.h b/tmk_core/common/host_driver.h
index edb9e5dd9..588d1c0be 100644
--- a/tmk_core/common/host_driver.h
+++ b/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
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 01c0e45b0..a33a16599 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -51,6 +51,7 @@
 
 #include "descriptor.h"
 #include "lufa.h"
+#include "quantum.h"
 
 #ifdef NKRO_ENABLE
   #include "keycode_config.h"
@@ -71,6 +72,10 @@
     #include "virtser.h"
 #endif
 
+#ifdef RGB_MIDI
+    #include "rgblight.h"        
+#endif
+
 uint8_t keyboard_idle = 0;
 /* 0: Boot Protocol, 1: Report Protocol(default) */
 uint8_t keyboard_protocol = 1;
@@ -79,9 +84,9 @@ static uint8_t keyboard_led_stats = 0;
 static report_keyboard_t keyboard_report_sent;
 
 #ifdef MIDI_ENABLE
-void usb_send_func(MidiDevice * device, uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2);
-void usb_get_midi(MidiDevice * device);
-void midi_usb_init(MidiDevice * device);
+static void usb_send_func(MidiDevice * device, uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2);
+static void usb_get_midi(MidiDevice * device);
+static void midi_usb_init(MidiDevice * device);
 #endif
 
 /* Host driver */
@@ -709,7 +714,7 @@ int8_t sendchar(uint8_t c)
  ******************************************************************************/
 
 #ifdef MIDI_ENABLE
-void usb_send_func(MidiDevice * device, uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2) {
+static void usb_send_func(MidiDevice * device, uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2) {
   MIDI_EventPacket_t event;
   event.Data1 = byte0;
   event.Data2 = byte1;
@@ -769,7 +774,7 @@ void usb_send_func(MidiDevice * device, uint16_t cnt, uint8_t byte0, uint8_t byt
   USB_USBTask();
 }
 
-void usb_get_midi(MidiDevice * device) {
+static void usb_get_midi(MidiDevice * device) {
   MIDI_EventPacket_t event;
   while (MIDI_Device_ReceiveEventPacket(&USB_MIDI_Interface, &event)) {
 
@@ -799,12 +804,12 @@ void usb_get_midi(MidiDevice * device) {
   USB_USBTask();
 }
 
-void midi_usb_init(MidiDevice * device){
+static void midi_usb_init(MidiDevice * device){
   midi_device_init(device);
   midi_device_set_send_func(device, usb_send_func);
   midi_device_set_pre_input_process_func(device, usb_get_midi);
 
-  SetupHardware();
+  // SetupHardware();
   sei();
 }
 
@@ -1039,11 +1044,16 @@ int main(void)
         }
         #endif
 
+        keyboard_task();
+
 #ifdef MIDI_ENABLE
         midi_device_process(&midi_device);
         // MIDI_Task();
 #endif
-        keyboard_task();
+        
+#ifdef RGBLIGHT_ANIMATIONS
+        rgblight_task();
+#endif
 
 #ifdef VIRTSER_ENABLE
         virtser_task();
@@ -1077,15 +1087,196 @@ void fallthrough_callback(MidiDevice * device,
 #endif
 }
 
+#ifdef RGB_MIDI
+    rgblight_config_t rgblight_config;
+#endif
+
 void cc_callback(MidiDevice * device,
     uint8_t chan, uint8_t num, uint8_t val) {
   //sending it back on the next channel
-  midi_send_cc(device, (chan + 1) % 16, num, val);
+  // midi_send_cc(device, (chan + 1) % 16, num, val);
+    #ifdef RGB_MIDI
+        rgblight_config.raw = eeconfig_read_rgblight();
+        switch (num) {
+            case 14:
+                rgblight_config.hue = val * 360 / 127;
+            break;
+            case 15:
+                rgblight_config.sat = val << 1;
+            break;
+            case 16:
+                rgblight_config.val = val << 1;
+            break;
+        }
+        rgblight_sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
+    #endif
 }
 
-void sysex_callback(MidiDevice * device,
-    uint16_t start, uint8_t length, uint8_t * data) {
-  for (int i = 0; i < length; i++)
-    midi_send_cc(device, 15, 0x7F & data[i], 0x7F & (start + i));
+uint8_t midi_buffer[MIDI_SYSEX_BUFFER] = {0};
+
+void sysex_callback(MidiDevice * device, uint16_t start, uint8_t length, uint8_t * data) {
+  // for (int i = 0; i < length; i++)
+  //   midi_send_cc(device, 15, 0x7F & data[i], 0x7F & (start + i));
+    // if (start == 0x27) {
+        // SEND_STRING("\n");
+        // send_word(start);
+        // SEND_STRING(": ");
+        for (uint8_t place = 0; place < length; place++) {
+            // send_byte(*data);
+            midi_buffer[start + place] = *data;
+            if (*data == 0xF7 && midi_buffer[0] == 0xF0)
+                sysex_buffer_callback(device, start + place, midi_buffer);
+            // SEND_STRING(" ");
+            data++;
+        }
+    // }
+
+}
+
+uint32_t decode_uint32_chunk(uint8_t * data) {
+    uint32_t part1 = *data++;
+    uint32_t part2 = *data++;
+    uint32_t part3 = *data++;
+    uint32_t part4 = *data++;
+    uint32_t part5 = *data++;
+    return ((part1 & 0x1FUL) << 28) | (part2 << 21) | (part3 << 14) | (part4 << 7) | part5;
+}
+
+uint32_t decode_uint8_chunk(uint8_t * data) {
+    uint32_t part4 = *data++;
+    uint32_t part5 = *data++;
+    return (part4 << 7) | part5;
+}
+
+void encode_uint32_chunk(uint32_t data, uint8_t * pointer) {
+    *pointer++ = (data >> 28) & 0x7F;
+    *pointer++ = (data >> 21) & 0x7F;
+    *pointer++ = (data >> 14) & 0x7F;
+    *pointer++ = (data >> 7) & 0x7F;
+    *pointer++ = (data) & 0x7F;
+}
+
+void encode_uint8_chunk(uint8_t data, uint8_t * pointer) {
+    *pointer++ = (data >> 7) & 0x7F;
+    *pointer++ = (data) & 0x7F;
+}
+
+void sysex_buffer_callback(MidiDevice * device, uint8_t length, uint8_t * data) {
+    // uint8_t * pointer_copy = data; // use for debugging
+
+    //data++; // i'm 98% sure there's a better way to do this
+    data++;
+    data++;
+    data++;
+    data++;
+
+    switch (*data++) {
+        case 0x07: ; // Quantum action
+            break;
+        case 0x08: ; // Keyboard acion
+            break;
+        case 0x09: ; // User action
+            break;
+        case 0x12: ; // Set info on keyboard
+            switch (*data++) {
+                case 0x02: ; // set default layer
+                    uint8_t default_layer = decode_uint8_chunk(data);
+                    eeconfig_update_default_layer(default_layer);
+                    default_layer_set((uint32_t)default_layer);
+                    break;
+                case 0x08: ; // set keymap options
+                    uint8_t keymap_options = decode_uint8_chunk(data);
+                    eeconfig_update_keymap(keymap_options);
+                    break;
+            }
+            break;
+        case 0x13: ; // Get info from keyboard
+            switch (*data++) {
+                case 0x00: ; // Handshake
+                    send_bytes_sysex(0x00, NULL, 0);
+                    break;
+                case 0x01: ; // Get debug state
+                    uint8_t debug[2];
+                    encode_uint8_chunk(eeprom_read_byte(EECONFIG_DEBUG), debug);
+                    send_bytes_sysex(0x01, debug, 2);
+                    break;
+                case 0x02: ; // Get default layer
+                    uint8_t default_layer[2];
+                    encode_uint8_chunk(eeprom_read_byte(EECONFIG_DEFAULT_LAYER), default_layer);
+                    send_bytes_sysex(0x02, default_layer, 2);
+                    break;
+                #ifdef AUDIO_ENABLE
+                case 0x03: ; // Get backlight state
+                    uint8_t audio[2];
+                    encode_uint8_chunk(eeprom_read_byte(EECONFIG_AUDIO), audio);
+                    send_bytes_sysex(0x03, audio, 2);
+                #endif
+                case 0x04: ; // Get layer state
+                    uint8_t layers[5];
+                    encode_uint32_chunk(layer_state, layers);
+                    send_bytes_sysex(0x04, layers, 5);
+                    break;
+                #ifdef BACKLIGHT_ENABLE
+                case 0x06: ; // Get backlight state
+                    uint8_t backlight[2];
+                    encode_uint8_chunk(eeprom_read_byte(EECONFIG_BACKLIGHT), backlight);
+                    send_bytes_sysex(0x06, backlight, 2);
+                #endif
+                #ifdef RGBLIGHT_ENABLE
+                case 0x07: ; // Get rgblight state
+                    uint8_t rgblight[2];
+                    encode_uint32_chunk(eeprom_read_dword(EECONFIG_RGBLIGHT), rgblight);
+                    send_bytes_sysex(0x07, rgblight, 5);
+                #endif
+                case 0x08: ; // Keymap options
+                    uint8_t keymap_options[2];
+                    encode_uint8_chunk(eeconfig_read_keymap(), keymap_options);
+                    send_bytes_sysex(0x08, keymap_options, 2);
+                    break;
+            }
+            break;
+        #ifdef RGBLIGHT_ENABLE
+        case 0x27: ; // RGB LED functions
+            switch (*data++) {
+                case 0x00: ; // Update HSV
+                    uint32_t hsv = decode_uint32_chunk(data);
+                    rgblight_sethsv(((hsv >> 16) & 0xFFFF) % 360, (hsv >> 8) & 0xFF, hsv & 0xFF);
+                    break;
+                case 0x01: ; // Update RGB
+                    break;
+                case 0x02: ; // Update mode
+                    uint8_t rgb_mode = decode_uint8_chunk(data);
+                    rgblight_mode(rgb_mode);
+                    break;
+            }
+            break;
+        #endif
+    }
+
+    // SEND_STRING("\nDATA:\n");
+    // while (*pointer_copy != 0xF7) {
+    //     send_byte(*pointer_copy++);
+    //     SEND_STRING(" ");
+    // }
+
+}
+
+void send_unicode_midi(uint32_t unicode) {
+    uint8_t chunk[5];
+    encode_uint32_chunk(unicode, chunk);
+    send_bytes_sysex(0x05, chunk, 5);
 }
+
+void send_bytes_sysex(uint8_t type, uint8_t * bytes, uint8_t length) {
+    uint8_t * array = malloc(sizeof(uint8_t) * (length + 6));
+    array[0] = 0xF0;
+    array[1] = 0x00;
+    array[2] = 0x00;
+    array[3] = 0x00;
+    array[4] = type;
+    array[length + 5] = 0xF7;
+    memcpy(array + 5, bytes, length);
+    midi_send_array(&midi_device, length + 6, array);
+}
+
 #endif
diff --git a/tmk_core/protocol/lufa/lufa.h b/tmk_core/protocol/lufa/lufa.h
index aad08d640..198964f90 100644
--- a/tmk_core/protocol/lufa/lufa.h
+++ b/tmk_core/protocol/lufa/lufa.h
@@ -68,8 +68,18 @@ typedef struct {
 } __attribute__ ((packed)) report_extra_t;
 
 #ifdef MIDI_ENABLE
-void MIDI_Task(void);
-MidiDevice midi_device;
+  #define MIDI_SYSEX_BUFFER 16 
+  void MIDI_Task(void);
+  MidiDevice midi_device;
+
+  void sysex_callback(MidiDevice * device, uint16_t start, uint8_t length, uint8_t * data);
+  uint32_t decode_uint32_chunk(uint8_t * data);
+  uint32_t decode_uint8_chunk(uint8_t * data);
+  void encode_uint32_chunk(uint32_t data, uint8_t * pointer);
+  void encode_uint8_chunk(uint8_t data, uint8_t * pointer);
+  void sysex_buffer_callback(MidiDevice * device, uint8_t length, uint8_t * data);
+  void send_unicode_midi(uint32_t unicode);
+  void send_bytes_sysex(uint8_t type, uint8_t * bytes, uint8_t length);
 #endif
 
 // #if LUFA_VERSION_INTEGER < 0x120730