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

Compare commits

base: DarthAffe:7fabc71b286b38dd90287a9ac000cc4f25bd9d09
Branches Tags
DarthAffe:master
DarthAffe:Development
DarthAffe:SDK/DynamicLightning
DarthAffe:feature/typed-layouts
DarthAffe:SDK/HIDLampArray
DarthAffe:SomeFixes
DarthAffe:v3.1.0
DarthAffe:v3.0.0
DarthAffe:v2.1.0
DarthAffe:v2.0.3-prerelease.2
DarthAffe:v2.0.2-prerelease.3
DarthAffe:v2.0.0
DarthAffe:v2.0.1-prerelease.2
DarthAffe:v2.0.0-prerelease.131
DarthAffe:v1.0.0
DarthAffe:v0.1.33
..
compare: DarthAffe:f8e4cc6b497efe2066f82bf643058f8052fb621e
Branches Tags
DarthAffe:Development
DarthAffe:master
DarthAffe:SDK/DynamicLightning
DarthAffe:feature/typed-layouts
DarthAffe:SDK/HIDLampArray
DarthAffe:SomeFixes
DarthAffe:v3.1.0
DarthAffe:v3.0.0
DarthAffe:v2.1.0
DarthAffe:v2.0.3-prerelease.2
DarthAffe:v2.0.2-prerelease.3
DarthAffe:v2.0.0
DarthAffe:v2.0.1-prerelease.2
DarthAffe:v2.0.0-prerelease.131
DarthAffe:v1.0.0
DarthAffe:v0.1.33

No commits in common. "7fabc71b286b38dd90287a9ac000cc4f25bd9d09" and "f8e4cc6b497efe2066f82bf643058f8052fb621e" have entirely different histories.
7fabc71b28 ... f8e4cc6b49

1 changed files with 8 additions and 18 deletions
Show Stats Expand all files Collapse all files

26
RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
View File

@ -273,12 +273,7 @@ public sealed class CorsairDeviceProvider : AbstractRGBDeviceProvider
break;
case CorsairChannelDeviceType.EightLedSeriesFan:
string fanModelName = "8-Led-Series Fan";
if (device.model == "iCUE LINK System Hub")
fanModelName = "RX Fan";
yield return new CorsairFanRGBDevice(new CorsairFanRGBDeviceInfo(device, ledCount, offset, fanModelName), updateQueue);
yield return new CorsairFanRGBDevice(new CorsairFanRGBDeviceInfo(device, ledCount, offset, "8-Led-Series Fan Fan"), updateQueue);
break;
case CorsairChannelDeviceType.DAP:
@ -294,20 +289,20 @@ public sealed class CorsairDeviceProvider : AbstractRGBDeviceProvider
break;
case CorsairChannelDeviceType.Strip:
string stripModelName = "LED Strip";
string modelName = "LED Strip";
// LS100 Led Strips are reported as one big strip if configured in monitor mode in iCUE, 138 LEDs for dual monitor, 84 for single
if ((device.model == "LS100 Starter Kit") && (ledCount == 138))
stripModelName = "LS100 LED Strip (dual monitor)";
modelName = "LS100 LED Strip (dual monitor)";
else if ((device.model == "LS100 Starter Kit") && (ledCount == 84))
stripModelName = "LS100 LED Strip (single monitor)";
modelName = "LS100 LED Strip (single monitor)";
// Any other value means an "External LED Strip" in iCUE, these are reported per-strip, 15 for short strips, 27 for long
else if ((device.model == "LS100 Starter Kit") && (ledCount == 15))
stripModelName = "LS100 LED Strip (short)";
modelName = "LS100 LED Strip (short)";
else if ((device.model == "LS100 Starter Kit") && (ledCount == 27))
stripModelName = "LS100 LED Strip (long)";
modelName = "LS100 LED Strip (long)";
yield return new CorsairLedStripRGBDevice(new CorsairLedStripRGBDeviceInfo(device, ledCount, offset, stripModelName), updateQueue);
yield return new CorsairLedStripRGBDevice(new CorsairLedStripRGBDeviceInfo(device, ledCount, offset, modelName), updateQueue);
break;
case CorsairChannelDeviceType.DRAM:
@ -315,12 +310,7 @@ public sealed class CorsairDeviceProvider : AbstractRGBDeviceProvider
break;
default:
//Workaround to support LX Fans because they have an invalid ChannelDeviceType
if ((device.model == "iCUE LINK System Hub") && (ledCount == 18))
yield return new CorsairFanRGBDevice(new CorsairFanRGBDeviceInfo(device, ledCount, offset, "LX Fan"), updateQueue);
else
Throw(new RGBDeviceException("Unknown Device-Type"));
Throw(new RGBDeviceException("Unknown Device-Type"));
break;
}