From d345de2c401dc4298d0d3ad5d246ad6268e97100 Mon Sep 17 00:00:00 2001 From: Darth Affe Date: Mon, 26 Sep 2022 14:35:03 +0200 Subject: [PATCH] Applied code-formatting --- .../Abstract/OpenRGBDeviceInfo.cs | 12 +- .../Generic/LedMappings.cs | 270 +++++++++--------- .../Generic/OpenRGBGenericDevice.cs | 27 +- .../Generic/OpenRGBUpdateQueue.cs | 11 +- RGB.NET.Devices.OpenRGB/Helper.cs | 78 ++--- .../OpenRGBDeviceProvider.cs | 37 +-- .../PerZone/OpenRGBZoneDevice.cs | 34 ++- .../RGB.NET.Devices.OpenRGB.csproj | 106 +++---- ...RGB.NET.Devices.OpenRGB.csproj.DotSettings | 4 + 9 files changed, 304 insertions(+), 275 deletions(-) create mode 100644 RGB.NET.Devices.OpenRGB/RGB.NET.Devices.OpenRGB.csproj.DotSettings diff --git a/RGB.NET.Devices.OpenRGB/Abstract/OpenRGBDeviceInfo.cs b/RGB.NET.Devices.OpenRGB/Abstract/OpenRGBDeviceInfo.cs index ff9d3bf..05afff3 100644 --- a/RGB.NET.Devices.OpenRGB/Abstract/OpenRGBDeviceInfo.cs +++ b/RGB.NET.Devices.OpenRGB/Abstract/OpenRGBDeviceInfo.cs @@ -1,5 +1,4 @@ using RGB.NET.Core; -using System.Collections.Generic; using OpenRGBDevice = OpenRGB.NET.Models.Device; namespace RGB.NET.Devices.OpenRGB; @@ -9,6 +8,8 @@ namespace RGB.NET.Devices.OpenRGB; /// public class OpenRGBDeviceInfo : IRGBDeviceInfo { + #region Properties & Fields + /// public RGBDeviceType DeviceType { get; } @@ -29,16 +30,23 @@ public class OpenRGBDeviceInfo : IRGBDeviceInfo /// public OpenRGBDevice OpenRGBDevice { get; } + #endregion + + #region Constructors + /// /// Initializes a new instance of . /// /// The OpenRGB device to extract information from. internal OpenRGBDeviceInfo(OpenRGBDevice openRGBDevice) { - OpenRGBDevice = openRGBDevice; + this.OpenRGBDevice = openRGBDevice; + DeviceType = Helper.GetRgbNetDeviceType(openRGBDevice.Type); Manufacturer = Helper.GetVendorName(openRGBDevice); Model = Helper.GetModelName(openRGBDevice); DeviceName = DeviceHelper.CreateDeviceName(Manufacturer, Model); } + + #endregion } diff --git a/RGB.NET.Devices.OpenRGB/Generic/LedMappings.cs b/RGB.NET.Devices.OpenRGB/Generic/LedMappings.cs index 0e911ac..d6deb99 100644 --- a/RGB.NET.Devices.OpenRGB/Generic/LedMappings.cs +++ b/RGB.NET.Devices.OpenRGB/Generic/LedMappings.cs @@ -5,141 +5,141 @@ namespace RGB.NET.Devices.OpenRGB; internal static class LedMappings { - public static readonly Dictionary Default = new() + public static readonly Dictionary DEFAULT = new() { - ["Key: A" ] = LedId.Keyboard_A , - ["Key: B" ] = LedId.Keyboard_B , - ["Key: C" ] = LedId.Keyboard_C , - ["Key: D" ] = LedId.Keyboard_D , - ["Key: E" ] = LedId.Keyboard_E , - ["Key: F" ] = LedId.Keyboard_F , - ["Key: G" ] = LedId.Keyboard_G , - ["Key: H" ] = LedId.Keyboard_H , - ["Key: I" ] = LedId.Keyboard_I , - ["Key: J" ] = LedId.Keyboard_J , - ["Key: K" ] = LedId.Keyboard_K , - ["Key: L" ] = LedId.Keyboard_L , - ["Key: M" ] = LedId.Keyboard_M , - ["Key: N" ] = LedId.Keyboard_N , - ["Key: O" ] = LedId.Keyboard_O , - ["Key: P" ] = LedId.Keyboard_P , - ["Key: Q" ] = LedId.Keyboard_Q , - ["Key: R" ] = LedId.Keyboard_R , - ["Key: S" ] = LedId.Keyboard_S , - ["Key: T" ] = LedId.Keyboard_T , - ["Key: U" ] = LedId.Keyboard_U , - ["Key: V" ] = LedId.Keyboard_V , - ["Key: W" ] = LedId.Keyboard_W , - ["Key: X" ] = LedId.Keyboard_X , - ["Key: Y" ] = LedId.Keyboard_Y , - ["Key: Z" ] = LedId.Keyboard_Z , - ["Key: 1" ] = LedId.Keyboard_1 , - ["Key: 2" ] = LedId.Keyboard_2 , - ["Key: 3" ] = LedId.Keyboard_3 , - ["Key: 4" ] = LedId.Keyboard_4 , - ["Key: 5" ] = LedId.Keyboard_5 , - ["Key: 6" ] = LedId.Keyboard_6 , - ["Key: 7" ] = LedId.Keyboard_7 , - ["Key: 8" ] = LedId.Keyboard_8 , - ["Key: 9" ] = LedId.Keyboard_9 , - ["Key: 0" ] = LedId.Keyboard_0 , - ["Key: Enter" ] = LedId.Keyboard_Enter , - ["Key: Enter (ISO)" ] = LedId.Keyboard_Enter , - ["Key: Escape" ] = LedId.Keyboard_Escape , - ["Key: Backspace" ] = LedId.Keyboard_Backspace , - ["Key: Tab" ] = LedId.Keyboard_Tab , - ["Key: Space" ] = LedId.Keyboard_Space , - ["Key: -" ] = LedId.Keyboard_MinusAndUnderscore , - ["Key: =" ] = LedId.Keyboard_EqualsAndPlus , - ["Key: [" ] = LedId.Keyboard_BracketLeft , - ["Key: ]" ] = LedId.Keyboard_BracketRight , - ["Key: \\ (ANSI)" ] = LedId.Keyboard_Backslash , - ["Key: #" ] = LedId.Keyboard_NonUsTilde , - ["Key: ;" ] = LedId.Keyboard_SemicolonAndColon , - ["Key: '" ] = LedId.Keyboard_ApostropheAndDoubleQuote, - ["Key: `" ] = LedId.Keyboard_GraveAccentAndTilde , - ["Key: ," ] = LedId.Keyboard_CommaAndLessThan , - ["Key: ." ] = LedId.Keyboard_PeriodAndBiggerThan , - ["Key: /" ] = LedId.Keyboard_SlashAndQuestionMark , - ["Key: Caps Lock" ] = LedId.Keyboard_CapsLock , - ["Key: F1" ] = LedId.Keyboard_F1 , - ["Key: F2" ] = LedId.Keyboard_F2 , - ["Key: F3" ] = LedId.Keyboard_F3 , - ["Key: F4" ] = LedId.Keyboard_F4 , - ["Key: F5" ] = LedId.Keyboard_F5 , - ["Key: F6" ] = LedId.Keyboard_F6 , - ["Key: F7" ] = LedId.Keyboard_F7 , - ["Key: F8" ] = LedId.Keyboard_F8 , - ["Key: F9" ] = LedId.Keyboard_F9 , - ["Key: F10" ] = LedId.Keyboard_F10 , - ["Key: F11" ] = LedId.Keyboard_F11 , - ["Key: F12" ] = LedId.Keyboard_F12 , - ["Key: Print Screen" ] = LedId.Keyboard_PrintScreen , - ["Key: Scroll Lock" ] = LedId.Keyboard_ScrollLock , - ["Key: Pause/Break" ] = LedId.Keyboard_PauseBreak , - ["Key: Insert" ] = LedId.Keyboard_Insert , - ["Key: Home" ] = LedId.Keyboard_Home , - ["Key: Page Up" ] = LedId.Keyboard_PageUp , - ["Key: Delete" ] = LedId.Keyboard_Delete , - ["Key: End" ] = LedId.Keyboard_End , - ["Key: Page Down" ] = LedId.Keyboard_PageDown , - ["Key: Right Arrow" ] = LedId.Keyboard_ArrowRight , - ["Key: Left Arrow" ] = LedId.Keyboard_ArrowLeft , - ["Key: Down Arrow" ] = LedId.Keyboard_ArrowDown , - ["Key: Up Arrow" ] = LedId.Keyboard_ArrowUp , - ["Key: Num Lock" ] = LedId.Keyboard_NumLock , - ["Key: Number Pad /" ] = LedId.Keyboard_NumSlash , - ["Key: Number Pad *" ] = LedId.Keyboard_NumAsterisk , - ["Key: Number Pad -" ] = LedId.Keyboard_NumMinus , - ["Key: Number Pad +" ] = LedId.Keyboard_NumPlus , - ["Key: Number Pad Enter"] = LedId.Keyboard_NumEnter , - ["Key: Number Pad 1" ] = LedId.Keyboard_Num1 , - ["Key: Number Pad 2" ] = LedId.Keyboard_Num2 , - ["Key: Number Pad 3" ] = LedId.Keyboard_Num3 , - ["Key: Number Pad 4" ] = LedId.Keyboard_Num4 , - ["Key: Number Pad 5" ] = LedId.Keyboard_Num5 , - ["Key: Number Pad 6" ] = LedId.Keyboard_Num6 , - ["Key: Number Pad 7" ] = LedId.Keyboard_Num7 , - ["Key: Number Pad 8" ] = LedId.Keyboard_Num8 , - ["Key: Number Pad 9" ] = LedId.Keyboard_Num9 , - ["Key: Number Pad 0" ] = LedId.Keyboard_Num0 , - ["Key: Number Pad ." ] = LedId.Keyboard_NumPeriodAndDelete , - ["Key: Left Fn" ] = LedId.Keyboard_Function , - ["Key: Right Fn" ] = LedId.Keyboard_Function , - ["Key: \\ (ISO)" ] = LedId.Keyboard_NonUsBackslash , - ["Key: Menu" ] = LedId.Keyboard_Application , - ["Key: Left Control" ] = LedId.Keyboard_LeftCtrl , - ["Key: Left Shift" ] = LedId.Keyboard_LeftShift , - ["Key: Left Alt" ] = LedId.Keyboard_LeftAlt , - ["Key: Left Windows" ] = LedId.Keyboard_LeftGui , - ["Key: Right Control" ] = LedId.Keyboard_RightCtrl , - ["Key: Right Shift" ] = LedId.Keyboard_RightShift , - ["Key: Right Alt" ] = LedId.Keyboard_RightAlt , - ["Key: Right Windows" ] = LedId.Keyboard_RightGui , - ["Key: Media Next" ] = LedId.Keyboard_MediaNextTrack , - ["Key: Media Previous" ] = LedId.Keyboard_MediaPreviousTrack , - ["Key: Media Stop" ] = LedId.Keyboard_MediaStop , - ["Key: Media Pause" ] = LedId.Keyboard_MediaPlay , - ["Key: Media Play" ] = LedId.Keyboard_MediaPlay , - ["Key: Media Play/Pause"] = LedId.Keyboard_MediaPlay , - ["Key: Media Mute" ] = LedId.Keyboard_MediaMute , - ["Logo" ] = LedId.Logo , - ["Key: Brightness" ] = LedId.Keyboard_Brightness , - ["Key: M1" ] = LedId.Keyboard_Macro1 , - ["Key: M2" ] = LedId.Keyboard_Macro2 , - ["Key: M3" ] = LedId.Keyboard_Macro3 , - ["Key: M4" ] = LedId.Keyboard_Macro4 , - ["Key: M5" ] = LedId.Keyboard_Macro5 , - ["Key: G1" ] = LedId.Keyboard_Programmable1 , - ["Key: G2" ] = LedId.Keyboard_Programmable2 , - ["Key: G3" ] = LedId.Keyboard_Programmable3 , - ["Key: G4" ] = LedId.Keyboard_Programmable4 , - ["Key: G5" ] = LedId.Keyboard_Programmable5 , - ["Key: G6" ] = LedId.Keyboard_Programmable6 , - ["Key: G7" ] = LedId.Keyboard_Programmable7 , - ["Key: G8" ] = LedId.Keyboard_Programmable8 , - ["Key: G9" ] = LedId.Keyboard_Programmable9 , - ["Lighting" ] = LedId.Keyboard_Brightness , - ["Game Mode" ] = LedId.Keyboard_WinLock , + ["Key: A"] = LedId.Keyboard_A, + ["Key: B"] = LedId.Keyboard_B, + ["Key: C"] = LedId.Keyboard_C, + ["Key: D"] = LedId.Keyboard_D, + ["Key: E"] = LedId.Keyboard_E, + ["Key: F"] = LedId.Keyboard_F, + ["Key: G"] = LedId.Keyboard_G, + ["Key: H"] = LedId.Keyboard_H, + ["Key: I"] = LedId.Keyboard_I, + ["Key: J"] = LedId.Keyboard_J, + ["Key: K"] = LedId.Keyboard_K, + ["Key: L"] = LedId.Keyboard_L, + ["Key: M"] = LedId.Keyboard_M, + ["Key: N"] = LedId.Keyboard_N, + ["Key: O"] = LedId.Keyboard_O, + ["Key: P"] = LedId.Keyboard_P, + ["Key: Q"] = LedId.Keyboard_Q, + ["Key: R"] = LedId.Keyboard_R, + ["Key: S"] = LedId.Keyboard_S, + ["Key: T"] = LedId.Keyboard_T, + ["Key: U"] = LedId.Keyboard_U, + ["Key: V"] = LedId.Keyboard_V, + ["Key: W"] = LedId.Keyboard_W, + ["Key: X"] = LedId.Keyboard_X, + ["Key: Y"] = LedId.Keyboard_Y, + ["Key: Z"] = LedId.Keyboard_Z, + ["Key: 1"] = LedId.Keyboard_1, + ["Key: 2"] = LedId.Keyboard_2, + ["Key: 3"] = LedId.Keyboard_3, + ["Key: 4"] = LedId.Keyboard_4, + ["Key: 5"] = LedId.Keyboard_5, + ["Key: 6"] = LedId.Keyboard_6, + ["Key: 7"] = LedId.Keyboard_7, + ["Key: 8"] = LedId.Keyboard_8, + ["Key: 9"] = LedId.Keyboard_9, + ["Key: 0"] = LedId.Keyboard_0, + ["Key: Enter"] = LedId.Keyboard_Enter, + ["Key: Enter (ISO)"] = LedId.Keyboard_Enter, + ["Key: Escape"] = LedId.Keyboard_Escape, + ["Key: Backspace"] = LedId.Keyboard_Backspace, + ["Key: Tab"] = LedId.Keyboard_Tab, + ["Key: Space"] = LedId.Keyboard_Space, + ["Key: -"] = LedId.Keyboard_MinusAndUnderscore, + ["Key: ="] = LedId.Keyboard_EqualsAndPlus, + ["Key: ["] = LedId.Keyboard_BracketLeft, + ["Key: ]"] = LedId.Keyboard_BracketRight, + ["Key: \\ (ANSI)"] = LedId.Keyboard_Backslash, + ["Key: #"] = LedId.Keyboard_NonUsTilde, + ["Key: ;"] = LedId.Keyboard_SemicolonAndColon, + ["Key: '"] = LedId.Keyboard_ApostropheAndDoubleQuote, + ["Key: `"] = LedId.Keyboard_GraveAccentAndTilde, + ["Key: ,"] = LedId.Keyboard_CommaAndLessThan, + ["Key: ."] = LedId.Keyboard_PeriodAndBiggerThan, + ["Key: /"] = LedId.Keyboard_SlashAndQuestionMark, + ["Key: Caps Lock"] = LedId.Keyboard_CapsLock, + ["Key: F1"] = LedId.Keyboard_F1, + ["Key: F2"] = LedId.Keyboard_F2, + ["Key: F3"] = LedId.Keyboard_F3, + ["Key: F4"] = LedId.Keyboard_F4, + ["Key: F5"] = LedId.Keyboard_F5, + ["Key: F6"] = LedId.Keyboard_F6, + ["Key: F7"] = LedId.Keyboard_F7, + ["Key: F8"] = LedId.Keyboard_F8, + ["Key: F9"] = LedId.Keyboard_F9, + ["Key: F10"] = LedId.Keyboard_F10, + ["Key: F11"] = LedId.Keyboard_F11, + ["Key: F12"] = LedId.Keyboard_F12, + ["Key: Print Screen"] = LedId.Keyboard_PrintScreen, + ["Key: Scroll Lock"] = LedId.Keyboard_ScrollLock, + ["Key: Pause/Break"] = LedId.Keyboard_PauseBreak, + ["Key: Insert"] = LedId.Keyboard_Insert, + ["Key: Home"] = LedId.Keyboard_Home, + ["Key: Page Up"] = LedId.Keyboard_PageUp, + ["Key: Delete"] = LedId.Keyboard_Delete, + ["Key: End"] = LedId.Keyboard_End, + ["Key: Page Down"] = LedId.Keyboard_PageDown, + ["Key: Right Arrow"] = LedId.Keyboard_ArrowRight, + ["Key: Left Arrow"] = LedId.Keyboard_ArrowLeft, + ["Key: Down Arrow"] = LedId.Keyboard_ArrowDown, + ["Key: Up Arrow"] = LedId.Keyboard_ArrowUp, + ["Key: Num Lock"] = LedId.Keyboard_NumLock, + ["Key: Number Pad /"] = LedId.Keyboard_NumSlash, + ["Key: Number Pad *"] = LedId.Keyboard_NumAsterisk, + ["Key: Number Pad -"] = LedId.Keyboard_NumMinus, + ["Key: Number Pad +"] = LedId.Keyboard_NumPlus, + ["Key: Number Pad Enter"] = LedId.Keyboard_NumEnter, + ["Key: Number Pad 1"] = LedId.Keyboard_Num1, + ["Key: Number Pad 2"] = LedId.Keyboard_Num2, + ["Key: Number Pad 3"] = LedId.Keyboard_Num3, + ["Key: Number Pad 4"] = LedId.Keyboard_Num4, + ["Key: Number Pad 5"] = LedId.Keyboard_Num5, + ["Key: Number Pad 6"] = LedId.Keyboard_Num6, + ["Key: Number Pad 7"] = LedId.Keyboard_Num7, + ["Key: Number Pad 8"] = LedId.Keyboard_Num8, + ["Key: Number Pad 9"] = LedId.Keyboard_Num9, + ["Key: Number Pad 0"] = LedId.Keyboard_Num0, + ["Key: Number Pad ."] = LedId.Keyboard_NumPeriodAndDelete, + ["Key: Left Fn"] = LedId.Keyboard_Function, + ["Key: Right Fn"] = LedId.Keyboard_Function, + ["Key: \\ (ISO)"] = LedId.Keyboard_NonUsBackslash, + ["Key: Menu"] = LedId.Keyboard_Application, + ["Key: Left Control"] = LedId.Keyboard_LeftCtrl, + ["Key: Left Shift"] = LedId.Keyboard_LeftShift, + ["Key: Left Alt"] = LedId.Keyboard_LeftAlt, + ["Key: Left Windows"] = LedId.Keyboard_LeftGui, + ["Key: Right Control"] = LedId.Keyboard_RightCtrl, + ["Key: Right Shift"] = LedId.Keyboard_RightShift, + ["Key: Right Alt"] = LedId.Keyboard_RightAlt, + ["Key: Right Windows"] = LedId.Keyboard_RightGui, + ["Key: Media Next"] = LedId.Keyboard_MediaNextTrack, + ["Key: Media Previous"] = LedId.Keyboard_MediaPreviousTrack, + ["Key: Media Stop"] = LedId.Keyboard_MediaStop, + ["Key: Media Pause"] = LedId.Keyboard_MediaPlay, + ["Key: Media Play"] = LedId.Keyboard_MediaPlay, + ["Key: Media Play/Pause"] = LedId.Keyboard_MediaPlay, + ["Key: Media Mute"] = LedId.Keyboard_MediaMute, + ["Logo"] = LedId.Logo, + ["Key: Brightness"] = LedId.Keyboard_Brightness, + ["Key: M1"] = LedId.Keyboard_Macro1, + ["Key: M2"] = LedId.Keyboard_Macro2, + ["Key: M3"] = LedId.Keyboard_Macro3, + ["Key: M4"] = LedId.Keyboard_Macro4, + ["Key: M5"] = LedId.Keyboard_Macro5, + ["Key: G1"] = LedId.Keyboard_Programmable1, + ["Key: G2"] = LedId.Keyboard_Programmable2, + ["Key: G3"] = LedId.Keyboard_Programmable3, + ["Key: G4"] = LedId.Keyboard_Programmable4, + ["Key: G5"] = LedId.Keyboard_Programmable5, + ["Key: G6"] = LedId.Keyboard_Programmable6, + ["Key: G7"] = LedId.Keyboard_Programmable7, + ["Key: G8"] = LedId.Keyboard_Programmable8, + ["Key: G9"] = LedId.Keyboard_Programmable9, + ["Lighting"] = LedId.Keyboard_Brightness, + ["Game Mode"] = LedId.Keyboard_WinLock, }; } diff --git a/RGB.NET.Devices.OpenRGB/Generic/OpenRGBGenericDevice.cs b/RGB.NET.Devices.OpenRGB/Generic/OpenRGBGenericDevice.cs index 2e2d9f8..8f19c5a 100644 --- a/RGB.NET.Devices.OpenRGB/Generic/OpenRGBGenericDevice.cs +++ b/RGB.NET.Devices.OpenRGB/Generic/OpenRGBGenericDevice.cs @@ -1,11 +1,12 @@ using OpenRGB.NET.Enums; using RGB.NET.Core; -namespace RGB.NET.Devices.OpenRGB.Generic; +namespace RGB.NET.Devices.OpenRGB; /// public class OpenRGBGenericDevice : AbstractOpenRGBDevice { + #region Constructors /// /// Initializes a new instance of the class. /// @@ -17,6 +18,10 @@ public class OpenRGBGenericDevice : AbstractOpenRGBDevice InitializeLayout(); } + #endregion + + #region Methods + /// /// Initializes the LEDs of the device based on the data provided by the SDK. /// @@ -25,9 +30,9 @@ public class OpenRGBGenericDevice : AbstractOpenRGBDevice LedId initial = Helper.GetInitialLedIdForDeviceType(DeviceInfo.DeviceType); int y = 0; - Size ledSize = new Size(19); + Size ledSize = new(19); int zoneLedIndex = 0; - const int ledSpacing = 20; + const int LED_SPACING = 20; foreach (global::OpenRGB.NET.Models.Zone? zone in DeviceInfo.OpenRGBDevice.Zones) { @@ -43,18 +48,18 @@ public class OpenRGBGenericDevice : AbstractOpenRGBDevice if (index == uint.MaxValue) continue; - LedId ledId = LedMappings.Default.TryGetValue(DeviceInfo.OpenRGBDevice.Leds[zoneLedIndex + index].Name, out LedId l) - ? l - : initial++; + LedId ledId = LedMappings.DEFAULT.TryGetValue(DeviceInfo.OpenRGBDevice.Leds[zoneLedIndex + index].Name, out LedId id) + ? id + : initial++; //HACK: doing this because some different Led Names are mapped to the same LedId //for example, "Enter" and "ISO Enter". //this way, at least they'll be controllable as CustomX - while (AddLed(ledId, new Point(ledSpacing * column, y + (ledSpacing * row)), ledSize, zoneLedIndex + (int)index) == null) + while (AddLed(ledId, new Point(LED_SPACING * column, y + (LED_SPACING * row)), ledSize, zoneLedIndex + (int)index) == null) ledId = initial++; } } - y += (int)(zone.MatrixMap.Height * ledSpacing); + y += (int)(zone.MatrixMap.Height * LED_SPACING); } else { @@ -62,15 +67,17 @@ public class OpenRGBGenericDevice : AbstractOpenRGBDevice { LedId ledId = initial++; - while (AddLed(ledId, new Point(ledSpacing * i, y), ledSize, zoneLedIndex + i) == null) + while (AddLed(ledId, new Point(LED_SPACING * i, y), ledSize, zoneLedIndex + i) == null) ledId = initial++; } } //we'll just set each zone in its own row for now, //with each led for that zone being horizontally distributed - y += ledSpacing; + y += LED_SPACING; zoneLedIndex += (int)zone.LedCount; } } + + #endregion } diff --git a/RGB.NET.Devices.OpenRGB/Generic/OpenRGBUpdateQueue.cs b/RGB.NET.Devices.OpenRGB/Generic/OpenRGBUpdateQueue.cs index 4ff7ff6..aab78d4 100644 --- a/RGB.NET.Devices.OpenRGB/Generic/OpenRGBUpdateQueue.cs +++ b/RGB.NET.Devices.OpenRGB/Generic/OpenRGBUpdateQueue.cs @@ -14,11 +14,13 @@ namespace RGB.NET.Devices.OpenRGB; public class OpenRGBUpdateQueue : UpdateQueue { #region Properties & Fields + private readonly int _deviceid; private readonly OpenRGBClient _openRGB; private readonly OpenRGBDevice _device; private readonly OpenRGBColor[] _colors; + #endregion #region Constructors @@ -33,9 +35,10 @@ public class OpenRGBUpdateQueue : UpdateQueue public OpenRGBUpdateQueue(IDeviceUpdateTrigger updateTrigger, int deviceid, OpenRGBClient client, OpenRGBDevice device) : base(updateTrigger) { - _deviceid = deviceid; - _openRGB = client; - _device = device; + this._deviceid = deviceid; + this._openRGB = client; + this._device = device; + _colors = Enumerable.Range(0, _device.Colors.Length) .Select(_ => new OpenRGBColor()) .ToArray(); @@ -49,9 +52,7 @@ public class OpenRGBUpdateQueue : UpdateQueue protected override void Update(in ReadOnlySpan<(object key, Color color)> dataSet) { foreach ((object key, Color color) in dataSet) - { _colors[(int)key] = new OpenRGBColor(color.GetR(), color.GetG(), color.GetB()); - } _openRGB.UpdateLeds(_deviceid, _colors); } diff --git a/RGB.NET.Devices.OpenRGB/Helper.cs b/RGB.NET.Devices.OpenRGB/Helper.cs index de9493b..02c81f2 100644 --- a/RGB.NET.Devices.OpenRGB/Helper.cs +++ b/RGB.NET.Devices.OpenRGB/Helper.cs @@ -6,48 +6,50 @@ namespace RGB.NET.Devices.OpenRGB; internal static class Helper { - public static LedId GetInitialLedIdForDeviceType(RGBDeviceType type) => type switch - { - RGBDeviceType.Mouse => LedId.Mouse1, - RGBDeviceType.Headset => LedId.Headset1, - RGBDeviceType.Mousepad => LedId.Mousepad1, - RGBDeviceType.LedStripe => LedId.LedStripe1, - RGBDeviceType.LedMatrix => LedId.LedMatrix1, - RGBDeviceType.Mainboard => LedId.Mainboard1, - RGBDeviceType.GraphicsCard => LedId.GraphicsCard1, - RGBDeviceType.DRAM => LedId.DRAM1, - RGBDeviceType.HeadsetStand => LedId.HeadsetStand1, - RGBDeviceType.Keypad => LedId.Keypad1, - RGBDeviceType.Fan => LedId.Fan1, - RGBDeviceType.Speaker => LedId.Speaker1, - RGBDeviceType.Cooler => LedId.Cooler1, - RGBDeviceType.Keyboard => LedId.Keyboard_Custom1, - _ => LedId.Custom1 - }; + public static LedId GetInitialLedIdForDeviceType(RGBDeviceType type) + => type switch + { + RGBDeviceType.Mouse => LedId.Mouse1, + RGBDeviceType.Headset => LedId.Headset1, + RGBDeviceType.Mousepad => LedId.Mousepad1, + RGBDeviceType.LedStripe => LedId.LedStripe1, + RGBDeviceType.LedMatrix => LedId.LedMatrix1, + RGBDeviceType.Mainboard => LedId.Mainboard1, + RGBDeviceType.GraphicsCard => LedId.GraphicsCard1, + RGBDeviceType.DRAM => LedId.DRAM1, + RGBDeviceType.HeadsetStand => LedId.HeadsetStand1, + RGBDeviceType.Keypad => LedId.Keypad1, + RGBDeviceType.Fan => LedId.Fan1, + RGBDeviceType.Speaker => LedId.Speaker1, + RGBDeviceType.Cooler => LedId.Cooler1, + RGBDeviceType.Keyboard => LedId.Keyboard_Custom1, + _ => LedId.Custom1 + }; - public static RGBDeviceType GetRgbNetDeviceType(DeviceType type) => type switch - { - DeviceType.Motherboard => RGBDeviceType.Mainboard, - DeviceType.Dram => RGBDeviceType.DRAM, - DeviceType.Gpu => RGBDeviceType.GraphicsCard, - DeviceType.Cooler => RGBDeviceType.Cooler, - DeviceType.Ledstrip => RGBDeviceType.LedStripe, - DeviceType.Keyboard => RGBDeviceType.Keyboard, - DeviceType.Mouse => RGBDeviceType.Mouse, - DeviceType.Mousemat => RGBDeviceType.Mousepad, - DeviceType.Headset => RGBDeviceType.Headset, - DeviceType.HeadsetStand => RGBDeviceType.HeadsetStand, - _ => RGBDeviceType.Unknown - }; + public static RGBDeviceType GetRgbNetDeviceType(DeviceType type) + => type switch + { + DeviceType.Motherboard => RGBDeviceType.Mainboard, + DeviceType.Dram => RGBDeviceType.DRAM, + DeviceType.Gpu => RGBDeviceType.GraphicsCard, + DeviceType.Cooler => RGBDeviceType.Cooler, + DeviceType.Ledstrip => RGBDeviceType.LedStripe, + DeviceType.Keyboard => RGBDeviceType.Keyboard, + DeviceType.Mouse => RGBDeviceType.Mouse, + DeviceType.Mousemat => RGBDeviceType.Mousepad, + DeviceType.Headset => RGBDeviceType.Headset, + DeviceType.HeadsetStand => RGBDeviceType.HeadsetStand, + _ => RGBDeviceType.Unknown + }; - public static LedId GetInitialLedIdForDeviceType(DeviceType type) => - GetInitialLedIdForDeviceType(GetRgbNetDeviceType(type)); + public static LedId GetInitialLedIdForDeviceType(DeviceType type) + => GetInitialLedIdForDeviceType(GetRgbNetDeviceType(type)); public static string GetVendorName(OpenRGBDevice openRGBDevice) => string.IsNullOrWhiteSpace(openRGBDevice.Vendor) - ? "OpenRGB" - : openRGBDevice.Vendor; + ? "OpenRGB" + : openRGBDevice.Vendor; public static string GetModelName(OpenRGBDevice openRGBDevice) => string.IsNullOrWhiteSpace(openRGBDevice.Vendor) - ? openRGBDevice.Name - : openRGBDevice.Name.Replace(openRGBDevice.Vendor, "").Trim(); + ? openRGBDevice.Name + : openRGBDevice.Name.Replace(openRGBDevice.Vendor, "").Trim(); } diff --git a/RGB.NET.Devices.OpenRGB/OpenRGBDeviceProvider.cs b/RGB.NET.Devices.OpenRGB/OpenRGBDeviceProvider.cs index 9af68da..a9fd3b4 100644 --- a/RGB.NET.Devices.OpenRGB/OpenRGBDeviceProvider.cs +++ b/RGB.NET.Devices.OpenRGB/OpenRGBDeviceProvider.cs @@ -1,7 +1,6 @@ using OpenRGB.NET; using OpenRGB.NET.Models; using RGB.NET.Core; -using RGB.NET.Devices.OpenRGB.Generic; using System; using System.Collections.Generic; using System.Linq; @@ -16,7 +15,7 @@ public class OpenRGBDeviceProvider : AbstractRGBDeviceProvider { #region Properties & Fields - private readonly List _clients = new List(); + private readonly List _clients = new(); private static OpenRGBDeviceProvider? _instance; @@ -28,7 +27,7 @@ public class OpenRGBDeviceProvider : AbstractRGBDeviceProvider /// /// Gets a list of all defined device-definitions. /// - public List DeviceDefinitions { get; } = new List(); + public List DeviceDefinitions { get; } = new(); /// /// Indicates whether all devices will be added, or just the ones with a 'Direct' mode. Defaults to false. @@ -64,7 +63,7 @@ public class OpenRGBDeviceProvider : AbstractRGBDeviceProvider { try { - OpenRGBClient? openRgb = new OpenRGBClient(ip: deviceDefinition.Ip, port: deviceDefinition.Port, name: deviceDefinition.ClientName, autoconnect: true); + OpenRGBClient? openRgb = new(ip: deviceDefinition.Ip, port: deviceDefinition.Port, name: deviceDefinition.ClientName, autoconnect: true); _clients.Add(openRgb); deviceDefinition.Connected = true; } @@ -72,11 +71,11 @@ public class OpenRGBDeviceProvider : AbstractRGBDeviceProvider { deviceDefinition.Connected = false; deviceDefinition.LastError = e.Message; - Throw(e, false); + Throw(e); } } } - + /// protected override IEnumerable LoadDevices() { @@ -88,7 +87,7 @@ public class OpenRGBDeviceProvider : AbstractRGBDeviceProvider { Device? device = openRgb.GetControllerData(i); - int directModeIndex = Array.FindIndex(device.Modes, device => device.Name == "Direct"); + int directModeIndex = Array.FindIndex(device.Modes, d => d.Name == "Direct"); if (directModeIndex != -1) { //set the device to direct mode if it has it @@ -101,27 +100,21 @@ public class OpenRGBDeviceProvider : AbstractRGBDeviceProvider continue; } - OpenRGBUpdateQueue? updateQueue = new OpenRGBUpdateQueue(GetUpdateTrigger(), i, openRgb, device); + OpenRGBUpdateQueue? updateQueue = new(GetUpdateTrigger(), i, openRgb, device); if (PerZoneDeviceFlag.HasFlag(Helper.GetRgbNetDeviceType(device.Type))) { int totalLedCount = 0; - for (int zoneIndex = 0; zoneIndex < device.Zones.Length; zoneIndex++) - { - Zone zone = device.Zones[zoneIndex]; - - if (zone.LedCount == 0) - continue; - - yield return new OpenRGBZoneDevice(new OpenRGBDeviceInfo(device), totalLedCount, zone, updateQueue); - totalLedCount += (int)zone.LedCount; - } + foreach (Zone zone in device.Zones) + if (zone.LedCount > 0) + { + yield return new OpenRGBZoneDevice(new OpenRGBDeviceInfo(device), totalLedCount, zone, updateQueue); + totalLedCount += (int)zone.LedCount; + } } else - { yield return new OpenRGBGenericDevice(new OpenRGBDeviceInfo(device), updateQueue); - } } } } @@ -131,9 +124,9 @@ public class OpenRGBDeviceProvider : AbstractRGBDeviceProvider { base.Dispose(); - foreach (OpenRGBClient? client in _clients) + foreach (OpenRGBClient client in _clients) { - try { client?.Dispose(); } + try { client.Dispose(); } catch { /* at least we tried */ } } diff --git a/RGB.NET.Devices.OpenRGB/PerZone/OpenRGBZoneDevice.cs b/RGB.NET.Devices.OpenRGB/PerZone/OpenRGBZoneDevice.cs index dbd83de..42ab433 100644 --- a/RGB.NET.Devices.OpenRGB/PerZone/OpenRGBZoneDevice.cs +++ b/RGB.NET.Devices.OpenRGB/PerZone/OpenRGBZoneDevice.cs @@ -7,9 +7,15 @@ namespace RGB.NET.Devices.OpenRGB; /// public class OpenRGBZoneDevice : AbstractOpenRGBDevice { + #region Properties & Fields + private readonly int _initialLed; private readonly Zone _zone; + #endregion + + #region Constructors + /// /// Initializes a new instance of the class. /// @@ -26,11 +32,15 @@ public class OpenRGBZoneDevice : AbstractOpenRGBDevice InitializeLayout(); } + #endregion + + #region Methods + private void InitializeLayout() { - Size ledSize = new Size(19); - const int ledSpacing = 20; - LedId initial = Helper.GetInitialLedIdForDeviceType(DeviceInfo.DeviceType) + _initialLed; + Size ledSize = new(19); + const int LED_SPACING = 20; + LedId initialId = Helper.GetInitialLedIdForDeviceType(DeviceInfo.DeviceType) + _initialLed; if (_zone.Type == ZoneType.Matrix) { @@ -44,12 +54,12 @@ public class OpenRGBZoneDevice : AbstractOpenRGBDevice if (index == uint.MaxValue) continue; - LedId ledId = LedMappings.Default.TryGetValue(DeviceInfo.OpenRGBDevice.Leds[_initialLed + index].Name, out LedId l) - ? l - : initial++; + LedId ledId = LedMappings.DEFAULT.TryGetValue(DeviceInfo.OpenRGBDevice.Leds[_initialLed + index].Name, out LedId id) + ? id + : initialId++; - while (AddLed(ledId, new Point(ledSpacing * column, ledSpacing * row), ledSize, _initialLed + (int)index) == null) - ledId = initial++; + while (AddLed(ledId, new Point(LED_SPACING * column, LED_SPACING * row), ledSize, _initialLed + (int)index) == null) + ledId = initialId++; } } } @@ -57,11 +67,13 @@ public class OpenRGBZoneDevice : AbstractOpenRGBDevice { for (int i = 0; i < _zone.LedCount; i++) { - LedId ledId = initial++; + LedId ledId = initialId++; - while (AddLed(ledId, new Point(ledSpacing * i, 0), ledSize, _initialLed + i) == null) - ledId = initial++; + while (AddLed(ledId, new Point(LED_SPACING * i, 0), ledSize, _initialLed + i) == null) + ledId = initialId++; } } } + + #endregion } \ No newline at end of file diff --git a/RGB.NET.Devices.OpenRGB/RGB.NET.Devices.OpenRGB.csproj b/RGB.NET.Devices.OpenRGB/RGB.NET.Devices.OpenRGB.csproj index b29be9a..546e1f7 100644 --- a/RGB.NET.Devices.OpenRGB/RGB.NET.Devices.OpenRGB.csproj +++ b/RGB.NET.Devices.OpenRGB/RGB.NET.Devices.OpenRGB.csproj @@ -1,63 +1,65 @@ - - net6.0;net5.0 - latest - enable + + net6.0;net5.0 + latest + enable - diogotr7 - Wyrez - en-US - en-US - RGB.NET.Devices.OpenRGB - RGB.NET.Devices.OpenRGB - RGB.NET.Devices.OpenRGB - RGB.NET.Devices.OpenRGB - RGB.NET.Devices.OpenRGB - OpenRGB-Device-Implementations of RGB.NET - OpenRGB-Device-Implementations of RGB.NET, a C# (.NET) library for accessing various RGB-peripherals - Copyright © Darth Affe 2022 - Copyright © Darth Affe 2022 - icon.png - https://github.com/DarthAffe/RGB.NET - LGPL-2.1-only - Github - https://github.com/DarthAffe/RGB.NET - True + diogotr7 + Wyrez + en-US + en-US + RGB.NET.Devices.OpenRGB + RGB.NET.Devices.OpenRGB + RGB.NET.Devices.OpenRGB + RGB.NET.Devices.OpenRGB + RGB.NET.Devices.OpenRGB + OpenRGB-Device-Implementations of RGB.NET + OpenRGB-Device-Implementations of RGB.NET, a C# (.NET) library for accessing various RGB-peripherals + Copyright © Darth Affe 2022 + Copyright © Darth Affe 2022 + icon.png + https://github.com/DarthAffe/RGB.NET + LGPL-2.1-only + Github + https://github.com/DarthAffe/RGB.NET + True - 0.0.1 - 0.0.1 - 0.0.1 + - ..\bin\ - true - True - True - portable - snupkg - + 0.0.1 + 0.0.1 + 0.0.1 - - $(DefineConstants);TRACE;DEBUG - true - false - + ..\bin\ + true + True + True + portable + snupkg + - - true - $(NoWarn);CS1591;CS1572;CS1573 - $(DefineConstants);RELEASE - + + $(DefineConstants);TRACE;DEBUG + true + false + - - - + + true + $(NoWarn);CS1591;CS1572;CS1573 + $(DefineConstants);RELEASE + - - - + + + - - - + + + + + + + diff --git a/RGB.NET.Devices.OpenRGB/RGB.NET.Devices.OpenRGB.csproj.DotSettings b/RGB.NET.Devices.OpenRGB/RGB.NET.Devices.OpenRGB.csproj.DotSettings new file mode 100644 index 0000000..f79e29d --- /dev/null +++ b/RGB.NET.Devices.OpenRGB/RGB.NET.Devices.OpenRGB.csproj.DotSettings @@ -0,0 +1,4 @@ + + True + True + True \ No newline at end of file