From 4466acfbf726aeb36a923d65894d195384632e51 Mon Sep 17 00:00:00 2001 From: Darth Affe Date: Tue, 1 Jun 2021 22:19:42 +0200 Subject: [PATCH] Fixed compiler messages --- RGB.NET.Core/RGBSurface.cs | 4 ++-- RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs | 4 +++- RGB.NET.Devices.Corsair/Enum/CorsairLedId.cs | 2 -- .../Enum/CorsairLogicalKeyboardLayout.cs | 2 -- RGB.NET.Devices.Corsair/Generic/LedMappings.cs | 16 ++++++++-------- .../Native/_CorsairChannelDeviceInfo.cs | 2 ++ .../Native/_CorsairChannelInfo.cs | 1 + .../Native/_CorsairChannelsInfo.cs | 1 + .../Native/_CorsairDeviceInfo.cs | 1 + .../Native/_CorsairLedPosition.cs | 1 + 10 files changed, 19 insertions(+), 15 deletions(-) diff --git a/RGB.NET.Core/RGBSurface.cs b/RGB.NET.Core/RGBSurface.cs index 033d33e..34eabd3 100644 --- a/RGB.NET.Core/RGBSurface.cs +++ b/RGB.NET.Core/RGBSurface.cs @@ -18,11 +18,11 @@ namespace RGB.NET.Core { #region Properties & Fields - private Stopwatch _deltaTimeCounter; + private readonly Stopwatch _deltaTimeCounter; private readonly IList _devices = new List(); private readonly IList _updateTriggers = new List(); - private readonly List _ledGroups = new List(); + private readonly List _ledGroups = new(); /// /// Gets a readonly list containing all loaded . diff --git a/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs b/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs index 03dcdcd..8884945 100644 --- a/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs +++ b/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs @@ -43,7 +43,7 @@ namespace RGB.NET.Devices.Corsair /// /// Gets the last error documented by CUE. /// - public CorsairError LastError => _CUESDK.CorsairGetLastError(); + public static CorsairError LastError => _CUESDK.CorsairGetLastError(); #endregion @@ -207,6 +207,8 @@ namespace RGB.NET.Devices.Corsair try { _CUESDK.UnloadCUESDK(); } catch { /* at least we tried */ } + + GC.SuppressFinalize(this); } #endregion diff --git a/RGB.NET.Devices.Corsair/Enum/CorsairLedId.cs b/RGB.NET.Devices.Corsair/Enum/CorsairLedId.cs index 785a4e7..da23132 100644 --- a/RGB.NET.Devices.Corsair/Enum/CorsairLedId.cs +++ b/RGB.NET.Devices.Corsair/Enum/CorsairLedId.cs @@ -1,7 +1,5 @@ // ReSharper disable InconsistentNaming -#pragma warning disable 1591 // Missing XML comment for publicly visible type or member - namespace RGB.NET.Devices.Corsair { /// diff --git a/RGB.NET.Devices.Corsair/Enum/CorsairLogicalKeyboardLayout.cs b/RGB.NET.Devices.Corsair/Enum/CorsairLogicalKeyboardLayout.cs index 6217571..ce8ea57 100644 --- a/RGB.NET.Devices.Corsair/Enum/CorsairLogicalKeyboardLayout.cs +++ b/RGB.NET.Devices.Corsair/Enum/CorsairLogicalKeyboardLayout.cs @@ -1,8 +1,6 @@ // ReSharper disable InconsistentNaming // ReSharper disable UnusedMember.Global -#pragma warning disable 1591 // Missing XML comment for publicly visible type or member - namespace RGB.NET.Devices.Corsair { /// diff --git a/RGB.NET.Devices.Corsair/Generic/LedMappings.cs b/RGB.NET.Devices.Corsair/Generic/LedMappings.cs index d2502dd..4547e12 100644 --- a/RGB.NET.Devices.Corsair/Generic/LedMappings.cs +++ b/RGB.NET.Devices.Corsair/Generic/LedMappings.cs @@ -28,19 +28,19 @@ namespace RGB.NET.Devices.Corsair Keyboard.Add(LedId.Custom101 + i, CorsairLedId.OemLed101 + i); } - public static LedMapping GraphicsCard = new(); - public static LedMapping HeadsetStand = new(); - public static LedMapping Mainboard = new(); - public static LedMapping Memory = new(); - public static LedMapping Mousepad = new(); + public static LedMapping GraphicsCard { get; } = new(); + public static LedMapping HeadsetStand { get; } = new(); + public static LedMapping Mainboard { get; } = new(); + public static LedMapping Memory { get; } = new(); + public static LedMapping Mousepad { get; } = new(); - public static LedMapping Headset = new() + public static LedMapping Headset { get; } = new() { { LedId.Headset1, CorsairLedId.LeftLogo }, { LedId.Headset2, CorsairLedId.RightLogo }, }; - public static LedMapping Mouse = new() + public static LedMapping Mouse { get; } = new() { { LedId.Mouse1, CorsairLedId.B1 }, { LedId.Mouse2, CorsairLedId.B2 }, @@ -64,7 +64,7 @@ namespace RGB.NET.Devices.Corsair { LedId.Mouse20, CorsairLedId.B20 }, }; - public static LedMapping Keyboard = new() + public static LedMapping Keyboard { get; } = new() { { LedId.Invalid, CorsairLedId.Invalid }, { LedId.Logo, CorsairLedId.Logo }, diff --git a/RGB.NET.Devices.Corsair/Native/_CorsairChannelDeviceInfo.cs b/RGB.NET.Devices.Corsair/Native/_CorsairChannelDeviceInfo.cs index d3ce82f..117258c 100644 --- a/RGB.NET.Devices.Corsair/Native/_CorsairChannelDeviceInfo.cs +++ b/RGB.NET.Devices.Corsair/Native/_CorsairChannelDeviceInfo.cs @@ -1,6 +1,7 @@ #pragma warning disable 169 // Field 'x' is never used #pragma warning disable 414 // Field 'x' is assigned but its value never used #pragma warning disable 649 // Field 'x' is never assigned +#pragma warning disable IDE1006 // Naming Styles using System.Runtime.InteropServices; @@ -11,6 +12,7 @@ namespace RGB.NET.Devices.Corsair.Native /// CUE-SDK: contains information about separate LED-device connected to the channel controlled by the DIY-device. /// [StructLayout(LayoutKind.Sequential)] + internal class _CorsairChannelDeviceInfo { /// diff --git a/RGB.NET.Devices.Corsair/Native/_CorsairChannelInfo.cs b/RGB.NET.Devices.Corsair/Native/_CorsairChannelInfo.cs index 5933b4e..c2250ea 100644 --- a/RGB.NET.Devices.Corsair/Native/_CorsairChannelInfo.cs +++ b/RGB.NET.Devices.Corsair/Native/_CorsairChannelInfo.cs @@ -1,6 +1,7 @@ #pragma warning disable 169 // Field 'x' is never used #pragma warning disable 414 // Field 'x' is assigned but its value never used #pragma warning disable 649 // Field 'x' is never assigned +#pragma warning disable IDE1006 // Naming Styles using System; using System.Runtime.InteropServices; diff --git a/RGB.NET.Devices.Corsair/Native/_CorsairChannelsInfo.cs b/RGB.NET.Devices.Corsair/Native/_CorsairChannelsInfo.cs index 8dacba2..6eab5bd 100644 --- a/RGB.NET.Devices.Corsair/Native/_CorsairChannelsInfo.cs +++ b/RGB.NET.Devices.Corsair/Native/_CorsairChannelsInfo.cs @@ -1,6 +1,7 @@ #pragma warning disable 169 // Field 'x' is never used #pragma warning disable 414 // Field 'x' is assigned but its value never used #pragma warning disable 649 // Field 'x' is never assigned +#pragma warning disable IDE1006 // Naming Styles using System; using System.Runtime.InteropServices; diff --git a/RGB.NET.Devices.Corsair/Native/_CorsairDeviceInfo.cs b/RGB.NET.Devices.Corsair/Native/_CorsairDeviceInfo.cs index 418e9f6..84b6077 100644 --- a/RGB.NET.Devices.Corsair/Native/_CorsairDeviceInfo.cs +++ b/RGB.NET.Devices.Corsair/Native/_CorsairDeviceInfo.cs @@ -1,6 +1,7 @@ #pragma warning disable 169 // Field 'x' is never used #pragma warning disable 414 // Field 'x' is assigned but its value never used #pragma warning disable 649 // Field 'x' is never assigned +#pragma warning disable IDE1006 // Naming Styles using System; using System.Runtime.InteropServices; diff --git a/RGB.NET.Devices.Corsair/Native/_CorsairLedPosition.cs b/RGB.NET.Devices.Corsair/Native/_CorsairLedPosition.cs index 4ea4356..106c01d 100644 --- a/RGB.NET.Devices.Corsair/Native/_CorsairLedPosition.cs +++ b/RGB.NET.Devices.Corsair/Native/_CorsairLedPosition.cs @@ -1,6 +1,7 @@ #pragma warning disable 169 // Field 'x' is never used #pragma warning disable 414 // Field 'x' is assigned but its value never used #pragma warning disable 649 // Field 'x' is never assigned +#pragma warning disable IDE1006 // Naming Styles using System.Runtime.InteropServices;