DarthAffe/RGB.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2026-01-01 18:23:38 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: DarthAffe:7ad1e595a9c7d4d086775e8d41bc0ebac6188926
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:736d58c7a305c6060bb6c5a7e784375266e31164
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. "7ad1e595a9c7d4d086775e8d41bc0ebac6188926" and "736d58c7a305c6060bb6c5a7e784375266e31164" have entirely different histories.
7ad1e595a9 ... 736d58c7a3

2 changed files with 11 additions and 17 deletions
Show Stats Expand all files Collapse all files

24
RGB.NET.Devices.Wooting/Generic/WootingLedMappings.cs
View File

@ -307,29 +307,27 @@ internal static class WootingLedMappings
private static readonly Dictionary<LedId, (int row, int column)> ThreeKeyKeypad = new() private static readonly Dictionary<LedId, (int row, int column)> ThreeKeyKeypad = new()
{ {
//left (from top to bottom) //top left - bottom left
[LedId.LedStripe1] = (1, 0), [LedId.LedStripe1] = (0, 0),
[LedId.LedStripe2] = (2, 0), [LedId.LedStripe2] = (1, 0),
[LedId.LedStripe3] = (3, 0), [LedId.LedStripe3] = (3, 0),
//bottom (from left to right) //bottom left - bottom right
[LedId.LedStripe4] = (4, 1), [LedId.LedStripe4] = (4, 1),
[LedId.LedStripe5] = (4, 2), [LedId.LedStripe5] = (4, 2),
[LedId.LedStripe6] = (4, 4), [LedId.LedStripe6] = (4, 4),
[LedId.LedStripe7] = (4, 5), [LedId.LedStripe7] = (4, 5),
//right (from bottom to top) //bottom right - top right
[LedId.LedStripe8] = (3, 6), [LedId.LedStripe8] = (3, 6),
[LedId.LedStripe9] = (2, 6), [LedId.LedStripe9] = (1, 6),
[LedId.LedStripe10] = (1, 6), [LedId.LedStripe10] = (0, 6),
//top (from right to left) //top right - top left
[LedId.LedStripe11] = (0, 6), [LedId.LedStripe11] = (0, 4),
[LedId.LedStripe12] = (0, 4), [LedId.LedStripe12] = (0, 2),
[LedId.LedStripe13] = (0, 2),
[LedId.LedStripe14] = (0, 0),
//analog keys //Analog Keys
[LedId.Keypad1] = (3, 2), [LedId.Keypad1] = (3, 2),
[LedId.Keypad2] = (3, 3), [LedId.Keypad2] = (3, 3),
[LedId.Keypad3] = (3, 4), [LedId.Keypad3] = (3, 4),

4
RGB.NET.Devices.Wooting/WootingDeviceProvider.cs
View File

@ -102,10 +102,6 @@ public sealed class WootingDeviceProvider : AbstractRGBDeviceProvider
_WootingSDK.SelectDevice(i); _WootingSDK.SelectDevice(i);
_WootingDeviceInfo nativeDeviceInfo = (_WootingDeviceInfo)Marshal.PtrToStructure(_WootingSDK.GetDeviceInfo(), typeof(_WootingDeviceInfo))!; _WootingDeviceInfo nativeDeviceInfo = (_WootingDeviceInfo)Marshal.PtrToStructure(_WootingSDK.GetDeviceInfo(), typeof(_WootingDeviceInfo))!;
//Uwu non-rgb returns zero here.
if (nativeDeviceInfo.MaxLedIndex == 0)
continue;
yield return nativeDeviceInfo.DeviceType switch yield return nativeDeviceInfo.DeviceType switch
{ {
WootingDeviceType.Keypad3Keys => new WootingKeypadRGBDevice(new WootingKeypadRGBDeviceInfo(nativeDeviceInfo, i), updateQueue), WootingDeviceType.Keypad3Keys => new WootingKeypadRGBDevice(new WootingKeypadRGBDeviceInfo(nativeDeviceInfo, i), updateQueue),