RGB.NET.Core/Devices/RGBDeviceType.cs

@@ -88,11 +88,6 @@ public enum RGBDeviceType
     /// </summary>
     Monitor = 1 << 14,
 
-    /// <summary>
-    /// Represents a generic led-controller.
-    /// </summary>
-    LedController = 1 << 15,
-
     /// <summary>
     /// Represents a device where the type is not known or not present in the list.
     /// </summary>

RGB.NET.Devices.CoolerMaster/Native/_CoolerMasterSDK.cs

@@ -37,9 +37,7 @@ internal static class _CoolerMasterSDK
         if (_dllHandle != IntPtr.Zero) return;
 
         // HACK: Load library at runtime to support both, x86 and x64 with one managed dll
-        List<string> possiblePathList = (Environment.Is64BitProcess ? CoolerMasterDeviceProvider.PossibleX64NativePaths : CoolerMasterDeviceProvider.PossibleX86NativePaths)
+        List<string> possiblePathList = Environment.Is64BitProcess ? CoolerMasterDeviceProvider.PossibleX64NativePaths : CoolerMasterDeviceProvider.PossibleX86NativePaths;
-                                        .Select(Environment.ExpandEnvironmentVariables)
-                                        .ToList();
         string? dllPath = possiblePathList.FirstOrDefault(File.Exists);
         if (dllPath == null) throw new RGBDeviceException($"Can't find the CoolerMaster-SDK at one of the expected locations:\r\n '{string.Join("\r\n", possiblePathList.Select(Path.GetFullPath))}'");
 

RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
 using RGB.NET.Core;
 using RGB.NET.Devices.Corsair.Native;
@@ -142,30 +141,38 @@ public class CorsairDeviceProvider : AbstractRGBDeviceProvider
                 case CorsairDeviceType.Cooler:
                 case CorsairDeviceType.CommanderPro:
                 case CorsairDeviceType.LightningNodePro:
-                    List<_CorsairChannelInfo> channels = GetChannels(nativeDeviceInfo).ToList();
+                    _CorsairChannelsInfo? channelsInfo = nativeDeviceInfo.channels;
-                    int channelsLedCount = channels.Sum(x => x.totalLedsCount);
+                    if (channelsInfo != null)
-                    int deviceLedCount = nativeDeviceInfo.ledsCount - channelsLedCount;
-
-                    if (deviceLedCount > 0)
-                        yield return new CorsairCustomRGBDevice(new CorsairCustomRGBDeviceInfo(i, nativeDeviceInfo, deviceLedCount), updateQueue);
-
-                    int ledOffset = deviceLedCount;
-                    foreach (_CorsairChannelInfo channelInfo in channels)
                     {
-                        int channelDeviceInfoStructSize = Marshal.SizeOf(typeof(_CorsairChannelDeviceInfo));
+                        IntPtr channelInfoPtr = channelsInfo.channels;
-                        IntPtr channelDeviceInfoPtr = channelInfo.devices;
+                        int ledOffset = 0;
-                        for (int device = 0; (device < channelInfo.devicesCount) && (ledOffset < nativeDeviceInfo.ledsCount); device++)
+
+                        for (int channel = 0; channel < channelsInfo.channelsCount; channel++)
                         {
-                            _CorsairChannelDeviceInfo channelDeviceInfo = (_CorsairChannelDeviceInfo)Marshal.PtrToStructure(channelDeviceInfoPtr, typeof(_CorsairChannelDeviceInfo))!;
+                            CorsairLedId referenceLed = GetChannelReferenceId(nativeDeviceInfo.type, channel);
+                            if (referenceLed == CorsairLedId.Invalid) continue;
 
-                            yield return new CorsairCustomRGBDevice(new CorsairCustomRGBDeviceInfo(i, nativeDeviceInfo, channelDeviceInfo, ledOffset), updateQueue);
+                            _CorsairChannelInfo channelInfo = (_CorsairChannelInfo)Marshal.PtrToStructure(channelInfoPtr, typeof(_CorsairChannelInfo))!;
 
-                            ledOffset += channelDeviceInfo.deviceLedCount;
+                            int channelDeviceInfoStructSize = Marshal.SizeOf(typeof(_CorsairChannelDeviceInfo));
-                            channelDeviceInfoPtr = new IntPtr(channelDeviceInfoPtr.ToInt64() + channelDeviceInfoStructSize);
+                            IntPtr channelDeviceInfoPtr = channelInfo.devices;
+
+                            for (int device = 0; (device < channelInfo.devicesCount) && (ledOffset < nativeDeviceInfo.ledsCount); device++)
+                            {
+                                _CorsairChannelDeviceInfo channelDeviceInfo = (_CorsairChannelDeviceInfo)Marshal.PtrToStructure(channelDeviceInfoPtr, typeof(_CorsairChannelDeviceInfo))!;
+
+                                yield return new CorsairCustomRGBDevice(new CorsairCustomRGBDeviceInfo(i, nativeDeviceInfo, channelDeviceInfo, referenceLed, ledOffset), updateQueue);
+                                referenceLed += channelDeviceInfo.deviceLedCount;
+
+                                ledOffset += channelDeviceInfo.deviceLedCount;
+                                channelDeviceInfoPtr = new IntPtr(channelDeviceInfoPtr.ToInt64() + channelDeviceInfoStructSize);
+                            }
+
+                            int channelInfoStructSize = Marshal.SizeOf(typeof(_CorsairChannelInfo));
+                            channelInfoPtr = new IntPtr(channelInfoPtr.ToInt64() + channelInfoStructSize);
                         }
                     }
                     break;
