DarthAffe/RGB.NET
1
0 Fork 0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2026-11-11 13:06:24 +00:00
Code Issues Releases Wiki Activity

Merge branch 'Development' into patch-1

Browse Source
This commit is contained in:
DarthAffe authored and GitHub committed 2025-02-06 20:14:42 +01:00
2 parents a2a25bc40a 899fc697e4
commit e151b3f194
107 files changed
+518 -346
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

RGB.NET.Devices.SteelSeries/Generic/LedMappings.cs
+18 -1
View File
@@ -480,7 +480,7 @@ public static class LedMappings
{ LedId.Mouse9, SteelSeriesLedId.ZoneNine },
{ LedId.Mouse10, SteelSeriesLedId.ZoneTen }
};
/// <summary>
/// Gets the mapping for two-zone headsets.
/// </summary>
@@ -627,4 +627,21 @@ public static class LedMappings
{ LedId.LedStripe102, SteelSeriesLedId.ZoneOneHundredTwo },
{ LedId.LedStripe103, SteelSeriesLedId.ZoneOneHundredThree }
};
/// <summary>
/// Gets the mapping for 10-zone kayboard.
/// </summary>
public static LedMapping<SteelSeriesLedId> KeyboardTenZone { get; } = new()
{
{ LedId.Keyboard_Custom1, SteelSeriesLedId.ZoneOne },
{ LedId.Keyboard_Custom2, SteelSeriesLedId.ZoneTwo },
{ LedId.Keyboard_Custom3, SteelSeriesLedId.ZoneThree },
{ LedId.Keyboard_Custom4, SteelSeriesLedId.ZoneFour },
{ LedId.Keyboard_Custom5, SteelSeriesLedId.ZoneFive },
{ LedId.Keyboard_Custom6, SteelSeriesLedId.ZoneSix },
{ LedId.Keyboard_Custom7, SteelSeriesLedId.ZoneSeven },
{ LedId.Keyboard_Custom8, SteelSeriesLedId.ZoneEight },
{ LedId.Keyboard_Custom9, SteelSeriesLedId.ZoneNine },
{ LedId.Keyboard_Custom10, SteelSeriesLedId.ZoneTen }
};
}
RGB.NET.Devices.SteelSeries/Generic/SteelSeriesDeviceUpdateQueue.cs
+1 -1
View File
@@ -51,7 +51,7 @@ internal sealed class SteelSeriesDeviceUpdateQueue : UpdateQueue
}
/// <inheritdoc />
protected override bool Update(in ReadOnlySpan<(object key, Color color)> dataSet)
protected override bool Update(ReadOnlySpan<(object key, Color color)> dataSet)
{
try
{
RGB.NET.Devices.SteelSeries/RGB.NET.Devices.SteelSeries.csproj
+1 -1
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
RGB.NET.Devices.SteelSeries/SteelSeriesDeviceProvider.cs
+6 -2
View File
@@ -46,6 +46,7 @@ public sealed class SteelSeriesDeviceProvider : AbstractRGBDeviceProvider
//Mice
{ 0x1836, RGBDeviceType.Mouse, "Aerox 3", LedMappings.MouseThreeZone, SteelSeriesDeviceType.ThreeZone },
{ 0x183A, RGBDeviceType.Mouse, "Aerox 3 Wireless", LedMappings.MouseThreeZone, SteelSeriesDeviceType.ThreeZone },
{ 0x1858, RGBDeviceType.Mouse, "Aerox 9 Wireless", LedMappings.MouseThreeZone, SteelSeriesDeviceType.ThreeZone },
{ 0x1702, RGBDeviceType.Mouse, "Rival 100", LedMappings.MouseOneZone, SteelSeriesDeviceType.OneZone },
{ 0x1814, RGBDeviceType.Mouse, "Rival 105", LedMappings.MouseOneZone, SteelSeriesDeviceType.OneZone },
{ 0x1816, RGBDeviceType.Mouse, "Rival 106", LedMappings.MouseOneZone, SteelSeriesDeviceType.OneZone },
@@ -69,6 +70,7 @@ public sealed class SteelSeriesDeviceProvider : AbstractRGBDeviceProvider
{ 0x1852, RGBDeviceType.Mouse, "Aerox 5 Wireless", LedMappings.MouseThreeZone, SteelSeriesDeviceType.ThreeZone },
//Keyboards
{ 0x161A, RGBDeviceType.Keyboard, "Apex 3", LedMappings.KeyboardTenZone, SteelSeriesDeviceType.TenZone },
{ 0x161C, RGBDeviceType.Keyboard, "Apex 5", LedMappings.KeyboardMappingUk, SteelSeriesDeviceType.PerKey },
{ 0x1612, RGBDeviceType.Keyboard, "Apex 7", LedMappings.KeyboardMappingUk, SteelSeriesDeviceType.PerKey },
{ 0x1618, RGBDeviceType.Keyboard, "Apex 7 TKL", LedMappings.KeyboardTklMappingUk, SteelSeriesDeviceType.PerKey },
@@ -77,9 +79,11 @@ public sealed class SteelSeriesDeviceProvider : AbstractRGBDeviceProvider
{ 0x1610, RGBDeviceType.Keyboard, "Apex Pro", LedMappings.KeyboardMappingUk, SteelSeriesDeviceType.PerKey },
{ 0x1614, RGBDeviceType.Keyboard, "Apex Pro TKL", LedMappings.KeyboardTklMappingUk, SteelSeriesDeviceType.PerKey },
{ 0x1644, RGBDeviceType.Keyboard, "Apex Pro TKL Wireless Gen3", LedMappings.KeyboardTklMappingUk, SteelSeriesDeviceType.PerKey },
{ 0x1630, RGBDeviceType.Keyboard, "Apex Pro TKL", LedMappings.KeyboardTklMappingUk, SteelSeriesDeviceType.PerKey }, // DarthAffe 27.05.2024: This could be a generic wireless connector
{ 0x1640, RGBDeviceType.Keyboard, "Apex Pro 3", LedMappings.KeyboardMappingUk, SteelSeriesDeviceType.PerKey },
{ 0x2036, RGBDeviceType.Keyboard, "MSI Notebook", LedMappings.KeyboardNotebookMappingUk, SteelSeriesDeviceType.PerKey },
{ 0x113A, RGBDeviceType.Keyboard, "MSI GE78HX", LedMappings.KeyboardMSIGE78Mapping, SteelSeriesDeviceType.PerKey },
{ 0x1122, RGBDeviceType.Keyboard, "MSI Notebook", LedMappings.KeyboardNotebookMappingUk, SteelSeriesDeviceType.PerKey },
{ 0x1122, RGBDeviceType.Keyboard, "MSI Notebook", LedMappings.KeyboardNotebookMappingUk, SteelSeriesDeviceType.PerKey },
//Headsets
{ 0x12AA, RGBDeviceType.Headset, "Arctis 5", LedMappings.HeadsetTwoZone, SteelSeriesDeviceType.TwoZone },
@@ -163,4 +167,4 @@ public sealed class SteelSeriesDeviceProvider : AbstractRGBDeviceProvider
}
#endregion
}
}