From c0340c93bab1933e307c0a518a6e03dc975122a8 Mon Sep 17 00:00:00 2001 From: Craig Oates Date: Fri, 5 Nov 2021 17:29:32 +0000 Subject: [PATCH] Squashed commit of the following: commit 338c0122099367e07b24a9a28a52a0d71157cf9b Merge: 4df33ee a51c310 Author: Craig Oates Date: Fri Nov 5 17:26:43 2021 +0000 Merge branch 'unstable' into stable commit a51c310c258a8148fe2ea4572d7211ea06b2b5f6 Author: Craig Oates Date: Fri Nov 5 17:26:12 2021 +0000 update README. commit 4df33eee04c3ae71135f79c9b8545c8ed54a99e0 Merge: d72ceb9 328e605 Author: Craig Oates Date: Fri Jun 11 13:46:17 2021 +0100 Merge branch 'unstable' into stable commit 328e605c525f3341c4bf833c4422762d9e695a5b Merge: 1c0b8f3 c6157c5 Author: Craig Oates Date: Fri Jun 11 13:45:12 2021 +0100 Merge branch 'master' into unstable commit d72ceb9dc8e89e8104742677bf269ffa99a938a3 Merge: 7313c08 1c0b8f3 Author: Craig Oates Date: Fri Jun 11 13:40:54 2021 +0100 Merge branch 'unstable' into stable commit 7313c08cf1a9cb64fe98e16ee40046bf2d7477dc Author: Craig Oates Date: Fri Jun 11 13:31:14 2021 +0100 merge unstable into stable. commit 1c0b8f3d2a399ee3f544090b2f3827a4e2144c90 Author: Craig Oates Date: Fri Jun 11 13:28:25 2021 +0100 update to 2021.6.11 (Ross to Andy label change). commit 3153b6ceefa05d973e314063c375a2d7105b5428 Author: Craig Oates Date: Wed May 26 16:59:39 2021 +0100 update version number to 2021.5.26. commit 922fab998e788952aa70380553af4744571e1b81 Author: Craig Oates Date: Wed May 26 16:59:01 2021 +0100 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. commit c809a4dfb1b0e986fe56bbf58704c3eef914b35c Author: Craig Oates Date: Wed May 26 16:46:36 2021 +0100 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. commit 18af017df91073e1913aa89b4dbb84f9acb272a1 Merge: 8b46b32 48ced0d Author: Craig Oates Date: Mon May 3 17:57:41 2021 +0100 Merge branch 'unstable' of http://git.abbether.net/return-to-ritherdon/eyes-and-ears into unstable commit 8b46b324622e6ec16edbb2bc2368a3fd777740c7 Author: Craig Oates Date: Mon May 3 17:55:37 2021 +0100 update version information to 2021.5.3. commit c9485bd3032793ed372c98bede4828b13c9f9338 Author: Craig Oates Date: Mon May 3 17:37:32 2021 +0100 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. commit 40b60daa3fa3618e303a67cd900166f67544c09c Author: Craig Oates Date: Mon May 3 17:28:27 2021 +0100 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. commit 4c0f44eac94a86082a00a439cd228791736ee7f4 Author: Craig Oates Date: Mon May 3 17:24:04 2021 +0100 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). commit b899f66747ed9f8fcd2f8372bdfbc9ff40e12beb Author: Craig Oates Date: Mon May 3 17:19:45 2021 +0100 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. commit 8dc91291c102957e7bdc1f828a4239daf3a4f975 Author: Craig Oates Date: Mon May 3 16:25:00 2021 +0100 update threshold for detecting a weld for factory1. commit 31f0368fff08a6dda0b1d4599bbcb8f8663e8b65 Author: Craig Oates Date: Wed Feb 10 19:02:29 2021 +0000 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. commit d95182926ec09c5d151183fae40dae018cf30d53 Author: Craig Oates Date: Sun Feb 7 22:01:25 2021 +0000 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). commit a04d132c5e5f818d8fb7bc0e529f4d107c579aa0 Author: Craig Oates Date: Sun Feb 7 21:06:16 2021 +0000 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. commit 5d91fc5772177c8d25af5a25e4329cc52b0fe48e Author: Craig Oates Date: Sat Feb 6 21:54:18 2021 +0000 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. commit e03215a7e8a0702d9b95807782379cb5288f636c Author: Craig Oates Date: Sat Feb 6 21:36:56 2021 +0000 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. commit 33d6cf83a8223f3621d30031cbc03d6a2c5d1a41 Author: Craig Oates Date: Sat Feb 6 19:50:14 2021 +0000 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). commit 690a9dd5dd6d092c15bb21a82ec8dce81ca92ad9 Author: Craig Oates Date: Sat Feb 6 19:04:14 2021 +0000 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. commit 48ced0d2ecb9387a11d8530cc379f3ae26856fb2 Author: Craig Oates Date: Mon May 3 17:55:37 2021 +0100 update version information to 2021.5.3. commit d4ecacf4f5e3402cb6124dd5afdc657c6b80cd20 Author: Craig Oates Date: Mon May 3 17:37:32 2021 +0100 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. commit 7c05b955f3f3ffe13988c2ef1f91365095586e20 Author: Craig Oates Date: Mon May 3 17:28:27 2021 +0100 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. commit 0dd49b7aa72d314bedd5898df02690155aa4c2fb Author: Craig Oates Date: Mon May 3 17:24:04 2021 +0100 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). commit e4068dfcd1e7688406c06d979388f36075ede3a8 Author: Craig Oates Date: Mon May 3 17:19:45 2021 +0100 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. commit 98056770d2a4c3648c2572cec8aab526c45f3b04 Author: Craig Oates Date: Mon May 3 16:25:00 2021 +0100 update threshold for detecting a weld for factory1. commit e6787ff665102440db2be3907335b38487d36b6a Author: Craig Oates Date: Wed Feb 10 19:02:29 2021 +0000 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. commit 01ae38a3543730f463c998fafec20353cec2b00c Author: Craig Oates Date: Sun Feb 7 22:01:25 2021 +0000 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). commit a74774da5bf196bd12bf893ab1689a09717df1f5 Author: Craig Oates Date: Sun Feb 7 21:06:16 2021 +0000 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. commit e7a6ec1500770ef84084b442948379167bbe23d9 Author: Craig Oates Date: Sat Feb 6 21:54:18 2021 +0000 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. commit 90b7fedbc5815116d1c3573f4b38371f022450fa Author: Craig Oates Date: Sat Feb 6 21:36:56 2021 +0000 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. commit 6ad2bcbf135b97effbde4e33650d48c269b12daf Author: Craig Oates Date: Sat Feb 6 19:50:14 2021 +0000 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). commit a1d5427ba1c10f926e8a33491740137dbf266483 Author: Craig Oates Date: Sat Feb 6 19:04:14 2021 +0000 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. commit 635b240bac26cd3d1f041a0759a82f03ea7e3bc2 Author: Craig Oates Date: Thu Jan 14 19:06:15 2021 +0000 update project info. commit 8767f613975b4826fcef0c1e10595ee357a2fd5a Author: Craig Oates Date: Thu Jan 14 18:42:59 2021 +0000 add extra status levels and project info. to legend. The new levels are extra colour codes which describe the various states of the system with finer detail. commit ea4389b59457776d7f14ceb62086ac25eba489b7 Author: Craig Oates Date: Thu Jan 14 17:52:35 2021 +0000 update version number. The app. is going to use a date based versioning system going forward. The format is yyyy.mm.dd.build. The build number is the build for that day and not a 'total' build (I.E. the total amount of time the app. has been built). Note: Visual Studio does not like it when you use '01' (I.E. January). It does not compile because it does not match any reg-ex patterns specified by the UWP. Instead, you must use '1' to represent January and '11' for November. This is a minor formatting concern from an end-user's perspective but a fixed position for the developer. commit 5d090efc48919b3d8557377dbb3a32ba008ff55e Author: Craig Oates Date: Thu Jan 14 17:37:18 2021 +0000 add legend to dashboard. This is a basic colour coding legend which describes the various states the dashboard can display. commit 5957181250005dc15ab253b13a1fff0812bb343e Author: Craig Oates Date: Thu Jan 14 17:12:45 2021 +0000 add current time to dashboard. This should make it easier for viewers of the app. to see what the current time is -- when viewing it from a distance. commit 58f79e6b3c16c989b3f35b9ee1ee5c87dea38145 Author: Craig Oates Date: Thu Jan 14 16:27:23 2021 +0000 removed 'factory3' and 'gallery3' from dashboard. The logic for 'factory3' and 'gallery3' is still in place but is not bound to the view (MainPage.xml). The view xml is commented out and not removed. This should make it easier to re-add it if the need comes about. commit ecceb1f73d4cde1002e8bb391f1a35a23fd3c474 Author: Craig Oates Date: Thu Jan 14 15:57:42 2021 +0000 fix spelling mistake (#1). The app. header said 'Ritheron' instead of 'Ritherdon'. This corrects it. commit f3c31ff3f068f59f9173f510faff7408a4f606d1 Author: Craig Oates Date: Thu Jan 14 15:54:08 2021 +0000 fix time error bug (#4). 'factory2' was not updating its timestamp when it received a new reading. It was binding to the wrong property in MainPage.xml (view model). This changes the property to the correct one. commit c411f1ac2198bf98224d7faf6b62033fced5c5df Author: Craig Oates Date: Sat Jan 18 22:56:44 2020 +0000 change refresh button to play/stop button. commit f861d085735e00f2eaa5fed641825438c4059251 Author: Craig Oates Date: Sat Jan 18 22:23:33 2020 +0000 remove unused variables. commit a8147d1e757c5943e2cf607705057b4c754a3be7 Author: Craig Oates Date: Sat Jan 18 22:22:59 2020 +0000 add JSON types to rd.xml (release exceptions) and try-catch blocks. commit 088dd539c86c0a7a0aaaeeb98960210a9f84257c Author: Craig Oates Date: Sat Jan 18 20:04:15 2020 +0000 add visual assets (app's icon/logo). commit c348f8285d282bb4f7e85e34f39b20bdf5be46bb Author: Craig Oates Date: Sat Jan 18 19:55:38 2020 +0000 add RefreshButton event logic (main page.) commit 80463b52c35cdf992d08a0ccaa333decacc84339 Author: Craig Oates Date: Sat Jan 18 19:43:56 2020 +0000 update package manifest and .csproj for 0.1.1 test release. commit e316c40e1ab2decdd6a6d51eca5d47a7b668b714 Author: Craig Oates Date: Sat Jan 18 18:32:43 2020 +0000 change app. window to acrylic brush. commit 8eb9311d953d8c8b72ec5d2c8a544aee890ca5e1 Author: Craig Oates Date: Sat Jan 18 18:28:02 2020 +0000 leave notes, remove unused code and general tidy-up. commit 2c3c4cbea12d5b6afc86e06fa1b1e21eae642f58 Author: Craig Oates Date: Sat Jan 18 18:01:47 2020 +0000 update version number in package manifest. commit b2324e77a770509650b51e488eefe229451df9f0 Author: Craig Oates Date: Sat Jan 18 17:48:39 2020 +0000 implement the device status update features. commit 9cec79abf9628fa49659b48223e6fe9bec1d023d Author: Craig Oates Date: Fri Jan 17 03:29:31 2020 +0000 implemete G.U.I. update cycle/timer. commit 48e05a32d8e9b7836cd466bdfcb71c5c4d96f051 Author: Craig Oates Date: Fri Jan 17 01:46:07 2020 +0000 add expand models and services to a rough init status. commit d3e951eba8d2a9d729380e803bc7a6503f73ec39 Author: Craig Oates Date: Thu Jan 16 23:12:06 2020 +0000 add names to programmable elements on main page. commit 9d26e3a3086f1690b7710304475e9967daf583e4 Author: Craig Oates Date: Thu Jan 16 23:07:41 2020 +0000 add event handlers to buttons on main page. commit 25f8d9bc15cf96b1174f707cfd49a2c419f5fb0c Author: Craig Oates Date: Thu Jan 16 22:33:01 2020 +0000 create the dashboard view. commit 06186b20183c4ea025336786bf19ae51af592bf4 Author: Craig Oates Date: Thu Jan 16 19:30:18 2020 +0000 create U.W.P. project inplace of the W.P.F. version. commit 80b866ca44445978958f5c87e238cf886f0f72e7 Author: Craig Oates Date: Thu Jan 16 16:18:19 2020 +0000 create wpf .net core 3 desktop project. --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 39e6df5..75b9ec4 100644 --- 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. \ No newline at end of file +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) \ No newline at end of file