DarthAffe/RGB.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2025-12-13 01:58:30 +00:00
Code Issues Releases Wiki Activity

Replaced own hidsharp-package with the latest official which supports .net standard

Browse Source
This commit is contained in:
Darth Affe 2018-04-11 18:17:18 +02:00
parent b471c0e192
commit 62020a2d09
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RGB.NET.Devices.Logitech/HID/DeviceChecker.cs
View File

@ -11,7 +11,7 @@ namespace RGB.NET.Devices.Logitech.HID
#region Constants #region Constants
private const int VENDOR_ID = 0x046D; private const int VENDOR_ID = 0x046D;
//TODO DarthAffe 14.11.2017: Add devices //TODO DarthAffe 14.11.2017: Add devices
private static readonly List<(string model, RGBDeviceType deviceType, int id, string imageLayout, string layoutPath)> PER_KEY_DEVICES private static readonly List<(string model, RGBDeviceType deviceType, int id, string imageLayout, string layoutPath)> PER_KEY_DEVICES
= new List<(string model, RGBDeviceType deviceType, int id, string imageLayout, string layoutPath)> = new List<(string model, RGBDeviceType deviceType, int id, string imageLayout, string layoutPath)>
@ -47,8 +47,7 @@ namespace RGB.NET.Devices.Logitech.HID
internal static void LoadDeviceList() internal static void LoadDeviceList()
{ {
HidDeviceLoader loader = new HidDeviceLoader(); List<int> ids = DeviceList.Local.GetHidDevices(VENDOR_ID).Select(x => x.ProductID).Distinct().ToList();
List<int> ids = loader.GetDevices(VENDOR_ID).Select(x => x.ProductID).Distinct().ToList();
foreach ((string model, RGBDeviceType deviceType, int id, string imageLayout, string layoutPath) deviceData in PER_KEY_DEVICES) foreach ((string model, RGBDeviceType deviceType, int id, string imageLayout, string layoutPath) deviceData in PER_KEY_DEVICES)
if (ids.Contains(deviceData.id)) if (ids.Contains(deviceData.id))

2
RGB.NET.Devices.Logitech/RGB.NET.Devices.Logitech.csproj
View File

@ -60,7 +60,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\RGB.NET.Core\RGB.NET.Core.csproj" /> <ProjectReference Include="..\RGB.NET.Core\RGB.NET.Core.csproj" />
<PackageReference Include="HidSharp.Standard" Version="1.5.0" /> <PackageReference Include="HidSharp" Version="2.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'"> <ItemGroup Condition="'$(TargetFramework)' == 'net45'">