Added bluefruit protocol and converter for 70% M

[tmk_firmware.git] / protocol / iwrap / iwrap.c

diff --git a/protocol/iwrap/iwrap.c b/protocol/iwrap/iwrap.c
index 9c68761bf0f79086dd894a8318ce5ddc04600847..6a404116a15cccff2724c779e952b7c1133c7589 100644 (file)
--- a/protocol/iwrap/iwrap.c
+++ b/protocol/iwrap/iwrap.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <string.h>
 #include <avr/interrupt.h>
 #include <util/delay.h>
-#include "usb_keycodes.h"
+#include "keycode.h"
 #include "suart.h"
 #include "uart.h"
 #include "report.h"
@@ -334,8 +334,8 @@ static void send_keyboard(report_keyboard_t *report)
     // HID raw mode header
     xmit(0x9f);
     xmit(0x0a); // Length
-    xmit(0xa1); // keyboard report
-    xmit(0x01);
+    xmit(0xa1); // DATA(Input)
+    xmit(0x01); // Report ID
     xmit(report->mods);
     xmit(0x00); // reserved byte(always 0)
     xmit(report->keys[0]);
@@ -351,15 +351,17 @@ static void send_mouse(report_mouse_t *report)
 {
 #if defined(MOUSEKEY_ENABLE) || defined(PS2_MOUSE_ENABLE)
     if (!iwrap_connected() && !iwrap_check_connection()) return;
-    MUX_HEADER(0x01, 0x07);
+    MUX_HEADER(0x01, 0x09);
     // HID raw mode header
     xmit(0x9f);
-    xmit(0x05); // Length
-    xmit(0xa1); // mouse report
-    xmit(0x02);
+    xmit(0x07); // Length
+    xmit(0xa1); // DATA(Input)
+    xmit(0x02); // Report ID
     xmit(report->buttons);
     xmit(report->x);
     xmit(report->y);
+    xmit(report->v);
+    xmit(report->h);
     MUX_FOOTER(0x01);
 #endif
 }
@@ -457,8 +459,8 @@ static void send_consumer(uint16_t data)
     MUX_HEADER(0x01, 0x07);
     xmit(0x9f);
     xmit(0x05); // Length
-    xmit(0xa1); // consumer report
-    xmit(0x03);
+    xmit(0xa1); // DATA(Input)
+    xmit(0x03); // Report ID
     xmit(bits1);
     xmit(bits2);
     xmit(bits3);