From f00ab7f5815f2d67cfb12ead3d2d9fa727065f65 Mon Sep 17 00:00:00 2001 From: Darth Affe Date: Sat, 13 Feb 2021 20:09:04 +0100 Subject: [PATCH] Added abnt and ks keyboard-layouts --- RGB.NET.Core/Devices/KeyboardLayoutType.cs | 11 +++++++---- .../Keyboard/CoolerMasterKeyboardRGBDeviceInfo.cs | 6 +++--- .../Keyboard/CorsairKeyboardRGBDeviceInfo.cs | 10 +++++----- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/RGB.NET.Core/Devices/KeyboardLayoutType.cs b/RGB.NET.Core/Devices/KeyboardLayoutType.cs index f3c38b2..b763057 100644 --- a/RGB.NET.Core/Devices/KeyboardLayoutType.cs +++ b/RGB.NET.Core/Devices/KeyboardLayoutType.cs @@ -1,10 +1,13 @@ -namespace RGB.NET.Core +// ReSharper disable InconsistentNaming +namespace RGB.NET.Core { public enum KeyboardLayoutType { Unknown = 0, - Ansi = 1, - Iso = 2, - Jis = 3 + ANSI = 1, + ISO = 2, + JIS = 3, + ABNT = 4, + KS = 5 } } diff --git a/RGB.NET.Devices.CoolerMaster/Keyboard/CoolerMasterKeyboardRGBDeviceInfo.cs b/RGB.NET.Devices.CoolerMaster/Keyboard/CoolerMasterKeyboardRGBDeviceInfo.cs index 4275369..563c3ef 100644 --- a/RGB.NET.Devices.CoolerMaster/Keyboard/CoolerMasterKeyboardRGBDeviceInfo.cs +++ b/RGB.NET.Devices.CoolerMaster/Keyboard/CoolerMasterKeyboardRGBDeviceInfo.cs @@ -34,9 +34,9 @@ namespace RGB.NET.Devices.CoolerMaster this.Layout = physicalKeyboardLayout switch { CoolerMasterPhysicalKeyboardLayout.UNINIT => KeyboardLayoutType.Unknown, - CoolerMasterPhysicalKeyboardLayout.US => KeyboardLayoutType.Ansi, - CoolerMasterPhysicalKeyboardLayout.EU => KeyboardLayoutType.Iso, - CoolerMasterPhysicalKeyboardLayout.JP => KeyboardLayoutType.Jis, + CoolerMasterPhysicalKeyboardLayout.US => KeyboardLayoutType.ANSI, + CoolerMasterPhysicalKeyboardLayout.EU => KeyboardLayoutType.ISO, + CoolerMasterPhysicalKeyboardLayout.JP => KeyboardLayoutType.JIS, _ => KeyboardLayoutType.Unknown }; } diff --git a/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDeviceInfo.cs b/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDeviceInfo.cs index 2d60d65..aec0118 100644 --- a/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDeviceInfo.cs +++ b/RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDeviceInfo.cs @@ -45,11 +45,11 @@ namespace RGB.NET.Devices.Corsair this.LogicalLayout = (CorsairLogicalKeyboardLayout)nativeInfo.logicalLayout; this.Layout = PhysicalLayout switch { - CorsairPhysicalKeyboardLayout.US => KeyboardLayoutType.Ansi, - CorsairPhysicalKeyboardLayout.UK => KeyboardLayoutType.Iso, - CorsairPhysicalKeyboardLayout.BR => KeyboardLayoutType.Unknown, - CorsairPhysicalKeyboardLayout.JP => KeyboardLayoutType.Jis, - CorsairPhysicalKeyboardLayout.KR => KeyboardLayoutType.Unknown, + CorsairPhysicalKeyboardLayout.US => KeyboardLayoutType.ANSI, + CorsairPhysicalKeyboardLayout.UK => KeyboardLayoutType.ISO, + CorsairPhysicalKeyboardLayout.BR => KeyboardLayoutType.ABNT, + CorsairPhysicalKeyboardLayout.JP => KeyboardLayoutType.JIS, + CorsairPhysicalKeyboardLayout.KR => KeyboardLayoutType.KS, _ => KeyboardLayoutType.Unknown }; }