diff --git a/src/EyesAndEars.UWP/EyesAndEars.UWP/Services/DataServices.cs b/src/EyesAndEars.UWP/EyesAndEars.UWP/Services/DataServices.cs index e3bd735..72e5220 100644 --- a/src/EyesAndEars.UWP/EyesAndEars.UWP/Services/DataServices.cs +++ b/src/EyesAndEars.UWP/EyesAndEars.UWP/Services/DataServices.cs @@ -103,22 +103,23 @@ namespace EyesAndEars.UWP.Services { * the system knows about and everything is fine -- nothing * is broken. */ - - if (device == 1) { - if (reading > 0 && reading <= 39) // No weld detected. - return new SolidColorBrush(Colors.LightSeaGreen); - if (reading > 38) // Weld detected. - return new SolidColorBrush(Colors.DarkSeaGreen); - } - else if (device == 2) { - if (reading > 0 && reading <= 48) // No weld detected. - return new SolidColorBrush(Colors.LightSeaGreen); - if (reading > 48) // Weld detected. - return new SolidColorBrush(Colors.DarkSeaGreen); - } - else if (reading < 0) { - // The device is on but factory lights are off. - return new SolidColorBrush(Colors.LightSkyBlue); + if (device == 1 || device == 2) { + if (device == 1) { + if (reading > 0 && reading <= 39) // No weld detected. + return new SolidColorBrush(Colors.LightSeaGreen); + if (reading > 38) // Weld detected. + return new SolidColorBrush(Colors.DarkSeaGreen); + } + else if (device == 2) { + if (reading > 0 && reading <= 48) // No weld detected. + return new SolidColorBrush(Colors.LightSeaGreen); + if (reading > 48) // Weld detected. + return new SolidColorBrush(Colors.DarkSeaGreen); + } + else if (reading < 0) { + // The device is on but factory lights are off. + return new SolidColorBrush(Colors.LightSkyBlue); + } } // Indicate the gallery relays are on. return new SolidColorBrush(Colors.LightSeaGreen);