-
                 default:
                     Throw(new RGBDeviceException("Unknown Device-Type"));
                     break;
@@ -173,19 +180,18 @@ public class CorsairDeviceProvider : AbstractRGBDeviceProvider
         }
     }
 
-    private static IEnumerable<_CorsairChannelInfo> GetChannels(_CorsairDeviceInfo deviceInfo)
+    private static CorsairLedId GetChannelReferenceId(CorsairDeviceType deviceType, int channel)
     {
-        _CorsairChannelsInfo? channelsInfo = deviceInfo.channels;
+        if (deviceType == CorsairDeviceType.Cooler)
-        if (channelsInfo == null) yield break;
+            return CorsairLedId.CustomLiquidCoolerChannel1Led1;
 
-        IntPtr channelInfoPtr = channelsInfo.channels;
+        return channel switch
-        for (int channel = 0; channel < channelsInfo.channelsCount; channel++)
         {
-            yield return (_CorsairChannelInfo)Marshal.PtrToStructure(channelInfoPtr, typeof(_CorsairChannelInfo))!;
+            0 => CorsairLedId.CustomDeviceChannel1Led1,
-
+            1 => CorsairLedId.CustomDeviceChannel2Led1,
-            int channelInfoStructSize = Marshal.SizeOf(typeof(_CorsairChannelInfo));
+            2 => CorsairLedId.CustomDeviceChannel3Led1,
-            channelInfoPtr = new IntPtr(channelInfoPtr.ToInt64() + channelInfoStructSize);
+            _ => CorsairLedId.Invalid
-        }
+        };
     }
 
     /// <inheritdoc />

RGB.NET.Devices.Corsair/Custom/CorsairCustomRGBDeviceInfo.cs

