diff --git a/CueSDK.cs b/CueSDK.cs index 3034540..59a9375 100644 --- a/CueSDK.cs +++ b/CueSDK.cs @@ -171,19 +171,20 @@ namespace CUE.NET if (!info.CapsMask.HasFlag(CorsairDeviceCaps.Lighting)) continue; // Everything that doesn't support lighting control is useless + ICueDevice device; switch (info.Type) { case CorsairDeviceType.Keyboard: - devices.Add(KeyboardSDK = new CorsairKeyboard(new CorsairKeyboardDeviceInfo(nativeDeviceInfo))); + device = KeyboardSDK = new CorsairKeyboard(new CorsairKeyboardDeviceInfo(nativeDeviceInfo)); break; case CorsairDeviceType.Mouse: - devices.Add(MouseSDK = new CorsairMouse(new CorsairMouseDeviceInfo(nativeDeviceInfo))); + device = MouseSDK = new CorsairMouse(new CorsairMouseDeviceInfo(nativeDeviceInfo)); break; case CorsairDeviceType.Headset: - devices.Add(HeadsetSDK = new CorsairHeadset(new CorsairHeadsetDeviceInfo(nativeDeviceInfo))); + device = HeadsetSDK = new CorsairHeadset(new CorsairHeadsetDeviceInfo(nativeDeviceInfo)); break; case CorsairDeviceType.Mousemat: - devices.Add(MousematSDK = new CorsairMousemat(new CorsairMousematDeviceInfo(nativeDeviceInfo))); + device = MousematSDK = new CorsairMousemat(new CorsairMousematDeviceInfo(nativeDeviceInfo)); break; // ReSharper disable once RedundantCaseLabel case CorsairDeviceType.Unknown: @@ -191,6 +192,9 @@ namespace CUE.NET throw new WrapperException("Unknown Device-Type"); } + device.Initialize(); + devices.Add(device); + error = LastError; if (error != CorsairError.Success) Throw(error); diff --git a/Devices/Generic/AbstractCueDevice.cs b/Devices/Generic/AbstractCueDevice.cs index 45b33fb..309cf19 100644 --- a/Devices/Generic/AbstractCueDevice.cs +++ b/Devices/Generic/AbstractCueDevice.cs @@ -140,8 +140,6 @@ namespace CUE.NET.Devices.Generic { this.DeviceInfo = info; - // ReSharper disable once VirtualMemberCallInConstructor - I know, but I need this ... - InitializeLeds(); DeviceRectangle = RectangleHelper.CreateRectangleFromRectangles((this).Select(x => x.LedRectangle)); } @@ -152,9 +150,9 @@ namespace CUE.NET.Devices.Generic #region Initialize /// - /// Initializes the LEDs of the device. + /// Initializes the device. /// - protected abstract void InitializeLeds(); + public abstract void Initialize(); /// /// Initializes the LED-Object with the specified id. diff --git a/Devices/Headset/CorsairHeadset.cs b/Devices/Headset/CorsairHeadset.cs index 1486125..422e7df 100644 --- a/Devices/Headset/CorsairHeadset.cs +++ b/Devices/Headset/CorsairHeadset.cs @@ -39,9 +39,9 @@ namespace CUE.NET.Devices.Headset #region Methods /// - /// Initializes the LEDs of the device. + /// Initializes the the headset. /// - protected override void InitializeLeds() + public override void Initialize() { InitializeLed(CorsairHeadsetLedId.LeftLogo, new RectangleF(0, 0, 1, 1)); InitializeLed(CorsairHeadsetLedId.RightLogo, new RectangleF(1, 0, 1, 1)); diff --git a/Devices/ICueDevice.cs b/Devices/ICueDevice.cs index 75a856f..3b2226a 100644 --- a/Devices/ICueDevice.cs +++ b/Devices/ICueDevice.cs @@ -11,7 +11,7 @@ using CUE.NET.Groups; namespace CUE.NET.Devices { #region EventHandler - + /// /// Represents the event-handler of the Exception-event. /// @@ -134,6 +134,11 @@ namespace CUE.NET.Devices #region Methods + /// + /// Initializes the device. + /// + void Initialize(); + /// /// Perform an update for all dirty keys, or all keys if flushLeds is set to true. /// diff --git a/Devices/Keyboard/CorsairKeyboard.cs b/Devices/Keyboard/CorsairKeyboard.cs index 557e142..1d79e45 100644 --- a/Devices/Keyboard/CorsairKeyboard.cs +++ b/Devices/Keyboard/CorsairKeyboard.cs @@ -42,9 +42,9 @@ namespace CUE.NET.Devices.Keyboard #region Methods /// - /// Initializes the LEDs of the device. + /// Initializes the keyboard. /// - protected override void InitializeLeds() + public override void Initialize() { _CorsairLedPositions nativeLedPositions = (_CorsairLedPositions)Marshal.PtrToStructure(_CUESDK.CorsairGetLedPositions(), typeof(_CorsairLedPositions)); int structSize = Marshal.SizeOf(typeof(_CorsairLedPosition)); diff --git a/Devices/Mouse/CorsairMouse.cs b/Devices/Mouse/CorsairMouse.cs index 7eaad8e..d712e57 100644 --- a/Devices/Mouse/CorsairMouse.cs +++ b/Devices/Mouse/CorsairMouse.cs @@ -40,9 +40,9 @@ namespace CUE.NET.Devices.Mouse #region Methods /// - /// Initializes the LEDs of the device. + /// Initializes the mouse. /// - protected override void InitializeLeds() + public override void Initialize() { switch (MouseDeviceInfo.PhysicalLayout) { diff --git a/Devices/Mousemat/CorsairMousemat.cs b/Devices/Mousemat/CorsairMousemat.cs index 0d76ad0..54cf9e8 100644 --- a/Devices/Mousemat/CorsairMousemat.cs +++ b/Devices/Mousemat/CorsairMousemat.cs @@ -45,9 +45,9 @@ namespace CUE.NET.Devices.Mousemat #region Methods /// - /// Initializes the LEDs of the device. + /// Initializes the mousemat. /// - protected override void InitializeLeds() + public override void Initialize() { int deviceCount = _CUESDK.CorsairGetDeviceCount();