diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp index 072d914f..67e9288a 100644 --- a/Controllers/LogitechController/LogitechControllerDetect.cpp +++ b/Controllers/LogitechController/LogitechControllerDetect.cpp @@ -15,7 +15,8 @@ /*-----------------------------------------------------*\ | Keyboard product IDs | \*-----------------------------------------------------*/ -#define LOGITECH_G810_PID 0xC337 +#define LOGITECH_G810_1_PID 0xC337 +#define LOGITECH_G810_2_PID 0xC331 /*-----------------------------------------------------*\ | Mouse product IDs | \*-----------------------------------------------------*/ @@ -35,18 +36,19 @@ typedef struct static const logitech_device device_list[] = { - /*---------------------------------------------------------------------------------------------------------*\ - | Keyboards | - \*---------------------------------------------------------------------------------------------------------*/ - { LOGITECH_VID, LOGITECH_G810_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G810 Orion Spectrum" }, - /*---------------------------------------------------------------------------------------------------------*\ - | Mice | - \*---------------------------------------------------------------------------------------------------------*/ - { LOGITECH_VID, LOGITECH_G203_PID, 1, DEVICE_TYPE_MOUSE, "Logitech G203 Prodigy" }, - { LOGITECH_VID, LOGITECH_G403_PID, 1, DEVICE_TYPE_MOUSE, "Logitech G403 Prodigy" }, - /*---------------------------------------------------------------------------------------------------------*\ - | Mousemats | - \*---------------------------------------------------------------------------------------------------------*/ + /*-------------------------------------------------------------------------------------------------------------*\ + | Keyboards | + \*-------------------------------------------------------------------------------------------------------------*/ + { LOGITECH_VID, LOGITECH_G810_1_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G810 Orion Spectrum" }, + { LOGITECH_VID, LOGITECH_G810_2_PID, 1, DEVICE_TYPE_KEYBOARD, "Logitech G810 Orion Spectrum" }, + /*-------------------------------------------------------------------------------------------------------------*\ + | Mice | + \*-------------------------------------------------------------------------------------------------------------*/ + { LOGITECH_VID, LOGITECH_G203_PID, 1, DEVICE_TYPE_MOUSE, "Logitech G203 Prodigy" }, + { LOGITECH_VID, LOGITECH_G403_PID, 1, DEVICE_TYPE_MOUSE, "Logitech G403 Prodigy" }, + /*-------------------------------------------------------------------------------------------------------------*\ + | Mousemats | + \*-------------------------------------------------------------------------------------------------------------*/ }; /******************************************************************************************\ diff --git a/RGBController/RGBController_LogitechG810.cpp b/RGBController/RGBController_LogitechG810.cpp index 67eb6719..4713728d 100644 --- a/RGBController/RGBController_LogitechG810.cpp +++ b/RGBController/RGBController_LogitechG810.cpp @@ -33,7 +33,7 @@ static zone_type zone_types[] = static const unsigned int zone_sizes[] = { - 115, + 117, }; typedef struct @@ -91,7 +91,8 @@ static const led_type led_names[] = { "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, 0x31 },//ANSI only + { "Key: #/~", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x32 },//ISO only { "Key: ;/:", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x33 }, { "Key: '/'\"", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x34 }, { "Key: `/~", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x35 }, @@ -141,6 +142,7 @@ static const led_type led_names[] = { "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: \\/|", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only { "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 },