From 99177b0e390b0079cabe51d39133a3431348fa37 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Wed, 26 May 2021 17:11:17 +0100
Subject: [PATCH] 26-05-2021 snapshot.

---
 .../EyesAndEars.UWP/MainPage.xaml             |  6 ++--
 .../EyesAndEars.UWP/Package.appxmanifest      |  2 +-
 .../EyesAndEars.UWP/Services/DataServices.cs  | 33 ++++++++++---------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml b/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml
index 68fbd7e..ff64d14 100644
--- a/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml
+++ b/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml
@@ -40,7 +40,7 @@
             <StackPanel Padding="8,0">
                 <TextBlock Text="Return to Ritherdon Project" FontSize="40"/>
                 <StackPanel Orientation="Horizontal">
-                    <TextBlock Text="Unnamed Project" Padding="0" FontSize="24"
+                    <TextBlock Text="Personal Flash in Real-Time" Padding="0" FontSize="24"
                                VerticalAlignment="Bottom"/>
                     <TextBlock Text="by Nicola Ellis" Padding="0" Margin="12,0"
                                FontSize="18" VerticalAlignment="Bottom"/>
@@ -74,7 +74,7 @@
                                Text="{x:Bind _vm.Device1.LatestReading.reading,
                         Mode=OneWay, FallbackValue=404}" Foreground="White"
                                VerticalAlignment="Bottom" FontSize="144"/>
-                    <TextBlock Text="Factory 1" Foreground="White" FontSize="36"
+                    <TextBlock Text="Factory 1 (Ross)" Foreground="White" FontSize="36"
                                VerticalAlignment="Bottom"/>
                 </StackPanel>
             </Grid>
@@ -91,7 +91,7 @@
                                Text="{x:Bind _vm.Device2.LatestReading.reading,
                         Mode=OneWay, FallbackValue=404}" Foreground="White"
                                VerticalAlignment="Bottom" FontSize="144"/>
-                    <TextBlock Text="Factory 2" Foreground="White" FontSize="36"
+                    <TextBlock Text="Factory 2 (Tony)" Foreground="White" FontSize="36"
                                VerticalAlignment="Bottom"/>
                 </StackPanel>
             </Grid>
diff --git a/src/EyesAndEars.UWP/EyesAndEars.UWP/Package.appxmanifest b/src/EyesAndEars.UWP/EyesAndEars.UWP/Package.appxmanifest
index 680dd61..962c221 100644
--- a/src/EyesAndEars.UWP/EyesAndEars.UWP/Package.appxmanifest
+++ b/src/EyesAndEars.UWP/EyesAndEars.UWP/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="55acd946-60d4-4776-b6c6-03fef750e3da"
     Publisher="CN=Craig Oates"
-    Version="2021.5.3.0" />
+    Version="2021.5.26.0" />
 
   <mp:PhoneIdentity PhoneProductId="55acd946-60d4-4776-b6c6-03fef750e3da" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
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);