diff options
| author | luc wastiaux <luc.wastiaux@airpost.net> | 2017-02-13 07:44:28 +0800 |
|---|---|---|
| committer | luc wastiaux <luc.wastiaux@airpost.net> | 2017-02-13 07:44:28 +0800 |
| commit | 352d79e1fbbd7eea65793abb261dd544fec7bb1c (patch) | |
| tree | e006ee8098826054d93939b2a59521f6c032e10d /tmk_core/protocol/vusb/vusb.c | |
| parent | 5f8535b356e66975e20f1a573ab104db75f8b33c (diff) | |
| parent | 4505db5d0e0c2423645cc9117f29b942d4841c5b (diff) | |
| download | qmk_firmware-352d79e1fbbd7eea65793abb261dd544fec7bb1c.tar.gz qmk_firmware-352d79e1fbbd7eea65793abb261dd544fec7bb1c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/protocol/vusb/vusb.c')
| -rw-r--r-- | tmk_core/protocol/vusb/vusb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c index a8c13b928..022ac6f6b 100644 --- a/tmk_core/protocol/vusb/vusb.c +++ b/tmk_core/protocol/vusb/vusb.c | |||
| @@ -280,7 +280,7 @@ const PROGMEM uchar keyboard_hid_report[] = { | |||
| 280 | 0x95, 0x06, // Report Count (6), | 280 | 0x95, 0x06, // Report Count (6), |
| 281 | 0x75, 0x08, // Report Size (8), | 281 | 0x75, 0x08, // Report Size (8), |
| 282 | 0x15, 0x00, // Logical Minimum (0), | 282 | 0x15, 0x00, // Logical Minimum (0), |
| 283 | 0x25, 0xFF, 0x00, // Logical Maximum(255), | 283 | 0x26, 0xFF, 0x00, // Logical Maximum(255), |
| 284 | 0x05, 0x07, // Usage Page (Key Codes), | 284 | 0x05, 0x07, // Usage Page (Key Codes), |
| 285 | 0x19, 0x00, // Usage Minimum (0), | 285 | 0x19, 0x00, // Usage Minimum (0), |
| 286 | 0x29, 0xFF, // Usage Maximum (255), | 286 | 0x29, 0xFF, // Usage Maximum (255), |
| @@ -350,7 +350,7 @@ const PROGMEM uchar mouse_hid_report[] = { | |||
| 350 | 0xa1, 0x01, // COLLECTION (Application) | 350 | 0xa1, 0x01, // COLLECTION (Application) |
| 351 | 0x85, REPORT_ID_SYSTEM, // REPORT_ID (2) | 351 | 0x85, REPORT_ID_SYSTEM, // REPORT_ID (2) |
| 352 | 0x15, 0x01, // LOGICAL_MINIMUM (0x1) | 352 | 0x15, 0x01, // LOGICAL_MINIMUM (0x1) |
| 353 | 0x25, 0xb7, 0x00, // LOGICAL_MAXIMUM (0xb7) | 353 | 0x26, 0xb7, 0x00, // LOGICAL_MAXIMUM (0xb7) |
| 354 | 0x19, 0x01, // USAGE_MINIMUM (0x1) | 354 | 0x19, 0x01, // USAGE_MINIMUM (0x1) |
| 355 | 0x29, 0xb7, // USAGE_MAXIMUM (0xb7) | 355 | 0x29, 0xb7, // USAGE_MAXIMUM (0xb7) |
| 356 | 0x75, 0x10, // REPORT_SIZE (16) | 356 | 0x75, 0x10, // REPORT_SIZE (16) |