Browse Source

Move stuff around

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

+ 0
- 1
CitizenWatt-Base/post_update.sh View File

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

+ 0
- 20
CitizenWatt-Base/startup.sh View File

@@ -1,20 +0,0 @@
1
-#!/bin/sh
2
-
3
-echo "Starting the webserver…"
4
-screen -dmS visu && screen -S visu -p 0 -X stuff "while true; do python3 visu.py; done$(printf \\r)"
5
-
6
-echo "Starting receive script…"
7
-screen -dmS receive && screen -S receive -p 0 -X stuff "while true; do ./receive; done$(printf \\r)"
8
-echo "Done !\n"
9
-sleep 0.2
10
-echo "Starting processing script…"
11
-screen -dmS process && screen -S process -p 0 -X stuff "while true; do python3 process.py; done$(printf \\r)"
12
-echo "Done !\n"
13
-
14
-while ! curl -s --head http://localhost:8080 2>&1 > /dev/null; do
15
-    echo "Webserver is starting…"
16
-    sleep 1
17
-done
18
-echo "Webserver started !\n"
19
-
20
-echo "Ready to start !"

+ 0
- 1
CitizenWatt-Base/updater.sh View File

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

+ 13
- 0
README.md View File

@@ -4,3 +4,16 @@ CitizenWatt-refactor
4 4
 This is an updated version of [CitizenWatt](http://citizenwatt.paris/) code,
5 5
 aiming to be a backup of available stuff, with minor updates for anyone
6 6
 willing to build its own.
7
+
8
+CitizenWatt aimed at building a personal DIY energy consumption meter,
9
+inspired by [OpenEnergyMonitor](https://openenergymonitor.org/).
10
+
11
+I recently came across cloned CitizenWatt repositories and wanted to make some
12
+lifting of the code, while I set it back in place at home. I also found out
13
+that OpenEnergyMonitor was considerably nicer than it used to be, especially
14
+from a UX point of view. This aims at being an up to date merge of
15
+OpenEnergyMonitor and CitizenWatt, to be the best combination possible at the
16
+moment, in my opinion.
17
+
18
+This is part of a home automation process, hence the will to avoid installing
19
+pre-compiled images which are not easily extensible.

CitizenWatt-Base/README.md → base/README.md View File


CitizenWatt-Base/bottle.py → base/bottle.py View File


CitizenWatt-Base/bottle_sqlalchemy.py → base/bottle_sqlalchemy.py View File


CitizenWatt-Base/bottlesession.py → base/bottlesession.py View File


CitizenWatt-Base/libcitizenwatt/__init__.py → base/libcitizenwatt/__init__.py View File


CitizenWatt-Base/libcitizenwatt/cache.py → base/libcitizenwatt/cache.py View File


CitizenWatt-Base/libcitizenwatt/config.py → base/libcitizenwatt/config.py View File


CitizenWatt-Base/libcitizenwatt/database.py → base/libcitizenwatt/database.py View File


CitizenWatt-Base/libcitizenwatt/tools.py → base/libcitizenwatt/tools.py View File


CitizenWatt-Base/process.py → base/process.py View File


CitizenWatt-Base/static/css/normalize.css → base/static/css/normalize.css View File


CitizenWatt-Base/static/css/style.css → base/static/css/style.css View File


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


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


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


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


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


CitizenWatt-Base/static/img/bill.svg → base/static/img/bill.svg View File


CitizenWatt-Base/static/img/community.svg → base/static/img/community.svg View File


CitizenWatt-Base/static/img/contact.svg → base/static/img/contact.svg View File


CitizenWatt-Base/static/img/data.svg → base/static/img/data.svg View File


CitizenWatt-Base/static/img/day.svg → base/static/img/day.svg View File


CitizenWatt-Base/static/img/help.svg → base/static/img/help.svg View File


CitizenWatt-Base/static/img/install.svg → base/static/img/install.svg View File


CitizenWatt-Base/static/img/loading.svg → base/static/img/loading.svg View File


CitizenWatt-Base/static/img/loading_simple.svg → base/static/img/loading_simple.svg View File


CitizenWatt-Base/static/img/login.svg → base/static/img/login.svg View File


CitizenWatt-Base/static/img/logo.png → base/static/img/logo.png View File


CitizenWatt-Base/static/img/logout.svg → base/static/img/logout.svg View File


CitizenWatt-Base/static/img/month.svg → base/static/img/month.svg View File


CitizenWatt-Base/static/img/moon.svg → base/static/img/moon.svg View File


CitizenWatt-Base/static/img/more.svg → base/static/img/more.svg View File


CitizenWatt-Base/static/img/progress.svg → base/static/img/progress.svg View File


CitizenWatt-Base/static/img/results.svg → base/static/img/results.svg View File


CitizenWatt-Base/static/img/sensor.svg → base/static/img/sensor.svg View File


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


CitizenWatt-Base/static/img/sun.svg → base/static/img/sun.svg View File


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


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


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


CitizenWatt-Base/static/img/target.svg → base/static/img/target.svg View File


CitizenWatt-Base/static/img/tick.svg → base/static/img/tick.svg View File


CitizenWatt-Base/static/img/user.svg → base/static/img/user.svg View File


CitizenWatt-Base/static/img/week.svg → base/static/img/week.svg View File


CitizenWatt-Base/static/img/wiki.svg → base/static/img/wiki.svg View File


CitizenWatt-Base/static/js/conso/App.js → base/static/js/conso/App.js View File


CitizenWatt-Base/static/js/conso/Config.js → base/static/js/conso/Config.js View File


CitizenWatt-Base/static/js/conso/DataProvider.js → base/static/js/conso/DataProvider.js View File


CitizenWatt-Base/static/js/conso/Graph.js → base/static/js/conso/Graph.js View File


CitizenWatt-Base/static/js/conso/HashManager.js → base/static/js/conso/HashManager.js View File


CitizenWatt-Base/static/js/conso/Menu.js → base/static/js/conso/Menu.js View File


CitizenWatt-Base/static/js/conso/RateDisplay.js → base/static/js/conso/RateDisplay.js View File


CitizenWatt-Base/static/js/conso/tail.js → base/static/js/conso/tail.js View File


CitizenWatt-Base/static/js/dateutils.js → base/static/js/dateutils.js View File


CitizenWatt-Base/static/js/target.js → base/static/js/target.js View File


CitizenWatt-Base/static/js/utils.js → base/static/js/utils.js View File


CitizenWatt-Base/system/README.md → base/system/README.md View File


CitizenWatt-Base/system/citizenwatt.sh → base/system/citizenwatt.sh View File


CitizenWatt-Base/system/cleanup_raspbian.sh → base/system/cleanup_raspbian.sh View File


CitizenWatt-Base/system/install_citizenwatt.sh → base/system/install_citizenwatt.sh View File


CitizenWatt-Base/system/install_python34.sh → base/system/install_python34.sh View File


CitizenWatt-Base/system/install_rf24.sh → base/system/install_rf24.sh View File


CitizenWatt-Base/system/supervisor_citizenwatt.conf → base/system/supervisor_citizenwatt.conf View File


CitizenWatt-Base/tests/libcitizenwatt → base/tests/libcitizenwatt View File


CitizenWatt-Base/tests/test_process.py → base/tests/test_process.py View File


CitizenWatt-Base/tests/tests.js → base/tests/tests.js View File


CitizenWatt-Base/views/_begin.tpl → base/views/_begin.tpl View File


CitizenWatt-Base/views/_end.tpl → base/views/_end.tpl View File


CitizenWatt-Base/views/community.tpl → base/views/community.tpl View File


CitizenWatt-Base/views/conso.tpl → base/views/conso.tpl View File


CitizenWatt-Base/views/help.tpl → base/views/help.tpl View File


CitizenWatt-Base/views/index.tpl → base/views/index.tpl View File


CitizenWatt-Base/views/install.tpl → base/views/install.tpl View File


CitizenWatt-Base/views/login.tpl → base/views/login.tpl View File


CitizenWatt-Base/views/settings.tpl → base/views/settings.tpl View File


CitizenWatt-Base/visu.py → base/visu.py View File

@@ -749,7 +749,7 @@ def settings_post(db):
749 749
 def update():
750 750
     """Handles updating"""
751 751
     subprocess.Popen([os.path.dirname(os.path.realpath(__file__)) +
752
-                      "/updater.sh"])
752
+                      "/updater.sh"])  # TODO
753 753
     redirect("/settings")
