1
0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2025-12-13 10:08:31 +00:00

Compare commits

...

4 Commits

Author SHA1 Message Date
Robert Beekman
3fbc4b997e
Merge pull request #232 from DarthAffe/SDK/CoolerMaster
CoolerMaster - Added MM830 LED definitions
2021-09-03 20:40:35 +02:00
Robert Beekman
3074a2b7bf
Merge pull request #231 from DarthAffe/Core/UpdateTriggerCancel
Fix race condition in TimerUpdateTrigger stop
2021-09-03 20:40:14 +02:00
Robert
6f4c07d65f CoolerMaster - Added MM830 LED definitions 2021-09-01 20:16:29 +02:00
Robert
1fa466809e Fix race condition in TimerUpdateTrigger stop 2021-08-23 18:48:19 +02:00
2 changed files with 29 additions and 4 deletions

View File

@ -92,10 +92,20 @@ namespace RGB.NET.Core
if (UpdateTask != null)
{
UpdateTokenSource?.Cancel();
// ReSharper disable once MethodSupportsCancellation
UpdateTask.Wait();
UpdateTask.Dispose();
UpdateTask = null;
try
{
// ReSharper disable once MethodSupportsCancellation
UpdateTask.Wait();
}
catch (AggregateException)
{
// ignored
}
finally
{
UpdateTask.Dispose();
UpdateTask = null;
}
}
}
}

View File

@ -48,6 +48,21 @@ namespace RGB.NET.Devices.CoolerMaster
{ LedId.Mouse3, (0,2) }
}
},
{ CoolerMasterDevicesIndexes.MM830, new Dictionary<LedId, (int row, int column)>
{
{ LedId.Mouse1, (0,0) },
{ LedId.Mouse2, (0,1) },
{ LedId.Mouse3, (0,2) },
{ LedId.Mouse4, (0,3) },
{ LedId.Mouse5, (0,4) },
{ LedId.Mouse6, (0,5) },
{ LedId.Mouse7, (0,6) },
{ LedId.Mouse8, (0,7) },
{ LedId.Mouse9, (0,8) },
{ LedId.Mouse10, (0,9) },
}
},
};
#endregion