From 2d7350506668186e3736d83cdd6c133f98d5bae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayta=C3=A7=20Kayadelen?= Date: Wed, 11 Oct 2023 22:54:12 +0200 Subject: [PATCH] fix more rgb.net mappings for Logitech --- .../Devices/RGBNet/RgbNetKeyMappings.cs | 65 +++++++++++-------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/Project-Aurora/Project-Aurora/Devices/RGBNet/RgbNetKeyMappings.cs b/Project-Aurora/Project-Aurora/Devices/RGBNet/RgbNetKeyMappings.cs index dfb2db814..2c2ac713e 100644 --- a/Project-Aurora/Project-Aurora/Devices/RGBNet/RgbNetKeyMappings.cs +++ b/Project-Aurora/Project-Aurora/Devices/RGBNet/RgbNetKeyMappings.cs @@ -8,6 +8,7 @@ public static class RgbNetKeyMappings { private static readonly Dictionary AuroraToRgbNetKeyMap = new() { + { DeviceKeys.ESC, LedId.Keyboard_Escape }, { DeviceKeys.F1, LedId.Keyboard_F1 }, { DeviceKeys.F2, LedId.Keyboard_F2 }, { DeviceKeys.F3, LedId.Keyboard_F3 }, @@ -65,7 +66,7 @@ public static class RgbNetKeyMappings { DeviceKeys.DELETE, LedId.Keyboard_Delete }, { DeviceKeys.END, LedId.Keyboard_End }, { DeviceKeys.PAGE_DOWN, LedId.Keyboard_PageDown }, - { DeviceKeys.NUM_SEVEN, LedId.Keyboard_PageUp }, + { DeviceKeys.NUM_SEVEN, LedId.Keyboard_Num7 }, { DeviceKeys.NUM_EIGHT, LedId.Keyboard_Num8 }, { DeviceKeys.NUM_NINE, LedId.Keyboard_Num9 }, { DeviceKeys.NUM_PLUS, LedId.Keyboard_NumPlus }, @@ -122,26 +123,26 @@ public static class RgbNetKeyMappings { DeviceKeys.NUM_ZERO, LedId.Keyboard_Num0 }, { DeviceKeys.NUM_PERIOD, LedId.Keyboard_NumPeriodAndDelete }, { DeviceKeys.FN_Key, LedId.Keyboard_Function }, - { DeviceKeys.G1, LedId.Keyboard_Custom1 }, - { DeviceKeys.G2, LedId.Keyboard_Custom2 }, - { DeviceKeys.G3, LedId.Keyboard_Custom3 }, - { DeviceKeys.G4, LedId.Keyboard_Custom4 }, - { DeviceKeys.G5, LedId.Keyboard_Custom5 }, - { DeviceKeys.G6, LedId.Keyboard_Custom6 }, - { DeviceKeys.G7, LedId.Keyboard_Custom7 }, - { DeviceKeys.G8, LedId.Keyboard_Custom8 }, - { DeviceKeys.G9, LedId.Keyboard_Custom9 }, - { DeviceKeys.G10, LedId.Keyboard_Custom10 }, - { DeviceKeys.G11, LedId.Keyboard_Custom11 }, - { DeviceKeys.G12, LedId.Keyboard_Custom12 }, - { DeviceKeys.G13, LedId.Keyboard_Custom13 }, - { DeviceKeys.G14, LedId.Keyboard_Custom14 }, - { DeviceKeys.G15, LedId.Keyboard_Custom15 }, - { DeviceKeys.G16, LedId.Keyboard_Custom16 }, - { DeviceKeys.G17, LedId.Keyboard_Custom17 }, - { DeviceKeys.G18, LedId.Keyboard_Custom18 }, - { DeviceKeys.G19, LedId.Keyboard_Custom19 }, - { DeviceKeys.G20, LedId.Keyboard_Custom20 }, + { DeviceKeys.G1, LedId.Keyboard_Programmable1 }, + { DeviceKeys.G2, LedId.Keyboard_Programmable2 }, + { DeviceKeys.G3, LedId.Keyboard_Programmable3 }, + { DeviceKeys.G4, LedId.Keyboard_Programmable4 }, + { DeviceKeys.G5, LedId.Keyboard_Programmable5 }, + { DeviceKeys.G6, LedId.Keyboard_Programmable6 }, + { DeviceKeys.G7, LedId.Keyboard_Programmable7 }, + { DeviceKeys.G8, LedId.Keyboard_Programmable8 }, + { DeviceKeys.G9, LedId.Keyboard_Programmable9 }, + { DeviceKeys.G10, LedId.Keyboard_Programmable10 }, + { DeviceKeys.G11, LedId.Keyboard_Programmable11 }, + { DeviceKeys.G12, LedId.Keyboard_Programmable12 }, + { DeviceKeys.G13, LedId.Keyboard_Programmable13 }, + { DeviceKeys.G14, LedId.Keyboard_Programmable14 }, + { DeviceKeys.G15, LedId.Keyboard_Programmable15 }, + { DeviceKeys.G16, LedId.Keyboard_Programmable16 }, + { DeviceKeys.G17, LedId.Keyboard_Programmable17 }, + { DeviceKeys.G18, LedId.Keyboard_Programmable18 }, + { DeviceKeys.G19, LedId.Keyboard_Programmable19 }, + { DeviceKeys.G20, LedId.Keyboard_Programmable20 }, { DeviceKeys.LOGO, LedId.Logo }, { DeviceKeys.LOGO2, LedId.Logo }, { DeviceKeys.LOGO3, LedId.Logo }, @@ -169,7 +170,6 @@ public static class RgbNetKeyMappings { DeviceKeys.ADDITIONALLIGHT9, LedId.Custom9 }, { DeviceKeys.ADDITIONALLIGHT10, LedId.Custom10 }, - { DeviceKeys.Peripheral_Logo, LedId.Logo }, { DeviceKeys.NUM_ZEROZERO, LedId.Keyboard_Num00 }, { DeviceKeys.LEFT_FN, LedId.Keyboard_Function }, @@ -281,10 +281,13 @@ public static class RgbNetKeyMappings { DeviceKeys.HEADSET4, LedId.Headset4 }, { DeviceKeys.HEADSET5, LedId.Headset5 }, - //{DeviceKeys.NUM_LOCK_LED, LedId.301}, - //{DeviceKeys.CAPS_LOCK_LED, LedId.302}, - //{DeviceKeys.SCROLL_LOCK_LED, LedId.303}, - //{DeviceKeys.NONE, LedId.-1}, + //for logitech mice + { DeviceKeys.PERIPHERAL_DPI, LedId.Mouse1 }, + { DeviceKeys.Peripheral_Logo, LedId.Mouse2 }, + + {DeviceKeys.NUM_LOCK_LED, LedId.Keyboard_IndicatorNumLock}, + {DeviceKeys.CAPS_LOCK_LED, LedId.Keyboard_IndicatorCapsLock}, + {DeviceKeys.SCROLL_LOCK_LED, LedId.Keyboard_IndicatorScrollLock}, }; public static readonly ReadOnlyDictionary AuroraToRgbNet = new(AuroraToRgbNetKeyMap); @@ -407,6 +410,16 @@ public static class RgbNetKeyMappings { LedId.Keyboard_Programmable7, DeviceKeys.G7 }, { LedId.Keyboard_Programmable8, DeviceKeys.G8 }, { LedId.Keyboard_Programmable9, DeviceKeys.G9 }, + { LedId.Keyboard_Programmable10, DeviceKeys.G10 }, + { LedId.Keyboard_Programmable11, DeviceKeys.G11 }, + { LedId.Keyboard_Programmable12, DeviceKeys.G12 }, + { LedId.Keyboard_Programmable13, DeviceKeys.G13 }, + { LedId.Keyboard_Programmable14, DeviceKeys.G14 }, + { LedId.Keyboard_Programmable15, DeviceKeys.G15 }, + { LedId.Keyboard_Programmable16, DeviceKeys.G16 }, + { LedId.Keyboard_Programmable17, DeviceKeys.G17 }, + { LedId.Keyboard_Programmable18, DeviceKeys.G18 }, + { LedId.Keyboard_Programmable19, DeviceKeys.G19 }, { LedId.Logo, DeviceKeys.LOGO }, { LedId.Keyboard_MediaMute, DeviceKeys.VOLUME_MUTE }, { LedId.Keyboard_MediaPlay, DeviceKeys.MEDIA_PLAY_PAUSE },