diff --git a/Controllers/LogitechController/LogitechG810Controller.cpp b/Controllers/LogitechController/LogitechG810Controller.cpp index de065944..ba2cf3b4 100644 --- a/Controllers/LogitechController/LogitechG810Controller.cpp +++ b/Controllers/LogitechController/LogitechG810Controller.cpp @@ -20,6 +20,21 @@ LogitechG810Controller::~LogitechG810Controller() } +void LogitechG810Controller::Commit() +{ + SendCommit(); +} + +void LogitechG810Controller::SetDirect + ( + unsigned char zone, + unsigned char frame_count, + unsigned char * frame_data + ) +{ + SendDirectFrame(zone, frame_count, frame_data); +} + void LogitechG810Controller::SetMode ( unsigned char mode, @@ -29,8 +44,8 @@ void LogitechG810Controller::SetMode unsigned char blue ) { - SendMode(LOGITECH_G810_ZONE_KEYBOARD, mode, speed, red, green, blue); - SendMode(LOGITECH_G810_ZONE_LOGO, mode, speed, red, green, blue); + SendMode(LOGITECH_G810_ZONE_MODE_KEYBOARD, mode, speed, red, green, blue); + SendMode(LOGITECH_G810_ZONE_MODE_LOGO, mode, speed, red, green, blue); SendCommit(); } @@ -54,7 +69,43 @@ void LogitechG810Controller::SendCommit() usb_buf[0x00] = 0x11; usb_buf[0x01] = 0xFF; usb_buf[0x02] = 0x0C; - usb_buf[0x03] = 0x5A; + usb_buf[0x03] = 0x5D; + + /*-----------------------------------------------------*\ + | Send packet | + \*-----------------------------------------------------*/ + hid_write(dev, (unsigned char *)usb_buf, 20); + hid_read(dev, (unsigned char *)usb_buf, 20); +} + +void LogitechG810Controller::SendDirectFrame + ( + unsigned char zone, + unsigned char frame_count, + unsigned char * frame_data + ) +{ + char usb_buf[20]; + + /*-----------------------------------------------------*\ + | Zero out buffer | + \*-----------------------------------------------------*/ + memset(usb_buf, 0x00, sizeof(usb_buf)); + + /*-----------------------------------------------------*\ + | Set up Lighting Control packet | + \*-----------------------------------------------------*/ + usb_buf[0x00] = 0x11; + usb_buf[0x01] = 0xFF; + usb_buf[0x02] = 0x0C; + usb_buf[0x03] = 0x3D; + usb_buf[0x05] = zone; + usb_buf[0x07] = frame_count; + + /*-----------------------------------------------------*\ + | Copy in frame data | + \*-----------------------------------------------------*/ + memcpy(&usb_buf[0x08], frame_data, frame_count * 4); /*-----------------------------------------------------*\ | Send packet | diff --git a/Controllers/LogitechController/LogitechG810Controller.h b/Controllers/LogitechController/LogitechG810Controller.h index 6a061144..ddb6fb83 100644 --- a/Controllers/LogitechController/LogitechG810Controller.h +++ b/Controllers/LogitechController/LogitechG810Controller.h @@ -16,8 +16,16 @@ enum { - LOGITECH_G810_ZONE_KEYBOARD = 0x00, - LOGITECH_G810_ZONE_LOGO = 0x01, + LOGITECH_G810_ZONE_MODE_KEYBOARD = 0x00, + LOGITECH_G810_ZONE_MODE_LOGO = 0x01, +}; + +enum +{ + LOGITECH_G810_ZONE_DIRECT_KEYBOARD = 0x01, + LOGITECH_G810_ZONE_DIRECT_MEDIA = 0x02, + LOGITECH_G810_ZONE_DIRECT_LOGO = 0x10, + LOGITECH_G810_ZONE_DIRECT_INDICATORS = 0x40, }; enum @@ -44,6 +52,15 @@ public: LogitechG810Controller(hid_device* dev_handle); ~LogitechG810Controller(); + void Commit(); + + void SetDirect + ( + unsigned char zone, + unsigned char frame_count, + unsigned char * frame_data + ); + void SetMode ( unsigned char mode, @@ -56,6 +73,13 @@ public: private: hid_device* dev; + void SendDirectFrame + ( + unsigned char zone, + unsigned char frame_count, + unsigned char * frame_data + ); + void SendMode ( unsigned char zone, diff --git a/RGBController/RGBController_LogitechG810.cpp b/RGBController/RGBController_LogitechG810.cpp index 94447493..a21dcff9 100644 --- a/RGBController/RGBController_LogitechG810.cpp +++ b/RGBController/RGBController_LogitechG810.cpp @@ -9,6 +9,160 @@ #include "RGBController_LogitechG810.h" +//0xFFFFFFFF indicates an unused entry in matrix +#define NA 0xFFFFFFFF + +static unsigned int matrix_map[7][23] = + { { 109, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, 114, 112, 113, NA, 111, NA, 110, 108, NA, NA, NA }, + { 37, NA, 53, 54, 55, 56, NA, 57, 58, 59, 60, NA, 61, 62, 63, 64, 65, 66, 67, 107, 106, 105, 104 }, + { 48, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, NA, 41, 42, 38, NA, 68, 69, 70, 78, 79, 80, 81 }, + { 39, NA, 16, 22, 4, 17, NA, 19, 24, 20, 8, 14, 15, 43, 44, 45, 71, 72, 73, 90, 91, 92, 82 }, + { 52, NA, 0, 18, 3, 5, NA, 6, 7, 9, 10, 11, 46, 47, 36, NA, NA, NA, NA, 87, 88, 89, NA }, + { 97, NA, 25, 23, 2, 21, NA, 1, NA, 13, 12, 49, 50, 51, 101, NA, NA, 77, NA, 84, 85, 86, 83 }, + { 96, 99, 98, NA, NA, NA, NA, 40, NA, NA, NA, NA, 102, 103, 95, 100, 75, 76, 74, 93, NA, 94, NA } }; + +static const char* zone_names[] = +{ + "Keyboard", +}; + +static zone_type zone_types[] = +{ + ZONE_TYPE_MATRIX, +}; + +static const unsigned int zone_sizes[] = +{ + 115, +}; + +typedef struct +{ + const char * name; + const unsigned char zone; + const unsigned char idx; +} led_type; + +static const led_type led_names[] = +{ + /* Key Label Zone, Index */ + { "Key: A", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x04 }, + { "Key: B", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x05 }, + { "Key: C", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x06 }, + { "Key: D", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x07 }, + { "Key: E", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x08 }, + { "Key: F", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x09 }, + { "Key: G", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0A }, + { "Key: H", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0B }, + { "Key: I", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0C }, + { "Key: J", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0D }, + { "Key: K", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0E }, + { "Key: L", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x0F }, + { "Key: M", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x10 }, + { "Key: N", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x11 }, + { "Key: O", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x12 }, + { "Key: P", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x13 }, + { "Key: Q", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x14 }, + { "Key: R", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x15 }, + { "Key: S", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x16 }, + { "Key: T", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x17 }, + { "Key: U", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x18 }, + { "Key: V", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x19 }, + { "Key: W", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1A }, + { "Key: X", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1B }, + { "Key: Y", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1C }, + { "Key: Z", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1D }, + { "Key: 1", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1E }, + { "Key: 2", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x1F }, + { "Key: 3", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x20 }, + { "Key: 4", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x21 }, + { "Key: 5", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x22 }, + { "Key: 6", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x23 }, + { "Key: 7", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x24 }, + { "Key: 8", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x25 }, + { "Key: 9", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x26 }, + { "Key: 0", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x27 }, + { "Key: Enter", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x28 }, + { "Key: Escape", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x29 }, + { "Key: Backspace", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2A }, + { "Key: Tab", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2B }, + { "Key: Space", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2C }, + { "Key: -/_", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2D }, + { "Key: =/+", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2E }, + { "Key: [/{", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x2F }, + { "Key: ]/}", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x30 }, + { "Key: \\/|", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x31 }, + { "Key: ;/:", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x33 }, + { "Key: '/'\"", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x34 }, + { "Key: `/~", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x35 }, + { "Key: ,/<", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x36 }, + { "Key: ./>", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x37 }, + { "Key: //?", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x38 }, + { "Key: Caps Lock", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x39 }, + { "Key: F1", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3A }, + { "Key: F2", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3B }, + { "Key: F3", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3C }, + { "Key: F4", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3D }, + { "Key: F5", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3E }, + { "Key: F6", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x3F }, + { "Key: F7", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x40 }, + { "Key: F8", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x41 }, + { "Key: F9", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x42 }, + { "Key: F10", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x43 }, + { "Key: F11", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x44 }, + { "Key: F12", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x45 }, + { "Key: Print Screen", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x46 }, + { "Key: Scroll Lock", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x47 }, + { "Key: Pause/Break", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x48 }, + { "Key: Insert", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x49 }, + { "Key: Home", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4A }, + { "Key: Page Up", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4B }, + { "Key: Delete", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4C }, + { "Key: End", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4D }, + { "Key: Page Down", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4E }, + { "Key: Right Arrow", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x4F }, + { "Key: Left Arrow", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x50 }, + { "Key: Down Arrow", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x51 }, + { "Key: Up Arrow", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x52 }, + { "Key: Num Lock", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x53 }, + { "Key: Num Pad /", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x54 }, + { "Key: Num Pad *", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x55 }, + { "Key: Num Pad -", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x56 }, + { "Key: Num Pad +", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x57 }, + { "Key: Num Pad Enter", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x58 }, + { "Key: Num Pad 1", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x59 }, + { "Key: Num Pad 2", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5A }, + { "Key: Num Pad 3", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5B }, + { "Key: Num Pad 4", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5C }, + { "Key: Num Pad 5", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5D }, + { "Key: Num Pad 6", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5E }, + { "Key: Num Pad 7", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5F }, + { "Key: Num Pad 8", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x60 }, + { "Key: Num Pad 9", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x61 }, + { "Key: Num Pad 0", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x62 }, + { "Key: Num Pad .", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x63 }, + { "Key: Context", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x65 }, + { "Key: Left Control", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE0 }, + { "Key: Left Shift", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE1 }, + { "Key: Left Alt", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE2 }, + { "Key: Left Windows", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE3 }, + { "Key: Right Control", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE4 }, + { "Key: Right Shift", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE5 }, + { "Key: Right Alt", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE6 }, + { "Key: Right Windows", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0xE7 }, + { "Media Next", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB5 }, + { "Media Previous", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB6 }, + { "Media Stop", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB7 }, + { "Media Play/Pause", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xCD }, + { "Media Mute", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xE2 }, + { "Logo", LOGITECH_G810_ZONE_DIRECT_LOGO, 0x01 }, + { "Lighting", LOGITECH_G810_ZONE_DIRECT_INDICATORS, 0x01 }, + { "Game Mode", LOGITECH_G810_ZONE_DIRECT_INDICATORS, 0x02 }, + { "Caps Lock Indicator", LOGITECH_G810_ZONE_DIRECT_INDICATORS, 0x03 }, + { "Scroll Lock Indicator", LOGITECH_G810_ZONE_DIRECT_INDICATORS, 0x04 }, + { "Num Lock Indicator", LOGITECH_G810_ZONE_DIRECT_INDICATORS, 0x05 }, +}; + RGBController_LogitechG810::RGBController_LogitechG810(LogitechG810Controller* logitech_ptr) { logitech = logitech_ptr; @@ -17,6 +171,13 @@ RGBController_LogitechG810::RGBController_LogitechG810(LogitechG810Controller* l type = DEVICE_TYPE_KEYBOARD; description = "Logitech Keyboard Device"; + mode Direct; + Direct.name = "Direct"; + Direct.value = 0xFFFF; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); + mode Static; Static.name = "Static"; Static.value = LOGITECH_G810_MODE_STATIC; @@ -62,18 +223,43 @@ RGBController_LogitechG810::RGBController_LogitechG810(LogitechG810Controller* l void RGBController_LogitechG810::SetupZones() { - zone g810_zone; - g810_zone.name = "Keyboard Zone"; - g810_zone.type = ZONE_TYPE_SINGLE; - g810_zone.leds_min = 1; - g810_zone.leds_max = 1; - g810_zone.leds_count = 1; - g810_zone.matrix_map = NULL; - zones.push_back(g810_zone); + /*---------------------------------------------------------*\ + | Set up zones | + \*---------------------------------------------------------*/ + unsigned int total_led_count = 0; + for(unsigned int zone_idx = 0; zone_idx < 1; zone_idx++) + { + zone new_zone; + new_zone.name = zone_names[zone_idx]; + new_zone.type = zone_types[zone_idx]; + new_zone.leds_min = zone_sizes[zone_idx]; + new_zone.leds_max = zone_sizes[zone_idx]; + new_zone.leds_count = zone_sizes[zone_idx]; - led g810_led; - g810_led.name = "Keyboard LED"; - leds.push_back(g810_led); + if(zone_types[zone_idx] == ZONE_TYPE_MATRIX) + { + new_zone.matrix_map = new matrix_map_type; + new_zone.matrix_map->height = 7; + new_zone.matrix_map->width = 23; + new_zone.matrix_map->map = (unsigned int *)&matrix_map; + } + else + { + new_zone.matrix_map = NULL; + } + + zones.push_back(new_zone); + + total_led_count += zone_sizes[zone_idx]; + } + + for(unsigned int led_idx = 0; led_idx < total_led_count; led_idx++) + { + led new_led; + new_led.name = led_names[led_idx].name; + new_led.value = ( led_names[led_idx].zone << 8 ) + led_names[led_idx].idx; + leds.push_back(new_led); + } SetupColors(); } @@ -87,7 +273,13 @@ void RGBController_LogitechG810::ResizeZone(int /*zone*/, int /*new_size*/) void RGBController_LogitechG810::DeviceUpdateLEDs() { - + /*---------------------------------------------------------*\ + | TODO: Send packets with multiple LED frames | + \*---------------------------------------------------------*/ + for(int led_idx = 0; led_idx < leds.size(); led_idx++) + { + UpdateSingleLED(led_idx); + } } void RGBController_LogitechG810::UpdateZoneLEDs(int /*zone*/) @@ -95,9 +287,22 @@ void RGBController_LogitechG810::UpdateZoneLEDs(int /*zone*/) DeviceUpdateLEDs(); } -void RGBController_LogitechG810::UpdateSingleLED(int /*led*/) +void RGBController_LogitechG810::UpdateSingleLED(int led) { - DeviceUpdateLEDs(); + unsigned char frame[4]; + unsigned char zone; + unsigned char idx; + + zone = ( leds[led].value >> 8 ); + idx = ( leds[led].value & 0xFF ); + + frame[0] = idx; + frame[1] = RGBGetRValue(colors[led]); + frame[2] = RGBGetGValue(colors[led]); + frame[3] = RGBGetBValue(colors[led]); + + logitech->SetDirect(zone, 1, frame); + logitech->Commit(); } void RGBController_LogitechG810::SetCustomMode() @@ -107,6 +312,16 @@ void RGBController_LogitechG810::SetCustomMode() void RGBController_LogitechG810::UpdateMode() { + /*---------------------------------------------------------*\ + | Direct mode does not send a mode packet | + | Call UpdateLEDs to send direct packet | + \*---------------------------------------------------------*/ + if(active_mode == 0xFFFF) + { + UpdateLEDs(); + return; + } + unsigned char red = 0; unsigned char grn = 0; unsigned char blu = 0;