diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp index 16e26501..fbcf64f7 100644 --- a/Controllers/LogitechController/LogitechControllerDetect.cpp +++ b/Controllers/LogitechController/LogitechControllerDetect.cpp @@ -3,6 +3,7 @@ #include "LogitechG213Controller.h" #include "LogitechG560Controller.h" #include "LogitechG810Controller.h" +#include "LogitechG910Controller.h" #include "LogitechG815Controller.h" #include "LogitechGLightsyncController.h" #include "RGBController.h" @@ -10,6 +11,7 @@ #include "RGBController_LogitechG213.h" #include "RGBController_LogitechG560.h" #include "RGBController_LogitechG810.h" +#include "RGBController_LogitechG910.h" #include "RGBController_LogitechG815.h" #include "RGBController_LogitechGLightsync.h" #include "RGBController_LogitechGLightsync1zone.h" @@ -35,6 +37,7 @@ #define LOGITECH_G810_2_PID 0xC337 #define LOGITECH_G813_PID 0xC232 #define LOGITECH_G815_PID 0xC33F +#define LOGITECH_G910_PID 0xC335 /*-----------------------------------------------------*\ | Mouse product IDs | @@ -147,6 +150,65 @@ void DetectLogitechKeyboardG810(hid_device_info* info, const std::string& name) #endif } +void DetectLogitechKeyboardG910(hid_device_info* info, const std::string& name) +{ + /*-------------------------------------------------------------------------------------------------*\ + | Logitech keyboards use two different usages, one for 20-byte packets and one for 64-byte packets | + | Usage 0x0602 for 20 byte, usage 0x0604 for 64 byte, both are on usage page 0xFF43 | + \*-------------------------------------------------------------------------------------------------*/ +#ifdef USE_HID_USAGE + hid_device* dev_usage_0x0602 = nullptr; + hid_device* dev_usage_0x0604 = nullptr; + hid_device_info* info_temp = info; + + while(info_temp) + { + if(info_temp->vendor_id == info->vendor_id // constant LOGITECH_VID + && info_temp->product_id == info->product_id // NON-constant + && info_temp->interface_number == info->interface_number // constant 1 + && info_temp->usage_page == info->usage_page) // constant 0xFF43 + { + if(info_temp->usage == 0x0602) + { + dev_usage_0x0602 = hid_open_path(info_temp->path); + } + else if(info_temp->usage == 0x0604) + { + dev_usage_0x0604 = hid_open_path(info_temp->path); + } + } + if(dev_usage_0x0602 && dev_usage_0x0604) + { + break; + } + info_temp = info_temp->next; + } + if(dev_usage_0x0602 && dev_usage_0x0604) + { + LogitechG910Controller* controller = new LogitechG910Controller(dev_usage_0x0602, dev_usage_0x0604); + RGBController_LogitechG910* rgb_controller = new RGBController_LogitechG910(controller); + rgb_controller->name = name; + ResourceManager::get()->RegisterRGBController(rgb_controller); + } + else + { + // Not all of them could be opened, do some cleanup + hid_close(dev_usage_0x0602); + hid_close(dev_usage_0x0604); + } +#else + hid_device* dev = hid_open_path(info->path); + + if(dev) + { + LogitechG910Controller* controller = new LogitechG910Controller(dev, dev); + RGBController_LogitechG910* rgb_controller = new RGBController_LogitechG910(controller); + rgb_controller->name = name; + ResourceManager::get()->RegisterRGBController(rgb_controller); + } +#endif +} + void DetectLogitechKeyboardG815(hid_device_info* info, const std::string& name) { /*-------------------------------------------------------------------------------------------------*\ @@ -461,6 +523,7 @@ REGISTER_HID_DETECTOR_IP ("Logitech G810 Orion Spectrum", Dete REGISTER_HID_DETECTOR_IP ("Logitech G810 Orion Spectrum", DetectLogitechKeyboardG810, LOGITECH_VID, LOGITECH_G810_2_PID, 1, 0xFF43); REGISTER_HID_DETECTOR_IP ("Logitech G813 RGB Mechanical Gaming Keyboard", DetectLogitechKeyboardG815, LOGITECH_VID, LOGITECH_G813_PID, 1, 0xFF43); REGISTER_HID_DETECTOR_IP ("Logitech G815 RGB Mechanical Gaming Keyboard", DetectLogitechKeyboardG815, LOGITECH_VID, LOGITECH_G815_PID, 1, 0xFF43); +REGISTER_HID_DETECTOR_IP ("Logitech G910 Orion Spectrum", DetectLogitechKeyboardG910, LOGITECH_VID, LOGITECH_G910_PID, 1, 0xFF43); /*-------------------------------------------------------------------------------------------------------------------------------------------------*\ | Mice | \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ diff --git a/Controllers/LogitechController/LogitechG910Controller.cpp b/Controllers/LogitechController/LogitechG910Controller.cpp new file mode 100644 index 00000000..0b340a60 --- /dev/null +++ b/Controllers/LogitechController/LogitechG910Controller.cpp @@ -0,0 +1,181 @@ +/*-----------------------------------------*\ +| LogitechG910Controller.cpp | +| | +| Driver for Logitech G910 Orion Spectrum | +| keyboard light controller | +| | +| Adam Honse (CalcProgrammer1) 6/11/2020 | +\*-----------------------------------------*/ + +#include "LogitechG910Controller.h" +#include + +LogitechG910Controller::LogitechG910Controller(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12) +{ + dev_pkt_0x11 = dev_handle_0x11; + dev_pkt_0x12 = dev_handle_0x12; +} + +LogitechG910Controller::~LogitechG910Controller() +{ + hid_close(dev_pkt_0x11); + hid_close(dev_pkt_0x12); +} + +std::string LogitechG910Controller::GetSerialString() +{ + wchar_t serial_string[128]; + hid_get_serial_number_string(dev_pkt_0x11, serial_string, 128); + + std::wstring return_wstring = serial_string; + std::string return_string(return_wstring.begin(), return_wstring.end()); + + return(return_string); +} + +void LogitechG910Controller::Commit() +{ + SendCommit(); +} + +void LogitechG910Controller::SetDirect + ( + unsigned char zone, + unsigned char frame_count, + unsigned char * frame_data + ) +{ + SendDirectFrame(zone, frame_count, frame_data); +} + +void LogitechG910Controller::SetMode + ( + unsigned char mode, + unsigned short speed, + unsigned char red, + unsigned char green, + unsigned char blue + ) +{ + SendMode(LOGITECH_G910_ZONE_MODE_KEYBOARD, mode, speed, red, green, blue); + SendMode(LOGITECH_G910_ZONE_MODE_LOGO, mode, speed, red, green, blue); + + SendCommit(); +} + +/*-------------------------------------------------------------------------------------------------*\ +| Private packet sending functions. | +\*-------------------------------------------------------------------------------------------------*/ + +void LogitechG910Controller::SendCommit() +{ + char usb_buf[20]; + + /*-----------------------------------------------------*\ + | Zero out buffer | + \*-----------------------------------------------------*/ + memset(usb_buf, 0x00, sizeof(usb_buf)); + + /*-----------------------------------------------------*\ + | Set up Commit packet | + \*-----------------------------------------------------*/ + usb_buf[0x00] = 0x11; + usb_buf[0x01] = 0xFF; + usb_buf[0x02] = 0x0F; + usb_buf[0x03] = 0x5F; + + /*-----------------------------------------------------*\ + | Send packet | + \*-----------------------------------------------------*/ + hid_write(dev_pkt_0x11, (unsigned char *)usb_buf, 20); + hid_read(dev_pkt_0x11, (unsigned char *)usb_buf, 20); +} + +void LogitechG910Controller::SendDirectFrame + ( + unsigned char zone, + unsigned char frame_count, + unsigned char * frame_data + ) +{ + char usb_buf[64]; + + /*-----------------------------------------------------*\ + | Zero out buffer | + \*-----------------------------------------------------*/ + memset(usb_buf, 0x00, sizeof(usb_buf)); + + /*-----------------------------------------------------*\ + | Set up Lighting Control packet | + \*-----------------------------------------------------*/ + usb_buf[0x00] = 0x12; + usb_buf[0x01] = 0xFF; + usb_buf[0x02] = 0x0F; + usb_buf[0x03] = 0x3F; + usb_buf[0x05] = zone; + usb_buf[0x07] = frame_count; + + /*-----------------------------------------------------*\ + | Copy in frame data | + \*-----------------------------------------------------*/ + memcpy(&usb_buf[0x08], frame_data, frame_count * 4); + + /*-----------------------------------------------------*\ + | Send packet | + \*-----------------------------------------------------*/ + hid_write(dev_pkt_0x12, (unsigned char *)usb_buf, 64); + hid_read(dev_pkt_0x11, (unsigned char *)usb_buf, 20); +} + +void LogitechG910Controller::SendMode + ( + unsigned char zone, + unsigned char mode, + unsigned short speed, + unsigned char red, + unsigned char green, + unsigned char blue + ) +{ + 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] = 0x10; + usb_buf[0x03] = 0x3B; + usb_buf[0x04] = zone; + + usb_buf[0x05] = mode; + + usb_buf[0x06] = red; + usb_buf[0x07] = green; + usb_buf[0x08] = blue; + + speed = 100 * speed; + if(mode == LOGITECH_G910_MODE_CYCLE) + { + usb_buf[0x0B] = speed >> 8; + usb_buf[0x0C] = speed & 0xFF; + usb_buf[0x0D] = 0x64; + } + else if(mode == LOGITECH_G910_MODE_BREATHING) + { + usb_buf[0x09] = speed >> 8; + usb_buf[0x0A] = speed & 0xFF; + usb_buf[0x0C] = 0x64; + } + + /*-----------------------------------------------------*\ + | Send packet | + \*-----------------------------------------------------*/ + hid_write(dev_pkt_0x11, (unsigned char *)usb_buf, 20); + hid_read(dev_pkt_0x11, (unsigned char *)usb_buf, 20); +} diff --git a/Controllers/LogitechController/LogitechG910Controller.h b/Controllers/LogitechController/LogitechG910Controller.h new file mode 100644 index 00000000..9c67413b --- /dev/null +++ b/Controllers/LogitechController/LogitechG910Controller.h @@ -0,0 +1,99 @@ +/*-----------------------------------------*\ +| LogitechG910Controller.h | +| | +| Definitions and types for Logitech G910 | +| Orion Spectrum keyboard light controller | +| | +| Adam Honse (CalcProgrammer1) 6/11/2020 | +\*-----------------------------------------*/ + +#include "RGBController.h" + +#include +#include + +#pragma once + +enum +{ + LOGITECH_G910_ZONE_MODE_KEYBOARD = 0x00, + LOGITECH_G910_ZONE_MODE_LOGO = 0x01, +}; + +enum +{ + LOGITECH_G910_ZONE_DIRECT_KEYBOARD = 0x01, + LOGITECH_G910_ZONE_DIRECT_MEDIA = 0x02, + LOGITECH_G910_ZONE_DIRECT_LOGO = 0x10, + LOGITECH_G910_ZONE_DIRECT_INDICATORS = 0x40, +}; + +enum +{ + LOGITECH_G910_MODE_OFF = 0x00, + LOGITECH_G910_MODE_STATIC = 0x01, + LOGITECH_G910_MODE_BREATHING = 0x02, + LOGITECH_G910_MODE_CYCLE = 0x03, + LOGITECH_G910_MODE_WAVE = 0x04, +}; + +/*---------------------------------------------------------------------------------------------*\ +| Speed is 1000 for fast and 20000 for slow. | +| Values are multiplied by 100 later to give lots of GUI steps. | +\*---------------------------------------------------------------------------------------------*/ +enum +{ + LOGITECH_G910_SPEED_SLOWEST = 0xC8, /* Slowest speed */ + LOGITECH_G910_SPEED_NORMAL = 0x32, /* Normal speed */ + LOGITECH_G910_SPEED_FASTEST = 0x0A, /* Fastest speed */ +}; + +class LogitechG910Controller +{ +public: + LogitechG910Controller(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12); + ~LogitechG910Controller(); + + std::string GetSerialString(); + + void Commit(); + + void SetDirect + ( + unsigned char zone, + unsigned char frame_count, + unsigned char * frame_data + ); + + void SetMode + ( + unsigned char mode, + unsigned short speed, + unsigned char red, + unsigned char green, + unsigned char blue + ); + +private: + hid_device* dev_pkt_0x11; + hid_device* dev_pkt_0x12; + + void SendDirectFrame + ( + unsigned char zone, + unsigned char frame_count, + unsigned char * frame_data + ); + + void SendMode + ( + unsigned char zone, + unsigned char mode, + unsigned short speed, + unsigned char red, + unsigned char green, + unsigned char blue + ); + + void SendCommit(); +}; diff --git a/Controllers/LogitechController/RGBController_LogitechG910.cpp b/Controllers/LogitechController/RGBController_LogitechG910.cpp new file mode 100644 index 00000000..3241b0a8 --- /dev/null +++ b/Controllers/LogitechController/RGBController_LogitechG910.cpp @@ -0,0 +1,393 @@ +/*-----------------------------------------*\ +| RGBController_LogitechG910.cpp | +| | +| Generic RGB Interface for Logitech G910 | +| Orion Spectrum Keyboard | +| | +| Adam Honse (CalcProgrammer1) 6/12/2020 | +\*-----------------------------------------*/ + +#include "RGBController_LogitechG910.h" + +//0xFFFFFFFF indicates an unused entry in matrix +#define NA 0xFFFFFFFF + +static unsigned int matrix_map[7][23] = + { { 111, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, 116, 114, 115, NA, 113, NA, 112, 110, NA, NA, NA }, + { 37, NA, 54, 55, 56, 57, NA, 58, 59, 60, 61, NA, 62, 63, 64, 65, 66, 67, 68, 109, 108, 107, 106 }, + { 49, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, NA, 41, 42, 38, NA, 69, 70, 71, 79, 80, 81, 82 }, + { 39, NA, 16, 22, 4, 17, NA, 19, 24, 20, 8, 14, 15, 43, 44, 45, 72, 73, 74, 91, 92, 93, 83 }, + { 53, NA, 0, 18, 3, 5, NA, 6, 7, 9, 10, 11, 47, 48, 46, 36, NA, NA, NA, 88, 89, 90, NA }, + { 99, 96, 25, 23, 2, 21, NA, 1, NA, 13, 12, 50, 51, 52, 103, NA, NA, 78, NA, 85, 86, 87, 84 }, + { 98, 101, 100, NA, NA, NA, NA, 40, NA, NA, NA, NA, 104, 105, 97, 102, 76, 77, 75, 94, NA, 95, NA } }; + +static const char* zone_names[] = +{ + "Keyboard", +}; + +static zone_type zone_types[] = +{ + ZONE_TYPE_MATRIX, +}; + +static const unsigned int zone_sizes[] = +{ + 117, +}; + +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_G910_ZONE_DIRECT_KEYBOARD, 0x04 }, + { "Key: B", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x05 }, + { "Key: C", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x06 }, + { "Key: D", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x07 }, + { "Key: E", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x08 }, + { "Key: F", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x09 }, + { "Key: G", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0A }, + { "Key: H", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0B }, + { "Key: I", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0C }, + { "Key: J", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0D }, + { "Key: K", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0E }, + { "Key: L", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x0F }, + { "Key: M", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x10 }, + { "Key: N", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x11 }, + { "Key: O", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x12 }, + { "Key: P", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x13 }, + { "Key: Q", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x14 }, + { "Key: R", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x15 }, + { "Key: S", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x16 }, + { "Key: T", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x17 }, + { "Key: U", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x18 }, + { "Key: V", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x19 }, + { "Key: W", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1A }, + { "Key: X", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1B }, + { "Key: Y", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1C }, + { "Key: Z", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1D }, + { "Key: 1", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1E }, + { "Key: 2", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x1F }, + { "Key: 3", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x20 }, + { "Key: 4", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x21 }, + { "Key: 5", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x22 }, + { "Key: 6", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x23 }, + { "Key: 7", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x24 }, + { "Key: 8", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x25 }, + { "Key: 9", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x26 }, + { "Key: 0", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x27 }, + { "Key: Enter", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x28 }, + { "Key: Escape", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x29 }, + { "Key: Backspace", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2A }, + { "Key: Tab", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2B }, + { "Key: Space", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2C }, + { "Key: -", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2D }, + { "Key: =", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2E }, + { "Key: [", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x2F }, + { "Key: ]", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x30 }, + { "Key: \\ (ANSI)", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x31 },//ANSI only + { "Key: #", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only + { "Key: ;", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x33 }, + { "Key: '", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x34 }, + { "Key: `", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x35 }, + { "Key: ,", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x36 }, + { "Key: .", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x37 }, + { "Key: /", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x38 }, + { "Key: Caps Lock", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x39 }, + { "Key: F1", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3A }, + { "Key: F2", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3B }, + { "Key: F3", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3C }, + { "Key: F4", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3D }, + { "Key: F5", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3E }, + { "Key: F6", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x3F }, + { "Key: F7", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x40 }, + { "Key: F8", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x41 }, + { "Key: F9", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x42 }, + { "Key: F10", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x43 }, + { "Key: F11", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x44 }, + { "Key: F12", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x45 }, + { "Key: Print Screen", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x46 }, + { "Key: Scroll Lock", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x47 }, + { "Key: Pause/Break", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x48 }, + { "Key: Insert", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x49 }, + { "Key: Home", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4A }, + { "Key: Page Up", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4B }, + { "Key: Delete", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4C }, + { "Key: End", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4D }, + { "Key: Page Down", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4E }, + { "Key: Right Arrow", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x4F }, + { "Key: Left Arrow", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x50 }, + { "Key: Down Arrow", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x51 }, + { "Key: Up Arrow", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x52 }, + { "Key: Num Lock", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x53 }, + { "Key: Number Pad /", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x54 }, + { "Key: Number Pad *", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x55 }, + { "Key: Number Pad -", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x56 }, + { "Key: Number Pad +", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x57 }, + { "Key: Number Pad Enter", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x58 }, + { "Key: Number Pad 1", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x59 }, + { "Key: Number Pad 2", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5A }, + { "Key: Number Pad 3", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5B }, + { "Key: Number Pad 4", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5C }, + { "Key: Number Pad 5", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5D }, + { "Key: Number Pad 6", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5E }, + { "Key: Number Pad 7", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x5F }, + { "Key: Number Pad 8", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x60 }, + { "Key: Number Pad 9", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x61 }, + { "Key: Number Pad 0", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x62 }, + { "Key: Number Pad .", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x63 }, + { "Key: \\ (ISO)", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only + { "Key: Menu", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0x65 }, + { "Key: Left Control", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE0 }, + { "Key: Left Shift", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE1 }, + { "Key: Left Alt", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE2 }, + { "Key: Left Windows", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE3 }, + { "Key: Right Control", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE4 }, + { "Key: Right Shift", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE5 }, + { "Key: Right Alt", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE6 }, + { "Key: Right Windows", LOGITECH_G910_ZONE_DIRECT_KEYBOARD, 0xE7 }, + { "Key: Media Next", LOGITECH_G910_ZONE_DIRECT_MEDIA, 0xB5 }, + { "Key: Media Previous", LOGITECH_G910_ZONE_DIRECT_MEDIA, 0xB6 }, + { "Key: Media Stop", LOGITECH_G910_ZONE_DIRECT_MEDIA, 0xB7 }, + { "Key: Media Play/Pause", LOGITECH_G910_ZONE_DIRECT_MEDIA, 0xCD }, + { "Key: Media Mute", LOGITECH_G910_ZONE_DIRECT_MEDIA, 0xE2 }, + { "Logo", LOGITECH_G910_ZONE_DIRECT_LOGO, 0x01 }, + { "Lighting", LOGITECH_G910_ZONE_DIRECT_INDICATORS, 0x01 }, + { "Game Mode", LOGITECH_G910_ZONE_DIRECT_INDICATORS, 0x02 }, + { "Caps Lock Indicator", LOGITECH_G910_ZONE_DIRECT_INDICATORS, 0x03 }, + { "Scroll Lock Indicator", LOGITECH_G910_ZONE_DIRECT_INDICATORS, 0x04 }, + { "Num Lock Indicator", LOGITECH_G910_ZONE_DIRECT_INDICATORS, 0x05 }, +}; + +RGBController_LogitechG910::RGBController_LogitechG910(LogitechG910Controller* logitech_ptr) +{ + logitech = logitech_ptr; + + name = "Logitech Keyboard Device"; + vendor = "Logitech"; + type = DEVICE_TYPE_KEYBOARD; + description = "Logitech Keyboard Device"; + serial = logitech->GetSerialString(); + + 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_G910_MODE_STATIC; + Static.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; + Static.colors_min = 1; + Static.colors_max = 1; + Static.color_mode = MODE_COLORS_MODE_SPECIFIC; + Static.colors.resize(1); + modes.push_back(Static); + + mode Off; + Off.name = "Off"; + Off.value = LOGITECH_G910_MODE_OFF; + Off.flags = 0; + Off.color_mode = MODE_COLORS_NONE; + modes.push_back(Off); + + mode Cycle; + Cycle.name = "Cycle"; + Cycle.value = LOGITECH_G910_MODE_CYCLE; + Cycle.flags = MODE_FLAG_HAS_SPEED; + Cycle.color_mode = MODE_COLORS_NONE; + Cycle.speed_min = LOGITECH_G910_SPEED_SLOWEST; + Cycle.speed_max = LOGITECH_G910_SPEED_FASTEST; + Cycle.speed = LOGITECH_G910_SPEED_NORMAL; + modes.push_back(Cycle); + + mode Breathing; + Breathing.name = "Breathing"; + Breathing.value = LOGITECH_G910_MODE_BREATHING; + Breathing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_SPEED; + Breathing.colors_min = 1; + Breathing.colors_max = 1; + Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC; + Breathing.colors.resize(1); + Breathing.speed_min = LOGITECH_G910_SPEED_SLOWEST; + Breathing.speed_max = LOGITECH_G910_SPEED_FASTEST; + Breathing.speed = LOGITECH_G910_SPEED_NORMAL; + modes.push_back(Breathing); + + SetupZones(); +} + +RGBController_LogitechG910::~RGBController_LogitechG910() +{ + /*---------------------------------------------------------*\ + | Delete the matrix map | + \*---------------------------------------------------------*/ + for(unsigned int zone_index = 0; zone_index < zones.size(); zone_index++) + { + if(zones[zone_index].matrix_map != NULL) + { + delete zones[zone_index].matrix_map; + } + } + + delete logitech; +} + +void RGBController_LogitechG910::SetupZones() +{ + /*---------------------------------------------------------*\ + | 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]; + + 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(); +} + +void RGBController_LogitechG910::ResizeZone(int /*zone*/, int /*new_size*/) +{ + /*---------------------------------------------------------*\ + | This device does not support resizing zones | + \*---------------------------------------------------------*/ +} + +void RGBController_LogitechG910::DeviceUpdateLEDs() +{ + #define MAX_FRAMES_PER_PACKET 0x0E + + unsigned char frame_buf[MAX_FRAMES_PER_PACKET * 4]; + unsigned char frame_cnt = 0; + unsigned char prev_zone = 0; + unsigned char zone = 0; + unsigned char idx = 0; + + /*---------------------------------------------------------*\ + | TODO: Send packets with multiple LED frames | + \*---------------------------------------------------------*/ + for(std::size_t led_idx = 0; led_idx < leds.size(); led_idx++) + { + zone = ( leds[led_idx].value >> 8 ); + idx = ( leds[led_idx].value & 0xFF ); + + if((zone != prev_zone) && (frame_cnt != 0)) + { + logitech->SetDirect(prev_zone, frame_cnt, frame_buf); + frame_cnt = 0; + } + + frame_buf[(frame_cnt * 4) + 0] = idx; + frame_buf[(frame_cnt * 4) + 1] = RGBGetRValue(colors[led_idx]); + frame_buf[(frame_cnt * 4) + 2] = RGBGetGValue(colors[led_idx]); + frame_buf[(frame_cnt * 4) + 3] = RGBGetBValue(colors[led_idx]); + + frame_cnt++; + prev_zone = zone; + + if(frame_cnt == MAX_FRAMES_PER_PACKET) + { + logitech->SetDirect(prev_zone, frame_cnt, frame_buf); + frame_cnt = 0; + } + } + + if(frame_cnt != 0) + { + logitech->SetDirect(prev_zone, frame_cnt, frame_buf); + } + + logitech->Commit(); +} + +void RGBController_LogitechG910::UpdateZoneLEDs(int /*zone*/) +{ + DeviceUpdateLEDs(); +} + +void RGBController_LogitechG910::UpdateSingleLED(int led) +{ + 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_LogitechG910::SetCustomMode() +{ + active_mode = 0; +} + +void RGBController_LogitechG910::DeviceUpdateMode() +{ + /*---------------------------------------------------------*\ + | 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; + + if(modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC) + { + red = RGBGetRValue(modes[active_mode].colors[0]); + grn = RGBGetGValue(modes[active_mode].colors[0]); + blu = RGBGetBValue(modes[active_mode].colors[0]); + } + + logitech->SetMode(modes[active_mode].value, modes[active_mode].speed, red, grn, blu); +} diff --git a/Controllers/LogitechController/RGBController_LogitechG910.h b/Controllers/LogitechController/RGBController_LogitechG910.h new file mode 100644 index 00000000..b8639fec --- /dev/null +++ b/Controllers/LogitechController/RGBController_LogitechG910.h @@ -0,0 +1,33 @@ +/*-----------------------------------------*\ +| RGBController_LogitechG910.h | +| | +| Generic RGB Interface for Logitech G910 | +| Orion Spectrum keyboard | +| | +| Adam Honse (CalcProgrammer1) 6/12/2020 | +\*-----------------------------------------*/ + +#pragma once +#include "RGBController.h" +#include "LogitechG910Controller.h" + +class RGBController_LogitechG910 : public RGBController +{ +public: + RGBController_LogitechG910(LogitechG910Controller* logitech_ptr); + ~RGBController_LogitechG910(); + + void SetupZones(); + + void ResizeZone(int zone, int new_size); + + void DeviceUpdateLEDs(); + void UpdateZoneLEDs(int zone); + void UpdateSingleLED(int led); + + void SetCustomMode(); + void DeviceUpdateMode(); + +private: + LogitechG910Controller* logitech; +}; diff --git a/OpenRGB.pro b/OpenRGB.pro index d392fea3..5d4173cf 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -279,12 +279,14 @@ HEADERS += Controllers/LogitechController/LogitechG213Controller.h \ Controllers/LogitechController/LogitechG560Controller.h \ Controllers/LogitechController/LogitechG810Controller.h \ + Controllers/LogitechController/LogitechG910Controller.h \ Controllers/LogitechController/LogitechG815Controller.h \ Controllers/LogitechController/LogitechGLightsyncController.h \ Controllers/LogitechController/RGBController_LogitechG203L.h \ Controllers/LogitechController/RGBController_LogitechG213.h \ Controllers/LogitechController/RGBController_LogitechG560.h \ Controllers/LogitechController/RGBController_LogitechG810.h \ + Controllers/LogitechController/RGBController_LogitechG910.h \ Controllers/LogitechController/RGBController_LogitechG815.h \ Controllers/LogitechController/RGBController_LogitechGLightsync.h \ Controllers/LogitechController/RGBController_LogitechGLightsync1zone.h \ @@ -555,12 +557,14 @@ SOURCES += Controllers/LogitechController/LogitechG213Controller.cpp \ Controllers/LogitechController/LogitechG560Controller.cpp \ Controllers/LogitechController/LogitechG810Controller.cpp \ + Controllers/LogitechController/LogitechG910Controller.cpp \ Controllers/LogitechController/LogitechG815Controller.cpp \ Controllers/LogitechController/LogitechGLightsyncController.cpp \ Controllers/LogitechController/RGBController_LogitechG203L.cpp \ Controllers/LogitechController/RGBController_LogitechG213.cpp \ Controllers/LogitechController/RGBController_LogitechG560.cpp \ Controllers/LogitechController/RGBController_LogitechG810.cpp \ + Controllers/LogitechController/RGBController_LogitechG910.cpp \ Controllers/LogitechController/RGBController_LogitechG815.cpp \ Controllers/LogitechController/RGBController_LogitechGLightsync.cpp \ Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp \