DarthAffe/RGB.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2025-12-13 10:08:31 +00:00
Code Issues Releases Wiki Activity

ASUS - Cleaned up code and removed strangly placed per-device logic

Browse Source
This commit is contained in:
Robert 2021-03-29 16:17:14 +02:00
parent 40cce7aaaf
commit 9bfc53087c
4 changed files with 6 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
RGB.NET.Devices.Asus/Enum/AsusLedId.cs
View File

@ -149,19 +149,5 @@ namespace RGB.NET.Devices.Asus
KEY_MAIL = 0xEC, // Mail KEY_MAIL = 0xEC, // Mail
KEY_MEDIASELECT = 0xED, // Media Select KEY_MEDIASELECT = 0xED, // Media Select
KEY_FN = 0x100, // Function key KEY_FN = 0x100, // Function key
// Undocumented
UNDOCUMENTED_1 = 0x59,
UNDOCUMENTED_2 = 0x56,
UNDOCUMENTED_3 = 0x101,
UNDOCUMENTED_4 = 0x102,
UNDOCUMENTED_5 = 0x103,
UNDOCUMENTED_6 = 0x1EB, // ISO tilde
UNDOCUMENTED_7 = 0x1EC, // ISO backslash
// UNDOCUMENTED_8 = 0x14E,
// UNDOCUMENTED_9 = 0x424,
// UNDOCUMENTED_10 = 0x1A8,
// UNDOCUMENTED_11 = 0x415,
} }
} }

23
RGB.NET.Devices.Asus/Generic/AsusUpdateQueue.cs
View File

@ -47,23 +47,8 @@ namespace RGB.NET.Devices.Asus
AsusLedId index = (AsusLedId)key; AsusLedId index = (AsusLedId)key;
if (Device is IAuraSyncKeyboard keyboard) if (Device is IAuraSyncKeyboard keyboard)
{ {
IAuraRgbLight light = index switch IAuraRgbLight light = keyboard.Key[(ushort)index];
{
//UK keyboard Layout
AsusLedId.KEY_OEM_102 => keyboard.Lights[(int)((3 * keyboard.Width) + 13)],
AsusLedId.UNDOCUMENTED_1 => keyboard.Lights[(int)((4 * keyboard.Width) + 1)],
_ => keyboard.Key[(ushort)index]
};
// Asus Strix Scope
if (keyboard.Name == "Charm")
light = index switch
{
AsusLedId.KEY_LWIN => keyboard.Lights[(int)((5 * keyboard.Width) + 2)],
AsusLedId.KEY_LMENU => keyboard.Lights[(int)((5 * keyboard.Width) + 3)],
_ => light
};
(_, byte r, byte g, byte b) = value.GetRGBBytes(); (_, byte r, byte g, byte b) = value.GetRGBBytes();
light.Red = r; light.Red = r;
light.Green = g; light.Green = g;
@ -88,8 +73,10 @@ namespace RGB.NET.Devices.Asus
Device.Apply(); Device.Apply();
} }
catch catch
{ /* "The server threw an exception." seems to be a thing here ... */ } { /* "The server threw an exception." seems to be a thing here ... */
}
} }
#endregion #endregion
} }
} }

14
RGB.NET.Devices.Asus/Keyboard/AsusKeyboardLedMapping.cs
View File

