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

Refactored LedIds

Browse Source 
Everything is now based on the same ids for all devices
This commit is contained in:
DarthAffe committed 2017-12-13 17:19:56 +01:00
1 parent 200e471e4d
commit c5a1825f50
80 files changed
+2923 -3657
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDevice.cs
+6 -2
View File
@@ -2,6 +2,7 @@
// ReSharper disable UnusedMember.Global
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using RGB.NET.Core;
using RGB.NET.Devices.Corsair.Native;
@@ -38,11 +39,11 @@ namespace RGB.NET.Devices.Corsair
int structSize = Marshal.SizeOf(typeof(_CorsairLedPosition));
IntPtr ptr = nativeLedPositions.pLedPosition;
Dictionary<CorsairLedId, LedId> mapping = KeyboardIdMapping.DEFAULT.SwapKeyValue();
for (int i = 0; i < nativeLedPositions.numberOfLed; i++)
{
_CorsairLedPosition ledPosition = (_CorsairLedPosition)Marshal.PtrToStructure(ptr, typeof(_CorsairLedPosition));
InitializeLed(new CorsairLedId(this, ledPosition.ledId),
new Rectangle(ledPosition.left, ledPosition.top, ledPosition.width, ledPosition.height));
InitializeLed(mapping.TryGetValue(ledPosition.LedId, out LedId ledId) ? ledId : LedId.Invalid, new Rectangle(ledPosition.left, ledPosition.top, ledPosition.width, ledPosition.height));
ptr = new IntPtr(ptr.ToInt64() + structSize);
}
@@ -53,6 +54,9 @@ namespace RGB.NET.Devices.Corsair
DeviceInfo.LogicalLayout.ToString(), PathHelper.GetAbsolutePath(@"Images\Corsair\Keyboards"));
}
/// <inheritdoc />
protected override object CreateLedCustomData(LedId ledId) => KeyboardIdMapping.DEFAULT.TryGetValue(ledId, out CorsairLedId id) ? id : CorsairLedId.Invalid;
#endregion
}
}
RGB.NET.Devices.Corsair/Keyboard/KeyboardIdMapping.cs
+158
View File
@@ -0,0 +1,158 @@
using System.Collections.Generic;
using RGB.NET.Core;
namespace RGB.NET.Devices.Corsair
{
internal static class KeyboardIdMapping
{
internal static readonly Dictionary<LedId, CorsairLedId> DEFAULT = new Dictionary<LedId, CorsairLedId>
{
{ LedId.Invalid, CorsairLedId.Invalid },
{ LedId.Keyboard_Escape, CorsairLedId.Escape },
{ LedId.Keyboard_F1, CorsairLedId.F1 },
{ LedId.Keyboard_F2, CorsairLedId.F2 },
{ LedId.Keyboard_F3, CorsairLedId.F3 },
{ LedId.Keyboard_F4, CorsairLedId.F4 },
{ LedId.Keyboard_F5, CorsairLedId.F5 },
{ LedId.Keyboard_F6, CorsairLedId.F6 },
{ LedId.Keyboard_F7, CorsairLedId.F7 },
{ LedId.Keyboard_F8, CorsairLedId.F8 },
{ LedId.Keyboard_F9, CorsairLedId.F9 },
{ LedId.Keyboard_F10, CorsairLedId.F10 },
{ LedId.Keyboard_F11, CorsairLedId.F11 },
{ LedId.Keyboard_GraveAccentAndTilde, CorsairLedId.GraveAccentAndTilde },
{ LedId.Keyboard_1, CorsairLedId.D1 },
{ LedId.Keyboard_2, CorsairLedId.D2 },
{ LedId.Keyboard_3, CorsairLedId.D3 },
{ LedId.Keyboard_4, CorsairLedId.D4 },
{ LedId.Keyboard_5, CorsairLedId.D5 },
{ LedId.Keyboard_6, CorsairLedId.D6 },
{ LedId.Keyboard_7, CorsairLedId.D7 },
{ LedId.Keyboard_8, CorsairLedId.D8 },
{ LedId.Keyboard_9, CorsairLedId.D9 },
{ LedId.Keyboard_0, CorsairLedId.D0 },
{ LedId.Keyboard_MinusAndUnderscore, CorsairLedId.MinusAndUnderscore },
{ LedId.Keyboard_Tab, CorsairLedId.Tab },
{ LedId.Keyboard_Q, CorsairLedId.Q },
{ LedId.Keyboard_W, CorsairLedId.W },
{ LedId.Keyboard_E, CorsairLedId.E },
{ LedId.Keyboard_R, CorsairLedId.R },
{ LedId.Keyboard_T, CorsairLedId.T },
{ LedId.Keyboard_Y, CorsairLedId.Y },
{ LedId.Keyboard_U, CorsairLedId.U },
{ LedId.Keyboard_I, CorsairLedId.I },
{ LedId.Keyboard_O, CorsairLedId.O },
{ LedId.Keyboard_P, CorsairLedId.P },
{ LedId.Keyboard_BracketLeft, CorsairLedId.BracketLeft },
{ LedId.Keyboard_CapsLock, CorsairLedId.CapsLock },
{ LedId.Keyboard_A, CorsairLedId.A },
{ LedId.Keyboard_S, CorsairLedId.S },
{ LedId.Keyboard_D, CorsairLedId.D },
{ LedId.Keyboard_F, CorsairLedId.F },
{ LedId.Keyboard_G, CorsairLedId.G },
{ LedId.Keyboard_H, CorsairLedId.H },
{ LedId.Keyboard_J, CorsairLedId.J },
{ LedId.Keyboard_K, CorsairLedId.K },
{ LedId.Keyboard_L, CorsairLedId.L },
{ LedId.Keyboard_SemicolonAndColon, CorsairLedId.SemicolonAndColon },
{ LedId.Keyboard_ApostropheAndDoubleQuote, CorsairLedId.ApostropheAndDoubleQuote },
{ LedId.Keyboard_LeftShift, CorsairLedId.LeftShift },
{ LedId.Keyboard_NonUsBackslash, CorsairLedId.NonUsBackslash },
{ LedId.Keyboard_Z, CorsairLedId.Z },
{ LedId.Keyboard_X, CorsairLedId.X },
{ LedId.Keyboard_C, CorsairLedId.C },
{ LedId.Keyboard_V, CorsairLedId.V },
{ LedId.Keyboard_B, CorsairLedId.B },
{ LedId.Keyboard_N, CorsairLedId.N },
{ LedId.Keyboard_M, CorsairLedId.M },
{ LedId.Keyboard_CommaAndLessThan, CorsairLedId.CommaAndLessThan },
{ LedId.Keyboard_PeriodAndBiggerThan, CorsairLedId.PeriodAndBiggerThan },
{ LedId.Keyboard_SlashAndQuestionMark, CorsairLedId.SlashAndQuestionMark },
{ LedId.Keyboard_LeftCtrl, CorsairLedId.LeftCtrl },
{ LedId.Keyboard_LeftGui, CorsairLedId.LeftGui },
{ LedId.Keyboard_LeftAlt, CorsairLedId.LeftAlt },
{ LedId.Keyboard_Lang2, CorsairLedId.Lang2 },
{ LedId.Keyboard_Space, CorsairLedId.Space },
{ LedId.Keyboard_Lang1, CorsairLedId.Lang1 },
{ LedId.Keyboard_International2, CorsairLedId.International2 },
{ LedId.Keyboard_RightAlt, CorsairLedId.RightAlt },
{ LedId.Keyboard_RightGui, CorsairLedId.RightGui },
{ LedId.Keyboard_Application, CorsairLedId.Application },
{ LedId.Keyboard_Brightness, CorsairLedId.Brightness },
{ LedId.Keyboard_F12, CorsairLedId.F12 },
{ LedId.Keyboard_PrintScreen, CorsairLedId.PrintScreen },
{ LedId.Keyboard_ScrollLock, CorsairLedId.ScrollLock },
{ LedId.Keyboard_PauseBreak, CorsairLedId.PauseBreak },
{ LedId.Keyboard_Insert, CorsairLedId.Insert },
{ LedId.Keyboard_Home, CorsairLedId.Home },
{ LedId.Keyboard_PageUp, CorsairLedId.PageUp },
{ LedId.Keyboard_BracketRight, CorsairLedId.BracketRight },
{ LedId.Keyboard_Backslash, CorsairLedId.Backslash },
{ LedId.Keyboard_NonUsTilde, CorsairLedId.NonUsTilde },
{ LedId.Keyboard_Enter, CorsairLedId.Enter },
{ LedId.Keyboard_International1, CorsairLedId.International1 },
{ LedId.Keyboard_EqualsAndPlus, CorsairLedId.EqualsAndPlus },
{ LedId.Keyboard_International3, CorsairLedId.International3 },
{ LedId.Keyboard_Backspace, CorsairLedId.Backspace },
{ LedId.Keyboard_Delete, CorsairLedId.Delete },
{ LedId.Keyboard_End, CorsairLedId.End },
{ LedId.Keyboard_PageDown, CorsairLedId.PageDown },
{ LedId.Keyboard_RightShift, CorsairLedId.RightShift },
{ LedId.Keyboard_RightCtrl, CorsairLedId.RightCtrl },
{ LedId.Keyboard_ArrowUp, CorsairLedId.UpArrow },
{ LedId.Keyboard_ArrowLeft, CorsairLedId.LeftArrow },
{ LedId.Keyboard_ArrowDown, CorsairLedId.DownArrow },
{ LedId.Keyboard_ArrowRight, CorsairLedId.RightArrow },
{ LedId.Keyboard_WinLock, CorsairLedId.WinLock },
{ LedId.Keyboard_MediaMute, CorsairLedId.Mute },
{ LedId.Keyboard_MediaStop, CorsairLedId.Stop },
{ LedId.Keyboard_MediaPreviousTrack, CorsairLedId.ScanPreviousTrack },
{ LedId.Keyboard_MediaPlay, CorsairLedId.PlayPause },
{ LedId.Keyboard_MediaNextTrack, CorsairLedId.ScanNextTrack },
{ LedId.Keyboard_NumLock, CorsairLedId.NumLock },
{ LedId.Keyboard_NumSlash, CorsairLedId.KeypadSlash },
{ LedId.Keyboard_NumAsterisk, CorsairLedId.KeypadAsterisk },
{ LedId.Keyboard_NumMinus, CorsairLedId.KeypadMinus },
{ LedId.Keyboard_NumPlus, CorsairLedId.KeypadPlus },
{ LedId.Keyboard_NumEnter, CorsairLedId.KeypadEnter },
{ LedId.Keyboard_Num7, CorsairLedId.Keypad7 },
{ LedId.Keyboard_Num8, CorsairLedId.Keypad8 },
{ LedId.Keyboard_Num9, CorsairLedId.Keypad9 },
{ LedId.Keyboard_NumComma, CorsairLedId.KeypadComma },
{ LedId.Keyboard_Num4, CorsairLedId.Keypad4 },
{ LedId.Keyboard_Num5, CorsairLedId.Keypad5 },
{ LedId.Keyboard_Num6, CorsairLedId.Keypad6 },
{ LedId.Keyboard_Num1, CorsairLedId.Keypad1 },
{ LedId.Keyboard_Num2, CorsairLedId.Keypad2 },
{ LedId.Keyboard_Num3, CorsairLedId.Keypad3 },
{ LedId.Keyboard_Num0, CorsairLedId.Keypad0 },
{ LedId.Keyboard_NumPeriodAndDelete, CorsairLedId.KeypadPeriodAndDelete },
{ LedId.Keyboard_Programmable1, CorsairLedId.G1 },
{ LedId.Keyboard_Programmable2, CorsairLedId.G2 },
{ LedId.Keyboard_Programmable3, CorsairLedId.G3 },
{ LedId.Keyboard_Programmable4, CorsairLedId.G4 },
{ LedId.Keyboard_Programmable5, CorsairLedId.G5 },
{ LedId.Keyboard_Programmable6, CorsairLedId.G6 },
{ LedId.Keyboard_Programmable7, CorsairLedId.G7 },
{ LedId.Keyboard_Programmable8, CorsairLedId.G8 },
{ LedId.Keyboard_Programmable9, CorsairLedId.G9 },
{ LedId.Keyboard_Programmable10, CorsairLedId.G10 },
{ LedId.Keyboard_MediaVolumeUp, CorsairLedId.VolumeUp },
{ LedId.Keyboard_MediaVolumeDown, CorsairLedId.VolumeDown },
{ LedId.Keyboard_MacroRecording, CorsairLedId.MR },
{ LedId.Keyboard_Macro1, CorsairLedId.M1 },
{ LedId.Keyboard_Macro2, CorsairLedId.M2 },
{ LedId.Keyboard_Macro3, CorsairLedId.M3 },
{ LedId.Keyboard_Programmable11, CorsairLedId.G11 },
{ LedId.Keyboard_Programmable12, CorsairLedId.G12 },
{ LedId.Keyboard_Programmable13, CorsairLedId.G13 },
{ LedId.Keyboard_Programmable14, CorsairLedId.G14 },
{ LedId.Keyboard_Programmable15, CorsairLedId.G15 },
{ LedId.Keyboard_Programmable16, CorsairLedId.G16 },
{ LedId.Keyboard_Programmable17, CorsairLedId.G17 },
{ LedId.Keyboard_Programmable18, CorsairLedId.G18 },
{ LedId.Keyboard_International5, CorsairLedId.International5 },
{ LedId.Keyboard_International4, CorsairLedId.International4 },
};
}
}