mirror of
https://github.com/DarthAffe/RGB.NET.git
synced 2025-12-13 10:08:31 +00:00
Merge pull request #138 from Hex3l/Development
SteelSeries per-key-zone devices fix (keyboards), adds Apex 7 TKL
This commit is contained in:
GitHub
commit
0025f4321a
@ -39,7 +39,7 @@ namespace RGB.NET.Devices.SteelSeries.API
|
|||||||
(add-event-zone-use-with-specifier ""{EVENT_NAME}"" ""all"" ""rgb-17-zone"")
|
(add-event-zone-use-with-specifier ""{EVENT_NAME}"" ""all"" ""rgb-17-zone"")
|
||||||
(add-event-zone-use-with-specifier ""{EVENT_NAME}"" ""all"" ""rgb-24-zone"")
|
(add-event-zone-use-with-specifier ""{EVENT_NAME}"" ""all"" ""rgb-24-zone"")
|
||||||
(add-event-zone-use-with-specifier ""{EVENT_NAME}"" ""all"" ""rgb-103-zone"")";
|
(add-event-zone-use-with-specifier ""{EVENT_NAME}"" ""all"" ""rgb-103-zone"")";
|
||||||
|
|
||||||
private const string CORE_PROPS_WINDOWS = "%PROGRAMDATA%/SteelSeries/SteelSeries Engine 3/coreProps.json";
|
private const string CORE_PROPS_WINDOWS = "%PROGRAMDATA%/SteelSeries/SteelSeries Engine 3/coreProps.json";
|
||||||
private const string CORE_PROPS_OSX = "/Library/Application Support/SteelSeries Engine 3/coreProps.json";
|
private const string CORE_PROPS_OSX = "/Library/Application Support/SteelSeries Engine 3/coreProps.json";
|
||||||
|
|
||||||
|
|||||||
@ -121,6 +121,99 @@ namespace RGB.NET.Devices.SteelSeries.HID
|
|||||||
{ LedId.Keyboard_NumPeriodAndDelete, SteelSeriesLedId.KeypadPeriod }
|
{ LedId.Keyboard_NumPeriodAndDelete, SteelSeriesLedId.KeypadPeriod }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
private static readonly LedMapping KEYBOARD_TKL_MAPPING_UK = new LedMapping
|
||||||
|
{
|
||||||
|
{ LedId.Logo, SteelSeriesLedId.Logo },
|
||||||
|
{ LedId.Keyboard_Escape, SteelSeriesLedId.Escape },
|
||||||
|
{ LedId.Keyboard_F1, SteelSeriesLedId.F1 },
|
||||||
|
{ LedId.Keyboard_F2, SteelSeriesLedId.F2 },
|
||||||
|
{ LedId.Keyboard_F3, SteelSeriesLedId.F3 },
|
||||||
|
{ LedId.Keyboard_F4, SteelSeriesLedId.F4 },
|
||||||
|
{ LedId.Keyboard_F5, SteelSeriesLedId.F5 },
|
||||||
|
{ LedId.Keyboard_F6, SteelSeriesLedId.F6 },
|
||||||
|
{ LedId.Keyboard_F7, SteelSeriesLedId.F7 },
|
||||||
|
{ LedId.Keyboard_F8, SteelSeriesLedId.F8 },
|
||||||
|
{ LedId.Keyboard_F9, SteelSeriesLedId.F9 },
|
||||||
|
{ LedId.Keyboard_F10, SteelSeriesLedId.F10 },
|
||||||
|
{ LedId.Keyboard_F11, SteelSeriesLedId.F11 },
|
||||||
|
{ LedId.Keyboard_GraveAccentAndTilde, SteelSeriesLedId.Backqoute },
|
||||||
|
{ LedId.Keyboard_1, SteelSeriesLedId.Keyboard1 },
|
||||||
|
{ LedId.Keyboard_2, SteelSeriesLedId.Keyboard2 },
|
||||||
|
{ LedId.Keyboard_3, SteelSeriesLedId.Keyboard3 },
|
||||||
|
{ LedId.Keyboard_4, SteelSeriesLedId.Keyboard4 },
|
||||||
|
{ LedId.Keyboard_5, SteelSeriesLedId.Keyboard5 },
|
||||||
|
{ LedId.Keyboard_6, SteelSeriesLedId.Keyboard6 },
|
||||||
|
{ LedId.Keyboard_7, SteelSeriesLedId.Keyboard7 },
|
||||||
|
{ LedId.Keyboard_8, SteelSeriesLedId.Keyboard8 },
|
||||||
|
{ LedId.Keyboard_9, SteelSeriesLedId.Keyboard9 },
|
||||||
|
{ LedId.Keyboard_0, SteelSeriesLedId.Keyboard0 },
|
||||||
|
{ LedId.Keyboard_MinusAndUnderscore, SteelSeriesLedId.Dash },
|
||||||
|
{ LedId.Keyboard_Tab, SteelSeriesLedId.Tab },
|
||||||
|
{ LedId.Keyboard_Q, SteelSeriesLedId.Q },
|
||||||
|
{ LedId.Keyboard_W, SteelSeriesLedId.W },
|
||||||
|
{ LedId.Keyboard_E, SteelSeriesLedId.E },
|
||||||
|
{ LedId.Keyboard_R, SteelSeriesLedId.R },
|
||||||
|
{ LedId.Keyboard_T, SteelSeriesLedId.T },
|
||||||
|
{ LedId.Keyboard_Y, SteelSeriesLedId.Y },
|
||||||
|
{ LedId.Keyboard_U, SteelSeriesLedId.U },
|
||||||
|
{ LedId.Keyboard_I, SteelSeriesLedId.I },
|
||||||
|
{ LedId.Keyboard_O, SteelSeriesLedId.O },
|
||||||
|
{ LedId.Keyboard_P, SteelSeriesLedId.P },
|
||||||
|
{ LedId.Keyboard_BracketLeft, SteelSeriesLedId.LBracket },
|
||||||
|
{ LedId.Keyboard_CapsLock, SteelSeriesLedId.Caps },
|
||||||
|
{ LedId.Keyboard_A, SteelSeriesLedId.A },
|
||||||
|
{ LedId.Keyboard_S, SteelSeriesLedId.S },
|
||||||
|
{ LedId.Keyboard_D, SteelSeriesLedId.D },
|
||||||
|
{ LedId.Keyboard_F, SteelSeriesLedId.F },
|
||||||
|
{ LedId.Keyboard_G, SteelSeriesLedId.G },
|
||||||
|
{ LedId.Keyboard_H, SteelSeriesLedId.H },
|
||||||
|
{ LedId.Keyboard_J, SteelSeriesLedId.J },
|
||||||
|
{ LedId.Keyboard_K, SteelSeriesLedId.K },
|
||||||
|
{ LedId.Keyboard_L, SteelSeriesLedId.L },
|
||||||
|
{ LedId.Keyboard_SemicolonAndColon, SteelSeriesLedId.Semicolon },
|
||||||
|
{ LedId.Keyboard_ApostropheAndDoubleQuote, SteelSeriesLedId.Quote },
|
||||||
|
{ LedId.Keyboard_LeftShift, SteelSeriesLedId.LShift },
|
||||||
|
{ LedId.Keyboard_NonUsTilde, SteelSeriesLedId.Pound },
|
||||||
|
{ LedId.Keyboard_Z, SteelSeriesLedId.Z },
|
||||||
|
{ LedId.Keyboard_X, SteelSeriesLedId.X },
|
||||||
|
{ LedId.Keyboard_C, SteelSeriesLedId.C },
|
||||||
|
{ LedId.Keyboard_V, SteelSeriesLedId.V },
|
||||||
|
{ LedId.Keyboard_B, SteelSeriesLedId.B },
|
||||||
|
{ LedId.Keyboard_N, SteelSeriesLedId.N },
|
||||||
|
{ LedId.Keyboard_M, SteelSeriesLedId.M },
|
||||||
|
{ LedId.Keyboard_CommaAndLessThan, SteelSeriesLedId.Comma },
|
||||||
|
{ LedId.Keyboard_PeriodAndBiggerThan, SteelSeriesLedId.Period },
|
||||||
|
{ LedId.Keyboard_SlashAndQuestionMark, SteelSeriesLedId.Slash },
|
||||||
|
{ LedId.Keyboard_LeftCtrl, SteelSeriesLedId.LCtrl },
|
||||||
|
{ LedId.Keyboard_LeftGui, SteelSeriesLedId.LWin },
|
||||||
|
{ LedId.Keyboard_LeftAlt, SteelSeriesLedId.LAlt },
|
||||||
|
{ LedId.Keyboard_Space, SteelSeriesLedId.Spacebar },
|
||||||
|
{ LedId.Keyboard_RightAlt, SteelSeriesLedId.RAlt },
|
||||||
|
{ LedId.Keyboard_RightGui, SteelSeriesLedId.RWin },
|
||||||
|
{ LedId.Keyboard_Application, SteelSeriesLedId.SSKey },
|
||||||
|
{ LedId.Keyboard_F12, SteelSeriesLedId.F12 },
|
||||||
|
{ LedId.Keyboard_PrintScreen, SteelSeriesLedId.PrintScreen },
|
||||||
|
{ LedId.Keyboard_ScrollLock, SteelSeriesLedId.ScrollLock },
|
||||||
|
{ LedId.Keyboard_PauseBreak, SteelSeriesLedId.Pause },
|
||||||
|
{ LedId.Keyboard_Insert, SteelSeriesLedId.Insert },
|
||||||
|
{ LedId.Keyboard_Home, SteelSeriesLedId.Home },
|
||||||
|
{ LedId.Keyboard_PageUp, SteelSeriesLedId.PageUp },
|
||||||
|
{ LedId.Keyboard_BracketRight, SteelSeriesLedId.RBracket },
|
||||||
|
{ LedId.Keyboard_Backslash, SteelSeriesLedId.Backslash },
|
||||||
|
{ LedId.Keyboard_Enter, SteelSeriesLedId.Return },
|
||||||
|
{ LedId.Keyboard_EqualsAndPlus, SteelSeriesLedId.Equal },
|
||||||
|
{ LedId.Keyboard_Backspace, SteelSeriesLedId.Backspace },
|
||||||
|
{ LedId.Keyboard_Delete, SteelSeriesLedId.Delete },
|
||||||
|
{ LedId.Keyboard_End, SteelSeriesLedId.End },
|
||||||
|
{ LedId.Keyboard_PageDown, SteelSeriesLedId.PageDown },
|
||||||
|
{ LedId.Keyboard_RightShift, SteelSeriesLedId.RShift },
|
||||||
|
{ LedId.Keyboard_RightCtrl, SteelSeriesLedId.RCtrl },
|
||||||
|
{ LedId.Keyboard_ArrowUp, SteelSeriesLedId.UpArrow },
|
||||||
|
{ LedId.Keyboard_ArrowLeft, SteelSeriesLedId.LeftArrow },
|
||||||
|
{ LedId.Keyboard_ArrowDown, SteelSeriesLedId.DownArrow },
|
||||||
|
{ LedId.Keyboard_ArrowRight, SteelSeriesLedId.RightArrow }
|
||||||
|
};
|
||||||
|
|
||||||
private static readonly LedMapping MOUSE_TWO_ZONE = new LedMapping
|
private static readonly LedMapping MOUSE_TWO_ZONE = new LedMapping
|
||||||
{
|
{
|
||||||
{LedId.Mouse1, SteelSeriesLedId.ZoneOne},
|
{LedId.Mouse1, SteelSeriesLedId.ZoneOne},
|
||||||
@ -144,11 +237,12 @@ namespace RGB.NET.Devices.SteelSeries.HID
|
|||||||
//TODO DarthAffe 16.02.2019: Add devices
|
//TODO DarthAffe 16.02.2019: Add devices
|
||||||
private static readonly DeviceDataList DEVICES = new DeviceDataList
|
private static readonly DeviceDataList DEVICES = new DeviceDataList
|
||||||
{
|
{
|
||||||
("Rival 600", RGBDeviceType.Mouse, 0x0616, SteelSeriesDeviceType.EightZone, "default", @"Mice\Rival600", MOUSE_EIGHT_ZONE),
|
("Rival 600", RGBDeviceType.Mouse, 0x1724, SteelSeriesDeviceType.EightZone, "default", @"Mice\Rival600", MOUSE_EIGHT_ZONE),
|
||||||
("Rival 500", RGBDeviceType.Mouse, 0x170E, SteelSeriesDeviceType.TwoZone, "default", @"Mice\Rival500", MOUSE_TWO_ZONE),
|
("Rival 500", RGBDeviceType.Mouse, 0x170E, SteelSeriesDeviceType.TwoZone, "default", @"Mice\Rival500", MOUSE_TWO_ZONE),
|
||||||
("Rival 310", RGBDeviceType.Mouse, 0x1720, SteelSeriesDeviceType.TwoZone, "default", @"Mice\Rival310", MOUSE_TWO_ZONE),
|
("Rival 310", RGBDeviceType.Mouse, 0x1720, SteelSeriesDeviceType.TwoZone, "default", @"Mice\Rival310", MOUSE_TWO_ZONE),
|
||||||
|
|
||||||
("Apex M750", RGBDeviceType.Keyboard, 0x1724, SteelSeriesDeviceType.PerKey, "UK", @"Keyboards\M750\UK", KEYBOARD_MAPPING_UK),
|
("Apex 7 TKL", RGBDeviceType.Keyboard, 0x1618, SteelSeriesDeviceType.PerKey, "UK", @"Keyboards\7TKL\UK", KEYBOARD_TKL_MAPPING_UK),
|
||||||
|
("Apex M750", RGBDeviceType.Keyboard, 0x0616, SteelSeriesDeviceType.PerKey, "UK", @"Keyboards\M750\UK", KEYBOARD_MAPPING_UK),
|
||||||
};
|
};
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user