From a504a5f4e123bbce2e1299f2ab7edb508315f72b Mon Sep 17 00:00:00 2001 From: Diogo Trindade Date: Sat, 12 Dec 2020 15:16:26 +0000 Subject: [PATCH] Calibration - Moved color calibration reversion to ArtemisLed --- src/Artemis.Core/Models/Surface/ArtemisLed.cs | 9 +++++++++ src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Artemis.Core/Models/Surface/ArtemisLed.cs b/src/Artemis.Core/Models/Surface/ArtemisLed.cs index e31594d40..3198cac1d 100644 --- a/src/Artemis.Core/Models/Surface/ArtemisLed.cs +++ b/src/Artemis.Core/Models/Surface/ArtemisLed.cs @@ -68,5 +68,14 @@ namespace Artemis.Core { return RgbLed.ToString(); } + + /// + /// Gets the color of this led, reverting the correction done to the parent device + /// + /// + public Color GetOriginalColor() + { + return RgbLed.Color.DivideRGB(Device.RedScale, Device.GreenScale, Device.BlueScale); + } } } \ No newline at end of file diff --git a/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs b/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs index 62b3db0d5..88e5eb884 100644 --- a/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs +++ b/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs @@ -38,7 +38,7 @@ namespace Artemis.UI.Shared if (DisplayGeometry == null) return; - RGB.NET.Core.Color originalColor = Led.RgbLed.Color.DivideRGB(Led.Device.RedScale, Led.Device.GreenScale, Led.Device.BlueScale); + RGB.NET.Core.Color originalColor = Led.GetOriginalColor(); byte r = originalColor.GetR(); byte g = originalColor.GetG(); byte b = originalColor.GetB();