Move stuff around
@ -1 +0,0 @@
|
|||||||
#!/bin/sh
|
|
@ -1,20 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "Starting the webserver…"
|
|
||||||
screen -dmS visu && screen -S visu -p 0 -X stuff "while true; do python3 visu.py; done$(printf \\r)"
|
|
||||||
|
|
||||||
echo "Starting receive script…"
|
|
||||||
screen -dmS receive && screen -S receive -p 0 -X stuff "while true; do ./receive; done$(printf \\r)"
|
|
||||||
echo "Done !\n"
|
|
||||||
sleep 0.2
|
|
||||||
echo "Starting processing script…"
|
|
||||||
screen -dmS process && screen -S process -p 0 -X stuff "while true; do python3 process.py; done$(printf \\r)"
|
|
||||||
echo "Done !\n"
|
|
||||||
|
|
||||||
while ! curl -s --head http://localhost:8080 2>&1 > /dev/null; do
|
|
||||||
echo "Webserver is starting…"
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
echo "Webserver started !\n"
|
|
||||||
|
|
||||||
echo "Ready to start !"
|
|
@ -1 +0,0 @@
|
|||||||
#!/bin/bash
|
|
13
README.md
@ -4,3 +4,16 @@ CitizenWatt-refactor
|
|||||||
This is an updated version of [CitizenWatt](http://citizenwatt.paris/) code,
|
This is an updated version of [CitizenWatt](http://citizenwatt.paris/) code,
|
||||||
aiming to be a backup of available stuff, with minor updates for anyone
|
aiming to be a backup of available stuff, with minor updates for anyone
|
||||||
willing to build its own.
|
willing to build its own.
|
||||||
|
|
||||||
|
CitizenWatt aimed at building a personal DIY energy consumption meter,
|
||||||
|
inspired by [OpenEnergyMonitor](https://openenergymonitor.org/).
|
||||||
|
|
||||||
|
I recently came across cloned CitizenWatt repositories and wanted to make some
|
||||||
|
lifting of the code, while I set it back in place at home. I also found out
|
||||||
|
that OpenEnergyMonitor was considerably nicer than it used to be, especially
|
||||||
|
from a UX point of view. This aims at being an up to date merge of
|
||||||
|
OpenEnergyMonitor and CitizenWatt, to be the best combination possible at the
|
||||||
|
moment, in my opinion.
|
||||||
|
|
||||||
|
This is part of a home automation process, hence the will to avoid installing
|
||||||
|
pre-compiled images which are not easily extensible.
|
||||||
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 9.0 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
@ -749,7 +749,7 @@ def settings_post(db):
|
|||||||
def update():
|
def update():
|
||||||
"""Handles updating"""
|
"""Handles updating"""
|
||||||
subprocess.Popen([os.path.dirname(os.path.realpath(__file__)) +
|
subprocess.Popen([os.path.dirname(os.path.realpath(__file__)) +
|
||||||
"/updater.sh"])
|
"/updater.sh"]) # TODO
|
||||||
redirect("/settings")
|
redirect("/settings")
|
||||||
|
|
||||||
|
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 82 KiB |
Before Width: | Height: | Size: 108 KiB After Width: | Height: | Size: 108 KiB |
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 64 KiB |