From 38840ef6f4b1af296cd40612da959176e53e9851 Mon Sep 17 00:00:00 2001 From: Danielle Date: Sun, 12 Feb 2023 11:41:18 +1100 Subject: [PATCH 1/4] Asus dev --- RGB.NET.Devices.Asus/AsusDeviceProvider.cs | 42 +++++++++++++++++++++ RGB.NET.Devices.Asus/Enum/AsusDeviceType.cs | 3 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs index 2e09b52..a9413a7 100644 --- a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs +++ b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs @@ -3,6 +3,9 @@ using System; using System.Collections.Generic; +using System.IO; +using System.Reflection; +using System.Reflection.Metadata; using AuraServiceLib; using RGB.NET.Core; @@ -52,6 +55,7 @@ public class AsusDeviceProvider : AbstractRGBDeviceProvider } /// + protected override IEnumerable LoadDevices() { if (_sdk == null) yield break; @@ -75,6 +79,44 @@ public class AsusDeviceProvider : AbstractRGBDeviceProvider }; } } + /* + protected override IEnumerable LoadDevices() + { + if (_sdk == null) { + throw new InvalidOperationException($"Asus Library not yet loaded."); + yield break; + } + + var enviroment = new FileInfo(Assembly.GetExecutingAssembly().Location).DirectoryName; + var filePath = $"{enviroment}/ASUSDEBUG.txt"; + var content = ""; + + _devices = _sdk.Enumerate(0); + for (int i = 0; i < _devices.Count; i++) + { + IAuraSyncDevice device = _devices[i]; + + content += $"Name: {device.Name} Type: {device.Type} Type Hex: {device.Type:X} LEDs: {device.Lights.Count} \n\n"; + + yield return (AsusDeviceType)device.Type switch + { + AsusDeviceType.MB_RGB => new AsusMainboardRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Mainboard, device, WMIHelper.GetMainboardInfo()?.model ?? device.Name), GetUpdateTrigger()), + AsusDeviceType.MB_ADDRESABLE => new AsusUnspecifiedRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.LedStripe, device), LedId.LedStripe1, GetUpdateTrigger()), + AsusDeviceType.VGA_RGB => new AsusGraphicsCardRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.GraphicsCard, device), GetUpdateTrigger()), + AsusDeviceType.HEADSET_RGB => new AsusHeadsetRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Headset, device), GetUpdateTrigger()), + AsusDeviceType.DRAM_RGB => new AsusDramRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.DRAM, device), GetUpdateTrigger()), + AsusDeviceType.KEYBOARD_RGB => new AsusKeyboardRGBDevice(new AsusKeyboardRGBDeviceInfo(device), LedMappings.KeyboardMapping, GetUpdateTrigger()), + AsusDeviceType.NB_KB_RGB => new AsusKeyboardRGBDevice(new AsusKeyboardRGBDeviceInfo(device), LedMappings.KeyboardMapping, GetUpdateTrigger()), + AsusDeviceType.NB_KB_4ZONE_RGB => new AsusKeyboardRGBDevice(new AsusKeyboardRGBDeviceInfo(device), null, GetUpdateTrigger()), + AsusDeviceType.MOUSE_RGB => new AsusMouseRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Mouse, device), GetUpdateTrigger()), + AsusDeviceType.TERMINAL_RGB => new AsusUnspecifiedRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.LedController, device), LedId.Custom1, GetUpdateTrigger()), + _ => new AsusUnspecifiedRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Unknown, device), LedId.Custom1, GetUpdateTrigger()) + }; + } + + System.IO.File.WriteAllText(filePath, content); + } + */ /// public override void Dispose() diff --git a/RGB.NET.Devices.Asus/Enum/AsusDeviceType.cs b/RGB.NET.Devices.Asus/Enum/AsusDeviceType.cs index ad529ed..bb5f16f 100644 --- a/RGB.NET.Devices.Asus/Enum/AsusDeviceType.cs +++ b/RGB.NET.Devices.Asus/Enum/AsusDeviceType.cs @@ -20,5 +20,6 @@ internal enum AsusDeviceType : uint NB_KB_4ZONE_RGB = 0x81001, MOUSE_RGB = 0x90000, CHASSIS_RGB = 0xB0000, - PROJECTOR_RGB = 0xC0000 + PROJECTOR_RGB = 0xC0000, + TERMINAL_RGB = 0xE0000 } \ No newline at end of file From df2f5620eefe08d111cd5414dd9cd7c91f33fe15 Mon Sep 17 00:00:00 2001 From: Danielle Date: Sun, 12 Feb 2023 12:44:39 +1100 Subject: [PATCH 2/4] Update AsusDeviceProvider.cs --- RGB.NET.Devices.Asus/AsusDeviceProvider.cs | 40 ++-------------------- 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs index a9413a7..494adc0 100644 --- a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs +++ b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs @@ -3,9 +3,6 @@ using System; using System.Collections.Generic; -using System.IO; -using System.Reflection; -using System.Reflection.Metadata; using AuraServiceLib; using RGB.NET.Core; @@ -58,46 +55,16 @@ public class AsusDeviceProvider : AbstractRGBDeviceProvider protected override IEnumerable LoadDevices() { - if (_sdk == null) yield break; - - _devices = _sdk.Enumerate(0); - for (int i = 0; i < _devices.Count; i++) - { - IAuraSyncDevice device = _devices[i]; - yield return (AsusDeviceType)device.Type switch - { - AsusDeviceType.MB_RGB => new AsusMainboardRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Mainboard, device, WMIHelper.GetMainboardInfo()?.model ?? device.Name), GetUpdateTrigger()), - AsusDeviceType.MB_ADDRESABLE => new AsusUnspecifiedRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.LedStripe, device), LedId.LedStripe1, GetUpdateTrigger()), - AsusDeviceType.VGA_RGB => new AsusGraphicsCardRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.GraphicsCard, device), GetUpdateTrigger()), - AsusDeviceType.HEADSET_RGB => new AsusHeadsetRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Headset, device), GetUpdateTrigger()), - AsusDeviceType.DRAM_RGB => new AsusDramRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.DRAM, device), GetUpdateTrigger()), - AsusDeviceType.KEYBOARD_RGB => new AsusKeyboardRGBDevice(new AsusKeyboardRGBDeviceInfo(device), LedMappings.KeyboardMapping, GetUpdateTrigger()), - AsusDeviceType.NB_KB_RGB => new AsusKeyboardRGBDevice(new AsusKeyboardRGBDeviceInfo(device), LedMappings.KeyboardMapping, GetUpdateTrigger()), - AsusDeviceType.NB_KB_4ZONE_RGB => new AsusKeyboardRGBDevice(new AsusKeyboardRGBDeviceInfo(device), null, GetUpdateTrigger()), - AsusDeviceType.MOUSE_RGB => new AsusMouseRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Mouse, device), GetUpdateTrigger()), - _ => new AsusUnspecifiedRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Unknown, device), LedId.Custom1, GetUpdateTrigger()) - }; - } - } - /* - protected override IEnumerable LoadDevices() - { - if (_sdk == null) { - throw new InvalidOperationException($"Asus Library not yet loaded."); + if (_sdk == null) { yield break; } - var enviroment = new FileInfo(Assembly.GetExecutingAssembly().Location).DirectoryName; - var filePath = $"{enviroment}/ASUSDEBUG.txt"; - var content = ""; _devices = _sdk.Enumerate(0); for (int i = 0; i < _devices.Count; i++) { IAuraSyncDevice device = _devices[i]; - content += $"Name: {device.Name} Type: {device.Type} Type Hex: {device.Type:X} LEDs: {device.Lights.Count} \n\n"; - yield return (AsusDeviceType)device.Type switch { AsusDeviceType.MB_RGB => new AsusMainboardRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Mainboard, device, WMIHelper.GetMainboardInfo()?.model ?? device.Name), GetUpdateTrigger()), @@ -110,13 +77,10 @@ public class AsusDeviceProvider : AbstractRGBDeviceProvider AsusDeviceType.NB_KB_4ZONE_RGB => new AsusKeyboardRGBDevice(new AsusKeyboardRGBDeviceInfo(device), null, GetUpdateTrigger()), AsusDeviceType.MOUSE_RGB => new AsusMouseRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Mouse, device), GetUpdateTrigger()), AsusDeviceType.TERMINAL_RGB => new AsusUnspecifiedRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.LedController, device), LedId.Custom1, GetUpdateTrigger()), - _ => new AsusUnspecifiedRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Unknown, device), LedId.Custom1, GetUpdateTrigger()) + _ => new AsusUnspecifiedRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Unknown, device), LedId.Unknown1, GetUpdateTrigger()) }; } - - System.IO.File.WriteAllText(filePath, content); } - */ /// public override void Dispose() From 914bd8c0a1c591ddd20943bec09a2b40c182567b Mon Sep 17 00:00:00 2001 From: Danielle Date: Sun, 12 Feb 2023 12:45:30 +1100 Subject: [PATCH 3/4] Update AsusDeviceProvider.cs Code cleanup --- RGB.NET.Devices.Asus/AsusDeviceProvider.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs index 494adc0..0dfddb7 100644 --- a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs +++ b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs @@ -55,10 +55,7 @@ public class AsusDeviceProvider : AbstractRGBDeviceProvider protected override IEnumerable LoadDevices() { - if (_sdk == null) { - yield break; - } - + if (_sdk == null) yield break; _devices = _sdk.Enumerate(0); for (int i = 0; i < _devices.Count; i++) From db2f16d371780bf6b911d0b2515494ab08bbaa4a Mon Sep 17 00:00:00 2001 From: DarthAffe Date: Sun, 12 Feb 2023 13:48:01 +0100 Subject: [PATCH 4/4] Update RGB.NET.Devices.Asus/AsusDeviceProvider.cs --- RGB.NET.Devices.Asus/AsusDeviceProvider.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs index 0dfddb7..f9af5b3 100644 --- a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs +++ b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs @@ -52,7 +52,6 @@ public class AsusDeviceProvider : AbstractRGBDeviceProvider } /// - protected override IEnumerable LoadDevices() { if (_sdk == null) yield break;