login as: pi pi@192.168.10.128's password: тттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттт т ooooooooo. o8o т т `888 `Y88. `"' т т .ooooo. ooo. .oo. .oo. .ooooo. ooo. .oo. 888 .d88' oooo т т d88' `88b `888P"Y88bP"Y88b d88' `88b `888P"Y88b 888ooo88P' `888 т т 888ooo888 888 888 888 888 888 888 888 888 888 т т 888 .o 888 888 888 888 888 888 888 888 888 т т `Y8bod8P' o888o o888o o888o `Y8bod8P' o888o o888o o888o o888o т тттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттттт The programs included with the Debian GNU/Linux system are free software; the exact distribution terms for each program are described in the individual files in /usr/share/doc/*/copyright. Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted by applicable law. The file system is in Read Only (RO) mode. If you need to make changes, use the command 'rpi-rw' to put the file system in Read Write (RW) mode. Use 'rpi-ro' to return to RO mode. The /home/pi/data directory is always in RW mode. pi@emonpi(ro):~$ cat /home/pi/data/emonpiupdate.log I2C LCD NOT DETECTED Starting emonPi Update > EUID: 1000 Mon 3 Apr 13:22:34 UTC 2017 emonSD-07Nov16 git pull /home/pi/emonpi From https://github.com/openenergymonitor/emonpi 008c2b6..4dc88fa master -> origin/master * [new branch] emonhub-restart -> origin/emonhub-restart * [new branch] openhab2 -> origin/openhab2 * [new tag] 2.8.0 -> 2.8.0 * [new tag] 2.8.1 -> 2.8.1 * [new tag] 2.8.2 -> 2.8.2 Updating 008c2b6..4dc88fa Fast-forward .travis.yml | 26 +- README.md | 2 +- bash-rw-indicator | 7 +- docs/SD-card-build.md | 5 +- emoncmsupdate | 44 +- emonhub-sudoers | 1 + emonpiupdate | 1 + firmware/compiled/archive/emonPi_V2.7.hex | 1195 ++++++++++++ firmware/compiled/archive/emonPi_V2.8.1.hex | 1102 +++++++++++ firmware/compiled/archive/emonPi_V2.8.2.hex | 1120 ++++++++++++ firmware/compiled/archive/emonPi_V2.8.hex | 1194 ++++++++++++ firmware/compiled/latest.hex | 2340 +++++++++++------------- firmware/compiled/readme.md | 4 +- firmware/libraries/Readme.md | 4 +- firmware/platformio.ini | 19 +- firmware/readme.md | 61 +- firmware/src/lcd_serial.ino | 38 +- firmware/src/rf.ino | 75 +- firmware/src/src.ino | 97 +- firmware/src/startup.ino | 6 +- firmware/test_sketches/i2c_scan/.gitignore | 2 + firmware/test_sketches/i2c_scan/.travis.yml | 65 + firmware/test_sketches/i2c_scan/lib/readme.txt | 36 + firmware/test_sketches/i2c_scan/platformio.ini | 22 + firmware/test_sketches/i2c_scan/src/src.ino | 66 + firstbootupdate | 18 +- lcd/emonPiLCD.py | 43 +- lcd/emonPiLCD_update.py | 21 +- lcd/lcd_test.py | 10 +- lcd/lcddriver.py | 7 +- logrotate.conf | 2 +- rc.local_jessieminimal | 5 +- rfm69piupdate.sh | 33 + service-runner | 11 +- service-runner-update.sh | 41 +- update | 5 + 36 files changed, 6329 insertions(+), 1399 deletions(-) create mode 100644 emonhub-sudoers create mode 100644 firmware/compiled/archive/emonPi_V2.7.hex create mode 100644 firmware/compiled/archive/emonPi_V2.8.1.hex create mode 100644 firmware/compiled/archive/emonPi_V2.8.2.hex create mode 100644 firmware/compiled/archive/emonPi_V2.8.hex create mode 100644 firmware/test_sketches/i2c_scan/.gitignore create mode 100644 firmware/test_sketches/i2c_scan/.travis.yml create mode 100644 firmware/test_sketches/i2c_scan/lib/readme.txt create mode 100644 firmware/test_sketches/i2c_scan/platformio.ini create mode 100644 firmware/test_sketches/i2c_scan/src/src.ino create mode 100755 rfm69piupdate.sh git pull /home/pi/RFM2Pi error: Unable to append to .git/logs/refs/remotes/origin/master: Permission denied From https://github.com/openenergymonitor/RFM2Pi ! 5830c86..e5d874d master -> origin/master (unable to update local ref) git pull /home/pi/emonhub From https://github.com/openenergymonitor/emonhub afdb53e..3453090 emon-pi -> origin/emon-pi * [new branch] dev -> origin/dev * [new branch] lanip-status -> origin/lanip-status Updating afdb53e..3453090 Fast-forward .gitignore | 1 + README.md | 61 ++-- conf/emonhub.conf | 8 +- conf/emonpi.default.emonhub.conf | 11 +- conf/interfacer_examples/bmw/bmw.emonhub.conf | 18 + conf/interfacer_examples/bmw/readme.md | 65 ++++ .../directserial-serialtx3e/readme.md | 41 +++ conf/interfacer_examples/directserial/readme.md | 37 ++ .../graphite/graphite.emonhub.conf | 11 + conf/interfacer_examples/graphite/readme.md | 63 ++++ .../modbus/modbusTCP.emonhub.conf | 235 ++++++++++++ conf/interfacer_examples/modbus/readme.md | 83 +++++ conf/interfacer_examples/smasolar/readme.md | 68 ++++ .../smasolar/smasolar.emonhub.conf | 17 + .../smilices/readme.md} | 0 .../smilices}/smilics.emonhub.conf | 0 .../vedirect/readme.md} | 0 .../vedirect}/vedirect.emonhub.conf | 0 configuration.md | 16 +- service/emonhub | 2 +- src/emonhub.py | 34 ++ src/emonhub_setup.py | 4 +- src/interfacers/EmonFroniusModbusTcpInterfacer.py | 44 +++ src/interfacers/EmonHubBMWInterfacer.py | 294 ++++++++++++++++ src/interfacers/EmonHubEmoncmsHTTPInterfacer.py | 20 +- src/interfacers/EmonHubGraphiteInterfacer.py | 103 ++++++ src/interfacers/EmonHubJeeInterfacer.py | 7 +- src/interfacers/EmonHubSMASolarInterfacer.py | 313 ++++++++++++++++ src/interfacers/EmonHubTx3eInterfacer.py | 196 +++++++++++ src/interfacers/EmonModbusTcpInterfacer.py | 141 ++++++++ src/interfacers/emonhub_interfacer.py | 3 +- src/smalibrary/SMABluetoothPacket.py | 198 +++++++++++ src/smalibrary/SMANET2PlusPacket.py | 231 ++++++++++++ src/smalibrary/SMASolar_library.py | 392 +++++++++++++++++++++ src/smalibrary/__init__.py | 0 35 files changed, 2664 insertions(+), 53 deletions(-) create mode 100644 conf/interfacer_examples/bmw/bmw.emonhub.conf create mode 100644 conf/interfacer_examples/bmw/readme.md create mode 100644 conf/interfacer_examples/directserial-serialtx3e/readme.md create mode 100644 conf/interfacer_examples/directserial/readme.md create mode 100644 conf/interfacer_examples/graphite/graphite.emonhub.conf create mode 100644 conf/interfacer_examples/graphite/readme.md create mode 100644 conf/interfacer_examples/modbus/modbusTCP.emonhub.conf create mode 100644 conf/interfacer_examples/modbus/readme.md create mode 100644 conf/interfacer_examples/smasolar/readme.md create mode 100644 conf/interfacer_examples/smasolar/smasolar.emonhub.conf rename conf/{smilics.readme.md => interfacer_examples/smilices/readme.md} (100%) rename conf/{ => interfacer_examples/smilices}/smilics.emonhub.conf (100%) rename conf/{VEDirect.readme.md => interfacer_examples/vedirect/readme.md} (100%) rename conf/{ => interfacer_examples/vedirect}/vedirect.emonhub.conf (100%) create mode 100644 src/interfacers/EmonFroniusModbusTcpInterfacer.py create mode 100644 src/interfacers/EmonHubBMWInterfacer.py create mode 100644 src/interfacers/EmonHubGraphiteInterfacer.py create mode 100644 src/interfacers/EmonHubSMASolarInterfacer.py create mode 100644 src/interfacers/EmonHubTx3eInterfacer.py create mode 100644 src/interfacers/EmonModbusTcpInterfacer.py create mode 100644 src/smalibrary/SMABluetoothPacket.py create mode 100644 src/smalibrary/SMANET2PlusPacket.py create mode 100644 src/smalibrary/SMASolar_library.py create mode 100644 src/smalibrary/__init__.py git pull /home/pi/oem_openHab From https://github.com/openenergymonitor/oem_openHab 04c7caa..f7a12a1 master -> origin/master Updating 04c7caa..f7a12a1 Fast-forward Readme.md | 3 ++- oem.items | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) git pull /home/pi/usefulscripts error: insufficient permission for adding an object to repository database .git/objects fatal: failed to write object fatal: unpack-objects failed git pull /home/pi/huawei-hilink-status error: cannot open .git/FETCH_HEAD: Permission denied Start emonPi Atmega328 firmware update: ================================= EmonPi update started ================================= EUID: 1000 Collecting paho-mqtt Downloading paho-mqtt-1.2.1.tar.gz (51kB) Building wheels for collected packages: paho-mqtt Running setup.py bdist_wheel for paho-mqtt: started Running setup.py bdist_wheel for paho-mqtt: finished with status 'done' Stored in directory: /root/.cache/pip/wheels/66/22/ca/946fd7de22c549f1b784219ce237f82bfe8aa2fc899bc23827 Successfully built paho-mqtt Installing collected packages: paho-mqtt Found existing installation: paho-mqtt 1.1 Uninstalling paho-mqtt-1.1: Successfully uninstalled paho-mqtt-1.1 Successfully installed paho-mqtt-1.2.1 You are using pip version 8.1.2, however version 9.0.1 is available. You should consider upgrading via the 'pip install --upgrade pip' command. Stopping OpenEnergyMonitor emonHub: emonhub has been stopped ok. Start ATmega328 serial upload using avrdude with latest.hex Discrete Sampling avrdude -c arduino -p ATMEGA328P -P /dev/ttyAMA0 -b 115200 -U flash:w:/home/pi/emonpi/firmware/compiled/latest.hex avrdude-original: Using autoreset DTR on GPIO Pin 7 avrdude-original: stk500_getsync() attempt 1 of 10: not in sync: resp=0xe0 avrdude-original: stk500_getsync() attempt 2 of 10: not in sync: resp=0xfe avrdude-original: stk500_getsync() attempt 3 of 10: not in sync: resp=0xe0 avrdude-original: stk500_getsync() attempt 4 of 10: not in sync: resp=0xe0 avrdude-original: stk500_getsync() attempt 5 of 10: not in sync: resp=0x70 avrdude-original: stk500_getsync() attempt 6 of 10: not in sync: resp=0xf8 avrdude-original: stk500_getsync() attempt 7 of 10: not in sync: resp=0xe0 avrdude-original: stk500_getsync() attempt 8 of 10: not in sync: resp=0xe0 avrdude-original: stk500_getsync() attempt 9 of 10: not in sync: resp=0xe0 avrdude-original: stk500_getsync() attempt 10 of 10: not in sync: resp=0x7e avrdude-original done. Thank you. strace: |autoreset: Broken pipe Starting OpenEnergyMonitor emonHub: emonhub has been started ok. Start emonhub update script: ================================= EmonPi update started ================================= Running emonhub automatic node addition script EUID: 1000 EUID: 1000 [[5]] Node 5 already present [[6]] Node 6 already present [[7]] Node 7 already present [[8]] Node 8 already present [[9]] Node 9 already present [[10]] Node 10 already present [[11]] Node 11 already present [[19]] Node 19 already present [[20]] Node 20 already present [[21]] Node 21 already present [[22]] Node 22 already present [[23]] Node 23 already present [[24]] Node 24 already present [[25]] Node 25 already present [[26]] Node 26 already present Start emoncms update: ================================= Emoncms update started Mon 3 Apr 13:24:06 UTC 2017 EUID: 1000 Checking cron tab for service runner entry... service runner crontab entry already installed /home/pi/emonpi/emonhub-sudoers: parsed OK Install emonhub reboot sudoers entry git pull /var/www/emoncms dev-mosquitto-php master * stable symlinked_modules On branch stable Your branch is up-to-date with 'origin/stable'. nothing to commit, working directory clean From https://github.com/emoncms/emoncms dc70ba7..22c0ae9 stable -> origin/stable * [new branch] device-autocreate -> origin/device-autocreate 0c52196..6ebae58 master -> origin/master * [new branch] revert-604-master_contribution -> origin/revert-604-master_contribution * [new tag] 9.3.0 -> 9.3.0 * [new tag] 9.5.0 -> 9.5.0 * [new tag] 9.5.1 -> 9.5.1 * [new tag] 9.6.0 -> 9.6.0 * [new tag] 9.7.0 -> 9.7.0 * [new tag] 9.7.1 -> 9.7.1 * [new tag] 9.7.9 -> 9.7.9 * [new tag] 9.8.1 -> 9.8.1 * [new tag] 9.9.0 -> 9.9.0 Updating dc70ba7..22c0ae9 Fast-forward .travis.yml | 2 - Lib/bootstrap/css/bootstrap-responsive.css | 6 +- Lib/bootstrap/css/bootstrap-responsive.min.css | 6 +- Lib/bootstrap/css/bootstrap.css | 15 +++- Lib/bootstrap/css/bootstrap.min.css | 8 +- Lib/bootstrap/js/bootstrap.js | 98 ++++++++++++--------- Lib/bootstrap/js/bootstrap.min.js | 4 +- Modules/admin/admin_controller.php | 46 +++++----- Modules/admin/admin_main_view.php | 80 ++++++++++------- Modules/feed/Views/feedlist_view.php | 2 +- Modules/input/input_menu.php | 2 +- Modules/user/images/appstore.png | Bin 0 -> 8888 bytes Modules/user/images/en-play-badge.png | Bin 0 -> 4290 bytes Modules/user/profile/profile.php | 38 ++++---- Modules/user/user.js | 6 +- Modules/vis/Views/vis_main_view.php | 6 +- Modules/vis/multigraph_model.php | 2 +- Modules/vis/visualisations/bargraph.php | 12 +-- Modules/vis/visualisations/compare.php | 14 +-- .../dailyhistogram/dailyhistogram.php | 8 +- Modules/vis/visualisations/editdaily.php | 10 +-- Modules/vis/visualisations/editrealtime.php | 10 +-- Modules/vis/visualisations/graph.php | 8 +- Modules/vis/visualisations/histgraph.php | 6 +- Modules/vis/visualisations/multigraph.php | 14 +-- Modules/vis/visualisations/orderbars.php | 4 +- Modules/vis/visualisations/orderthreshold.php | 16 ++-- Modules/vis/visualisations/rawdata.php | 18 ++-- Modules/vis/visualisations/realtime.php | 14 +-- Modules/vis/visualisations/simplezoom.php | 12 +-- Modules/vis/visualisations/stacked.php | 12 +-- Modules/vis/visualisations/stackedsolar.php | 12 +-- Modules/vis/visualisations/threshold.php | 18 ++-- Modules/vis/visualisations/timecompare.php | 5 +- .../vis/visualisations/timecompare/timecompare.js | 2 +- Modules/vis/visualisations/timestoredaily.php | 16 ++-- Modules/vis/visualisations/zoom.php | 2 +- Modules/vis/widget/vis_render.js | 54 ++++++------ Theme/basic/theme.php | 2 +- docs/LinuxInstall.md | 87 ++++++++++++------ docs/RaspberryPi/MQTT.md | 48 ++++++++-- docs/RaspberryPi/readme.md | 9 +- index.php | 2 +- process_settings.php | 43 ++++++++- readme.md | 8 +- scripts/logger/logrotate.conf | 2 +- scripts/mqtt_input.service | 56 ++++++++++++ scripts/phpmqtt_input.php | 18 ++-- 48 files changed, 550 insertions(+), 313 deletions(-) create mode 100644 Modules/user/images/appstore.png create mode 100644 Modules/user/images/en-play-badge.png create mode 100644 scripts/mqtt_input.service git pull /var/www/emoncms/Modules/app * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean From https://github.com/emoncms/app 14345bc..6d07ab2 9.0 -> origin/9.0 * [new branch] refactor -> origin/refactor Updating 14345bc..6d07ab2 Fast-forward myelectric/myelectric.html | 5 ++--- myelectric/myelectric.js | 6 ------ myenergy/myenergy.js | 6 ------ mysolarpv/mysolarpv.js | 6 ------ mysolarpvdivert/mysolarpvdivert.js | 6 ------ style.css | 3 +-- 6 files changed, 3 insertions(+), 29 deletions(-) git pull /var/www/emoncms/Modules/config * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean From https://github.com/emoncms/config 8438a27..faabc47 9.0 -> origin/9.0 Updating 8438a27..faabc47 Fast-forward README.md | 18 ++++++--- config.png | Bin 0 -> 471961 bytes config_controller.php | 51 +++++++++++++++++-------- edit.php | 103 +++++++++++++++++++++----------------------------- emonnhub-sudoers | 1 + 5 files changed, 91 insertions(+), 82 deletions(-) create mode 100644 config.png create mode 100644 emonnhub-sudoers git pull /var/www/emoncms/Modules/wifi * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean From https://github.com/emoncms/wifi 8598aec..4db701d 9.0 -> origin/9.0 Updating 8598aec..4db701d Fast-forward view.html | 23 ++++++++++++++--------- wifi_menu.php | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) git pull /var/www/emoncms/Modules/dashboard environ-master * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean From https://github.com/emoncms/dashboard d47bcc0..6b0073d master -> origin/master Updating d47bcc0..6b0073d Fast-forward Views/dashboard_edit_view.php | 48 ++-- Views/dashboard_view.php | 16 +- Views/dashboardeditor.css | 62 +++++ Views/icons/Containers.png | Bin 0 -> 729 bytes Views/icons/Text.png | Bin 0 -> 756 bytes Views/icons/Visualisations.png | Bin 0 -> 926 bytes Views/icons/Widgets.png | Bin 0 -> 958 bytes Views/icons/emon-icon-back.png | Bin 3110 -> 519 bytes Views/icons/emon-icon-delete.png | Bin 3404 -> 519 bytes Views/icons/emon-icon-dial.png | Bin 5214 -> 0 bytes Views/icons/emon-icon-frame.png | Bin 3616 -> 0 bytes Views/icons/emon-icon-front.png | Bin 2605 -> 510 bytes Views/icons/emon-icon-gear.png | Bin 5168 -> 493 bytes Views/icons/emon-icon-plot.png | Bin 4814 -> 0 bytes Views/icons/emon-icon-redo.png | Bin 2664 -> 494 bytes Views/icons/emon-icon-save.png | Bin 1387 -> 0 bytes Views/icons/emon-icon-text.png | Bin 1695 -> 0 bytes Views/icons/emon-icon-tool.png | Bin 1764 -> 420 bytes Views/icons/emon-icon-undo.png | Bin 2751 -> 483 bytes Views/icons/emon-icon-view.png | Bin 4986 -> 552 bytes Views/icons/gear-icon-outlined.png | Bin 17273 -> 2229 bytes Views/js/designer.js | 4 +- dashboard_langjs.php | 28 ++ locale/de_DE/LC_MESSAGES/messages.po | 10 +- locale/es_ES/LC_MESSAGES/messages.mo | Bin 8208 -> 8583 bytes locale/es_ES/LC_MESSAGES/messages.po | 214 +++++++++------- widget/bar/bar_render.js | 484 ++++++++++++++++++----------------- widget/battery/battery_render.js | 181 +++++++++++++ widget/curl/curl_render.js | 22 +- widget/cylinder/cylinder_render.js | 31 +-- widget/dial/dial_render.js | 6 +- widget/feedvalue/feedvalue_render.js | 12 +- widget/jgauge/jgauge_render.js | 4 +- widget/jgauge2/jgauge2_render.js | 8 +- widget/sun/sun_render.js | 187 ++++++++++++++ widget/windrose/windrose_render.js | 8 +- 36 files changed, 921 insertions(+), 404 deletions(-) create mode 100644 Views/dashboardeditor.css create mode 100644 Views/icons/Containers.png create mode 100644 Views/icons/Text.png create mode 100644 Views/icons/Visualisations.png create mode 100644 Views/icons/Widgets.png delete mode 100644 Views/icons/emon-icon-dial.png delete mode 100644 Views/icons/emon-icon-frame.png delete mode 100644 Views/icons/emon-icon-plot.png delete mode 100644 Views/icons/emon-icon-save.png delete mode 100644 Views/icons/emon-icon-text.png create mode 100644 widget/battery/battery_render.js create mode 100644 widget/sun/sun_render.js git pull /var/www/emoncms/Modules/graph * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean From https://github.com/emoncms/graph 84beb45..e68cdc7 master -> origin/master Updating 84beb45..e68cdc7 Fast-forward embed.php | 5 ++++ graph.js | 86 +++++++++++++++++++++++++++++++++++++++++++++++---------------- view.php | 26 +++++++++++-------- 3 files changed, 85 insertions(+), 32 deletions(-) git pull /home/pi/postprocess Already on 'emonpi' Your branch is up-to-date with 'remotes/origin/emonpi'. Already up-to-date. git pull /home/pi/backup * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean From https://github.com/emoncms/backup 00617c2..f86ed05 master -> origin/master Updating 00617c2..f86ed05 Fast-forward backup/backup_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) replacing initd mqtt_input with systemd mqtt input Stopping Daemon for the emoncms MQTT script: mqtt_input. Created symlink from /etc/systemd/system/multi-user.target.wants/mqtt_input.service to /etc/systemd/system/mqtt_input.service. Update Emoncms database ["ALTER TABLE dashboard MODIFY `main` tinyint(1) Default '0'","ALTER TABLE dashboard MODIFY `public` tinyint(1) Default '0'","ALTER TABLE dashboard MODIFY `published` tinyint(1) Default '0'","ALTER TABLE dashboard MODIFY `showdescription` tinyint(1) Default '0'"] Restarting Services... Restarting OpenEnergyMonitor emonHub: emonhub has been restarted ok. Log is turned off Restarting feedwriter Restarting openhab (via systemctl): openhab.service. set log rotate config owner to root Restarting Services... Starting emonPi LCD service.. mount: / is busy Filesystem is locked - Read Only access type ' rpi-rw ' to unlock Mon 3 Apr 13:26:05 UTC 2017 ................... emonPi update done Filesystem is unlocked - Write access type ' rpi-ro ' to lock ############################################################# I2C LCD NOT DETECTED on either 0x['27', '3f'] ...exiting LCD script Starting emonPi Update > via service-runner-update.sh EUID: 1000 Argument: emonpi Sun 6 Jan 18:56:14 UTC 2019 ############################################################# emonSD-07Nov16 git pull /home/pi/emonpi * master wifiap On branch master Your branch is up-to-date with 'origin/master'. Untracked files: (use "git add ..." to include in what will be committed) 1 hardware/emonpi/emonpi2c/ lcd/gsmhuaweistatus.pyc lcd/i2c_lib.pyc lcd/lcddriver.pyc nothing added to commit but untracked files present (use "git add" to track) Updating 4dc88fa..ea1f98b Fast-forward .gitignore | 3 +- UDPBroadcast/broadcast.php | 8 + UDPBroadcast/readme.php | 5 + docs/SD-card-build.md | 399 ++-- emoncms-filesystem | 1 + emoncms-setup/README.md | 19 + emoncms-setup/emoncms-setup-sudoers | 1 + emoncms-setup/hello.php | 317 +++ emoncms-setup/module.json | 4 + emoncms-setup/setup_controller.php | 45 + emoncms-setup/setup_model.php | 47 + emoncms-setup/setup_schema.php | 6 + emoncms-wifiscan.sh | 4 + emoncms_wifiscan.php | 27 + emoncmsupdate | 171 +- emonpiupdate | 28 +- factoryreset | 115 +- firmware/compiled/archive/emonPi_V2.8.4.hex | 1123 ++++++++++ firmware/compiled/archive/emonPi_V2.9.0.hex | 1120 ++++++++++ firmware/compiled/latest.hex | 2212 ++++++++++---------- firmware/compiled/readme.md | 8 +- firmware/lib/readme.txt | 38 - .../libraries/Arduino-Temperature-Control-Library | 1 - firmware/libraries/LiquidCrystal_I2C | 1 - firmware/libraries/OneWire | 1 - firmware/libraries/Readme.md | 34 - firmware/libraries/emonlib | 1 - firmware/libraries/jeelib | 1 - firmware/platformio.ini | 7 +- firmware/readme.md | 42 +- firmware/src/lcd_serial.ino | 24 +- firmware/src/rf.ino | 18 +- firmware/src/src.ino | 74 +- firmware/src/startup.ino | 4 +- firmware/src/temperature.ino | 78 +- firstbootupdate | 7 +- fstab | 20 +- fstab-stretch | 14 + lcd/README.md | 53 +- lcd/disablessh.sh | 7 + lcd/emonPiLCD.cfg | 36 + lcd/emonPiLCD.py | 532 +++-- lcd/enablessh.sh | 7 + lcd/install | 66 - lcd/testing/push_and_hold.py | 23 + md5sum.py | 24 + ntp_update.sh | 11 + rc.local_jessieminimal | 42 +- service-runner | 25 +- service-runner-update.sh | 50 +- stretch/cmdline.txt | 1 + stretch/config.txt | 70 + stretch/fstab | 11 + stretch/motd | 25 + stretch/rc.local | 47 + stretch/readme.md | 8 + sudo_crontab | 5 + sudoers | 2 +- update | 33 +- wifi-check | 72 +- wifiAP/hostapd.conf | 2 +- wifiAP/networklog.sh | 5 + wifiAP/startAP.sh | 27 + wifiAP/stopAP.sh | 5 + wifiAP/wifiAP.sh | 65 +- wifiAP/wpa_supplicant_check.conf | 2 + 66 files changed, 5384 insertions(+), 1900 deletions(-) create mode 100644 UDPBroadcast/broadcast.php create mode 100644 UDPBroadcast/readme.php create mode 100644 emoncms-filesystem create mode 100644 emoncms-setup/README.md create mode 100644 emoncms-setup/emoncms-setup-sudoers create mode 100644 emoncms-setup/hello.php create mode 100644 emoncms-setup/module.json create mode 100644 emoncms-setup/setup_controller.php create mode 100644 emoncms-setup/setup_model.php create mode 100644 emoncms-setup/setup_schema.php create mode 100755 emoncms-wifiscan.sh create mode 100644 emoncms_wifiscan.php create mode 100644 firmware/compiled/archive/emonPi_V2.8.4.hex create mode 100644 firmware/compiled/archive/emonPi_V2.9.0.hex delete mode 100644 firmware/lib/readme.txt delete mode 160000 firmware/libraries/Arduino-Temperature-Control-Library delete mode 160000 firmware/libraries/LiquidCrystal_I2C delete mode 160000 firmware/libraries/OneWire delete mode 100644 firmware/libraries/Readme.md delete mode 160000 firmware/libraries/emonlib delete mode 160000 firmware/libraries/jeelib create mode 100755 fstab-stretch create mode 100755 lcd/disablessh.sh create mode 100644 lcd/emonPiLCD.cfg create mode 100755 lcd/enablessh.sh delete mode 100755 lcd/install create mode 100644 lcd/testing/push_and_hold.py create mode 100755 md5sum.py create mode 100755 ntp_update.sh create mode 100755 stretch/cmdline.txt create mode 100755 stretch/config.txt create mode 100644 stretch/fstab create mode 100644 stretch/motd create mode 100755 stretch/rc.local create mode 100644 stretch/readme.md create mode 100755 wifiAP/networklog.sh create mode 100755 wifiAP/startAP.sh create mode 100755 wifiAP/stopAP.sh create mode 100644 wifiAP/wpa_supplicant_check.conf git pull /home/pi/RFM2Pi * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Updating 5830c86..e5d874d Fast-forward .travis.yml | 21 + README.md | 6 +- .../RFM69CW_RF12_Demo_ATmega328/.gitignore | 2 + .../RFM69CW_RF12_Demo_ATmega328/.travis.yml | 65 + .../RFM69CW_RF12_Demo_ATmega328/dataflash.h | 358 - .../RFM69CW_RF12_Demo_ATmega328/lib/readme.txt | 36 + .../RFM69CW_RF12_Demo_ATmega328/platformio.ini | 31 + .../src.ino} | 182 +- hardware/RFM12Pi_V2.6/RFM12Pi_V1.6_pinout_brd.png | Bin 0 -> 81927 bytes hardware/RFM12Pi_V2.6/RFM12Pi_V1.6_sch.png | Bin 0 -> 10348 bytes hardware/RFM12Pi_V2.6/RFM12Pi_V2.6 GERBERS.zip | Bin 0 -> 22511 bytes hardware/RFM12Pi_V2.6/RFM12Pi_V2.6_brd.png | Bin 0 -> 43049 bytes hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GBL | 758 ++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GBS | 35 + hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTL | 1227 ++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTO | 1312 ++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTS | 249 + hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.TXT | 42 + hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b## | 3182 +++++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b#1 | 3175 +++++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b#2 | 3175 +++++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.brd | 3175 +++++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.dri | 39 + hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.gpi | 40 + hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.sch | 11844 ++++++++++++++++++ hardware/RFM69Pi_V3.1/.gitignore | 3 + hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_ISP_program.jpg | Bin 0 -> 1117958 bytes hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_bottom.JPG | Bin 0 -> 585909 bytes hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top.JPG | Bin 0 -> 689387 bytes hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top_side.JPG | Bin 0 -> 585123 bytes hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top_side2.JPG | Bin 0 -> 414696 bytes hardware/RFM69Pi_V3.1/RFM69Pi_RasPi.JPG | Bin 0 -> 1296118 bytes hardware/RFM69Pi_V3.1/RFM69Pi_RasPi_small.JPG | Bin 0 -> 136594 bytes hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.brd | 3648 ++++++ hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.dru | 69 + hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.pdf | Bin 0 -> 35060 bytes hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.sch | 12106 +++++++++++++++++++ hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_large.pdf | Bin 0 -> 34591 bytes hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_sch.pdf | Bin 0 -> 27187 bytes hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_sch_brd.pdf | Bin 0 -> 61345 bytes hardware/RFM69Pi_V3.1/RFm69PiV3.1_brd.jpg | Bin 0 -> 273735 bytes hardware/RFM69Pi_V3.1/RFm69PiV3.1_brd_white.png | Bin 0 -> 2674 bytes hardware/RFM69Pi_V3.1/RFm69PiV3.1_sch.png | Bin 0 -> 14310 bytes hardware/RFM69Pi_V3.1/Readme.md | 24 + hardware/RFM69Pi_V3_BOM.ods | Bin 0 -> 40734 bytes hardware/board.png | Bin 0 -> 36604 bytes hardware/readme.md | 23 + hardware/schematic.png | Bin 0 -> 63645 bytes update-RFM12.sh | 2 +- 49 files changed, 44336 insertions(+), 493 deletions(-) create mode 100644 .travis.yml create mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/.gitignore create mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/.travis.yml delete mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/dataflash.h create mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/lib/readme.txt create mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/platformio.ini rename firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/{RFM69CW_RF12_Demo_ATmega328.ino => src/src.ino} (85%) create mode 100644 hardware/RFM12Pi_V2.6/RFM12Pi_V1.6_pinout_brd.png create mode 100644 hardware/RFM12Pi_V2.6/RFM12Pi_V1.6_sch.png create mode 100644 hardware/RFM12Pi_V2.6/RFM12Pi_V2.6 GERBERS.zip create mode 100644 hardware/RFM12Pi_V2.6/RFM12Pi_V2.6_brd.png create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GBL create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GBS create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTL create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTO create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTS create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.TXT create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b## create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b#1 create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b#2 create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.brd create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.dri create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.gpi create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.sch create mode 100644 hardware/RFM69Pi_V3.1/.gitignore create mode 100644 hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_ISP_program.jpg create mode 100644 hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_bottom.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top_side.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top_side2.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_RasPi.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_RasPi_small.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.brd create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.dru create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.pdf create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.sch create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_large.pdf create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_sch.pdf create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_sch_brd.pdf create mode 100644 hardware/RFM69Pi_V3.1/RFm69PiV3.1_brd.jpg create mode 100644 hardware/RFM69Pi_V3.1/RFm69PiV3.1_brd_white.png create mode 100644 hardware/RFM69Pi_V3.1/RFm69PiV3.1_sch.png create mode 100644 hardware/RFM69Pi_V3.1/Readme.md create mode 100644 hardware/RFM69Pi_V3_BOM.ods create mode 100644 hardware/board.png create mode 100644 hardware/readme.md create mode 100644 hardware/schematic.png git pull /home/pi/emonhub K0den-wibeee_interface * emon-pi hmm01i-syslogging On branch emon-pi Your branch is up-to-date with 'origin/emon-pi'. nothing to commit, working directory clean Updating 3453090..fc60e98 Fast-forward conf/emonhub.conf | 34 +- conf/emonpi.default.emonhub.conf | 30 +- .../directserial-serialtx3e/readme.md | 2 +- conf/interfacer_examples/directserial/readme.md | 26 +- .../modbus/modbusTCP.emonhub.conf | 170 +------- conf/interfacer_examples/modbus/readme.md | 60 +-- conf/interfacer_examples/smasolar/readme.md | 8 +- .../smasolar/smasolar.emonhub.conf | 2 +- .../smilices/smilics.emonhub.conf | 4 +- ...t.emonhub.conf => bmv700.vedirect.emonhub.conf} | 4 +- .../vedirect/mppt.vedirect.emonhub.conf | 22 + conf/interfacer_examples/vedirect/readme.md | 64 ++- conf/nodes/11 | 8 +- conf/nodes/12 | 7 + conf/nodes/13 | 7 + conf/nodes/14 | 7 + conf/old.default.emonhub.conf | 4 +- configuration.md | 95 ++++- examples/mqtt_reader.py | 2 +- install.systemd | 39 ++ service/emonhub.default.conf | 1 + service/emonhub.service | 17 + src/{interfacers => }/Cargo.py | 0 src/emonhub.py | 119 +++--- src/emonhub_buffer.py | 115 +++++ src/{interfacers => }/emonhub_interfacer.py | 224 ++++++++-- src/interfacers/EmonHubBMWInterfacer.py | 15 +- src/interfacers/EmonHubEmoncmsHTTPInterfacer.py | 165 +++---- src/interfacers/EmonHubGraphiteInterfacer.py | 159 ++++--- src/interfacers/EmonHubJeeInterfacer.py | 65 +-- src/interfacers/EmonHubMqttInterfacer.py | 280 ++++++++---- src/interfacers/EmonHubPacketGenInterfacer.py | 1 - src/interfacers/EmonHubSMASolarInterfacer.py | 250 +++++------ src/interfacers/EmonHubSerialInterfacer.py | 16 +- src/interfacers/EmonHubSocketInterfacer.py | 7 +- src/interfacers/EmonHubTemplateInterfacer.py | 139 ++++++ src/interfacers/EmonHubTesterInterfacer.py | 61 --- src/interfacers/EmonHubTx3eInterfacer.py | 196 +++------ src/interfacers/EmonHubVEDirectInterfacer.py | 73 ++-- src/interfacers/EmonModbusTcpInterfacer.py | 279 +++++++----- src/interfacers/__init__.py | 18 + .../{ => tmp}/EmonFroniusModbusTcpInterfacer.py | 16 +- .../{ => tmp}/EmonHubSmilicsInterfacer.py | 26 +- src/smalibrary/SMABluetoothPacket.py | 64 +-- src/smalibrary/SMANET2PlusPacket.py | 251 ++++++----- src/smalibrary/SMASolar_library.py | 474 +++++++++++---------- 46 files changed, 2063 insertions(+), 1563 deletions(-) rename conf/interfacer_examples/vedirect/{vedirect.emonhub.conf => bmv700.vedirect.emonhub.conf} (92%) create mode 100644 conf/interfacer_examples/vedirect/mppt.vedirect.emonhub.conf create mode 100644 conf/nodes/12 create mode 100644 conf/nodes/13 create mode 100644 conf/nodes/14 create mode 100755 install.systemd create mode 100644 service/emonhub.default.conf create mode 100644 service/emonhub.service rename src/{interfacers => }/Cargo.py (100%) create mode 100644 src/emonhub_buffer.py rename src/{interfacers => }/emonhub_interfacer.py (72%) create mode 100644 src/interfacers/EmonHubTemplateInterfacer.py delete mode 100644 src/interfacers/EmonHubTesterInterfacer.py rename src/interfacers/{ => tmp}/EmonFroniusModbusTcpInterfacer.py (84%) rename src/interfacers/{ => tmp}/EmonHubSmilicsInterfacer.py (79%) git pull /home/pi/oem_openHab * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Already up-to-date. git pull /home/pi/usefulscripts * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean git pull /home/pi/huawei-hilink-status * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Start emonPi Atmega328 firmware update: ================================= EmonPi update started ================================= EUID: 1000 Collecting paho-mqtt Downloading https://files.pythonhosted.org/packages/25/63/db25e62979c2a716a74950c9ed658dce431b5cb01fde29eb6cba9489a904/paho-mqtt-1.4.0.tar.gz (88kB) Building wheels for collected packages: paho-mqtt Running setup.py bdist_wheel for paho-mqtt: started Running setup.py bdist_wheel for paho-mqtt: finished with status 'done' Stored in directory: /root/.cache/pip/wheels/82/e5/de/d90d0f397648a1b58ffeea1b5742ac8c77f71fd43b550fa5a5 Successfully built paho-mqtt Installing collected packages: paho-mqtt Found existing installation: paho-mqtt 1.2.1 Uninstalling paho-mqtt-1.2.1: Successfully uninstalled paho-mqtt-1.2.1 Successfully installed paho-mqtt-1.4.0 Get:1 http://ppa.launchpad.net xenial InRelease [17.5 kB] Get:2 http://archive.raspberrypi.org jessie InRelease [22.9 kB] Get:3 http://mirrordirector.raspbian.org jessie InRelease [14.9 kB] Get:4 http://repo.mosquitto.org jessie InRelease [11.0 kB] Ign http://dl.bintray.com stable InRelease Get:5 http://dl.bintray.com stable Release.gpg [821 B] Get:6 http://dl.bintray.com stable Release [6,051 B] Get:7 http://ppa.launchpad.net xenial/main Sources [668 B] Get:8 http://mirrordirector.raspbian.org jessie/main armhf Packages [9,539 kB] Get:9 http://ppa.launchpad.net xenial/main armhf Packages [1,556 B] Err http://repo.mosquitto.org jessie InRelease Get:10 http://ppa.launchpad.net xenial/main Translation-en [928 B] Get:11 http://archive.raspberrypi.org jessie/main armhf Packages [171 kB] Get:12 http://dl.bintray.com stable/main armhf Packages [77.8 kB] Get:13 http://archive.raspberrypi.org jessie/ui armhf Packages [58.9 kB] Get:14 http://mirrordirector.raspbian.org jessie/contrib armhf Packages [43.3 kB] Get:15 http://mirrordirector.raspbian.org jessie/non-free armhf Packages [88.1 kB] Get:16 http://mirrordirector.raspbian.org jessie/rpi armhf Packages [1,356 B] Ign http://dl.bintray.com stable/main Translation-en_GB Ign http://dl.bintray.com stable/main Translation-en Ign http://archive.raspberrypi.org jessie/main Translation-en_GB Ign http://archive.raspberrypi.org jessie/main Translation-en Ign http://archive.raspberrypi.org jessie/ui Translation-en_GB Ign http://archive.raspberrypi.org jessie/ui Translation-en Ign http://mirrordirector.raspbian.org jessie/contrib Translation-en_GB Ign http://mirrordirector.raspbian.org jessie/contrib Translation-en Ign http://mirrordirector.raspbian.org jessie/main Translation-en_GB Ign http://mirrordirector.raspbian.org jessie/main Translation-en Ign http://mirrordirector.raspbian.org jessie/non-free Translation-en_GB Ign http://mirrordirector.raspbian.org jessie/non-free Translation-en Ign http://mirrordirector.raspbian.org jessie/rpi Translation-en_GB Ign http://mirrordirector.raspbian.org jessie/rpi Translation-en Fetched 10.1 MB in 1min 5s (154 kB/s) Reading package lists... Reading package lists... Building dependency tree... Reading state information... python-rpi.gpio is already the newest version. Suggested packages: python-gpiozero-docs The following NEW packages will be installed: python-gpiozero python-spidev 0 upgraded, 2 newly installed, 0 to remove and 200 not upgraded. Need to get 97.1 kB of archives. After this operation, 532 kB of additional disk space will be used. Get:1 http://archive.raspberrypi.org/debian/ jessie/main python-spidev armhf 2.0~git20150907 [7,724 B] Get:2 http://archive.raspberrypi.org/debian/ jessie/main python-gpiozero all 1.4.0 [89.4 kB] Fetched 97.1 kB in 0s (292 kB/s) Selecting previously unselected package python-spidev. (Reading database ... 50160 files and directories currently installed.) Preparing to unpack .../python-spidev_2.0~git20150907_armhf.deb ... Unpacking python-spidev (2.0~git20150907) ... Selecting previously unselected package python-gpiozero. Preparing to unpack .../python-gpiozero_1.4.0_all.deb ... Unpacking python-gpiozero (1.4.0) ... Setting up python-spidev (2.0~git20150907) ... Setting up python-gpiozero (1.4.0) ... Stopping OpenEnergyMonitor emonHub: emonhub has been stopped ok. Start ATmega328 serial upload using avrdude with latest.hex Discrete Sampling avrdude -c arduino -p ATMEGA328P -P /dev/ttyAMA0 -b 115200 -U flash:w:/home/pi/emonpi/firmware/compiled/latest.hex avrdude-original: Using autoreset DTR on GPIO Pin 7 Starting OpenEnergyMonitor emonHub: emonhub has been started ok. Start emonhub update script: ================================= EmonPi update started ================================= Running emonhub automatic node addition script EUID: 1000 EUID: 1000 [[5]] Node 5 already present [[6]] Node 6 already present [[7]] Node 7 already present [[8]] Node 8 already present [[9]] Node 9 already present [[10]] Node 10 already present [[11]] Node 11 already present Added node 12 to emonhub.conf Added node 13 to emonhub.conf Added node 14 to emonhub.conf [[19]] Node 19 already present [[20]] Node 20 already present [[21]] Node 21 already present [[22]] Node 22 already present [[23]] Node 23 already present [[24]] Node 24 already present [[25]] Node 25 already present [[26]] Node 26 already present Start emoncms update: ================================= Emoncms update started Emoncms update script V1.2.0 Sun 6 Jan 19:00:49 UTC 2019 ############################################################# emonSD version: emonSD-07Nov16 EUID: 1000 /home/pi/emonpi/emoncms-filesystem: parsed OK emonPi Emoncms admin file-system toggle buttons sudoers entry installed /home/pi/emonpi/emoncms-setup/emoncms-setup-sudoers: parsed OK Emoncms setup module sudoers entry installed current settings.php md5: 6922362a0a23fa0918bcc91b1fcf1ca3 Default settings.php md5: 6922362a0a23fa0918bcc91b1fcf1ca3 git pull /var/www/emoncms dev-mosquitto-php master * stable symlinked_modules On branch stable Your branch is up-to-date with 'origin/stable'. nothing to commit, working directory clean Updating 22c0ae9..59723e7 Fast-forward .gitignore | 5 + .htaccess | 11 +- .travis.yml | 98 +- Lib/EmonLogger.php | 6 + .../js/bootstrap-datepicker.js | 474 +++++ Lib/dbschemasetup.php | 391 +++- Lib/email.php | 13 +- Lib/enum.php | 31 + Lib/flot/jquery.flot.merged.js | 879 ++++++++ Lib/flot/merge.php | 27 + Lib/hammer.min.js | 7 + Lib/listjs/list.js | 9 +- Lib/misc/clipboard.js | 27 +- Lib/misc/sidebar.css | 69 + Lib/misc/sidebar.js | 61 + Lib/moment.min.js | 1 + Lib/momentjs-locales/cy.js | 79 + Lib/momentjs-locales/da.js | 59 + Lib/momentjs-locales/de.js | 75 + Lib/momentjs-locales/en-gb.js | 66 + Lib/momentjs-locales/es.js | 91 + Lib/momentjs-locales/et.js | 79 + Lib/momentjs-locales/fr.js | 82 + Lib/momentjs-locales/it.js | 68 + Lib/momentjs-locales/nl-be.js | 86 + Lib/momentjs-locales/nl.js | 86 + Lib/phpMQTT.php | 412 ---- Lib/responsive-linked-tables.js | 355 ++++ Lib/tablejs/COPYRIGHT.txt | 5 +- Lib/tablejs/custom-table-fields.js | 170 +- Lib/tablejs/expandtables.html | 91 + Lib/tablejs/table.js | 350 +++- Lib/travis-CI/emoncms.conf | 7 + Lib/travis-CI/travis-ci-apache | 25 + Lib/units.php | 33 + Modules/admin/admin_controller.php | 118 +- Modules/admin/admin_main_view.php | 258 ++- Modules/admin/admin_menu.php | 2 +- .../{en_EN => en_GB}/LC_MESSAGES/messages.mo | Bin .../{en_EN => en_GB}/LC_MESSAGES/messages.po | 0 Modules/admin/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 2132 -> 3710 bytes Modules/admin/locale/fr_FR/LC_MESSAGES/messages.po | 304 ++- Modules/admin/module.json | 4 + Modules/admin/pi-model.json | 237 +++ Modules/admin/update_view.php | 7 + Modules/admin/userlist_view.php | 175 +- Modules/eventp/eventp_processlist.php | 127 +- .../locale/fr_FR/LC_MESSAGES/eventp_messages.mo | Bin 0 -> 3747 bytes .../locale/fr_FR/LC_MESSAGES/eventp_messages.po | 1159 +++++++++++ Modules/eventp/module.json | 4 + Modules/feed/Views/feedapi_view.php | 35 +- Modules/feed/Views/feedlist_view.php | 369 +++- Modules/feed/Views/feedlist_view_v2.php | 1298 ++++++++++++ Modules/feed/engine/CassandraEngine.php | 295 +++ Modules/feed/engine/Histogram.php | 10 +- Modules/feed/engine/MysqlTimeSeries.php | 349 +++- Modules/feed/engine/PHPFina.php | 411 +++- Modules/feed/engine/PHPFinaTest.php | 164 ++ Modules/feed/engine/PHPFiwa.php | 12 +- Modules/feed/engine/PHPTimeSeries.php | 134 +- Modules/feed/engine/RedisBuffer.php | 14 +- Modules/feed/engine/TemplateEngine.php | 4 +- Modules/feed/engine/VirtualFeed.php | 27 +- Modules/feed/engine/shared_helper.php | 112 ++ Modules/feed/feed.js | 57 +- Modules/feed/feed_controller.php | 112 +- Modules/feed/feed_model.php | 503 ++++- Modules/feed/feed_schema.php | 10 +- .../{en_EN => en_GB}/LC_MESSAGES/messages.mo | Bin .../{en_EN => en_GB}/LC_MESSAGES/messages.po | 0 Modules/feed/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 3537 -> 12939 bytes Modules/feed/locale/fr_FR/LC_MESSAGES/messages.po | 2120 ++++++++++++-------- Modules/feed/module.json | 4 + Modules/input/Views/device_view.php | 645 ++++++ Modules/input/Views/input.js | 27 +- Modules/input/Views/input_api.php | 167 +- Modules/input/Views/input_dialog.js | 33 + Modules/input/Views/input_dialog.php | 54 + Modules/input/Views/input_view.php | 202 +- Modules/input/Views/schedule.php | 96 + Modules/input/input_controller.php | 377 ++-- Modules/input/input_methods.php | 332 +++ Modules/input/input_model.php | 518 ++++- Modules/input/input_schema.php | 6 +- .../{en_EN => en_GB}/LC_MESSAGES/messages.mo | Bin .../{en_EN => en_GB}/LC_MESSAGES/messages.po | 0 Modules/input/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 7444 -> 14290 bytes Modules/input/locale/fr_FR/LC_MESSAGES/messages.po | 825 +++++--- Modules/input/module.json | 4 + Modules/process/Views/process_api.php | 34 +- Modules/process/Views/process_ui.js | 723 ++++--- Modules/process/Views/process_ui.php | 96 +- .../locale/fr_FR/LC_MESSAGES/process_messages.mo | Bin 0 -> 26277 bytes .../locale/fr_FR/LC_MESSAGES/process_messages.po | 1415 +++++++++++++ Modules/process/module.json | 4 + Modules/process/process_langjs.php | 45 + Modules/process/process_model.php | 94 +- Modules/process/process_processlist.php | 916 +++++++-- Modules/schedule/Views/schedule_api.php | 63 +- Modules/schedule/Views/schedule_view.php | 70 +- .../LC_MESSAGES/schedule_messages.mo} | Bin .../LC_MESSAGES/schedule_messages.po} | 0 .../{messages.mo => schedule_messages.mo} | Bin .../{messages.po => schedule_messages.po} | 0 .../locale/et_EE/LC_MESSAGES/schedule_messages.mo | Bin 0 -> 2817 bytes .../locale/et_EE/LC_MESSAGES/schedule_messages.po | 167 ++ .../locale/fr_FR/LC_MESSAGES/schedule_messages.mo | Bin 0 -> 9072 bytes .../locale/fr_FR/LC_MESSAGES/schedule_messages.po | 355 ++++ Modules/schedule/module.json | 4 + Modules/schedule/schedule_menu.php | 4 +- Modules/schedule/schedule_model.php | 47 +- Modules/schedule/schedule_processlist.php | 73 +- Modules/schedule/schedule_schema.php | 4 +- Modules/time/module.json | 4 + Modules/time/time_controller.php | 16 +- Modules/user/deleteuser.php | 90 + .../{en_EN => en_GB}/LC_MESSAGES/messages.mo | Bin .../{en_EN => en_GB}/LC_MESSAGES/messages.po | 0 Modules/user/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 4393 -> 7664 bytes Modules/user/locale/fr_FR/LC_MESSAGES/messages.po | 1929 ++++++++++-------- Modules/user/login_block.php | 108 +- Modules/user/module.json | 4 + Modules/user/profile/profile.php | 277 ++- Modules/user/rememberme_model.php | 413 +++- Modules/user/user.js | 60 +- Modules/user/user_controller.php | 103 +- Modules/user/user_menu.php | 2 +- Modules/user/user_model.php | 705 +++++-- Modules/user/user_schema.php | 15 +- Modules/vis/Views/multigraph_edit.js | 546 +++-- Modules/vis/Views/vis_main_view.php | 50 +- .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 .../LC_MESSAGES/vis_messages.mo} | Bin .../LC_MESSAGES/vis_messages.po} | 0 .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 Modules/vis/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 2236 -> 0 bytes Modules/vis/locale/fr_FR/LC_MESSAGES/messages.po | 809 -------- .../vis/locale/fr_FR/LC_MESSAGES/vis_messages.mo | Bin 0 -> 11922 bytes .../vis/locale/fr_FR/LC_MESSAGES/vis_messages.po | 1484 ++++++++++++++ .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 Modules/vis/module.json | 4 + Modules/vis/multigraph_model.php | 40 +- Modules/vis/vis_controller.php | 18 +- Modules/vis/vis_langjs.php | 132 ++ Modules/vis/vis_menu.php | 8 +- Modules/vis/vis_object.php | 158 +- Modules/vis/vis_schema.php | 4 +- Modules/vis/visualisations/bargraph.php | 51 +- Modules/vis/visualisations/compare.php | 10 +- .../vis/visualisations/comparison/comparison.php | 9 +- .../dailyhistogram/dailyhistogram.php | 21 +- Modules/vis/visualisations/editdaily.php | 12 +- Modules/vis/visualisations/editrealtime.php | 10 +- Modules/vis/visualisations/graph.php | 9 +- Modules/vis/visualisations/histgraph.php | 8 +- Modules/vis/visualisations/multigraph.php | 19 +- .../vis/visualisations/multigraph/multigraph.js | 222 +- Modules/vis/visualisations/orderbars.php | 7 +- Modules/vis/visualisations/orderthreshold.php | 12 +- Modules/vis/visualisations/rawdata.php | 13 +- Modules/vis/visualisations/realtime.php | 8 +- Modules/vis/visualisations/simplezoom.php | 13 +- Modules/vis/visualisations/stacked.php | 10 +- Modules/vis/visualisations/stackedsolar.php | 10 +- Modules/vis/visualisations/threshold.php | 10 +- Modules/vis/visualisations/timecompare.php | 10 +- Modules/vis/visualisations/timestoredaily.php | 11 +- Modules/vis/visualisations/zoom.php | 13 +- Modules/vis/widget/vis_render.js | 75 +- Modules/vis/widget/vis_widget.php | 6 +- Theme/basic/ajax-loader.gif | Bin 0 -> 4663 bytes Theme/basic/emon-blue.css | 307 +++ Theme/basic/emon-standard.css | 307 +++ Theme/basic/emon-sun.css | 320 +++ Theme/basic/emon.css | 101 - Theme/basic/{emoncms_logo.png => logo_login.png} | Bin Theme/basic/menu_view.php | 10 +- Theme/basic/theme.php | 176 +- composer.json | 8 + composer.lock | 120 ++ core.php | 72 +- default.emonpi.settings.php | 30 +- default.settings.php | 27 +- docs/Cassandra.md | 38 + docs/LinuxInstall.md | 98 +- docs/RaspberryPi/Low-write-mode.md | 21 +- docs/RaspberryPi/MQTT.md | 34 +- docs/RaspberryPi/USB_HDD.md | 8 +- docs/RaspberryPi/general.md | 26 +- docs/RaspberryPi/jessie.md | 189 ++ docs/RaspberryPi/read-only.md | 30 +- docs/RaspberryPi/readme.md | 133 +- docs/Upgrading.md | 24 +- docs/gettext.md | 17 +- docs/input_encrypted.md | 52 + index.php | 72 +- locale.php | 65 +- param.php | 113 ++ process_settings.php | 93 +- readme.md | 103 +- route.php | 36 +- scripts/.htaccess | 1 + scripts/examples/mqtt_feed_subscriber.php | 81 +- scripts/examples/mqtt_input_publisher.php | 75 +- scripts/input_queue_processor.php | 2 +- scripts/logger/install.sh | 29 +- scripts/logger/logrotate.conf | 2 +- scripts/logger/rc.local | 2 +- scripts/logger/readme.md | 4 +- scripts/old.phpmqtt_input.php | 163 -- scripts/phpmqtt_input.php | 327 ++- scripts/process_langjs_builder.php | 57 + scripts/services/install-service-runner-update.md | 37 + scripts/services/service-runner/service-runner.py | 83 + .../services/service-runner/service-runner.service | 68 + scripts/vis_langjs_builder.php | 57 + test.php | 10 - tests/.gitignore | 4 + tests/Lib/emonCMS-travis-setup.js | 29 + tests/Lib/emoncms_tests_helper.js | 47 + tests/Lib/start_selenium_server.sh | 2 + tests/Lib/travis_login_details.js | 12 + tests/package.json | 18 + tests/readme.md | 46 + tests/specs/emonCMS-first-login.js | 19 + tests/wdio.conf.js | 277 +++ version.txt | 1 + 236 files changed, 24946 insertions(+), 6848 deletions(-) create mode 100644 Lib/bootstrap-datetimepicker-0.0.11/js/bootstrap-datepicker.js create mode 100644 Lib/flot/jquery.flot.merged.js create mode 100644 Lib/flot/merge.php create mode 100644 Lib/hammer.min.js create mode 100644 Lib/misc/sidebar.css create mode 100644 Lib/misc/sidebar.js create mode 100644 Lib/moment.min.js create mode 100644 Lib/momentjs-locales/cy.js create mode 100644 Lib/momentjs-locales/da.js create mode 100644 Lib/momentjs-locales/de.js create mode 100644 Lib/momentjs-locales/en-gb.js create mode 100644 Lib/momentjs-locales/es.js create mode 100644 Lib/momentjs-locales/et.js create mode 100644 Lib/momentjs-locales/fr.js create mode 100644 Lib/momentjs-locales/it.js create mode 100644 Lib/momentjs-locales/nl-be.js create mode 100644 Lib/momentjs-locales/nl.js delete mode 100644 Lib/phpMQTT.php create mode 100644 Lib/responsive-linked-tables.js create mode 100644 Lib/tablejs/expandtables.html create mode 100644 Lib/travis-CI/emoncms.conf create mode 100644 Lib/travis-CI/travis-ci-apache create mode 100644 Lib/units.php rename Modules/admin/locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo (100%) rename Modules/admin/locale/{en_EN => en_GB}/LC_MESSAGES/messages.po (100%) create mode 100644 Modules/admin/module.json create mode 100644 Modules/admin/pi-model.json create mode 100644 Modules/eventp/locale/fr_FR/LC_MESSAGES/eventp_messages.mo create mode 100644 Modules/eventp/locale/fr_FR/LC_MESSAGES/eventp_messages.po create mode 100644 Modules/eventp/module.json create mode 100644 Modules/feed/Views/feedlist_view_v2.php create mode 100644 Modules/feed/engine/CassandraEngine.php create mode 100644 Modules/feed/engine/PHPFinaTest.php rename Modules/feed/locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo (100%) rename Modules/feed/locale/{en_EN => en_GB}/LC_MESSAGES/messages.po (100%) create mode 100644 Modules/feed/module.json create mode 100644 Modules/input/Views/device_view.php create mode 100644 Modules/input/Views/input_dialog.js create mode 100644 Modules/input/Views/input_dialog.php create mode 100644 Modules/input/Views/schedule.php create mode 100644 Modules/input/input_methods.php rename Modules/input/locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo (100%) rename Modules/input/locale/{en_EN => en_GB}/LC_MESSAGES/messages.po (100%) create mode 100644 Modules/input/module.json create mode 100644 Modules/process/locale/fr_FR/LC_MESSAGES/process_messages.mo create mode 100644 Modules/process/locale/fr_FR/LC_MESSAGES/process_messages.po create mode 100644 Modules/process/module.json create mode 100644 Modules/process/process_langjs.php rename Modules/schedule/locale/{en_EN/LC_MESSAGES/messages.mo => en_GB/LC_MESSAGES/schedule_messages.mo} (100%) rename Modules/schedule/locale/{en_EN/LC_MESSAGES/messages.po => en_GB/LC_MESSAGES/schedule_messages.po} (100%) rename Modules/schedule/locale/es_ES/LC_MESSAGES/{messages.mo => schedule_messages.mo} (100%) rename Modules/schedule/locale/es_ES/LC_MESSAGES/{messages.po => schedule_messages.po} (100%) create mode 100644 Modules/schedule/locale/et_EE/LC_MESSAGES/schedule_messages.mo create mode 100644 Modules/schedule/locale/et_EE/LC_MESSAGES/schedule_messages.po create mode 100644 Modules/schedule/locale/fr_FR/LC_MESSAGES/schedule_messages.mo create mode 100644 Modules/schedule/locale/fr_FR/LC_MESSAGES/schedule_messages.po create mode 100644 Modules/schedule/module.json create mode 100644 Modules/time/module.json create mode 100644 Modules/user/deleteuser.php rename Modules/user/locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo (100%) rename Modules/user/locale/{en_EN => en_GB}/LC_MESSAGES/messages.po (100%) create mode 100644 Modules/user/module.json rename Modules/vis/locale/da_DK/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/da_DK/LC_MESSAGES/{messages.po => vis_messages.po} (100%) rename Modules/vis/locale/de_DE/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/de_DE/LC_MESSAGES/{messages.po => vis_messages.po} (100%) rename Modules/vis/locale/{en_EN/LC_MESSAGES/messages.mo => en_GB/LC_MESSAGES/vis_messages.mo} (100%) rename Modules/vis/locale/{en_EN/LC_MESSAGES/messages.po => en_GB/LC_MESSAGES/vis_messages.po} (100%) rename Modules/vis/locale/es_ES/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/es_ES/LC_MESSAGES/{messages.po => vis_messages.po} (100%) delete mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/messages.mo delete mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/messages.po create mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/vis_messages.mo create mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/vis_messages.po rename Modules/vis/locale/it_IT/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/it_IT/LC_MESSAGES/{messages.po => vis_messages.po} (100%) rename Modules/vis/locale/nl_BE/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/nl_BE/LC_MESSAGES/{messages.po => vis_messages.po} (100%) rename Modules/vis/locale/nl_NL/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/nl_NL/LC_MESSAGES/{messages.po => vis_messages.po} (100%) create mode 100644 Modules/vis/module.json create mode 100644 Modules/vis/vis_langjs.php create mode 100644 Theme/basic/ajax-loader.gif create mode 100644 Theme/basic/emon-blue.css create mode 100644 Theme/basic/emon-standard.css create mode 100644 Theme/basic/emon-sun.css delete mode 100644 Theme/basic/emon.css rename Theme/basic/{emoncms_logo.png => logo_login.png} (100%) create mode 100644 composer.json create mode 100644 composer.lock create mode 100644 docs/Cassandra.md create mode 100644 docs/RaspberryPi/jessie.md create mode 100644 docs/input_encrypted.md create mode 100644 param.php create mode 100644 scripts/.htaccess delete mode 100644 scripts/old.phpmqtt_input.php create mode 100644 scripts/process_langjs_builder.php create mode 100644 scripts/services/install-service-runner-update.md create mode 100755 scripts/services/service-runner/service-runner.py create mode 100644 scripts/services/service-runner/service-runner.service create mode 100644 scripts/vis_langjs_builder.php delete mode 100644 test.php create mode 100644 tests/.gitignore create mode 100644 tests/Lib/emonCMS-travis-setup.js create mode 100644 tests/Lib/emoncms_tests_helper.js create mode 100755 tests/Lib/start_selenium_server.sh create mode 100644 tests/Lib/travis_login_details.js create mode 100644 tests/package.json create mode 100644 tests/readme.md create mode 100644 tests/specs/emonCMS-first-login.js create mode 100644 tests/wdio.conf.js create mode 100644 version.txt NEW default settings.php md5: bfcadb4356440ffc96c06a5d91aa2a02 settings.php has NOT been user modifed Update required to settings.php... settings.php autoupdated git pull /var/www/emoncms/Modules/app * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean Updating 6d07ab2..94afc98 Fast-forward AppConfig_model.php | 177 ++-- app2.js | 176 ---- app_controller.php | 142 +++- app_menu.php | 19 +- apps/blank.php | 103 +++ apps/costcomparison.php | 780 +++++++++++++++++ apps/myelectric.php | 606 ++++++++++++++ apps/myelectric2.php | 816 ++++++++++++++++++ apps/myenergy.php | 515 ++++++++++++ apps/myheatpump.php | 811 ++++++++++++++++++ apps/mysolarpv.php | 762 +++++++++++++++++ apps/mysolarpvdivert.php | 1163 ++++++++++++++++++++++++++ apps/openevse.php | 618 ++++++++++++++ apps/template.php | 120 +++ apps/timeofuse.php | 847 +++++++++++++++++++ {myenergy => archive/myenergy}/myenergy.html | 0 {myenergy => archive/myenergy}/myenergy.js | 76 +- available_apps.php | 53 ++ client.php | 100 --- css/app (copy).css | 220 +++++ css/config.css | 53 ++ css/dark.css | 135 +++ css/light.css | 92 ++ css/pagenav.css | 69 ++ images/costcomparison_app.png | Bin 0 -> 38798 bytes lib/config.js | 505 ++++++----- lib/costcomparison_rates.js | 198 +++++ lib/feed.js | 41 +- lib/graph_bars.js | 2 +- lib/graph_lines.js | 23 + lib/timeseries.js | 14 +- list_view.php | 112 +++ module.json | 4 + myelectric/myelectric.html | 110 --- myelectric/myelectric.js | 422 ---------- mysolarpv/mysolarpv.html | 121 --- mysolarpv/mysolarpv.js | 590 ------------- mysolarpvdivert/mysolarpvdivert.html | 274 ------ mysolarpvdivert/mysolarpvdivert.js | 821 ------------------ sidebar.php | 82 ++ style.css | 175 ---- vis.helper.js | 85 +- 42 files changed, 8845 insertions(+), 3187 deletions(-) delete mode 100644 app2.js create mode 100644 apps/blank.php create mode 100644 apps/costcomparison.php create mode 100644 apps/myelectric.php create mode 100644 apps/myelectric2.php create mode 100644 apps/myenergy.php create mode 100644 apps/myheatpump.php create mode 100644 apps/mysolarpv.php create mode 100644 apps/mysolarpvdivert.php create mode 100644 apps/openevse.php create mode 100644 apps/template.php create mode 100644 apps/timeofuse.php rename {myenergy => archive/myenergy}/myenergy.html (100%) rename {myenergy => archive/myenergy}/myenergy.js (82%) create mode 100644 available_apps.php delete mode 100644 client.php create mode 100644 css/app (copy).css create mode 100644 css/config.css create mode 100644 css/dark.css create mode 100644 css/light.css create mode 100644 css/pagenav.css create mode 100644 images/costcomparison_app.png create mode 100644 lib/costcomparison_rates.js create mode 100644 list_view.php create mode 100644 module.json delete mode 100644 myelectric/myelectric.html delete mode 100644 myelectric/myelectric.js delete mode 100644 mysolarpv/mysolarpv.html delete mode 100644 mysolarpv/mysolarpv.js delete mode 100644 mysolarpvdivert/mysolarpvdivert.html delete mode 100644 mysolarpvdivert/mysolarpvdivert.js create mode 100644 sidebar.php delete mode 100644 style.css Branch stable set up to track remote branch stable from origin. git pull /var/www/emoncms/Modules/config * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean Updating faabc47..cf5b1a6 Fast-forward emonnhub-sudoers => emonhub-sudoers | 0 module.json | 4 ++++ 2 files changed, 4 insertions(+) rename emonnhub-sudoers => emonhub-sudoers (100%) create mode 100644 module.json Branch stable set up to track remote branch stable from origin. git pull /var/www/emoncms/Modules/wifi * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean Updating 4db701d..cb78a15 Fast-forward README.md | 2 +- icons/ajax-loader.gif | Bin 0 -> 3208 bytes icons/wifi0.png | Bin 0 -> 760 bytes icons/wifi0secure.png | Bin 0 -> 1331 bytes icons/wifi1.png | Bin 0 -> 766 bytes icons/wifi1secure.png | Bin 0 -> 1332 bytes icons/wifi2.png | Bin 0 -> 755 bytes icons/wifi2secure.png | Bin 0 -> 1301 bytes icons/wifi3.png | Bin 0 -> 766 bytes icons/wifi3secure.png | Bin 0 -> 1263 bytes icons/wifi4.png | Bin 0 -> 1353 bytes icons/wifi4secure.png | Bin 0 -> 1422 bytes view.html | 21 +++++++++++--- wifi.php | 16 +++++++++++ wifi_controller.php | 75 ++++++++++++++++++++++++++++++++------------------ wifi_menu.php | 1 + 16 files changed, 83 insertions(+), 32 deletions(-) create mode 100644 icons/ajax-loader.gif create mode 100644 icons/wifi0.png create mode 100644 icons/wifi0secure.png create mode 100644 icons/wifi1.png create mode 100644 icons/wifi1secure.png create mode 100644 icons/wifi2.png create mode 100644 icons/wifi2secure.png create mode 100644 icons/wifi3.png create mode 100644 icons/wifi3secure.png create mode 100644 icons/wifi4.png create mode 100644 icons/wifi4secure.png Branch stable set up to track remote branch stable from origin. git pull /var/www/emoncms/Modules/dashboard On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Updating 6b0073d..617af6e Fast-forward AntiXSS/filter_test.php | 24 + AntiXSS/php5/AntiXSS.php | 2905 +++++++++ AntiXSS/php5/Bootup.php | 194 + AntiXSS/php5/UTF8.php | 7491 +++++++++++++++++++++++ AntiXSS/php5/data/caseFolding_full.php | 222 + AntiXSS/php5/data/chr.php | 264 + AntiXSS/php5/data/encodings.php | 428 ++ AntiXSS/php5/data/ord.php | 264 + AntiXSS/php5/data/utf8_fix.php | 94 + AntiXSS/php5/data/utf8_msword.php | 23 + AntiXSS/php5/data/win1252_to_utf8.php | 130 + AntiXSS/php7/AntiXSS.php | 2905 +++++++++ AntiXSS/php7/Bootup.php | 195 + AntiXSS/php7/UTF8.php | 7201 ++++++++++++++++++++++ AntiXSS/php7/data/caseFolding_full.php | 222 + AntiXSS/php7/data/chr.php | 264 + AntiXSS/php7/data/encodings.php | 428 ++ AntiXSS/php7/data/ord.php | 264 + AntiXSS/php7/data/utf8_fix.php | 94 + AntiXSS/php7/data/utf8_msword.php | 23 + AntiXSS/php7/data/win1252_to_utf8.php | 130 + LICENSE.txt | 619 ++ Readme.md | 2 + Views/dashboard_config.php | 66 +- Views/dashboard_edit_view.php | 38 +- Views/dashboard_list.php | 5 +- Views/dashboard_view.php | 17 +- Views/js/designer.js | 263 +- Views/js/render.js | 11 + Views/js/widget.css | 8 - Views/js/widgetlist.js | 12 +- Views/loadwidgets.php | 2 +- dashboard | 1 + dashboard.js | 4 +- dashboard_controller.php | 5 +- dashboard_langjs.php | 550 +- dashboard_model.php | 127 +- dashboard_schema.php | 5 +- locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo | Bin locale/{en_EN => en_GB}/LC_MESSAGES/messages.po | 0 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 5200 -> 15636 bytes locale/fr_FR/LC_MESSAGES/messages.po | 1314 +++- module.json | 4 + widget/bar/bar_render.js | 573 +- widget/battery/battery_render.js | 200 +- widget/button/button_render.js | 2 + widget/curl/curl_render.js | 8 +- widget/cylinder/cylinder_render.js | 211 +- widget/dewpoint/dewpoint_render.js | 283 +- widget/dial/dial_render.js | 558 +- widget/feedtime/feedtime_render.js | 261 + widget/feedvalue/feedvalue_render.js | 295 +- widget/frostpoint/frostpoint_render.js | 311 + widget/heatindex/heatindex_render.js | 350 ++ widget/humidex/humidex_render.js | 285 + widget/isactivefeed/isactivefeed_render.js | 206 + widget/jgauge/jgauge_render.js | 6 +- widget/jgauge2/jgauge2_render.js | 9 +- widget/led/led_render.js | 205 +- widget/signal/signal_render.js | 206 + widget/sun/sun_render.js | 136 +- widget/thermometer/thermometer_render.js | 580 ++ widget/thresholds/thresholds_render.js | 175 + widget/windrose/windrose_render.js | 9 +- 64 files changed, 30522 insertions(+), 1165 deletions(-) create mode 100644 AntiXSS/filter_test.php create mode 100644 AntiXSS/php5/AntiXSS.php create mode 100644 AntiXSS/php5/Bootup.php create mode 100644 AntiXSS/php5/UTF8.php create mode 100644 AntiXSS/php5/data/caseFolding_full.php create mode 100644 AntiXSS/php5/data/chr.php create mode 100644 AntiXSS/php5/data/encodings.php create mode 100644 AntiXSS/php5/data/ord.php create mode 100644 AntiXSS/php5/data/utf8_fix.php create mode 100644 AntiXSS/php5/data/utf8_msword.php create mode 100644 AntiXSS/php5/data/win1252_to_utf8.php create mode 100644 AntiXSS/php7/AntiXSS.php create mode 100644 AntiXSS/php7/Bootup.php create mode 100644 AntiXSS/php7/UTF8.php create mode 100644 AntiXSS/php7/data/caseFolding_full.php create mode 100644 AntiXSS/php7/data/chr.php create mode 100644 AntiXSS/php7/data/encodings.php create mode 100644 AntiXSS/php7/data/ord.php create mode 100644 AntiXSS/php7/data/utf8_fix.php create mode 100644 AntiXSS/php7/data/utf8_msword.php create mode 100644 AntiXSS/php7/data/win1252_to_utf8.php create mode 100644 LICENSE.txt create mode 120000 dashboard rename locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo (100%) rename locale/{en_EN => en_GB}/LC_MESSAGES/messages.po (100%) create mode 100644 module.json create mode 100644 widget/feedtime/feedtime_render.js create mode 100644 widget/frostpoint/frostpoint_render.js create mode 100644 widget/heatindex/heatindex_render.js create mode 100644 widget/humidex/humidex_render.js create mode 100644 widget/isactivefeed/isactivefeed_render.js create mode 100644 widget/signal/signal_render.js create mode 100644 widget/thermometer/thermometer_render.js create mode 100644 widget/thresholds/thresholds_render.js Branch stable set up to track remote branch stable from origin. git pull /var/www/emoncms/Modules/graph * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Updating e68cdc7..a205709 Fast-forward Lib/bootstrap-switch.css | 187 ++++++ Lib/bootstrap-switch.js | 784 ++++++++++++++++++++++++ embed.php | 40 +- graph.css | 121 ++++ graph.js | 484 +++++++++++---- graph_controller.php | 38 +- graph_model.php | 109 +++- graph_schema.php | 1 + group_graph.js | 1482 ++++++++++++++++++++++++++++++++++++++++++++++ group_view.php | 367 ++++++++++++ module.json | 4 + view.php | 184 ++++-- vis.helper.js | 13 + widget/graph_widget.php | 39 +- 14 files changed, 3661 insertions(+), 192 deletions(-) create mode 100644 Lib/bootstrap-switch.css create mode 100644 Lib/bootstrap-switch.js create mode 100644 graph.css create mode 100644 group_graph.js create mode 100644 group_view.php create mode 100644 module.json Branch stable set up to track remote branch stable from origin. git pull /home/pi/postprocess Your branch is up-to-date with 'remotes/origin/emonpi'. Updating 93c7cd7..d392f91 Fast-forward exportcalc.php | 109 ------------ postprocess-module/module.json | 4 + .../postprocess_controller.php | 132 ++++++++++---- postprocess-module/postprocess_menu.php | 7 + postprocess-module/postprocess_model.php | 56 ++++++ postprocess-module/postprocess_schema.php | 6 + .../postprocess => postprocess-module}/view.js | 0 .../postprocess => postprocess-module}/view.php | 0 postprocess.php | 43 ----- postprocess.sh | 3 + postprocess_run.php | 78 ++++++++ processes/accumulator.php | 80 +++++++++ processes/addfeeds.php | 129 ++++++++++++++ processes/exportcalc.php | 129 ++++++++++++++ processes/importcalc.php | 129 ++++++++++++++ processes/mergefeeds.php | 129 ++++++++++++++ processes/offsetfeed.php | 80 +++++++++ powertokwh.php => processes/powertokwh.php | 0 processes/removenan.php | 80 +++++++++ processes/removeresets.php | 85 +++++++++ processes/scalefeed.php | 80 +++++++++ trimfeedstart.php => processes/trimfeedstart.php | 2 + readme.md | 15 +- storageserver/html/postprocess/.htaccess | 196 --------------------- storageserver/html/postprocess/index.php | 47 ----- 25 files changed, 1187 insertions(+), 432 deletions(-) delete mode 100644 exportcalc.php create mode 100644 postprocess-module/module.json rename {mainserver/postprocess => postprocess-module}/postprocess_controller.php (59%) create mode 100644 postprocess-module/postprocess_menu.php create mode 100644 postprocess-module/postprocess_model.php create mode 100644 postprocess-module/postprocess_schema.php rename {mainserver/postprocess => postprocess-module}/view.js (100%) rename {mainserver/postprocess => postprocess-module}/view.php (100%) delete mode 100644 postprocess.php create mode 100755 postprocess.sh create mode 100644 postprocess_run.php create mode 100644 processes/accumulator.php create mode 100644 processes/addfeeds.php create mode 100644 processes/exportcalc.php create mode 100644 processes/importcalc.php create mode 100644 processes/mergefeeds.php create mode 100644 processes/offsetfeed.php rename powertokwh.php => processes/powertokwh.php (100%) create mode 100644 processes/removenan.php create mode 100644 processes/removeresets.php create mode 100644 processes/scalefeed.php rename trimfeedstart.php => processes/trimfeedstart.php (96%) delete mode 100644 storageserver/html/postprocess/.htaccess delete mode 100644 storageserver/html/postprocess/index.php git clone https://github.com/emoncms/sync Your branch is up-to-date with 'origin/master'. git clone https://github.com/emoncms/device Your branch is up-to-date with 'origin/master'. git pull /home/pi/backup * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean pi@emonpi(ro):~$