From 618bebc46b5b4c52f0b68291cdea706c7624ca2b Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 23 Jul 2020 10:26:16 -0500 Subject: [PATCH] Update key names for G810 and Poseidon Z RGB --- RGBController/RGBController_LogitechG810.cpp | 68 ++++++++++---------- RGBController/RGBController_PoseidonZRGB.cpp | 4 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/RGBController/RGBController_LogitechG810.cpp b/RGBController/RGBController_LogitechG810.cpp index b61f0d98..09d58980 100644 --- a/RGBController/RGBController_LogitechG810.cpp +++ b/RGBController/RGBController_LogitechG810.cpp @@ -87,18 +87,18 @@ static const led_type led_names[] = { "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 },//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 }, - { "Key: ,/<", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x36 }, - { "Key: ./>", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x37 }, - { "Key: //?", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x38 }, + { "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 },//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 }, + { "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 }, @@ -126,23 +126,23 @@ static const led_type led_names[] = { "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: \\/|", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x64 },//ISO only + { "Key: Number Pad /", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x54 }, + { "Key: Number Pad *", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x55 }, + { "Key: Number Pad -", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x56 }, + { "Key: Number Pad +", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x57 }, + { "Key: Number Pad Enter", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x58 }, + { "Key: Number Pad 1", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x59 }, + { "Key: Number Pad 2", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5A }, + { "Key: Number Pad 3", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5B }, + { "Key: Number Pad 4", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5C }, + { "Key: Number Pad 5", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5D }, + { "Key: Number Pad 6", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5E }, + { "Key: Number Pad 7", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x5F }, + { "Key: Number Pad 8", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x60 }, + { "Key: Number Pad 9", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x61 }, + { "Key: Number Pad 0", LOGITECH_G810_ZONE_DIRECT_KEYBOARD, 0x62 }, + { "Key: Number 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 }, @@ -152,11 +152,11 @@ static const led_type led_names[] = { "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 }, + { "Key: Media Next", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB5 }, + { "Key: Media Previous", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB6 }, + { "Key: Media Stop", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xB7 }, + { "Key: Media Play/Pause", LOGITECH_G810_ZONE_DIRECT_MEDIA, 0xCD }, + { "Key: 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 }, diff --git a/RGBController/RGBController_PoseidonZRGB.cpp b/RGBController/RGBController_PoseidonZRGB.cpp index 8502616e..7ac871bd 100644 --- a/RGBController/RGBController_PoseidonZRGB.cpp +++ b/RGBController/RGBController_PoseidonZRGB.cpp @@ -49,7 +49,7 @@ static const char* led_names[] = "Key: 1", "Key: Q", "Key: A", - "Key: Windows", + "Key: Left Windows", "Key: Down Arrow", "Key: Delete", "Key: F2", @@ -115,7 +115,7 @@ static const char* led_names[] = "Key: P", "Key: ;", "Key: ,", - "Key: Fn", + "Key: Right Fn", "Key: Number Pad .", "Key: Number Pad *", "Key: F11",