diff --git a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs
index e3b093c..1f0784e 100644
--- a/RGB.NET.Devices.Asus/AsusDeviceProvider.cs
+++ b/RGB.NET.Devices.Asus/AsusDeviceProvider.cs
@@ -63,7 +63,7 @@ public sealed class AsusDeviceProvider : AbstractRGBDeviceProvider
yield return (AsusDeviceType)device.Type switch
{
- AsusDeviceType.MB_RGB => new AsusMainboardRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Mainboard, device, WMIHelper.GetMainboardInfo()?.model ?? device.Name), GetUpdateTrigger()),
+ AsusDeviceType.MB_RGB => new AsusMainboardRGBDevice(new AsusRGBDeviceInfo(RGBDeviceType.Mainboard, device, 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()),
diff --git a/RGB.NET.Devices.Asus/Helper/WMIHelper.cs b/RGB.NET.Devices.Asus/Helper/WMIHelper.cs
deleted file mode 100644
index 482f3a3..0000000
--- a/RGB.NET.Devices.Asus/Helper/WMIHelper.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Management;
-
-namespace RGB.NET.Devices.Asus;
-
-// ReSharper disable once InconsistentNaming
-internal static class WMIHelper
-{
- #region Properties & Fields
-
- // ReSharper disable InconsistentNaming
- private static readonly ManagementObjectSearcher? _systemModelSearcher;
- private static readonly ManagementObjectSearcher? _mainboardSearcher;
- private static readonly ManagementObjectSearcher? _graphicsCardSearcher;
- // ReSharper restore InconsistentNaming
-
- private static string? _systemModelInfo;
- private static (string manufacturer, string model)? _mainboardInfo;
- private static string? _graphicsCardInfo;
-
- #endregion
-
- #region Constructors
-
- static WMIHelper()
- {
- if (OperatingSystem.IsWindows())
- {
- _systemModelSearcher = new ManagementObjectSearcher(@"root\CIMV2", "SELECT Model FROM Win32_ComputerSystem");
- _mainboardSearcher = new ManagementObjectSearcher(@"root\CIMV2", "SELECT Manufacturer,Product FROM Win32_BaseBoard");
- _graphicsCardSearcher = new ManagementObjectSearcher(@"root\CIMV2", "SELECT Name FROM Win32_VideoController");
- }
- }
-
- #endregion
-
- #region Methods
-
- internal static string? GetSystemModelInfo()
- {
- if (!OperatingSystem.IsWindows()) return null;
-
- if ((_systemModelInfo == null) && (_systemModelSearcher != null))
- foreach (ManagementBaseObject managementBaseObject in _systemModelSearcher.Get())
- {
- _systemModelInfo = managementBaseObject["Model"].ToString();
- break;
- }
-
- return _systemModelInfo;
- }
-
- internal static (string manufacturer, string model)? GetMainboardInfo()
- {
- if (!OperatingSystem.IsWindows()) return null;
-
- if (!_mainboardInfo.HasValue && (_mainboardSearcher != null))
- foreach (ManagementBaseObject managementBaseObject in _mainboardSearcher.Get())
- {
- _mainboardInfo = (managementBaseObject["Manufacturer"].ToString() ?? string.Empty, managementBaseObject["Product"].ToString() ?? string.Empty);
- break;
- }
-
- return _mainboardInfo;
- }
-
- internal static string? GetGraphicsCardsInfo()
- {
- if (!OperatingSystem.IsWindows()) return null;
-
- if ((_graphicsCardInfo == null) && (_graphicsCardSearcher != null))
- foreach (ManagementBaseObject managementBaseObject in _graphicsCardSearcher.Get())
- {
- _graphicsCardInfo = managementBaseObject["Name"].ToString();
- break;
- }
-
- return _graphicsCardInfo;
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/RGB.NET.Devices.Asus/Keyboard/AsusKeyboardRGBDeviceInfo.cs b/RGB.NET.Devices.Asus/Keyboard/AsusKeyboardRGBDeviceInfo.cs
index b40ec59..b99688a 100644
--- a/RGB.NET.Devices.Asus/Keyboard/AsusKeyboardRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Asus/Keyboard/AsusKeyboardRGBDeviceInfo.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using AuraServiceLib;
+using AuraServiceLib;
using RGB.NET.Core;
namespace RGB.NET.Devices.Asus;
@@ -11,12 +10,6 @@ public sealed class AsusKeyboardRGBDeviceInfo : AsusRGBDeviceInfo, IKeyboardDevi
{
#region Properties & Fields
- ///
- /// The ASUS SDK returns useless names for notebook keyboards, possibly for others as well.
- /// Keep a list of those and rely on to get the real model
- ///
- private static readonly List GENERIC_DEVICE_NAMES = new() { "NotebookKeyboard" };
-
///
public KeyboardLayoutType Layout => KeyboardLayoutType.Unknown;
@@ -37,7 +30,7 @@ public sealed class AsusKeyboardRGBDeviceInfo : AsusRGBDeviceInfo, IKeyboardDevi
#region Methods
- private static string? GetKeyboardModel(string deviceName) => GENERIC_DEVICE_NAMES.Contains(deviceName) ? WMIHelper.GetSystemModelInfo() : deviceName;
+ private static string? GetKeyboardModel(string deviceName) => deviceName;
#endregion
}
\ No newline at end of file
diff --git a/RGB.NET.Devices.Asus/RGB.NET.Devices.Asus.csproj b/RGB.NET.Devices.Asus/RGB.NET.Devices.Asus.csproj
index dc67689..6d14d24 100644
--- a/RGB.NET.Devices.Asus/RGB.NET.Devices.Asus.csproj
+++ b/RGB.NET.Devices.Asus/RGB.NET.Devices.Asus.csproj
@@ -56,10 +56,6 @@
-
-
-
-