From 0d2882e7ea69cadcc769eef6d672dc29150433ba Mon Sep 17 00:00:00 2001 From: Daro Date: Fri, 29 Sep 2017 17:12:20 +0200 Subject: [PATCH] Glaive support --- CueSDK.cs | 3 +-- Devices/Mouse/GlaiveMouse.cs | 32 ++----------------------------- Examples/SimpleDevTest/Program.cs | 2 +- 3 files changed, 4 insertions(+), 33 deletions(-) diff --git a/CueSDK.cs b/CueSDK.cs index 5120a27..b1e2dbb 100644 --- a/CueSDK.cs +++ b/CueSDK.cs @@ -80,7 +80,6 @@ namespace CUE.NET /// public static CorsairMouse MouseSDK { get; private set; } - public static GlaiveMouse GlaiveSDK { get; private set; } /// /// Gets the managed representation of a headset managed by the CUE-SDK. @@ -202,7 +201,7 @@ namespace CUE.NET case CorsairDeviceType.Mouse: if(info.Model.ToLower().Contains("glaive")) { - device = GlaiveSDK = new GlaiveMouse(new CorsairMouseDeviceInfo(nativeDeviceInfo)); + device = MouseSDK = new GlaiveMouse(new CorsairMouseDeviceInfo(nativeDeviceInfo)); } else { diff --git a/Devices/Mouse/GlaiveMouse.cs b/Devices/Mouse/GlaiveMouse.cs index 7e24d2d..0aad0a0 100644 --- a/Devices/Mouse/GlaiveMouse.cs +++ b/Devices/Mouse/GlaiveMouse.cs @@ -12,7 +12,7 @@ using CUE.NET.Exceptions; namespace CUE.NET.Devices.Mouse { - public class GlaiveMouse : AbstractCueDevice + public class GlaiveMouse : CorsairMouse { private const int vid = 0x1b1c; private const int pid = 0x1b34; @@ -26,12 +26,8 @@ namespace CUE.NET.Devices.Mouse private bool initialized = false; - public CorsairMouseDeviceInfo MouseDeviceInfo { get; } - public GlaiveMouse(CorsairMouseDeviceInfo info) : base(info) - { - this.MouseDeviceInfo = info; - } + { } public static GlaiveMouse FromCorsairMouse(CorsairMouse mouse) { @@ -46,30 +42,6 @@ namespace CUE.NET.Devices.Mouse initialized = true; - switch (MouseDeviceInfo.PhysicalLayout) - { - case CorsairPhysicalMouseLayout.Zones1: - InitializeLed(CorsairMouseLedId.B1, new RectangleF(0, 0, 1, 1)); - break; - case CorsairPhysicalMouseLayout.Zones2: - InitializeLed(CorsairMouseLedId.B1, new RectangleF(0, 0, 1, 1)); - InitializeLed(CorsairMouseLedId.B2, new RectangleF(1, 0, 1, 1)); - break; - case CorsairPhysicalMouseLayout.Zones3: - InitializeLed(CorsairMouseLedId.B1, new RectangleF(0, 0, 1, 1)); - InitializeLed(CorsairMouseLedId.B2, new RectangleF(1, 0, 1, 1)); - InitializeLed(CorsairMouseLedId.B3, new RectangleF(2, 0, 1, 1)); - break; - case CorsairPhysicalMouseLayout.Zones4: - InitializeLed(CorsairMouseLedId.B1, new RectangleF(0, 0, 1, 1)); - InitializeLed(CorsairMouseLedId.B2, new RectangleF(1, 0, 1, 1)); - InitializeLed(CorsairMouseLedId.B3, new RectangleF(2, 0, 1, 1)); - InitializeLed(CorsairMouseLedId.B4, new RectangleF(3, 0, 1, 1)); - break; - default: - throw new WrapperException($"Can't initial mouse with layout '{MouseDeviceInfo.PhysicalLayout}'"); - } - base.Initialize(); } diff --git a/Examples/SimpleDevTest/Program.cs b/Examples/SimpleDevTest/Program.cs index 1fc5b15..418f2c6 100644 --- a/Examples/SimpleDevTest/Program.cs +++ b/Examples/SimpleDevTest/Program.cs @@ -409,7 +409,7 @@ namespace SimpleDevTest CueSDK.Initialize(); - GlaiveMouse mouse = CueSDK.GlaiveSDK; + CorsairMouse mouse = CueSDK.MouseSDK; //mouse.Initialize();