754 754
 
755 755
 

CitizenWatt-PiBoard/LICENSE → receiver/LICENSE View File


CitizenWatt-Base/Makefile → receiver/Makefile View File


CitizenWatt-PiBoard/README.md → receiver/README.md View File


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


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


CitizenWatt-PiBoard/PiBoard.brd → receiver/hardware/PiBoard.brd View File


CitizenWatt-PiBoard/PiBoard.sch → receiver/hardware/PiBoard.sch View File


CitizenWatt-Base/receive.cpp → receiver/software/receive.cpp View File


CitizenWatt-sensor/LICENSE → sensor/LICENSE View File


CitizenWatt-sensor/README.md → sensor/README.md View File


CitizenWatt-sensor/Hardware/.gitignore → sensor/hardware/.gitignore View File


CitizenWatt-sensor/Hardware/CitizenBoard.brd → sensor/hardware/CitizenBoard.brd View File


CitizenWatt-sensor/Hardware/CitizenBoard.sch → sensor/hardware/CitizenBoard.sch View File


CitizenWatt-sensor/Hardware/silkscreen3bold_standalone.svg → sensor/hardware/silkscreen3bold_standalone.svg View File


CitizenWatt-sensor/Software/sensor/printf.h → sensor/software/sensor/printf.h View File


CitizenWatt-sensor/Software/sensor/sensor.ino → sensor/software/sensor/sensor.ino View File