diff --git a/CitizenWatt-Base/post_update.sh b/CitizenWatt-Base/post_update.sh deleted file mode 100755 index 1a24852..0000000 --- a/CitizenWatt-Base/post_update.sh +++ /dev/null @@ -1 +0,0 @@ -#!/bin/sh diff --git a/CitizenWatt-Base/startup.sh b/CitizenWatt-Base/startup.sh deleted file mode 100755 index ee5f643..0000000 --- a/CitizenWatt-Base/startup.sh +++ /dev/null @@ -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 !" diff --git a/CitizenWatt-Base/updater.sh b/CitizenWatt-Base/updater.sh deleted file mode 100755 index a9bf588..0000000 --- a/CitizenWatt-Base/updater.sh +++ /dev/null @@ -1 +0,0 @@ -#!/bin/bash diff --git a/README.md b/README.md index bb79b6d..9983c38 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,16 @@ CitizenWatt-refactor This is an updated version of [CitizenWatt](http://citizenwatt.paris/) code, aiming to be a backup of available stuff, with minor updates for anyone 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. diff --git a/CitizenWatt-Base/README.md b/base/README.md similarity index 100% rename from CitizenWatt-Base/README.md rename to base/README.md diff --git a/CitizenWatt-Base/bottle.py b/base/bottle.py similarity index 100% rename from CitizenWatt-Base/bottle.py rename to base/bottle.py diff --git a/CitizenWatt-Base/bottle_sqlalchemy.py b/base/bottle_sqlalchemy.py similarity index 100% rename from CitizenWatt-Base/bottle_sqlalchemy.py rename to base/bottle_sqlalchemy.py diff --git a/CitizenWatt-Base/bottlesession.py b/base/bottlesession.py similarity index 100% rename from CitizenWatt-Base/bottlesession.py rename to base/bottlesession.py diff --git a/CitizenWatt-Base/libcitizenwatt/__init__.py b/base/libcitizenwatt/__init__.py similarity index 100% rename from CitizenWatt-Base/libcitizenwatt/__init__.py rename to base/libcitizenwatt/__init__.py diff --git a/CitizenWatt-Base/libcitizenwatt/cache.py b/base/libcitizenwatt/cache.py similarity index 100% rename from CitizenWatt-Base/libcitizenwatt/cache.py rename to base/libcitizenwatt/cache.py diff --git a/CitizenWatt-Base/libcitizenwatt/config.py b/base/libcitizenwatt/config.py similarity index 100% rename from CitizenWatt-Base/libcitizenwatt/config.py rename to base/libcitizenwatt/config.py diff --git a/CitizenWatt-Base/libcitizenwatt/database.py b/base/libcitizenwatt/database.py similarity index 100% rename from CitizenWatt-Base/libcitizenwatt/database.py rename to base/libcitizenwatt/database.py diff --git a/CitizenWatt-Base/libcitizenwatt/tools.py b/base/libcitizenwatt/tools.py similarity index 100% rename from CitizenWatt-Base/libcitizenwatt/tools.py rename to base/libcitizenwatt/tools.py diff --git a/CitizenWatt-Base/process.py b/base/process.py similarity index 100% rename from CitizenWatt-Base/process.py rename to base/process.py diff --git a/CitizenWatt-Base/static/css/normalize.css b/base/static/css/normalize.css similarity index 100% rename from CitizenWatt-Base/static/css/normalize.css rename to base/static/css/normalize.css diff --git a/CitizenWatt-Base/static/css/style.css b/base/static/css/style.css similarity index 100% rename from CitizenWatt-Base/static/css/style.css rename to base/static/css/style.css diff --git a/CitizenWatt-Base/static/font/OpenSans-Bold.ttf b/base/static/font/OpenSans-Bold.ttf similarity index 100% rename from CitizenWatt-Base/static/font/OpenSans-Bold.ttf rename to base/static/font/OpenSans-Bold.ttf diff --git a/CitizenWatt-Base/static/font/OpenSans-BoldItalic.ttf b/base/static/font/OpenSans-BoldItalic.ttf similarity index 100% rename from CitizenWatt-Base/static/font/OpenSans-BoldItalic.ttf rename to base/static/font/OpenSans-BoldItalic.ttf diff --git a/CitizenWatt-Base/static/font/OpenSans-Italic.ttf b/base/static/font/OpenSans-Italic.ttf similarity index 100% rename from CitizenWatt-Base/static/font/OpenSans-Italic.ttf rename to base/static/font/OpenSans-Italic.ttf diff --git a/CitizenWatt-Base/static/font/OpenSans-Light.ttf b/base/static/font/OpenSans-Light.ttf similarity index 100% rename from CitizenWatt-Base/static/font/OpenSans-Light.ttf rename to base/static/font/OpenSans-Light.ttf diff --git a/CitizenWatt-Base/static/font/OpenSans-Regular.ttf b/base/static/font/OpenSans-Regular.ttf similarity index 100% rename from CitizenWatt-Base/static/font/OpenSans-Regular.ttf rename to base/static/font/OpenSans-Regular.ttf diff --git a/CitizenWatt-Base/static/img/bill.svg b/base/static/img/bill.svg similarity index 100% rename from CitizenWatt-Base/static/img/bill.svg rename to base/static/img/bill.svg diff --git a/CitizenWatt-Base/static/img/community.svg b/base/static/img/community.svg similarity index 100% rename from CitizenWatt-Base/static/img/community.svg rename to base/static/img/community.svg diff --git a/CitizenWatt-Base/static/img/contact.svg b/base/static/img/contact.svg similarity index 100% rename from CitizenWatt-Base/static/img/contact.svg rename to base/static/img/contact.svg diff --git a/CitizenWatt-Base/static/img/data.svg b/base/static/img/data.svg similarity index 100% rename from CitizenWatt-Base/static/img/data.svg rename to base/static/img/data.svg diff --git a/CitizenWatt-Base/static/img/day.svg b/base/static/img/day.svg similarity index 100% rename from CitizenWatt-Base/static/img/day.svg rename to base/static/img/day.svg diff --git a/CitizenWatt-Base/static/img/help.svg b/base/static/img/help.svg similarity index 100% rename from CitizenWatt-Base/static/img/help.svg rename to base/static/img/help.svg diff --git a/CitizenWatt-Base/static/img/install.svg b/base/static/img/install.svg similarity index 100% rename from CitizenWatt-Base/static/img/install.svg rename to base/static/img/install.svg diff --git a/CitizenWatt-Base/static/img/loading.svg b/base/static/img/loading.svg similarity index 100% rename from CitizenWatt-Base/static/img/loading.svg rename to base/static/img/loading.svg diff --git a/CitizenWatt-Base/static/img/loading_simple.svg b/base/static/img/loading_simple.svg similarity index 100% rename from CitizenWatt-Base/static/img/loading_simple.svg rename to base/static/img/loading_simple.svg diff --git a/CitizenWatt-Base/static/img/login.svg b/base/static/img/login.svg similarity index 100% rename from CitizenWatt-Base/static/img/login.svg rename to base/static/img/login.svg diff --git a/CitizenWatt-Base/static/img/logo.png b/base/static/img/logo.png similarity index 100% rename from CitizenWatt-Base/static/img/logo.png rename to base/static/img/logo.png diff --git a/CitizenWatt-Base/static/img/logout.svg b/base/static/img/logout.svg similarity index 100% rename from CitizenWatt-Base/static/img/logout.svg rename to base/static/img/logout.svg diff --git a/CitizenWatt-Base/static/img/month.svg b/base/static/img/month.svg similarity index 100% rename from CitizenWatt-Base/static/img/month.svg rename to base/static/img/month.svg diff --git a/CitizenWatt-Base/static/img/moon.svg b/base/static/img/moon.svg similarity index 100% rename from CitizenWatt-Base/static/img/moon.svg rename to base/static/img/moon.svg diff --git a/CitizenWatt-Base/static/img/more.svg b/base/static/img/more.svg similarity index 100% rename from CitizenWatt-Base/static/img/more.svg rename to base/static/img/more.svg diff --git a/CitizenWatt-Base/static/img/progress.svg b/base/static/img/progress.svg similarity index 100% rename from CitizenWatt-Base/static/img/progress.svg rename to base/static/img/progress.svg diff --git a/CitizenWatt-Base/static/img/results.svg b/base/static/img/results.svg similarity index 100% rename from CitizenWatt-Base/static/img/results.svg rename to base/static/img/results.svg diff --git a/CitizenWatt-Base/static/img/sensor.svg b/base/static/img/sensor.svg similarity index 100% rename from CitizenWatt-Base/static/img/sensor.svg rename to base/static/img/sensor.svg diff --git a/CitizenWatt-Base/static/img/small-data.svg b/base/static/img/small-data.svg similarity index 100% rename from CitizenWatt-Base/static/img/small-data.svg rename to base/static/img/small-data.svg diff --git a/CitizenWatt-Base/static/img/sun.svg b/base/static/img/sun.svg similarity index 100% rename from CitizenWatt-Base/static/img/sun.svg rename to base/static/img/sun.svg diff --git a/CitizenWatt-Base/static/img/target-no.svg b/base/static/img/target-no.svg similarity index 100% rename from CitizenWatt-Base/static/img/target-no.svg rename to base/static/img/target-no.svg diff --git a/CitizenWatt-Base/static/img/target-ok.svg b/base/static/img/target-ok.svg similarity index 100% rename from CitizenWatt-Base/static/img/target-ok.svg rename to base/static/img/target-ok.svg diff --git a/CitizenWatt-Base/static/img/target-wip.svg b/base/static/img/target-wip.svg similarity index 100% rename from CitizenWatt-Base/static/img/target-wip.svg rename to base/static/img/target-wip.svg diff --git a/CitizenWatt-Base/static/img/target.svg b/base/static/img/target.svg similarity index 100% rename from CitizenWatt-Base/static/img/target.svg rename to base/static/img/target.svg diff --git a/CitizenWatt-Base/static/img/tick.svg b/base/static/img/tick.svg similarity index 100% rename from CitizenWatt-Base/static/img/tick.svg rename to base/static/img/tick.svg diff --git a/CitizenWatt-Base/static/img/user.svg b/base/static/img/user.svg similarity index 100% rename from CitizenWatt-Base/static/img/user.svg rename to base/static/img/user.svg diff --git a/CitizenWatt-Base/static/img/week.svg b/base/static/img/week.svg similarity index 100% rename from CitizenWatt-Base/static/img/week.svg rename to base/static/img/week.svg diff --git a/CitizenWatt-Base/static/img/wiki.svg b/base/static/img/wiki.svg similarity index 100% rename from CitizenWatt-Base/static/img/wiki.svg rename to base/static/img/wiki.svg diff --git a/CitizenWatt-Base/static/js/conso/App.js b/base/static/js/conso/App.js similarity index 100% rename from CitizenWatt-Base/static/js/conso/App.js rename to base/static/js/conso/App.js diff --git a/CitizenWatt-Base/static/js/conso/Config.js b/base/static/js/conso/Config.js similarity index 100% rename from CitizenWatt-Base/static/js/conso/Config.js rename to base/static/js/conso/Config.js diff --git a/CitizenWatt-Base/static/js/conso/DataProvider.js b/base/static/js/conso/DataProvider.js similarity index 100% rename from CitizenWatt-Base/static/js/conso/DataProvider.js rename to base/static/js/conso/DataProvider.js diff --git a/CitizenWatt-Base/static/js/conso/Graph.js b/base/static/js/conso/Graph.js similarity index 100% rename from CitizenWatt-Base/static/js/conso/Graph.js rename to base/static/js/conso/Graph.js diff --git a/CitizenWatt-Base/static/js/conso/HashManager.js b/base/static/js/conso/HashManager.js similarity index 100% rename from CitizenWatt-Base/static/js/conso/HashManager.js rename to base/static/js/conso/HashManager.js diff --git a/CitizenWatt-Base/static/js/conso/Menu.js b/base/static/js/conso/Menu.js similarity index 100% rename from CitizenWatt-Base/static/js/conso/Menu.js rename to base/static/js/conso/Menu.js diff --git a/CitizenWatt-Base/static/js/conso/RateDisplay.js b/base/static/js/conso/RateDisplay.js similarity index 100% rename from CitizenWatt-Base/static/js/conso/RateDisplay.js rename to base/static/js/conso/RateDisplay.js diff --git a/CitizenWatt-Base/static/js/conso/tail.js b/base/static/js/conso/tail.js similarity index 100% rename from CitizenWatt-Base/static/js/conso/tail.js rename to base/static/js/conso/tail.js diff --git a/CitizenWatt-Base/static/js/dateutils.js b/base/static/js/dateutils.js similarity index 100% rename from CitizenWatt-Base/static/js/dateutils.js rename to base/static/js/dateutils.js diff --git a/CitizenWatt-Base/static/js/target.js b/base/static/js/target.js similarity index 100% rename from CitizenWatt-Base/static/js/target.js rename to base/static/js/target.js diff --git a/CitizenWatt-Base/static/js/utils.js b/base/static/js/utils.js similarity index 100% rename from CitizenWatt-Base/static/js/utils.js rename to base/static/js/utils.js diff --git a/CitizenWatt-Base/system/README.md b/base/system/README.md similarity index 100% rename from CitizenWatt-Base/system/README.md rename to base/system/README.md diff --git a/CitizenWatt-Base/system/citizenwatt.sh b/base/system/citizenwatt.sh similarity index 100% rename from CitizenWatt-Base/system/citizenwatt.sh rename to base/system/citizenwatt.sh diff --git a/CitizenWatt-Base/system/cleanup_raspbian.sh b/base/system/cleanup_raspbian.sh similarity index 100% rename from CitizenWatt-Base/system/cleanup_raspbian.sh rename to base/system/cleanup_raspbian.sh diff --git a/CitizenWatt-Base/system/install_citizenwatt.sh b/base/system/install_citizenwatt.sh similarity index 100% rename from CitizenWatt-Base/system/install_citizenwatt.sh rename to base/system/install_citizenwatt.sh diff --git a/CitizenWatt-Base/system/install_python34.sh b/base/system/install_python34.sh similarity index 100% rename from CitizenWatt-Base/system/install_python34.sh rename to base/system/install_python34.sh diff --git a/CitizenWatt-Base/system/install_rf24.sh b/base/system/install_rf24.sh similarity index 100% rename from CitizenWatt-Base/system/install_rf24.sh rename to base/system/install_rf24.sh diff --git a/CitizenWatt-Base/system/supervisor_citizenwatt.conf b/base/system/supervisor_citizenwatt.conf similarity index 100% rename from CitizenWatt-Base/system/supervisor_citizenwatt.conf rename to base/system/supervisor_citizenwatt.conf diff --git a/CitizenWatt-Base/tests/libcitizenwatt b/base/tests/libcitizenwatt similarity index 100% rename from CitizenWatt-Base/tests/libcitizenwatt rename to base/tests/libcitizenwatt diff --git a/CitizenWatt-Base/tests/test_process.py b/base/tests/test_process.py similarity index 100% rename from CitizenWatt-Base/tests/test_process.py rename to base/tests/test_process.py diff --git a/CitizenWatt-Base/tests/tests.js b/base/tests/tests.js similarity index 100% rename from CitizenWatt-Base/tests/tests.js rename to base/tests/tests.js diff --git a/CitizenWatt-Base/views/_begin.tpl b/base/views/_begin.tpl similarity index 100% rename from CitizenWatt-Base/views/_begin.tpl rename to base/views/_begin.tpl diff --git a/CitizenWatt-Base/views/_end.tpl b/base/views/_end.tpl similarity index 100% rename from CitizenWatt-Base/views/_end.tpl rename to base/views/_end.tpl diff --git a/CitizenWatt-Base/views/community.tpl b/base/views/community.tpl similarity index 100% rename from CitizenWatt-Base/views/community.tpl rename to base/views/community.tpl diff --git a/CitizenWatt-Base/views/conso.tpl b/base/views/conso.tpl similarity index 100% rename from CitizenWatt-Base/views/conso.tpl rename to base/views/conso.tpl diff --git a/CitizenWatt-Base/views/help.tpl b/base/views/help.tpl similarity index 100% rename from CitizenWatt-Base/views/help.tpl rename to base/views/help.tpl diff --git a/CitizenWatt-Base/views/index.tpl b/base/views/index.tpl similarity index 100% rename from CitizenWatt-Base/views/index.tpl rename to base/views/index.tpl diff --git a/CitizenWatt-Base/views/install.tpl b/base/views/install.tpl similarity index 100% rename from CitizenWatt-Base/views/install.tpl rename to base/views/install.tpl diff --git a/CitizenWatt-Base/views/login.tpl b/base/views/login.tpl similarity index 100% rename from CitizenWatt-Base/views/login.tpl rename to base/views/login.tpl diff --git a/CitizenWatt-Base/views/settings.tpl b/base/views/settings.tpl similarity index 100% rename from CitizenWatt-Base/views/settings.tpl rename to base/views/settings.tpl diff --git a/CitizenWatt-Base/visu.py b/base/visu.py similarity index 99% rename from CitizenWatt-Base/visu.py rename to base/visu.py index 74fe80b..1c3f266 100755 --- a/CitizenWatt-Base/visu.py +++ b/base/visu.py @@ -749,7 +749,7 @@ def settings_post(db): def update(): """Handles updating""" subprocess.Popen([os.path.dirname(os.path.realpath(__file__)) + - "/updater.sh"]) + "/updater.sh"]) # TODO redirect("/settings") diff --git a/CitizenWatt-PiBoard/LICENSE b/receiver/LICENSE similarity index 100% rename from CitizenWatt-PiBoard/LICENSE rename to receiver/LICENSE diff --git a/CitizenWatt-Base/Makefile b/receiver/Makefile similarity index 100% rename from CitizenWatt-Base/Makefile rename to receiver/Makefile diff --git a/CitizenWatt-PiBoard/README.md b/receiver/README.md similarity index 100% rename from CitizenWatt-PiBoard/README.md rename to receiver/README.md diff --git a/CitizenWatt-PiBoard/2017-02-15-201954.png b/receiver/hardware/2017-02-15-201954.png similarity index 100% rename from CitizenWatt-PiBoard/2017-02-15-201954.png rename to receiver/hardware/2017-02-15-201954.png diff --git a/CitizenWatt-PiBoard/2017-02-15-202006.png b/receiver/hardware/2017-02-15-202006.png similarity index 100% rename from CitizenWatt-PiBoard/2017-02-15-202006.png rename to receiver/hardware/2017-02-15-202006.png diff --git a/CitizenWatt-PiBoard/PiBoard.brd b/receiver/hardware/PiBoard.brd similarity index 100% rename from CitizenWatt-PiBoard/PiBoard.brd rename to receiver/hardware/PiBoard.brd diff --git a/CitizenWatt-PiBoard/PiBoard.sch b/receiver/hardware/PiBoard.sch similarity index 100% rename from CitizenWatt-PiBoard/PiBoard.sch rename to receiver/hardware/PiBoard.sch diff --git a/CitizenWatt-Base/receive.cpp b/receiver/software/receive.cpp similarity index 100% rename from CitizenWatt-Base/receive.cpp rename to receiver/software/receive.cpp diff --git a/CitizenWatt-sensor/LICENSE b/sensor/LICENSE similarity index 100% rename from CitizenWatt-sensor/LICENSE rename to sensor/LICENSE diff --git a/CitizenWatt-sensor/README.md b/sensor/README.md similarity index 100% rename from CitizenWatt-sensor/README.md rename to sensor/README.md diff --git a/CitizenWatt-sensor/Hardware/.gitignore b/sensor/hardware/.gitignore similarity index 100% rename from CitizenWatt-sensor/Hardware/.gitignore rename to sensor/hardware/.gitignore diff --git a/CitizenWatt-sensor/Hardware/CitizenBoard.brd b/sensor/hardware/CitizenBoard.brd similarity index 100% rename from CitizenWatt-sensor/Hardware/CitizenBoard.brd rename to sensor/hardware/CitizenBoard.brd diff --git a/CitizenWatt-sensor/Hardware/CitizenBoard.sch b/sensor/hardware/CitizenBoard.sch similarity index 100% rename from CitizenWatt-sensor/Hardware/CitizenBoard.sch rename to sensor/hardware/CitizenBoard.sch diff --git a/CitizenWatt-sensor/Hardware/silkscreen3bold_standalone.svg b/sensor/hardware/silkscreen3bold_standalone.svg similarity index 100% rename from CitizenWatt-sensor/Hardware/silkscreen3bold_standalone.svg rename to sensor/hardware/silkscreen3bold_standalone.svg diff --git a/CitizenWatt-sensor/Software/sensor/printf.h b/sensor/software/sensor/printf.h similarity index 100% rename from CitizenWatt-sensor/Software/sensor/printf.h rename to sensor/software/sensor/printf.h diff --git a/CitizenWatt-sensor/Software/sensor/sensor.ino b/sensor/software/sensor/sensor.ino similarity index 100% rename from CitizenWatt-sensor/Software/sensor/sensor.ino rename to sensor/software/sensor/sensor.ino