commit eda360a068
Merge: 0b9b295071c8cf
Author: Craig Oates <craig@craigoates.net>
Date: Fri Nov 5 18:24:33 2021 +0000
Merge branch 'unstable' into stable
commit 071c8cf5f3
Merge: 1534c0456e05dc
Author: Craig Oates <craig@craigoates.net>
Date: Fri Nov 5 18:16:43 2021 +0000
Merge branch 'unstable' of git.abbether.net:return-to-ritherdon/light-meter into unstable
commit 1534c04635
Author: Craig Oates <craig@craigoates.net>
Date: Fri Nov 5 18:15:45 2021 +0000
update README.
commit 56e05dceaf
Author: rtrp@factory1 <rtrp@factory1.com>
Date: Fri Feb 5 16:54:31 2021 +0000
use session to persist REST calls and expand exception handling.
Previously, the light-meter was creating a new HTTP request to send every new reading. This now
uses a persistant session to reduce the amount of requests made to the server -- and reduce low
on the system.
The extra exceptions listed and expanded on are mostly for testing. At the time of writing, the
system as a whole is hanging at various parts throughout the day and the intention is to monitor
the Light Meter to see if any of the new exceptions are the cause (or contributing) to the
hanging. The current trains-of-thought at the minute are too many requests (system load too
high) and requests not timing out properly.
commit b4571b0c1e
Author: rtrp@factory1 <rtrp@factory1.com>
Date: Wed Jan 27 21:59:51 2021 +0000
create a Systemd service file.
This file is used to start the program at startup. It, also, restarts the
program if it crashes or throws an exception. The usual scenario which
causes the program to crash is the 'max. requests exceeded' exception in
the 'requests' module (Python). When that happens, this 'restart' service
has a 60 seconds wait period -- which acts as a 'backoff' period.
You will need to copy the .service file to the appropriate systemd
location, 'daemon-reload' systemctl, enable the service and start the
service. You will need to look-up how to do that -- this info. is beyond
the scope of this commmit.
commit 0b9b295036
Merge: 814fbdfb7140cb
Author: Craig Oates <craig@craigoates.net>
Date: Wed Jan 13 13:08:23 2021 +0000
Merge branch 'unstable' of return-to-ritherdon/light-meter into stable
commit b7140cbf2b
Author: Craig Oates <craig@craigoates.net>
Date: Wed Jan 13 12:59:44 2021 +0000
change info. about cronjob in README.
This is a minor change but I thought it was best to document it.
The factory typically shutdowns at 16:00 but for some reason I thought it was 18:00. Because of this, 'factory1' (the light-meter used for testing) was not shutting down properly. The factory's power was cut at the end of the day (again typically 16:00 but not always) and the Pi would have a dirty power-down. This, also, meant the server and its opposite relay [return-to-ritherdon/relay] would think it was still on but sending no new readings.
All of the above has no great effect of the **note** left in the README but I thought I should change it on the off-chance someone copies that line into a part of the system.
commit 46b8d53cc4
Author: rtrp@factory1 <rtrp@factory1.com>
Date: Wed Jan 13 11:58:27 2021 +0000
remove merge conflict artefacts.
commit 2ad344846b
Merge: 39cf8bc6e4e425
Author: rtrp@factory1 <rtrp@factory1.com>
Date: Wed Jan 13 11:51:02 2021 +0000
Merge remote-tracking branch 'origin/fact2temp' into unstable
commit 39cf8bc302
Author: rtrp@factory1 <rtrp@factory1.com>
Date: Wed Jan 13 11:22:47 2021 +0000
update URL used for RESTAPI calls.
I have given the 'mid-point' server a domain name to reduce the need to manually update the IP address if/when the
server needs to be restarted (for whatever reason). The changes here include the new URL.
commit 6e4e4254cf
Author: Craig Oates <craig@craigoates.net>
Date: Wed Dec 16 17:18:07 2020 +0000
extend URL list for adding new light readings.
The base URL uses ritherdon.abbether.net now, in the main part of the
python code. I have added checks to see which device is running the
code and forms a complete URL for the API call.
The way the URL is formed for the API call is not the most elegant
solution but is was quick to write and the code has a limited
life-span. It will not require any further modification when it goes
live. So, the speed it took to write it was a good trade-off in my opinion.
commit 7a3e3df07a
Author: Craig Oates <craig@craigoates.net>
Date: Wed Dec 16 16:53:19 2020 +0000
change URL to ritherdon.abbether.net
The URL used here is a domain name and not just an IP address. This
should reduce the need to update the IP address in the code if the
server, currently hosted on AWS at time of writing, needs to be
restarted. The servers on AWS do not keep the same IP address if you
stop and start them.
The abbether.net domain is a personal one and used as a way to reduce
project costs. I did not use this domain when I first wrote the code
here because I did not own it. Long story short, the Covid-19 malarkey
meant the project was put on hold and I ended up owning abbether.net
during the first lock-down. The decision to use the domain is one of
convince my end. I did not want to keep updating the code manually if
the server on AWS was stopping and starting.
commit 9532df8137
Author: rtrp@factory1 <rtrp@factory1.com>
Date: Sun Jan 12 19:22:56 2020 +0000
adjust shutdown call in shutdown.sh.
commit a75cf4083f
Author: Craig Oates <craig@craigoates.net>
Date: Sun Jan 12 02:00:25 2020 +0000
add residency overview image to readme.
commit b0d6474809
Author: Craig Oates <craig@craigoates.net>
Date: Sun Jan 12 01:39:48 2020 +0000
comment out testing/debugging print states in cli_meter.
commit 67bef91b14
Author: Craig Oates <craig@craigoates.net>
Date: Sun Jan 12 01:34:03 2020 +0000
fix typo's in readme.
commit beccebc3ec
Author: Craig Oates <craig@craigoates.net>
Date: Sun Jan 12 01:15:14 2020 +0000
add main-proj-architecture image (for readme).
commit 22bd78800c
Author: Craig Oates <craig@craigoates.net>
Date: Sun Jan 12 00:18:10 2020 +0000
update images in readme.
commit 234dffe4c0
Author: Craig Oates <craig@craigoates.net>
Date: Sat Jan 11 23:40:42 2020 +0000
make edit to readme structure.
commit 9ccdc91778
Author: Craig Oates <craig@craigoates.net>
Date: Sat Jan 11 23:34:47 2020 +0000
add images for readme.
commit d99e04c87d
Author: Craig Oates <craig@craigoates.net>
Date: Sat Jan 11 23:12:03 2020 +0000
add hardware section to readme.
commit 445adcc53a
Author: Craig Oates <craig@craigoates.net>
Date: Sat Jan 11 22:04:00 2020 +0000
edit the readme.
commit fa98024e0f
Author: Craig Oates <craig@craigoates.net>
Date: Sat Jan 11 21:33:38 2020 +0000
update readme.
commit 8e98fe2fac
Author: Craig Oates <craig@craigoates.net>
Date: Sat Jan 11 18:53:23 2020 +0000
add comments to startup, shutdown and cli-meter.
commit 0eaea3b798
Author: rtrp@factory1 <rtrp@factory1.com>
Date: Sat Jan 11 01:11:22 2020 +0000
refactor timers in scripts.
commit 9027a3bcb1
Author: rtrp@factory1 <rtrp@factory1.com>
Date: Fri Jan 10 21:02:05 2020 +0000
create a make-logs script.
commit 5f264e7f60
Author: Craig <craig@craigoates.net>
Date: Fri Jan 10 01:28:21 2020 +0000
add times to startup and shutdown scripts.
commit f0f4776a9b
Author: Craig <craig@craigoates.net>
Date: Fri Jan 10 00:07:26 2020 +0000
add start-up and shutdown scripts.
commit c5da9d5918
Author: Craig <craig@craigoates.net>
Date: Sun Jan 5 19:45:45 2020 +0000
add keyboard interrup exception.
commit 9ef10aef16
Author: Craig <craig@craigoates.net>
Date: Sun Jan 5 19:15:40 2020 +0000
port 'cli' code from light_meter to cli_meter.
commit f89e7b3923
Author: Craig Oates <craig@craigoates.net>
Date: Sun Dec 15 00:12:59 2019 +0000
add cli-meter.py
commit 32e5b464c6
Author: Craig Oates <craig@craigoates.net>
Date: Sat Dec 14 23:52:28 2019 +0000
port over code from roaming-light project.
Craig Oates