Browse Source

Move stuff around

master
Lucas Verney 6 years ago
parent
commit
8b39bda099
No known key found for this signature in database
GPG Key ID: 75B45CF41F334690
  1. 1
      CitizenWatt-Base/post_update.sh
  2. 20
      CitizenWatt-Base/startup.sh
  3. 1
      CitizenWatt-Base/updater.sh
  4. 13
      README.md
  5. 0
      base/README.md
  6. 0
      base/bottle.py
  7. 0
      base/bottle_sqlalchemy.py
  8. 0
      base/bottlesession.py
  9. 0
      base/libcitizenwatt/__init__.py
  10. 0
      base/libcitizenwatt/cache.py
  11. 0
      base/libcitizenwatt/config.py
  12. 0
      base/libcitizenwatt/database.py
  13. 0
      base/libcitizenwatt/tools.py
  14. 0
      base/process.py
  15. 0
      base/static/css/normalize.css
  16. 0
      base/static/css/style.css
  17. 0
      base/static/font/OpenSans-Bold.ttf
  18. 0
      base/static/font/OpenSans-BoldItalic.ttf
  19. 0
      base/static/font/OpenSans-Italic.ttf
  20. 0
      base/static/font/OpenSans-Light.ttf
  21. 0
      base/static/font/OpenSans-Regular.ttf
  22. 0
      base/static/img/bill.svg
  23. 0
      base/static/img/community.svg
  24. 0
      base/static/img/contact.svg
  25. 0
      base/static/img/data.svg
  26. 0
      base/static/img/day.svg
  27. 0
      base/static/img/help.svg
  28. 0
      base/static/img/install.svg
  29. 0
      base/static/img/loading.svg
  30. 0
      base/static/img/loading_simple.svg
  31. 0
      base/static/img/login.svg
  32. 0
      base/static/img/logo.png
  33. 0
      base/static/img/logout.svg
  34. 0
      base/static/img/month.svg
  35. 0
      base/static/img/moon.svg
  36. 0
      base/static/img/more.svg
  37. 0
      base/static/img/progress.svg
  38. 0
      base/static/img/results.svg
  39. 0
      base/static/img/sensor.svg
  40. 0
      base/static/img/small-data.svg
  41. 0
      base/static/img/sun.svg
  42. 0
      base/static/img/target-no.svg
  43. 0
      base/static/img/target-ok.svg
  44. 0
      base/static/img/target-wip.svg
  45. 0
      base/static/img/target.svg
  46. 0
      base/static/img/tick.svg
  47. 0
      base/static/img/user.svg
  48. 0
      base/static/img/week.svg
  49. 0
      base/static/img/wiki.svg
  50. 0
      base/static/js/conso/App.js
  51. 0
      base/static/js/conso/Config.js
  52. 0
      base/static/js/conso/DataProvider.js
  53. 0
      base/static/js/conso/Graph.js
  54. 0
      base/static/js/conso/HashManager.js
  55. 0
      base/static/js/conso/Menu.js
  56. 0
      base/static/js/conso/RateDisplay.js
  57. 0
      base/static/js/conso/tail.js
  58. 0
      base/static/js/dateutils.js
  59. 0
      base/static/js/target.js
  60. 0
      base/static/js/utils.js
  61. 0
      base/system/README.md
  62. 0
      base/system/citizenwatt.sh
  63. 0
      base/system/cleanup_raspbian.sh
  64. 0
      base/system/install_citizenwatt.sh
  65. 0
      base/system/install_python34.sh
  66. 0
      base/system/install_rf24.sh
  67. 0
      base/system/supervisor_citizenwatt.conf
  68. 0
      base/tests/libcitizenwatt
  69. 0
      base/tests/test_process.py
  70. 0
      base/tests/tests.js
  71. 0
      base/views/_begin.tpl
  72. 0
      base/views/_end.tpl
  73. 0
      base/views/community.tpl
  74. 0
      base/views/conso.tpl
  75. 0
      base/views/help.tpl
  76. 0
      base/views/index.tpl
  77. 0
      base/views/install.tpl
  78. 0
      base/views/login.tpl
  79. 0
      base/views/settings.tpl
  80. 2
      base/visu.py
  81. 0
      receiver/LICENSE
  82. 0
      receiver/Makefile
  83. 0
      receiver/README.md
  84. 0
      receiver/hardware/2017-02-15-201954.png
  85. 0
      receiver/hardware/2017-02-15-202006.png
  86. 0
      receiver/hardware/PiBoard.brd
  87. 0
      receiver/hardware/PiBoard.sch
  88. 0
      receiver/software/receive.cpp
  89. 0
      sensor/LICENSE
  90. 0
      sensor/README.md
  91. 0
      sensor/hardware/.gitignore
  92. 0
      sensor/hardware/CitizenBoard.brd
  93. 0
      sensor/hardware/CitizenBoard.sch
  94. 0
      sensor/hardware/silkscreen3bold_standalone.svg
  95. 0
      sensor/software/sensor/printf.h
  96. 0
      sensor/software/sensor/sensor.ino