@ -145,24 +145,12 @@ namespace RGB.NET.Devices.Asus
{ AsusLedId.KEY_MYCOMPUTER, LedId.Keyboard_Custom33 }, { AsusLedId.KEY_MYCOMPUTER, LedId.Keyboard_Custom33 },
{ AsusLedId.KEY_MAIL, LedId.Keyboard_Custom34 }, { AsusLedId.KEY_MAIL, LedId.Keyboard_Custom34 },
{ AsusLedId.KEY_MEDIASELECT, LedId.Keyboard_Custom35 }, { AsusLedId.KEY_MEDIASELECT, LedId.Keyboard_Custom35 },
{ AsusLedId.KEY_FN, LedId.Keyboard_Custom36 }, { AsusLedId.KEY_FN, LedId.Keyboard_Function },
{ AsusLedId.KEY_MUTE, LedId.Keyboard_MediaMute }, { AsusLedId.KEY_MUTE, LedId.Keyboard_MediaMute },
{ AsusLedId.KEY_PLAYPAUSE, LedId.Keyboard_MediaPlay }, { AsusLedId.KEY_PLAYPAUSE, LedId.Keyboard_MediaPlay },
{ AsusLedId.KEY_MEDIASTOP, LedId.Keyboard_MediaStop }, { AsusLedId.KEY_MEDIASTOP, LedId.Keyboard_MediaStop },
{ AsusLedId.KEY_VOLUMEDOWN, LedId.Keyboard_MediaVolumeDown }, { AsusLedId.KEY_VOLUMEDOWN, LedId.Keyboard_MediaVolumeDown },
{ AsusLedId.KEY_VOLUMEUP, LedId.Keyboard_MediaVolumeUp }, { AsusLedId.KEY_VOLUMEUP, LedId.Keyboard_MediaVolumeUp },
{ AsusLedId.UNDOCUMENTED_1, LedId.Keyboard_NonUsBackslash },
{ AsusLedId.UNDOCUMENTED_2, LedId.Keyboard_NonUsTilde },
{ AsusLedId.UNDOCUMENTED_3, LedId.Logo },
{ AsusLedId.UNDOCUMENTED_4, LedId.Keyboard_Custom1 },
{ AsusLedId.UNDOCUMENTED_5, LedId.Keyboard_Custom2 },
{ AsusLedId.UNDOCUMENTED_6, LedId.Keyboard_NonUsTilde },
{ AsusLedId.UNDOCUMENTED_7, LedId.Keyboard_NonUsBackslash },
// { AsusLedId.UNDOCUMENTED_8, LedId.Keyboard_Custom37 },
// { AsusLedId.UNDOCUMENTED_9, LedId.Keyboard_Custom38 },
// { AsusLedId.UNDOCUMENTED_10, LedId.Keyboard_Custom39 },
// { AsusLedId.UNDOCUMENTED_11, LedId.Keyboard_Custom40 },
}; };
} }
} }

10
RGB.NET.Devices.Asus/Keyboard/AsusKeyboardRGBDevice.cs
View File

@ -40,21 +40,11 @@ namespace RGB.NET.Devices.Asus
if (DeviceInfo.Device.Type != (uint)AsusDeviceType.NB_KB_4ZONE_RGB) if (DeviceInfo.Device.Type != (uint)AsusDeviceType.NB_KB_4ZONE_RGB)
{ {
int pos = 0; int pos = 0;
int unknownLed = (int) LedId.Unknown1;
foreach (IAuraRgbKey key in ((IAuraSyncKeyboard)DeviceInfo.Device).Keys) foreach (IAuraRgbKey key in ((IAuraSyncKeyboard)DeviceInfo.Device).Keys)
{ {
if (AsusKeyboardLedMapping.MAPPING.TryGetValue((AsusLedId)key.Code, out LedId ledId)) if (AsusKeyboardLedMapping.MAPPING.TryGetValue((AsusLedId)key.Code, out LedId ledId))
AddAsusLed((AsusLedId)key.Code, ledId, new Point(pos++ * 19, 0), new Size(19, 19)); AddAsusLed((AsusLedId)key.Code, ledId, new Point(pos++ * 19, 0), new Size(19, 19));
else
{
AddAsusLed((AsusLedId)key.Code, (LedId)unknownLed, new Point(pos++ * 19, 0), new Size(19, 19));
unknownLed++;
}
} }
// UK Layout
AddAsusLed(AsusLedId.KEY_OEM_102, AsusKeyboardLedMapping.MAPPING[AsusLedId.KEY_OEM_102], new Point(pos++ * 19, 0), new Size(19, 19));
AddAsusLed(AsusLedId.KEY_OEM_102, AsusKeyboardLedMapping.MAPPING[AsusLedId.UNDOCUMENTED_1], new Point(pos * 19, 0), new Size(19, 19));
} }
else else
{ {