mirror of
https://github.com/DarthAffe/CUE.NET.git
synced 2025-12-12 16:58:29 +00:00
Updated SDK to 2.18.127
Added headset stand support Added Glaive support
This commit is contained in:
parent
220953bfe7
commit
6840813529
@ -67,6 +67,9 @@
|
|||||||
<Compile Include="Devices\Generic\EventArgs\UpdatedEventArgs.cs" />
|
<Compile Include="Devices\Generic\EventArgs\UpdatedEventArgs.cs" />
|
||||||
<Compile Include="Devices\Generic\EventArgs\UpdatingEventArgs.cs" />
|
<Compile Include="Devices\Generic\EventArgs\UpdatingEventArgs.cs" />
|
||||||
<Compile Include="Devices\Generic\LedUpateRequest.cs" />
|
<Compile Include="Devices\Generic\LedUpateRequest.cs" />
|
||||||
|
<Compile Include="Devices\HeadsetStand\CorsairHeadsetStand.cs" />
|
||||||
|
<Compile Include="Devices\HeadsetStand\CorsairHeadsetStandDeviceInfo.cs" />
|
||||||
|
<Compile Include="Devices\HeadsetStand\Enums\CorsairHeadsetStandLedId.cs" />
|
||||||
<Compile Include="Devices\Keyboard\Enums\BrushCalculationMode.cs" />
|
<Compile Include="Devices\Keyboard\Enums\BrushCalculationMode.cs" />
|
||||||
<Compile Include="Effects\AbstractLedGroupEffect.cs" />
|
<Compile Include="Effects\AbstractLedGroupEffect.cs" />
|
||||||
<Compile Include="Effects\AbstractBrushEffect.cs" />
|
<Compile Include="Effects\AbstractBrushEffect.cs" />
|
||||||
|
|||||||
20
CueSDK.cs
20
CueSDK.cs
@ -8,6 +8,7 @@ using CUE.NET.Devices;
|
|||||||
using CUE.NET.Devices.Generic;
|
using CUE.NET.Devices.Generic;
|
||||||
using CUE.NET.Devices.Generic.Enums;
|
using CUE.NET.Devices.Generic.Enums;
|
||||||
using CUE.NET.Devices.Headset;
|
using CUE.NET.Devices.Headset;
|
||||||
|
using CUE.NET.Devices.HeadsetStand;
|
||||||
using CUE.NET.Devices.Keyboard;
|
using CUE.NET.Devices.Keyboard;
|
||||||
using CUE.NET.Devices.Mouse;
|
using CUE.NET.Devices.Mouse;
|
||||||
using CUE.NET.Devices.Mousemat;
|
using CUE.NET.Devices.Mousemat;
|
||||||
@ -86,11 +87,17 @@ namespace CUE.NET
|
|||||||
public static CorsairHeadset HeadsetSDK { get; private set; }
|
public static CorsairHeadset HeadsetSDK { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the managed representation of a moustmat managed by the CUE-SDK.
|
/// Gets the managed representation of a mousemat managed by the CUE-SDK.
|
||||||
/// Note that currently only one connected mousemat is supported.
|
/// Note that currently only one connected mousemat is supported.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static CorsairMousemat MousematSDK { get; private set; }
|
public static CorsairMousemat MousematSDK { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the managed representation of a headset stand managed by the CUE-SDK.
|
||||||
|
/// Note that currently only one connected headset stand is supported.
|
||||||
|
/// </summary>
|
||||||
|
public static CorsairHeadsetStand HeadsetStandSDK { get; private set; }
|
||||||
|
|
||||||
// ReSharper restore UnusedAutoPropertyAccessor.Global
|
// ReSharper restore UnusedAutoPropertyAccessor.Global
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
@ -120,6 +127,8 @@ namespace CUE.NET
|
|||||||
return HeadsetSDK != null;
|
return HeadsetSDK != null;
|
||||||
case CorsairDeviceType.Mousemat:
|
case CorsairDeviceType.Mousemat:
|
||||||
return MousematSDK != null;
|
return MousematSDK != null;
|
||||||
|
case CorsairDeviceType.HeadsetStand:
|
||||||
|
return HeadsetStandSDK != null;
|
||||||
default:
|
default:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -205,6 +214,9 @@ namespace CUE.NET
|
|||||||
case CorsairDeviceType.Mousemat:
|
case CorsairDeviceType.Mousemat:
|
||||||
device = MousematSDK = new CorsairMousemat(new CorsairMousematDeviceInfo(nativeDeviceInfo));
|
device = MousematSDK = new CorsairMousemat(new CorsairMousematDeviceInfo(nativeDeviceInfo));
|
||||||
break;
|
break;
|
||||||
|
case CorsairDeviceType.HeadsetStand:
|
||||||
|
device = HeadsetStandSDK = new CorsairHeadsetStand(new CorsairHeadsetStandDeviceInfo(nativeDeviceInfo));
|
||||||
|
break;
|
||||||
// ReSharper disable once RedundantCaseLabel
|
// ReSharper disable once RedundantCaseLabel
|
||||||
case CorsairDeviceType.Unknown:
|
case CorsairDeviceType.Unknown:
|
||||||
default:
|
default:
|
||||||
@ -245,6 +257,7 @@ namespace CUE.NET
|
|||||||
MouseSDK?.ResetLeds();
|
MouseSDK?.ResetLeds();
|
||||||
HeadsetSDK?.ResetLeds();
|
HeadsetSDK?.ResetLeds();
|
||||||
MousematSDK?.ResetLeds();
|
MousematSDK?.ResetLeds();
|
||||||
|
HeadsetStandSDK?.ResetLeds();
|
||||||
|
|
||||||
_CUESDK.Reload();
|
_CUESDK.Reload();
|
||||||
|
|
||||||
@ -295,6 +308,10 @@ namespace CUE.NET
|
|||||||
if (!reloadedDevices.ContainsKey(CorsairDeviceType.Mousemat)
|
if (!reloadedDevices.ContainsKey(CorsairDeviceType.Mousemat)
|
||||||
|| MousematSDK.MousematDeviceInfo.Model != reloadedDevices[CorsairDeviceType.Mousemat].Model)
|
|| MousematSDK.MousematDeviceInfo.Model != reloadedDevices[CorsairDeviceType.Mousemat].Model)
|
||||||
throw new WrapperException("The previously loaded Mousemat got disconnected.");
|
throw new WrapperException("The previously loaded Mousemat got disconnected.");
|
||||||
|
if (HeadsetStandSDK != null)
|
||||||
|
if (!reloadedDevices.ContainsKey(CorsairDeviceType.HeadsetStand)
|
||||||
|
|| HeadsetStandSDK.HeadsetStandDeviceInfo.Model != reloadedDevices[CorsairDeviceType.HeadsetStand].Model)
|
||||||
|
throw new WrapperException("The previously loaded Headset Stand got disconnected.");
|
||||||
|
|
||||||
IsInitialized = true;
|
IsInitialized = true;
|
||||||
}
|
}
|
||||||
@ -309,6 +326,7 @@ namespace CUE.NET
|
|||||||
MouseSDK = null;
|
MouseSDK = null;
|
||||||
HeadsetSDK = null;
|
HeadsetSDK = null;
|
||||||
MousematSDK = null;
|
MousematSDK = null;
|
||||||
|
HeadsetStandSDK = null;
|
||||||
IsInitialized = false;
|
IsInitialized = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -15,6 +15,7 @@ namespace CUE.NET.Devices.Generic.Enums
|
|||||||
Mouse = 1,
|
Mouse = 1,
|
||||||
Keyboard = 2,
|
Keyboard = 2,
|
||||||
Headset = 3,
|
Headset = 3,
|
||||||
Mousemat = 4
|
Mousemat = 4,
|
||||||
|
HeadsetStand = 5
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -205,5 +205,15 @@ namespace CUE.NET.Devices.Generic.Enums
|
|||||||
Lightbar17 = 186,
|
Lightbar17 = 186,
|
||||||
Lightbar18 = 187,
|
Lightbar18 = 187,
|
||||||
Lightbar19 = 188,
|
Lightbar19 = 188,
|
||||||
|
|
||||||
|
HeadsetStandZone1 = 191,
|
||||||
|
HeadsetStandZone2 = 192,
|
||||||
|
HeadsetStandZone3 = 193,
|
||||||
|
HeadsetStandZone4 = 194,
|
||||||
|
HeadsetStandZone5 = 195,
|
||||||
|
HeadsetStandZone6 = 196,
|
||||||
|
HeadsetStandZone7 = 197,
|
||||||
|
HeadsetStandZone8 = 198,
|
||||||
|
HeadsetStandZone9 = 199,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
91
Devices/HeadsetStand/CorsairHeadsetStand.cs
Normal file
91
Devices/HeadsetStand/CorsairHeadsetStand.cs
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
// ReSharper disable UnusedAutoPropertyAccessor.Global
|
||||||
|
// ReSharper disable MemberCanBePrivate.Global
|
||||||
|
// ReSharper disable UnusedMember.Global
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using CUE.NET.Devices.Generic;
|
||||||
|
using CUE.NET.Devices.Generic.Enums;
|
||||||
|
using CUE.NET.Exceptions;
|
||||||
|
using CUE.NET.Native;
|
||||||
|
|
||||||
|
namespace CUE.NET.Devices.HeadsetStand
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Represents the SDK for a corsair headset stand.
|
||||||
|
/// </summary>
|
||||||
|
public class CorsairHeadsetStand : AbstractCueDevice
|
||||||
|
{
|
||||||
|
#region Properties & Fields
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets specific information provided by CUE for the headset stand.
|
||||||
|
/// </summary>
|
||||||
|
public CorsairHeadsetStandDeviceInfo HeadsetStandDeviceInfo { get; }
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Constructors
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="CorsairHeadsetStand"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="info">The specific information provided by CUE for the headset stand</param>
|
||||||
|
internal CorsairHeadsetStand(CorsairHeadsetStandDeviceInfo info)
|
||||||
|
: base(info)
|
||||||
|
{
|
||||||
|
this.HeadsetStandDeviceInfo = info;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Methods
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes the headset stand.
|
||||||
|
/// </summary>
|
||||||
|
public override void Initialize()
|
||||||
|
{
|
||||||
|
int deviceCount = _CUESDK.CorsairGetDeviceCount();
|
||||||
|
|
||||||
|
// Get headset stand device index
|
||||||
|
int headsetStandIndex = -1;
|
||||||
|
for (int i = 0; i < deviceCount; i++)
|
||||||
|
{
|
||||||
|
_CorsairDeviceInfo nativeDeviceInfo = (_CorsairDeviceInfo)Marshal.PtrToStructure(_CUESDK.CorsairGetDeviceInfo(i), typeof(_CorsairDeviceInfo));
|
||||||
|
GenericDeviceInfo info = new GenericDeviceInfo(nativeDeviceInfo);
|
||||||
|
if (info.Type != CorsairDeviceType.HeadsetStand)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
headsetStandIndex = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (headsetStandIndex < 0)
|
||||||
|
throw new WrapperException("Can't determine headset stand device index");
|
||||||
|
|
||||||
|
_CorsairLedPositions nativeLedPositions = (_CorsairLedPositions)Marshal.PtrToStructure(_CUESDK.CorsairGetLedPositionsByDeviceIndex(headsetStandIndex), typeof(_CorsairLedPositions));
|
||||||
|
int structSize = Marshal.SizeOf(typeof(_CorsairLedPosition));
|
||||||
|
IntPtr ptr = nativeLedPositions.pLedPosition;
|
||||||
|
|
||||||
|
// Put the positions in an array for sorting later on
|
||||||
|
List<_CorsairLedPosition> positions = new List<_CorsairLedPosition>();
|
||||||
|
for (int i = 0; i < nativeLedPositions.numberOfLed; i++)
|
||||||
|
{
|
||||||
|
_CorsairLedPosition ledPosition = (_CorsairLedPosition)Marshal.PtrToStructure(ptr, typeof(_CorsairLedPosition));
|
||||||
|
ptr = new IntPtr(ptr.ToInt64() + structSize);
|
||||||
|
positions.Add(ledPosition);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort for easy iteration by clients
|
||||||
|
foreach (_CorsairLedPosition ledPosition in positions.OrderBy(p => p.ledId))
|
||||||
|
InitializeLed(ledPosition.ledId, new RectangleF((float)ledPosition.left, (float)ledPosition.top, (float)ledPosition.width, (float)ledPosition.height));
|
||||||
|
|
||||||
|
base.Initialize();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
}
|
||||||
26
Devices/HeadsetStand/CorsairHeadsetStandDeviceInfo.cs
Normal file
26
Devices/HeadsetStand/CorsairHeadsetStandDeviceInfo.cs
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
// ReSharper disable MemberCanBePrivate.Global
|
||||||
|
// ReSharper disable UnusedAutoPropertyAccessor.Global
|
||||||
|
|
||||||
|
using CUE.NET.Devices.Generic;
|
||||||
|
using CUE.NET.Native;
|
||||||
|
|
||||||
|
namespace CUE.NET.Devices.HeadsetStand
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Represents specific information for a CUE headset stand.
|
||||||
|
/// </summary>
|
||||||
|
public class CorsairHeadsetStandDeviceInfo : GenericDeviceInfo
|
||||||
|
{
|
||||||
|
#region Constructors
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Internal constructor of managed <see cref="CorsairHeadsetStandDeviceInfo" />.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="nativeInfo">The native <see cref="_CorsairDeviceInfo" />-struct</param>
|
||||||
|
internal CorsairHeadsetStandDeviceInfo(_CorsairDeviceInfo nativeInfo)
|
||||||
|
: base(nativeInfo)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
}
|
||||||
26
Devices/HeadsetStand/Enums/CorsairHeadsetStandLedId.cs
Normal file
26
Devices/HeadsetStand/Enums/CorsairHeadsetStandLedId.cs
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
// ReSharper disable UnusedMember.Global
|
||||||
|
// ReSharper disable InconsistentNaming
|
||||||
|
|
||||||
|
#pragma warning disable 1591 // Missing XML comment for publicly visible type or member
|
||||||
|
|
||||||
|
using CUE.NET.Devices.Generic.Enums;
|
||||||
|
|
||||||
|
namespace CUE.NET.Devices.HeadsetStand.Enums
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Contains list of all LEDs available for corsair headset stands.
|
||||||
|
/// </summary>
|
||||||
|
public static class CorsairHeadsetStandLedId
|
||||||
|
{
|
||||||
|
public const CorsairLedId Invalid = CorsairLedId.Invalid;
|
||||||
|
public const CorsairLedId HeadsetStandZone1 = CorsairLedId.HeadsetStandZone1;
|
||||||
|
public const CorsairLedId HeadsetStandZone2 = CorsairLedId.HeadsetStandZone2;
|
||||||
|
public const CorsairLedId HeadsetStandZone3 = CorsairLedId.HeadsetStandZone3;
|
||||||
|
public const CorsairLedId HeadsetStandZone4 = CorsairLedId.HeadsetStandZone4;
|
||||||
|
public const CorsairLedId HeadsetStandZone5 = CorsairLedId.HeadsetStandZone5;
|
||||||
|
public const CorsairLedId HeadsetStandZone6 = CorsairLedId.HeadsetStandZone6;
|
||||||
|
public const CorsairLedId HeadsetStandZone7 = CorsairLedId.HeadsetStandZone7;
|
||||||
|
public const CorsairLedId HeadsetStandZone8 = CorsairLedId.HeadsetStandZone8;
|
||||||
|
public const CorsairLedId HeadsetStandZone9 = CorsairLedId.HeadsetStandZone9;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -2,10 +2,16 @@
|
|||||||
// ReSharper disable UnusedAutoPropertyAccessor.Global
|
// ReSharper disable UnusedAutoPropertyAccessor.Global
|
||||||
// ReSharper disable UnusedMember.Global
|
// ReSharper disable UnusedMember.Global
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
using CUE.NET.Devices.Generic;
|
using CUE.NET.Devices.Generic;
|
||||||
|
using CUE.NET.Devices.Generic.Enums;
|
||||||
using CUE.NET.Devices.Mouse.Enums;
|
using CUE.NET.Devices.Mouse.Enums;
|
||||||
using CUE.NET.Exceptions;
|
using CUE.NET.Exceptions;
|
||||||
|
using CUE.NET.Native;
|
||||||
|
|
||||||
namespace CUE.NET.Devices.Mouse
|
namespace CUE.NET.Devices.Mouse
|
||||||
{
|
{
|
||||||
@ -44,6 +50,14 @@ namespace CUE.NET.Devices.Mouse
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
|
// Glaive is a special flake that doesn't follow the default layout
|
||||||
|
if (MouseDeviceInfo.Model == "GLAIVE RGB")
|
||||||
|
{
|
||||||
|
InitializeLed(CorsairMouseLedId.B1, new RectangleF(0, 0, 1, 1)); // Logo
|
||||||
|
InitializeLed(CorsairMouseLedId.B2, new RectangleF(2, 0, 1, 1)); // Front
|
||||||
|
InitializeLed(CorsairMouseLedId.B5, new RectangleF(3, 0, 1, 1)); // Sides
|
||||||
|
return;
|
||||||
|
}
|
||||||
switch (MouseDeviceInfo.PhysicalLayout)
|
switch (MouseDeviceInfo.PhysicalLayout)
|
||||||
{
|
{
|
||||||
case CorsairPhysicalMouseLayout.Zones1:
|
case CorsairPhysicalMouseLayout.Zones1:
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user