update README.

Merge branch 'master' into unstable
2021-6-11 snapshot.
5 changed files with 27 additions and 22 deletions
--- a/README.md
+++ b/README.md
@ -1,3 +1,6 @@
-# eyes-and-ears
+# Return to Ritherdon: Eyes and Ears

-A dashboard which provides a live overview of the, as of yet, unnamed project.
+Eyes and Ears is a Windows UWP 'Dashboard App.' which monitors the overall artwork, 'Personal Flash in Real-Time' -- which is one of several artworks in the 'Return to Ritherdon' project. For more information on the 'Return to Ritherdon' project and 'Eyes and Ears' specifically, please use the following linsk:
+
+- [Return to Ritherdon Overview](https://git.abbether.net/return-to-ritherdon/rtr-docs)
+- [Eyes and Ears Documentation](https://git.abbether.net/return-to-ritherdon/rtr-docs/src/branch/master/eyes-and-ears/rtr-eyes-and-ears.md)
--- a/src/EyesAndEars.UWP/EyesAndEars.UWP/EyesAndEars.UWP.csproj
+++ b/src/EyesAndEars.UWP/EyesAndEars.UWP/EyesAndEars.UWP.csproj
@ -28,6 +28,7 @@
    <AppxBundle>Always</AppxBundle>
    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    <DebugSymbols>true</DebugSymbols>
--- 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 (Andy)" 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>
--- 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.2.10.0" />
+    Version="2021.6.11.0" />

  <mp:PhoneIdentity PhoneProductId="55acd946-60d4-4776-b6c6-03fef750e3da" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

--- 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);
Author	SHA1	Message	Date
Craig Oates	a51c310c25	update README.	3 years ago
Craig Oates	328e605c52	Merge branch 'master' into unstable	3 years ago
Craig Oates	c6157c58df	2021-6-11 snapshot.	3 years ago
Craig Oates	d7f58fee84	update .csproj file.	3 years ago
Craig Oates	1c0b8f3d2a	update to 2021.6.11 (Ross to Andy label change).	3 years ago
Craig Oates	c617416402	change 'Ross' label to 'Andy'. Ross is no longer at Ritherdon and Andy (and Harry) have taken over his role.	3 years ago
Craig Oates	99177b0e39	26-05-2021 snapshot.	3 years ago
Craig Oates	3153b6ceef	update version number to 2021.5.26.	3 years ago
Craig Oates	922fab998e	stop gallery blocks indicating negative light. The gallery blocks on the dashboard have been changing to light sky blue when the (factory) light meter have recorded negative light. This change stops this. The reason why is to make the behaviour consistent. I made the gallery blocks stop hightlighting the 'weld occured' moment in a previous commit because it's not the job of the gallery block to relay something which its not responsible for. By including the negative light change, though, this broke that decision and created inconsistency into how the dashboard operates. The light meter blocks inform what's happening their end and the gallery blocks don't need to repeat that.	3 years ago
Craig Oates	c809a4dfb1	replace working-text with final. Changed 'unnamed' to the actual name of the artwork and added 'Ross' and 'Tony' labels to the light meter readings they are monitored by.	3 years ago
Craig Oates	21ead57d15	2021-05-03 Snapshot.	3 years ago
Craig Oates	18af017df9	Merge branch 'unstable' of http://git.abbether.net/return-to-ritherdon/eyes-and-ears into unstable	3 years ago
Craig Oates	8b46b32462	update version information to 2021.5.3.	3 years ago
Craig Oates	c9485bd303	change the default value for CurrentTime property in ViewModel. I previously set CurrentTime to the current time on the system. I've changed it to 'Not Set' so dev's can identify any configuration errors. I've done this because I fell foul to that problem already. When I was initialising MainPageVM, I was using DateTime.Now as the default value and when initialising it in the View class (MainPage.xaml.cs). This confused me because I couldn't understand why the time wouldn't update when I change the code. Basically, I was updating MainPageVM because the time displayed on the dashboard matched what I set it as in the ViewModel. But, the time was being changed in the View class (at run-time) with the DateTime.Now property.	3 years ago
Craig Oates	40b60daa3f	initialise CurrentTime with current time zone offset. CurrentTime is not a main feature and does not refer to any of the time-stamps attached to any of the device sections (on the dashboard). This is just a clock to help people quickly see how long is left in the day before the various devices shut down (based on the Legend Info. below it. So, this is just a cosmetic change.	3 years ago
Craig Oates	4c0f44eac9	add white fill/shape/border around app's logo. When the program is in dark mode, the logo is difficult to see (if you can see it at all). I've added a block of white behind it show to combat this. I went with white because the logo is fine when Windows is in light mode. Because of that, the border/shape/fill recedes into the background. I decided against changing the logo programmatically to an alternative version because it'll require more work than it's worth. This is a minor cosmetic part of the program and, this way, the logo remains as intended (a rich navy blue).	3 years ago
Craig Oates	b899f66747	fix (#1 ): time not adjusting time zone. The time (top-right) of dashboard was not updating to British Summer Time (BST). The change here adds a converision of the system's current/local time to match that of it current time zone. I should've done this at the beginning but here it's done now. And, most importantly, it's before the exhibition has started.	3 years ago
Craig Oates	8dc91291c1	update threshold for detecting a weld for factory1.	3 years ago
Craig Oates	31f0368fff	add extra return statement for gallery device status. In UpdateStatusColour, the code checks to see what state the device it's processing is in and relays that information to the user with a colour change on the dashboard. In a previous commit, I forgot to include a return statement to indicate the Relays (gallery1 and 2) are on. The one line of code added here addresses that. Note: The code is starting to look sloppy. The code in UpdateStatusColour is beginning to turn into a sprawing mess of branching logic. I have decided to keep like this for now because of the fixed requirements but you should be aware of the mess building-up. If the requirements begin to change, here might be a good place to start refactoring from.	3 years ago
Craig Oates	d95182926e	change LogToggle to stop logging and clear log area. The tablet I'm using most of the time to monitor the system (with Eyes and Ears) is under powered (too many Windows 10 updates at this point by I digress). So, it doesn't handle the increase in RAM needed for this feature very well. I change the LogToggle to provide a way to clear the log area alongside stopping the program logging (reducing RAM usage and processing cycles).	3 years ago
Craig Oates	a04d132c5e	implement a audio notification feature (for status changes). The changes here are a completion of a previous P.O.C. commit. When the program detects a change in the status of a device (I.E. 'on' to 'off' and vice-versa), Eyes and Ears will play an text-to-speech phrase to indicate the change.	3 years ago
Craig Oates	5d91fc5772	create a P.O.C. for a text-to-speech feature. This is a very rough bit of code. This is for testing the possibilty/usability of having the program provide updates using the SpeechSynthesizer class. The initial intention is to have the program denote any change in power status ('gallery1' is now off', 'weld detected by factory1' Etc.) and, if it's any good, expand it from there. The code changes made here are incomplete but I'm packing up for the day and going home -- it's late. I'm logging the current changes for future reference.	3 years ago
Craig Oates	e03215a7e8	implement logging system on dashboard. The code added here is more about populating the area created for logging each web request. The XAML code was done in the previous commit. As I stated there, these logs are more about the providing the user of this program visual feedback about the state of the program. There are times when the various devices (light meters/relays) don't update and it's hard to tell if that's Eyes and Ears, the internet connection or the devices on the other end.	3 years ago
Craig Oates	33d6cf83a8	create a log section on dashboard and toggle button. This is in aid of providing the user with more feedback about the program (eyes and ears) than the light readings and web requests. The toggle button allows the user to turn-off the logs if they don't want or need them. This is not a full implementation of the logging system (this is just a start).	3 years ago
Craig Oates	690a9dd5dd	fine-tune the colour changes for each device and its status. There was a case where the device status would change to the 'low light detected' (light sky blue) when on the border between a weld being detected and not. This commit addresses that. Also, both Light Meters have been installed at this point and it is apparent both of the welding booths have different light levels. Becuase of this, the dashboard now has code in place which seperates the update-checks to match the device/welding booth. In other words, factory1 does not go dark see green at factory2's light levels.	3 years ago
Craig Oates	48ced0d2ec	update version information to 2021.5.3.	3 years ago
Craig Oates	49a4dceacd	2020-01-14 Snapshot: Stable into Master (#6 )	3 years ago