diff options
| author | tmk <nobody@nowhere> | 2013-04-19 23:43:52 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-04-20 00:45:56 +0900 |
| commit | 663027751831eb0e80d64c90aaf82d2921533aed (patch) | |
| tree | c0e5e9034e3db11c01d0828feb92046d1729f1ce /protocol/iwrap/iwrap.c | |
| parent | 90da1c59bd4e2d501bb0ccb670a90677f2f9c4e7 (diff) | |
Add support of mouse horizontal wheel to iWRAP
Diffstat (limited to 'protocol/iwrap/iwrap.c')
| -rw-r--r-- | protocol/iwrap/iwrap.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/protocol/iwrap/iwrap.c b/protocol/iwrap/iwrap.c index d65d9e38ef..6a404116a1 100644 --- a/protocol/iwrap/iwrap.c +++ b/protocol/iwrap/iwrap.c @@ -335,7 +335,7 @@ static void send_keyboard(report_keyboard_t *report) xmit(0x9f); xmit(0x0a); // Length xmit(0xa1); // DATA(Input) - xmit(0x01); + xmit(0x01); // Report ID xmit(report->mods); xmit(0x00); // reserved byte(always 0) xmit(report->keys[0]); @@ -351,22 +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(0x07); // Length xmit(0xa1); // DATA(Input) - xmit(0x02); - /* vertical wheel support */ - int8_t wheel = report->v; - if (wheel < -15) { - wheel = -15; - } else if (wheel > 15) { - wheel = 15; - } - xmit(((wheel&0x1f)<<3) | (report->buttons&0x07)); + xmit(0x02); // Report ID + xmit(report->buttons); xmit(report->x); xmit(report->y); + xmit(report->v); + xmit(report->h); MUX_FOOTER(0x01); #endif } @@ -465,7 +460,7 @@ static void send_consumer(uint16_t data) xmit(0x9f); xmit(0x05); // Length xmit(0xa1); // DATA(Input) - xmit(0x03); + xmit(0x03); // Report ID xmit(bits1); xmit(bits2); xmit(bits3); |