From 343104297d46b375185fa63f8a821ccf0eeb4724 Mon Sep 17 00:00:00 2001 From: Jacob Alexander Date: Sat, 17 Oct 2015 15:03:21 -0700 Subject: [PATCH] Adding support for kll 0.3d - Requires kll compiler update - Includes descriptor update to handle new consumer control codes --- Macro/PartialMap/usb_hid.h | 13 +++++++++++-- Output/pjrcUSB/arm/usb_desc.c | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Macro/PartialMap/usb_hid.h b/Macro/PartialMap/usb_hid.h index a9ac568..4f5cd7a 100644 --- a/Macro/PartialMap/usb_hid.h +++ b/Macro/PartialMap/usb_hid.h @@ -438,7 +438,15 @@ #define CONSUMER_BROADCAST_MODE 0x064 #define CONSUMER_SNAPSHOT 0x065 #define CONSUMER_STILL 0x066 -// 0x067 - 0x07F Reserved +// 0x067 - 0x06E Reserved? +#define CONSUMER_BRIGHTNESS_INCREMENT 0x06F +#define CONSUMER_BRIGHTNESS_DECREMENT 0x070 + +#define CONSUMER_BACKLIGHT_TOGGLE 0x072 +#define CONSUMER_BRIGHTNESS_MIN 0x073 +#define CONSUMER_BRIGHTNESS_MAX 0x074 +#define CONSUMER_BRIGHTNESS_AUTO 0x075 +// 0x076 - 0x07F Reserved #define CONSUMER_ASSIGN_SELECTION 0x081 #define CONSUMER_MODE_STEP 0x082 @@ -770,5 +778,6 @@ #define AC_SPLIT 0x29A #define AC_DISTRIBUTE_HORIZONTALLY 0x29B #define AC_DISTRIBUTE_VERTICALLY 0x29C -// 0x29D-0xFFFF Reserved +#define AC_NEXT_KEYBOARD_LAYOUT_SEL 0x29D +// 0x29E-0xFFFF Reserved diff --git a/Output/pjrcUSB/arm/usb_desc.c b/Output/pjrcUSB/arm/usb_desc.c index 70ece51..ee278e8 100644 --- a/Output/pjrcUSB/arm/usb_desc.c +++ b/Output/pjrcUSB/arm/usb_desc.c @@ -300,7 +300,7 @@ static uint8_t sys_ctrl_report_desc[] = { 0x26, 0x9C, 0x02, // Logical Maximum (668), 0x05, 0x0C, // Usage Page (Consumer), 0x19, 0x01, // Usage Minimum (1), - 0x2A, 0x9C, 0x02, // Usage Maximum (668), + 0x2A, 0x9D, 0x02, // Usage Maximum (669), 0x81, 0x00, // Input (Data, Array), 0xc0, // End Collection - Consumer Control };