diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-12-19 17:07:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-19 17:07:39 +0100 |
| commit | ea926369b80c446141edd16c892112fab69b20b6 (patch) | |
| tree | b6b945900e765337d9e7fd4437d775b97a7bcd51 | |
| parent | 29731588b74d9a3416d42bc292b47b3634c772d7 (diff) | |
| parent | a305da2bc9ca5fbca7564d931088271048751d4b (diff) | |
| download | qmk_firmware-ea926369b80c446141edd16c892112fab69b20b6.tar.gz qmk_firmware-ea926369b80c446141edd16c892112fab69b20b6.tar.xz | |
Merge pull request #963 from Wilba6582/fix_900
Fixes issue #900 KC_PWR not working
| -rw-r--r-- | tmk_core/protocol/lufa/descriptor.c | 6 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/protocol/lufa/descriptor.c b/tmk_core/protocol/lufa/descriptor.c index 14d99b50b..feeea76df 100644 --- a/tmk_core/protocol/lufa/descriptor.c +++ b/tmk_core/protocol/lufa/descriptor.c @@ -143,10 +143,10 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM ExtrakeyReport[] = HID_RI_USAGE(8, 0x80), /* System Control */ HID_RI_COLLECTION(8, 0x01), /* Application */ HID_RI_REPORT_ID(8, REPORT_ID_SYSTEM), - HID_RI_LOGICAL_MINIMUM(16, 0x0081), - HID_RI_LOGICAL_MAXIMUM(16, 0x00B7), + HID_RI_LOGICAL_MINIMUM(16, 0x0001), + HID_RI_LOGICAL_MAXIMUM(16, 0x0003), HID_RI_USAGE_MINIMUM(16, 0x0081), /* System Power Down */ - HID_RI_USAGE_MAXIMUM(16, 0x00B7), /* System Display LCD Autoscale */ + HID_RI_USAGE_MAXIMUM(16, 0x0083), /* System Wake Up */ HID_RI_REPORT_SIZE(8, 16), HID_RI_REPORT_COUNT(8, 1), HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE), diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index dd78fe621..097189770 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -732,7 +732,7 @@ static void send_system(uint16_t data) report_extra_t r = { .report_id = REPORT_ID_SYSTEM, - .usage = data + .usage = data - SYSTEM_POWER_DOWN + 1 }; Endpoint_SelectEndpoint(EXTRAKEY_IN_EPNUM); |