DarthAffe/RGB.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2025-12-12 17:48:31 +00:00
Code Issues Releases Wiki Activity

Revert "Added Id to devices"

Browse Source 
This reverts commit a86d5f7e84b8ba586f819d5b672b7176ae1416f4.
This commit is contained in:
Darth Affe 2018-07-10 20:33:50 +02:00
parent a86d5f7e84
commit 7c5306232f
19 changed files with 12 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RGB.NET.Core/Devices/IRGBDeviceInfo.cs
View File

@ -9,11 +9,6 @@ namespace RGB.NET.Core
{
#region Properties & Fields
/// <summary>
/// Gets an unique identifier of the <see cref="IRGBDevice"/> this info belongs to.
/// </summary>
object DeviceId { get; }
/// <summary>
/// Gets the <see cref="RGBDeviceType"/> of the <see cref="IRGBDevice"/>.
/// </summary>

3
RGB.NET.Devices.Asus/Generic/AsusRGBDeviceInfo.cs
View File

@ -11,9 +11,6 @@ namespace RGB.NET.Devices.Asus
{
#region Properties & Fields
/// <inheritdoc />
public object DeviceId => Handle.ToInt32();
/// <inheritdoc />
public RGBDeviceType DeviceType { get; }

3
RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDeviceInfo.cs
View File

@ -12,9 +12,6 @@ namespace RGB.NET.Devices.CoolerMaster
{
#region Properties & Fields
/// <inheritdoc />
public object DeviceId => DeviceIndex;
/// <inheritdoc />
public RGBDeviceType DeviceType { get; }

3
RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs
View File

@ -14,9 +14,6 @@ namespace RGB.NET.Devices.Corsair
{
#region Properties & Fields
/// <inheritdoc />
public object DeviceId => CorsairDeviceIndex;
/// <summary>
/// Gets the corsair specific device type.
/// </summary>

3
RGB.NET.Devices.DMX/E131/E131DeviceInfo.cs
View File

@ -21,9 +21,6 @@ namespace RGB.NET.Devices.DMX.E131
#region Properties & Fields
/// <inheritdoc />
public object DeviceId => CID;
/// <inheritdoc />
public RGBDeviceType DeviceType { get; }

7
RGB.NET.Devices.Debug/DebugRGBDeviceInfo.cs
View File

@ -11,9 +11,6 @@ namespace RGB.NET.Devices.Debug
{
#region Properties & Fields
/// <inheritdoc />
public object DeviceId { get; }
/// <inheritdoc />
public RGBDeviceType DeviceType { get; }
@ -44,15 +41,13 @@ namespace RGB.NET.Devices.Debug
/// <param name="model">The model of the device.</param>
/// <param name="lighting">The <see cref="RGBDeviceLighting"/> of the device.</param>
/// <param name="supportsSyncBack">True if the device supports syncback; false if not.</param>
/// <param name="deviceId">The unique identifier of this device.</param>
internal DebugRGBDeviceInfo(RGBDeviceType deviceType, string manufacturer, string model, RGBDeviceLighting lighting, bool supportsSyncBack, object deviceId = null)
internal DebugRGBDeviceInfo(RGBDeviceType deviceType, string manufacturer, string model, RGBDeviceLighting lighting, bool supportsSyncBack)
{
this.DeviceType = deviceType;
this.Manufacturer = manufacturer;
this.Model = model;
this.Lighting = lighting;
this.SupportsSyncBack = supportsSyncBack;
this.DeviceId = deviceId;
}
#endregion

3
RGB.NET.Devices.Logitech/Generic/LogitechRGBDeviceInfo.cs
View File

@ -11,9 +11,6 @@ namespace RGB.NET.Devices.Logitech
{
#region Properties & Fields
/// <inheritdoc />
public object DeviceId => Lighting;
/// <inheritdoc />
public RGBDeviceType DeviceType { get; }

3
RGB.NET.Devices.Msi/Generic/MsiRGBDeviceInfo.cs
View File

@ -11,9 +11,6 @@ namespace RGB.NET.Devices.Msi
{
#region Properties & Fields
/// <inheritdoc />
public object DeviceId => MsiDeviceType;
/// <inheritdoc />
public RGBDeviceType DeviceType { get; }

2
RGB.NET.Devices.Novation/Generic/NovationRGBDevice.cs
View File

@ -58,7 +58,7 @@ namespace RGB.NET.Devices.Novation
}
if (DeviceInfo.ColorCapabilities == NovationColorCapabilities.LimitedRG)
UpdateQueue = new LimitedColorUpdateQueue(updateTrigger, DeviceInfo.MidiDeviceId);
UpdateQueue = new LimitedColorUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
}
/// <summary>

7
RGB.NET.Devices.Novation/Generic/NovationRGBDeviceInfo.cs
View File

@ -11,9 +11,6 @@ namespace RGB.NET.Devices.Novation
{
#region Properties & Fields
/// <inheritdoc />
public object DeviceId => MidiDeviceId;
/// <inheritdoc />
public RGBDeviceType DeviceType { get; }
@ -40,7 +37,7 @@ namespace RGB.NET.Devices.Novation
/// <summary>
/// Gets the (midi)-id of the <see cref="IRGBDevice"/>..
/// </summary>
public int MidiDeviceId { get; }
public int DeviceId { get; }
#endregion
@ -57,7 +54,7 @@ namespace RGB.NET.Devices.Novation
{
this.DeviceType = deviceType;
this.Model = model;
this.MidiDeviceId = deviceId;
this.DeviceId = deviceId;
this.ColorCapabilities = colorCapabilities;
}

2
RGB.NET.Devices.Razer/ChromaLink/RazerChromaLinkRGBDevice.cs
View File

@ -42,7 +42,7 @@ namespace RGB.NET.Devices.Razer
protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Custom1;
/// <inheritdoc />
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerChromaLinkUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerChromaLinkUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
#endregion
}

7
RGB.NET.Devices.Razer/Generic/RazerRGBDeviceInfo.cs
View File

@ -11,13 +11,10 @@ namespace RGB.NET.Devices.Razer
{
#region Properties & Fields
/// <inheritdoc />
public object DeviceId => RazerDeviceId;
/// <summary>
/// Gets the Id of the <see cref="RazerRGBDevice{TDeviceInfo}"/>.
/// </summary>
public Guid RazerDeviceId { get; }
public Guid DeviceId { get; }
/// <inheritdoc />
public RGBDeviceType DeviceType { get; }
@ -49,7 +46,7 @@ namespace RGB.NET.Devices.Razer
/// <param name="model">The model of the <see cref="IRGBDevice"/>.</param>
internal RazerRGBDeviceInfo(Guid deviceId, RGBDeviceType deviceType, string model)
{
this.RazerDeviceId = deviceId;
this.DeviceId = deviceId;
this.DeviceType = deviceType;
this.Model = model;
}

2
RGB.NET.Devices.Razer/Headset/RazerHeadsetRGBDevice.cs
View File

@ -42,7 +42,7 @@ namespace RGB.NET.Devices.Razer
protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Headset1;
/// <inheritdoc />
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerHeadsetUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerHeadsetUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
#endregion
}

2
RGB.NET.Devices.Razer/Keyboard/RazerKeyboardRGBDevice.cs
View File

@ -48,7 +48,7 @@ namespace RGB.NET.Devices.Razer
protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Keyboard_Escape;
/// <inheritdoc />
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerKeyboardUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerKeyboardUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
#endregion
}

2
RGB.NET.Devices.Razer/Keypad/RazerKeypadRGBDevice.cs
View File

@ -45,7 +45,7 @@ namespace RGB.NET.Devices.Razer
protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Keypad1;
/// <inheritdoc />
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerKeypadUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerKeypadUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
#endregion
}

2
RGB.NET.Devices.Razer/Mouse/RazerMouseRGBDevice.cs
View File

@ -45,7 +45,7 @@ namespace RGB.NET.Devices.Razer
protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Mouse1;
/// <inheritdoc />
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerMouseUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerMouseUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
#endregion
}

2
RGB.NET.Devices.Razer/Mousepad/RazerMousepadRGBDevice.cs
View File

@ -42,7 +42,7 @@ namespace RGB.NET.Devices.Razer
protected override object CreateLedCustomData(LedId ledId) => (int)ledId - (int)LedId.Mousepad1;
/// <inheritdoc />
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerMousepadUpdateQueue(updateTrigger, DeviceInfo.RazerDeviceId);
protected override RazerUpdateQueue CreateUpdateQueue(IDeviceUpdateTrigger updateTrigger) => new RazerMousepadUpdateQueue(updateTrigger, DeviceInfo.DeviceId);
#endregion
}

3
RGB.NET.Devices.SoIP/Client/SoIPClientRGBDeviceInfo.cs
View File

@ -11,9 +11,6 @@ namespace RGB.NET.Devices.SoIP.Client
{
#region Properties & Fields
/// <inheritdoc />
public object DeviceId => $"{Hostname}:{Port}";
/// <inheritdoc />
public RGBDeviceType DeviceType => RGBDeviceType.Unknown;

3
RGB.NET.Devices.SoIP/Server/SoIPServerRGBDeviceInfo.cs
View File

@ -11,9 +11,6 @@ namespace RGB.NET.Devices.SoIP.Server
{
#region Properties & Fields
/// <inheritdoc />
public object DeviceId => Port;
/// <inheritdoc />
public RGBDeviceType DeviceType => RGBDeviceType.Unknown;