@@ -17,6 +17,11 @@ public class CorsairCustomRGBDeviceInfo : CorsairRGBDeviceInfo
 {
     #region Properties & Fields
 
+    /// <summary>
+    /// Gets the corsair-id of the first LED of this device.
+    /// </summary>
+    public CorsairLedId ReferenceCorsairLed { get; }
+
     /// <summary>
     /// Gets the amount of LEDs this device contains.
     /// </summary>
@@ -31,6 +36,7 @@ public class CorsairCustomRGBDeviceInfo : CorsairRGBDeviceInfo
 
     #region Constructors
 
+    //TODO DarthAffe 07.07.2018: DAP is a fan right now, that's most likely wrong
     /// <inheritdoc />
     /// <summary>
     /// Internal constructor of managed <see cref="T:RGB.NET.Devices.Corsair.CorsairCustomRGBDeviceInfo" />.
@@ -38,24 +44,18 @@ public class CorsairCustomRGBDeviceInfo : CorsairRGBDeviceInfo
     /// <param name="deviceIndex">The index of the <see cref="T:RGB.NET.Devices.Corsair._CorsairChannelDeviceInfo" />.</param>
     /// <param name="nativeInfo">The native <see cref="T:RGB.NET.Devices.Corsair.Native._CorsairDeviceInfo" />-struct</param>
     /// <param name="channelDeviceInfo">The native <see cref="T:RGB.NET.Devices.Corsair.Native._CorsairChannelDeviceInfo"/> representing this device.</param>
+    /// <param name="referenceCorsairLed">The id of the first LED of this device.</param>
     /// <param name="ledOffset">The offset used to find the LEDs of this device.</param>
-    internal CorsairCustomRGBDeviceInfo(int deviceIndex, _CorsairDeviceInfo nativeInfo, _CorsairChannelDeviceInfo channelDeviceInfo, int ledOffset)
+    internal CorsairCustomRGBDeviceInfo(int deviceIndex, _CorsairDeviceInfo nativeInfo, _CorsairChannelDeviceInfo channelDeviceInfo, CorsairLedId referenceCorsairLed, int ledOffset)
         : base(deviceIndex, GetDeviceType(channelDeviceInfo.type), nativeInfo,
                GetModelName(nativeInfo.model == IntPtr.Zero ? string.Empty : Regex.Replace(Marshal.PtrToStringAnsi(nativeInfo.model) ?? string.Empty, " ?DEMO", string.Empty, RegexOptions.IgnoreCase), channelDeviceInfo))
     {
+        this.ReferenceCorsairLed = referenceCorsairLed;
         this.LedOffset = ledOffset;
 
         LedCount = channelDeviceInfo.deviceLedCount;
     }
 
-    internal CorsairCustomRGBDeviceInfo(int deviceIndex, _CorsairDeviceInfo nativeInfo, int ledCount)
-        : base(deviceIndex, GetDeviceType(nativeInfo.type), nativeInfo)
-    {
-        this.LedCount = ledCount;
-
-        LedOffset = 0;
-    }
-
     #endregion
 
     #region Methods
@@ -77,24 +77,6 @@ public class CorsairCustomRGBDeviceInfo : CorsairRGBDeviceInfo
             _ => throw new ArgumentOutOfRangeException(nameof(deviceType), deviceType, null)
         };
 
