1 files changed, 57 insertions, 2 deletions

diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c
index c6e6e95054..d310d4b807 100644
--- a/protocol/lufa/lufa.c
+++ b/protocol/lufa/lufa.c
@@ -51,7 +51,14 @@
 
 #include "descriptor.h"
 #include "lufa.h"
-#include <beeps.h>
+
+#ifdef MIDI_ENABLE
+    #include <beeps.h>
+#endif
+
+#ifdef BLUETOOTH_ENABLE
+    #include "bluetooth.h"
+#endif
 
 // #include <LUFA/Version.h>
 // #include <LUFA/Drivers/USB/USB.h>
@@ -87,7 +94,6 @@ host_driver_t lufa_driver = {
     usb_get_midi,
     midi_usb_init,
 #endif
-
 };
 
 void SetupHardware(void);
@@ -439,6 +445,14 @@ static uint8_t keyboard_leds(void)
 
 static void send_keyboard(report_keyboard_t *report)
 {
+
+#ifdef BLUETOOTH_ENABLE
+    bluefruit_serial_send(0xFD);
+    for (uint8_t i = 0; i < KEYBOARD_EPSIZE; i++) {
+        bluefruit_serial_send(report->raw[i]);
+    }
+#endif
+
     uint8_t timeout = 255;
 
     if (USB_DeviceState != DEVICE_STATE_Configured)
@@ -475,11 +489,25 @@ static void send_keyboard(report_keyboard_t *report)
     Endpoint_ClearIN();
 
     keyboard_report_sent = *report;
+
 }
 
 static void send_mouse(report_mouse_t *report)
 {
 #ifdef MOUSE_ENABLE
+
+#ifdef BLUETOOTH_ENABLE
+    bluefruit_serial_send(0xFD);
+    bluefruit_serial_send(0x00);
+    bluefruit_serial_send(0x03);
+    bluefruit_serial_send(report->buttons);
+    bluefruit_serial_send(report->x);
+    bluefruit_serial_send(report->y);
+    bluefruit_serial_send(report->v); // should try sending the wheel v here
+    bluefruit_serial_send(report->h); // should try sending the wheel h here
+    bluefruit_serial_send(0x00);
+#endif
+
     uint8_t timeout = 255;
 
     if (USB_DeviceState != DEVICE_STATE_Configured)
@@ -497,6 +525,7 @@ static void send_mouse(report_mouse_t *report)
 
     /* Finalize the stream transfer to send the last packet */
     Endpoint_ClearIN();
+
 #endif
 }
 
@@ -523,6 +552,23 @@ static void send_system(uint16_t data)
 
 static void send_consumer(uint16_t data)
 {
+
+#ifdef BLUETOOTH_ENABLE
+    static uint16_t last_data = 0;
+    if (data == last_data) return;
+    last_data = data;
+    uint16_t bitmap = CONSUMER2BLUEFRUIT(data);
+    bluefruit_serial_send(0xFD);
+    bluefruit_serial_send(0x00);
+    bluefruit_serial_send(0x02);
+    bluefruit_serial_send((bitmap>>8)&0xFF);
+    bluefruit_serial_send(bitmap&0xFF); 
+    bluefruit_serial_send(0x00);
+    bluefruit_serial_send(0x00);
+    bluefruit_serial_send(0x00);
+    bluefruit_serial_send(0x00);
+#endif
+
     uint8_t timeout = 255;
 
     if (USB_DeviceState != DEVICE_STATE_Configured)
@@ -540,6 +586,8 @@ static void send_consumer(uint16_t data)
 
     Endpoint_Write_Stream_LE(&r, sizeof(report_extra_t), NULL);
     Endpoint_ClearIN();
+
+
 }
 
 
@@ -836,6 +884,10 @@ int main(void)
     // midi_send_noteoff(&midi_device, 0, 64, 127);
 #endif
 
+#ifdef BLUETOOTH_ENABLE
+    serial_init();
+#endif
+
 
     /* wait for USB startup & debug output */
     // while (USB_DeviceState != DEVICE_STATE_Configured) {
@@ -856,6 +908,8 @@ int main(void)
 
     print("Keyboard start.\n");
     while (1) {
+
+#ifndef BLUETOOTH_ENABLE
         while (USB_DeviceState == DEVICE_STATE_Suspended) {
             print("[s]");
             suspend_power_down();
@@ -863,6 +917,7 @@ int main(void)
                     USB_Device_SendRemoteWakeup();
             }
         }
+#endif
 
 #ifdef MIDI_ENABLE
         midi_device_process(&midi_device);