1
CitizenWatt-Base/post_update.sh

@ -1 +0,0 @@ @@ -1 +0,0 @@
#!/bin/sh

20
CitizenWatt-Base/startup.sh

@ -1,20 +0,0 @@ @@ -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
CitizenWatt-Base/updater.sh

@ -1 +0,0 @@ @@ -1 +0,0 @@
#!/bin/bash

13
README.md

@ -4,3 +4,16 @@ CitizenWatt-refactor @@ -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.

0
CitizenWatt-Base/README.md → base/README.md

0
CitizenWatt-Base/bottle.py → base/bottle.py

0
CitizenWatt-Base/bottle_sqlalchemy.py → base/bottle_sqlalchemy.py

0
CitizenWatt-Base/bottlesession.py → base/bottlesession.py

0
CitizenWatt-Base/libcitizenwatt/__init__.py → base/libcitizenwatt/__init__.py

0
CitizenWatt-Base/libcitizenwatt/cache.py → base/libcitizenwatt/cache.py

0
CitizenWatt-Base/libcitizenwatt/config.py → base/libcitizenwatt/config.py

0
CitizenWatt-Base/libcitizenwatt/database.py → base/libcitizenwatt/database.py

0
CitizenWatt-Base/libcitizenwatt/tools.py → base/libcitizenwatt/tools.py

0
CitizenWatt-Base/process.py → base/process.py

0
CitizenWatt-Base/static/css/normalize.css → base/static/css/normalize.css vendored

0
CitizenWatt-Base/static/css/style.css → base/static/css/style.css

0
CitizenWatt-Base/static/font/OpenSans-Bold.ttf → base/static/font/OpenSans-Bold.ttf

0
CitizenWatt-Base/static/font/OpenSans-BoldItalic.ttf → base/static/font/OpenSans-BoldItalic.ttf

0
CitizenWatt-Base/static/font/OpenSans-Italic.ttf → base/static/font/OpenSans-Italic.ttf

0
CitizenWatt-Base/static/font/OpenSans-Light.ttf → base/static/font/OpenSans-Light.ttf

0
CitizenWatt-Base/static/font/OpenSans-Regular.ttf → base/static/font/OpenSans-Regular.ttf

0
CitizenWatt-Base/static/img/bill.svg → base/static/img/bill.svg

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
CitizenWatt-Base/static/img/community.svg → base/static/img/community.svg

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
CitizenWatt-Base/static/img/contact.svg → base/static/img/contact.svg

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

0
CitizenWatt-Base/static/img/data.svg → base/static/img/data.svg

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
CitizenWatt-Base/static/img/day.svg → base/static/img/day.svg

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
CitizenWatt-Base/static/img/help.svg → base/static/img/help.svg

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
CitizenWatt-Base/static/img/install.svg → base/static/img/install.svg

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
CitizenWatt-Base/static/img/loading.svg → base/static/img/loading.svg

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

0
CitizenWatt-Base/static/img/loading_simple.svg → base/static/img/loading_simple.svg

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

0
CitizenWatt-Base/static/img/login.svg → base/static/img/login.svg

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
CitizenWatt-Base/static/img/logo.png → base/static/img/logo.png

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
CitizenWatt-Base/static/img/logout.svg → base/static/img/logout.svg

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
CitizenWatt-Base/static/img/month.svg → base/static/img/month.svg

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

0
CitizenWatt-Base/static/img/moon.svg → base/static/img/moon.svg

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

0
CitizenWatt-Base/static/img/more.svg → base/static/img/more.svg

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
CitizenWatt-Base/static/img/progress.svg → base/static/img/progress.svg

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

0
CitizenWatt-Base/static/img/results.svg → base/static/img/results.svg

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
CitizenWatt-Base/static/img/sensor.svg → base/static/img/sensor.svg

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
CitizenWatt-Base/static/img/small-data.svg → base/static/img/small-data.svg

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
CitizenWatt-Base/static/img/sun.svg → base/static/img/sun.svg

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
CitizenWatt-Base/static/img/target-no.svg → base/static/img/target-no.svg

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
CitizenWatt-Base/static/img/target-ok.svg → base/static/img/target-ok.svg

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
CitizenWatt-Base/static/img/target-wip.svg → base/static/img/target-wip.svg

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

0
CitizenWatt-Base/static/img/target.svg → base/static/img/target.svg

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
CitizenWatt-Base/static/img/tick.svg → base/static/img/tick.svg

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
CitizenWatt-Base/static/img/user.svg → base/static/img/user.svg

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
CitizenWatt-Base/static/img/week.svg → base/static/img/week.svg

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
CitizenWatt-Base/static/img/wiki.svg → base/static/img/wiki.svg

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