-    private static RGBDeviceType GetDeviceType(CorsairDeviceType deviceType)
-        => deviceType switch
-        {
-            CorsairDeviceType.Unknown => RGBDeviceType.Unknown,
-            CorsairDeviceType.Mouse => RGBDeviceType.Mouse,
-            CorsairDeviceType.Keyboard => RGBDeviceType.Keyboard,
-            CorsairDeviceType.Headset => RGBDeviceType.Headset,
-            CorsairDeviceType.Mousepad => RGBDeviceType.Mousepad,
-            CorsairDeviceType.HeadsetStand => RGBDeviceType.HeadsetStand,
-            CorsairDeviceType.CommanderPro => RGBDeviceType.LedController,
-            CorsairDeviceType.LightningNodePro => RGBDeviceType.LedController,
-            CorsairDeviceType.MemoryModule => RGBDeviceType.DRAM,
-            CorsairDeviceType.Cooler => RGBDeviceType.Cooler,
-            CorsairDeviceType.Mainboard => RGBDeviceType.Mainboard,
-            CorsairDeviceType.GraphicsCard => RGBDeviceType.GraphicsCard,
-            _ => throw new ArgumentOutOfRangeException(nameof(deviceType), deviceType, null)
-        };
-
     private static string GetModelName(string model, _CorsairChannelDeviceInfo channelDeviceInfo)
     {
         switch (channelDeviceInfo.type)

RGB.NET.Devices.Corsair/Native/_CUESDK.cs

@@ -32,9 +32,7 @@ internal static class _CUESDK
         if (_dllHandle != IntPtr.Zero) return;
 
         // HACK: Load library at runtime to support both, x86 and x64 with one managed dll
-        List<string> possiblePathList = (Environment.Is64BitProcess ? CorsairDeviceProvider.PossibleX64NativePaths : CorsairDeviceProvider.PossibleX86NativePaths)
+        List<string> possiblePathList = Environment.Is64BitProcess ? CorsairDeviceProvider.PossibleX64NativePaths : CorsairDeviceProvider.PossibleX86NativePaths;
-                                        .Select(Environment.ExpandEnvironmentVariables)
-                                        .ToList();
         string? dllPath = possiblePathList.FirstOrDefault(File.Exists);
         if (dllPath == null) throw new RGBDeviceException($"Can't find the CUE-SDK at one of the expected locations:\r\n '{string.Join("\r\n", possiblePathList.Select(Path.GetFullPath))}'");
 

RGB.NET.Devices.Logitech/Native/_LogitechGSDK.cs

@@ -33,9 +33,7 @@ internal class _LogitechGSDK
         if (_dllHandle != IntPtr.Zero) return;
 
         // HACK: Load library at runtime to support both, x86 and x64 with one managed dll
-        List<string> possiblePathList = (Environment.Is64BitProcess ? LogitechDeviceProvider.PossibleX64NativePaths : LogitechDeviceProvider.PossibleX86NativePaths)
+        List<string> possiblePathList = Environment.Is64BitProcess ? LogitechDeviceProvider.PossibleX64NativePaths : LogitechDeviceProvider.PossibleX86NativePaths;
-                                        .Select(Environment.ExpandEnvironmentVariables)
-                                        .ToList();
         string? dllPath = possiblePathList.FirstOrDefault(File.Exists);
         if (dllPath == null) throw new RGBDeviceException($"Can't find the Logitech-SDK at one of the expected locations:\r\n '{string.Join("\r\n", possiblePathList.Select(Path.GetFullPath))}'");
 

RGB.NET.Devices.Msi/Native/_MsiSDK.cs

@@ -32,9 +32,7 @@ internal static class _MsiSDK
         if (_dllHandle != IntPtr.Zero) return;
 
         // HACK: Load library at runtime to support both, x86 and x64 with one managed dll
-        List<string> possiblePathList = (Environment.Is64BitProcess ? MsiDeviceProvider.PossibleX64NativePaths : MsiDeviceProvider.PossibleX86NativePaths)
+        List<string> possiblePathList = Environment.Is64BitProcess ? MsiDeviceProvider.PossibleX64NativePaths : MsiDeviceProvider.PossibleX86NativePaths;
-                                        .Select(Environment.ExpandEnvironmentVariables)
-                                        .ToList();
         string? dllPath = possiblePathList.FirstOrDefault(File.Exists);
         if (dllPath == null) throw new RGBDeviceException($"Can't find the Msi-SDK at one of the expected locations:\r\n '{string.Join("\r\n", possiblePathList.Select(Path.GetFullPath))}'");
 

RGB.NET.Devices.Razer/Native/_RazerSDK.cs

@@ -32,10 +32,8 @@ internal static class _RazerSDK
         if (_dllHandle != IntPtr.Zero) return;
 
         // HACK: Load library at runtime to support both, x86 and x64 with one managed dll
-        List<string> possiblePathList = (Environment.Is64BitProcess ? RazerDeviceProvider.PossibleX64NativePaths : RazerDeviceProvider.PossibleX86NativePaths)
+        List<string> possiblePathList = Environment.Is64BitProcess ? RazerDeviceProvider.PossibleX64NativePaths : RazerDeviceProvider.PossibleX86NativePaths;
-                                        .Select(Environment.ExpandEnvironmentVariables)
+        string? dllPath = possiblePathList.Select(Environment.ExpandEnvironmentVariables).FirstOrDefault(File.Exists);
-                                        .ToList();
-        string? dllPath = possiblePathList.FirstOrDefault(File.Exists);
         if (dllPath == null) throw new RGBDeviceException($"Can't find the Razer-SDK at one of the expected locations:\r\n '{string.Join("\r\n", possiblePathList.Select(Path.GetFullPath))}'");
 
         _dllHandle = LoadLibrary(dllPath);

RGB.NET.Devices.Wooting/Native/_WootingSDK.cs

@@ -32,9 +32,7 @@ internal static class _WootingSDK
         if (_dllHandle != IntPtr.Zero) return;
 
         // HACK: Load library at runtime to support both, x86 and x64 with one managed dll
-        List<string> possiblePathList = (Environment.Is64BitProcess ? WootingDeviceProvider.PossibleX64NativePaths : WootingDeviceProvider.PossibleX86NativePaths)
+        List<string> possiblePathList = Environment.Is64BitProcess ? WootingDeviceProvider.PossibleX64NativePaths : WootingDeviceProvider.PossibleX86NativePaths;
-                                        .Select(Environment.ExpandEnvironmentVariables)
-                                        .ToList();
         string? dllPath = possiblePathList.FirstOrDefault(File.Exists);
         if (dllPath == null) throw new RGBDeviceException($"Can't find the Wooting-SDK at one of the expected locations:\r\n '{string.Join("\r\n", possiblePathList.Select(Path.GetFullPath))}'");