0
CitizenWatt-Base/static/js/conso/App.js → base/static/js/conso/App.js

0
CitizenWatt-Base/static/js/conso/Config.js → base/static/js/conso/Config.js

0
CitizenWatt-Base/static/js/conso/DataProvider.js → base/static/js/conso/DataProvider.js

0
CitizenWatt-Base/static/js/conso/Graph.js → base/static/js/conso/Graph.js

0
CitizenWatt-Base/static/js/conso/HashManager.js → base/static/js/conso/HashManager.js

0
CitizenWatt-Base/static/js/conso/Menu.js → base/static/js/conso/Menu.js

0
CitizenWatt-Base/static/js/conso/RateDisplay.js → base/static/js/conso/RateDisplay.js

0
CitizenWatt-Base/static/js/conso/tail.js → base/static/js/conso/tail.js

0
CitizenWatt-Base/static/js/dateutils.js → base/static/js/dateutils.js

0
CitizenWatt-Base/static/js/target.js → base/static/js/target.js

0
CitizenWatt-Base/static/js/utils.js → base/static/js/utils.js

0
CitizenWatt-Base/system/README.md → base/system/README.md

0
CitizenWatt-Base/system/citizenwatt.sh → base/system/citizenwatt.sh

0
CitizenWatt-Base/system/cleanup_raspbian.sh → base/system/cleanup_raspbian.sh

0
CitizenWatt-Base/system/install_citizenwatt.sh → base/system/install_citizenwatt.sh

0
CitizenWatt-Base/system/install_python34.sh → base/system/install_python34.sh

0
CitizenWatt-Base/system/install_rf24.sh → base/system/install_rf24.sh

0
CitizenWatt-Base/system/supervisor_citizenwatt.conf → base/system/supervisor_citizenwatt.conf

0
CitizenWatt-Base/tests/libcitizenwatt → base/tests/libcitizenwatt

0
CitizenWatt-Base/tests/test_process.py → base/tests/test_process.py

0
CitizenWatt-Base/tests/tests.js → base/tests/tests.js

0
CitizenWatt-Base/views/_begin.tpl → base/views/_begin.tpl

0
CitizenWatt-Base/views/_end.tpl → base/views/_end.tpl

0
CitizenWatt-Base/views/community.tpl → base/views/community.tpl

0
CitizenWatt-Base/views/conso.tpl → base/views/conso.tpl

0
CitizenWatt-Base/views/help.tpl → base/views/help.tpl

0
CitizenWatt-Base/views/index.tpl → base/views/index.tpl

0
CitizenWatt-Base/views/install.tpl → base/views/install.tpl

0
CitizenWatt-Base/views/login.tpl → base/views/login.tpl

0
CitizenWatt-Base/views/settings.tpl → base/views/settings.tpl

2
CitizenWatt-Base/visu.py → base/visu.py

@ -749,7 +749,7 @@ def settings_post(db): @@ -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")

0
CitizenWatt-PiBoard/LICENSE → receiver/LICENSE

0
CitizenWatt-Base/Makefile → receiver/Makefile

0
CitizenWatt-PiBoard/README.md → receiver/README.md

0
CitizenWatt-PiBoard/2017-02-15-201954.png → receiver/hardware/2017-02-15-201954.png

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 82 KiB

0
CitizenWatt-PiBoard/2017-02-15-202006.png → receiver/hardware/2017-02-15-202006.png

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

0
CitizenWatt-PiBoard/PiBoard.brd → receiver/hardware/PiBoard.brd

0
CitizenWatt-PiBoard/PiBoard.sch → receiver/hardware/PiBoard.sch

0
CitizenWatt-Base/receive.cpp → receiver/software/receive.cpp

0
CitizenWatt-sensor/LICENSE → sensor/LICENSE

0
CitizenWatt-sensor/README.md → sensor/README.md

0
CitizenWatt-sensor/Hardware/.gitignore → sensor/hardware/.gitignore vendored

0
CitizenWatt-sensor/Hardware/CitizenBoard.brd → sensor/hardware/CitizenBoard.brd

0
CitizenWatt-sensor/Hardware/CitizenBoard.sch → sensor/hardware/CitizenBoard.sch

0
CitizenWatt-sensor/Hardware/silkscreen3bold_standalone.svg → sensor/hardware/silkscreen3bold_standalone.svg

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

0
CitizenWatt-sensor/Software/sensor/printf.h → sensor/software/sensor/printf.h

0
CitizenWatt-sensor/Software/sensor/sensor.ino → sensor/software/sensor/sensor.ino

Loading…
Cancel
Save