Starting emonPi Update > EUID: 1000 Mon 20 Mar 20:08:53 UTC 2017 emonSD-07Nov16 git pull /home/pi/emonpi Updating 703f1b2..91d2e6f Fast-forward docs/SD-card-build.md | 5 +- emoncmsupdate | 44 +- emonhub-sudoers | 1 + firmware/compiled/archive/emonPi_V2.8.2.hex | 1120 +++++++++++++ firmware/compiled/latest.hex | 2056 ++++++++++++------------ firmware/libraries/Readme.md | 4 +- firmware/platformio.ini | 7 + firmware/readme.md | 11 + firmware/src/lcd_serial.ino | 36 +- firmware/src/src.ino | 23 +- 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 | 41 +- lcd/emonPiLCD_update.py | 21 +- lcd/lcd_test.py | 10 +- lcd/lcddriver.py | 7 +- rfm69piupdate.sh | 33 + service-runner | 11 +- service-runner-update.sh | 41 +- update | 4 + 24 files changed, 2599 insertions(+), 1085 deletions(-) create mode 100644 emonhub-sudoers create mode 100644 firmware/compiled/archive/emonPi_V2.8.2.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 git pull /home/pi/emonhub Updating 70b7847..3453090 Fast-forward README.md | 49 +-- conf/emonhub.conf | 8 +- conf/emonpi.default.emonhub.conf | 8 +- 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 + .../graphite/{graphite.readme.md => readme.md} | 0 .../modbus/{modbusTCP.readme.md => readme.md} | 0 conf/interfacer_examples/smasolar/readme.md | 68 ++++ .../smasolar/smasolar.emonhub.conf | 17 + .../smilices/{smilics.readme.md => readme.md} | 0 .../vedirect/{vedirect.readme.md => readme.md} | 0 configuration.md | 16 +- src/emonhub.py | 28 +- src/emonhub_setup.py | 4 +- src/interfacers/EmonHubBMWInterfacer.py | 294 ++++++++++++++++ src/interfacers/EmonHubJeeInterfacer.py | 7 +- src/interfacers/EmonHubSMASolarInterfacer.py | 313 ++++++++++++++++ src/interfacers/EmonHubTx3eInterfacer.py | 196 +++++++++++ src/smalibrary/SMABluetoothPacket.py | 198 +++++++++++ src/smalibrary/SMANET2PlusPacket.py | 231 ++++++++++++ src/smalibrary/SMASolar_library.py | 392 +++++++++++++++++++++ src/smalibrary/__init__.py | 0 25 files changed, 1954 insertions(+), 47 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 rename conf/interfacer_examples/graphite/{graphite.readme.md => readme.md} (100%) rename conf/interfacer_examples/modbus/{modbusTCP.readme.md => readme.md} (100%) create mode 100644 conf/interfacer_examples/smasolar/readme.md create mode 100644 conf/interfacer_examples/smasolar/smasolar.emonhub.conf rename conf/interfacer_examples/smilices/{smilics.readme.md => readme.md} (100%) rename conf/interfacer_examples/vedirect/{vedirect.readme.md => readme.md} (100%) create mode 100644 src/interfacers/EmonHubBMWInterfacer.py create mode 100644 src/interfacers/EmonHubSMASolarInterfacer.py create mode 100644 src/interfacers/EmonHubTx3eInterfacer.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 Updating 125ea33..f7a12a1 Fast-forward oem.items | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) git pull /home/pi/usefulscripts git pull /home/pi/huawei-hilink-status Start emonPi Atmega328 firmware update: ================================= EmonPi update started ================================= EUID: 1000 Requirement already up-to-date: paho-mqtt in /usr/local/lib/python2.7/dist-packages 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 [[12]] Node 12 already present [[13]] Node 13 already present [[14]] Node 14 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 20 Mar 20:10:18 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'. Untracked files: (use "git add ..." to include in what will be committed) images/ nothing added to commit but untracked files present (use "git add" to track) Updating db0e857..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 | 31 ++++++-- Modules/feed/Views/feedlist_view.php | 2 +- Modules/input/input_menu.php | 2 +- Modules/user/profile/profile.php | 4 +- Modules/user/user.js | 6 +- Modules/vis/multigraph_model.php | 2 +- Modules/vis/visualisations/compare.php | 4 +- Theme/basic/theme.php | 2 +- docs/LinuxInstall.md | 10 +-- docs/RaspberryPi/MQTT.md | 48 +++++++++++-- docs/RaspberryPi/readme.md | 4 +- index.php | 2 +- readme.md | 4 ++ scripts/mqtt_input.service | 56 +++++++++++++++ scripts/phpmqtt_input.php | 18 ++--- 23 files changed, 260 insertions(+), 120 deletions(-) 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 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 Updating a28f027..faabc47 Fast-forward README.md | 6 ++++++ config_controller.php | 11 ++++++++--- edit.php | 23 ++++++++++++++++++----- emonnhub-sudoers | 1 + 4 files changed, 33 insertions(+), 8 deletions(-) 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 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'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: Views/js/widget.css modified: Views/js/widgetlist.js Untracked files: (use "git add ..." to include in what will be committed) Views/js/widget.css-old Views/js/widgetlist.js-old widget/feed_10pt/ widget/feed_14pt/ widget/feed_8pt/ widget/feedhalfsize/ widget/jgaugegrid/ widget/jgaugesolar/ widget/nest/ widget/pvhorizontal/ widget/pvvertical/ widget/small_led/ widget/smallfeedvalue/ no changes added to commit (use "git add" and/or "git commit -a") Updating e1732e5..624bced Fast-forward Views/dashboard_edit_view.php | 15 +- Views/dashboard_view.php | 10 +- dashboard_langjs.php | 18 ++ 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/dial/dial_render.js | 6 +- widget/feedvalue/feedvalue_render.js | 12 +- widget/jgauge/jgauge_render.js | 4 +- widget/jgauge2/jgauge2_render.js | 8 +- widget/windrose/windrose_render.js | 8 +- 14 files changed, 628 insertions(+), 364 deletions(-) create mode 100644 widget/battery/battery_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 Updating 3d18ee5..e68cdc7 Fast-forward embed.php | 5 +++++ graph.js | 19 +++++++++++++------ view.php | 7 +++++++ 3 files changed, 25 insertions(+), 6 deletions(-) git pull /home/pi/postprocess 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 Already up-to-date. replacing initd mqtt_input with systemd mqtt input Stopping Daemon for the emoncms MQTT script: mqtt_input. Update Emoncms database [] 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.. Filesystem is locked - Read Only access type ' rpi-rw ' to unlock Mon 20 Mar 20:11:59 UTC 2017 ................... emonPi update done Filesystem is unlocked - Write access type ' rpi-ro ' to lock ############################################################# I2C LCD DETECTED Ox27 Starting emonPi Update > via service-runner-update.sh EUID: 1000 Argument: emonpi Sun 14 May 20:30:00 UTC 2017 ############################################################# emonSD-07Nov16 git pull /home/pi/emonpi * master wifiap On branch master Your branch is up-to-date with 'origin/master'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: rc.local_jessieminimal Untracked files: (use "git add ..." to include in what will be committed) 1 Atmega328/emonPi_RFM69CW_RF12Demo_DiscreteSampling/compiled/emonPi_Firmware.hex hardware/emonpi/emonpi2c/ lcd/gsmhuaweistatus.pyc lcd/i2c_lib.pyc lcd/lcddriver.pyc no changes added to commit (use "git add" and/or "git commit -a") Updating 91d2e6f..fad6524 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'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: src/interfacers/EmonModbusTcpInterfacer.py no changes added to commit (use "git add" and/or "git commit -a") Updating 3453090..0a4da93 Fast-forward conf/interfacer_examples/directserial/readme.md | 26 +- conf/interfacer_examples/smasolar/readme.md | 8 +- .../smasolar/smasolar.emonhub.conf | 2 +- src/interfacers/EmonHubSMASolarInterfacer.py | 242 +++++------ src/interfacers/EmonHubTx3eInterfacer.py | 100 +---- src/smalibrary/SMABluetoothPacket.py | 64 +-- src/smalibrary/SMANET2PlusPacket.py | 251 ++++++----- src/smalibrary/SMASolar_library.py | 474 +++++++++++---------- 8 files changed, 550 insertions(+), 617 deletions(-) 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 paho-mqtt-1.2.3.tar.gz (72kB) 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/f3/c1/ac/0d44a83f4672267263cd26d9efba6babebff13b7a5593e1fb7 Successfully built paho-mqtt Installing collected packages: paho-mqtt Found existing installation: paho-mqtt 1.2 Uninstalling paho-mqtt-1.2: Successfully uninstalled paho-mqtt-1.2 Successfully installed paho-mqtt-1.2.3 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 [[12]] Node 12 already present [[13]] Node 13 already present [[14]] Node 14 already present #[[15]] [[15]] Node 15 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 Sun 14 May 20:31:23 UTC 2017 EUID: 1000 Checking cron tab for service runner entry... service runner crontab entry already installed git pull /var/www/emoncms dev-mosquitto-php master * stable symlinked_modules On branch stable Your branch is up-to-date with 'origin/stable'. Untracked files: (use "git add ..." to include in what will be committed) images/ nothing added to commit but untracked files present (use "git add" to track) Updating 22c0ae9..243ec18 Fast-forward .travis.yml | 1 - Lib/tablejs/COPYRIGHT.txt | 5 +- Lib/tablejs/custom-table-fields.js | 99 +++++----- Lib/tablejs/expandtables.html | 91 +++++++++ Lib/tablejs/table.js | 283 +++++++++++++++++++--------- Modules/admin/admin_controller.php | 15 ++ Modules/admin/admin_main_view.php | 28 ++- Modules/eventp/eventp_processlist.php | 10 +- Modules/feed/Views/feedapi_view.php | 9 +- Modules/feed/Views/feedlist_view.php | 44 +++-- Modules/feed/engine/PHPFina.php | 213 ++++++++++++++++++--- Modules/feed/engine/VirtualFeed.php | 13 +- Modules/feed/feed_controller.php | 47 ++++- Modules/feed/feed_model.php | 86 ++++++++- Modules/input/Views/input_api.php | 8 +- Modules/input/Views/input_dialog.js | 33 ++++ Modules/input/Views/input_dialog.php | 24 +++ Modules/input/Views/input_view.php | 185 ++++++++---------- Modules/input/input_controller.php | 94 +++++---- Modules/input/input_model.php | 18 +- Modules/process/Views/process_ui.js | 113 +++++++---- Modules/process/process_model.php | 36 +++- Modules/process/process_processlist.php | 105 ++++++----- Modules/schedule/Views/schedule_view.php | 31 +-- Modules/schedule/schedule_processlist.php | 8 +- Modules/user/profile/profile.php | 50 +++-- Modules/user/user.js | 20 +- Modules/user/user_controller.php | 2 +- Modules/user/user_model.php | 54 +++++- Modules/user/user_schema.php | 3 +- Modules/vis/vis_controller.php | 4 +- Modules/vis/visualisations/bargraph.php | 15 +- Modules/vis/widget/vis_render.js | 9 +- Theme/basic/ajax-loader.gif | Bin 0 -> 4663 bytes Theme/basic/emon-blue.css | 134 +++++++++++++ Theme/basic/{emon.css => emon-standard.css} | 14 +- Theme/basic/menu_view.php | 6 +- Theme/basic/theme.php | 38 ++-- core.php | 2 +- default.emonpi.settings.php | 8 +- default.settings.php | 8 +- docs/LinuxInstall.md | 6 +- docs/RaspberryPi/readme.md | 4 +- docs/gettext.md | 17 +- index.php | 18 +- process_settings.php | 87 ++++----- readme.md | 89 +++++++-- scripts/phpmqtt_input.php | 94 +++++---- 48 files changed, 1624 insertions(+), 657 deletions(-) create mode 100644 Lib/tablejs/expandtables.html create mode 100644 Modules/input/Views/input_dialog.js create mode 100644 Modules/input/Views/input_dialog.php create mode 100644 Theme/basic/ajax-loader.gif create mode 100644 Theme/basic/emon-blue.css rename Theme/basic/{emon.css => emon-standard.css} (88%) 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..1a2207b Fast-forward AppConfig_model.php | 177 ++-- app2.js | 176 ---- app_controller.php | 136 ++- app_menu.php | 19 +- apps/myelectric.php | 586 +++++++++++++ apps/myelectric2.php | 760 +++++++++++++++++ apps/myenergy.php | 514 ++++++++++++ apps/myheatpump.php | 807 ++++++++++++++++++ apps/mysolarpv.php | 758 +++++++++++++++++ apps/mysolarpvdivert.php | 1157 ++++++++++++++++++++++++++ apps/openevse.php | 615 ++++++++++++++ apps/template.php | 116 +++ apps/timeofuse.php | 780 +++++++++++++++++ {myenergy => archive/myenergy}/myenergy.html | 0 {myenergy => archive/myenergy}/myenergy.js | 76 +- available_apps.php | 48 ++ client.php | 100 --- css/app (copy).css | 220 +++++ css/config.css | 48 ++ css/dark.css | 96 +++ css/light.css | 62 ++ css/pagenav.css | 69 ++ lib/config.js | 481 ++++++----- lib/feed.js | 27 +- lib/timeseries.js | 14 +- list_view.php | 102 +++ 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 +- 35 files changed, 7446 insertions(+), 3178 deletions(-) delete mode 100644 app2.js 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 list_view.php 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 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 Already up-to-date. 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..14fa926 Fast-forward view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) git pull /var/www/emoncms/Modules/dashboard environ-master * master On branch master Your branch is up-to-date with 'origin/master'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: Views/js/widget.css modified: Views/js/widgetlist.js Untracked files: (use "git add ..." to include in what will be committed) Views/js/widget.css-old Views/js/widgetlist.js-old widget/feed_10pt/ widget/feed_14pt/ widget/feed_8pt/ widget/feedhalfsize/ widget/jgaugegrid/ widget/jgaugesolar/ widget/nest/ widget/pvhorizontal/ widget/pvvertical/ widget/small_led/ widget/smallfeedvalue/ no changes added to commit (use "git add" and/or "git commit -a") Updating 624bced..e873139 Fast-forward dashboard_langjs.php | 16 +++- widget/battery/battery_render.js | 6 +- widget/dial/dial_render.js | 79 +++++++++++++++-- widget/signal/signal_render.js | 185 ++++++++++++++++++++++++++++++++++++++ widget/sun/sun_render.js | 187 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 462 insertions(+), 11 deletions(-) create mode 100644 widget/signal/signal_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 Already up-to-date. git pull /home/pi/postprocess Your branch is up-to-date with 'remotes/origin/emonpi'. git pull /home/pi/backup * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Already up-to-date. update mqtt_input systemd unit file Update Emoncms database

settings.php file error

settings.php config file has new settings for this version. Copy default.settings.php to settings.php and modify the later.

To fix, check that the settings are set in settings.php or try re-creating your settings.php file from default.settings.php template

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.. Filesystem is locked - Read Only access type ' rpi-rw ' to unlock Sun 14 May 20:33:30 UTC 2017 ................... emonPi update done Filesystem is unlocked - Write access type ' rpi-ro ' to lock ############################################################# I2C LCD DETECTED Ox27 Starting emonPi Update > via service-runner-update.sh EUID: 1000 Argument: emonpi Mon 15 May 14:54:00 UTC 2017 ############################################################# emonSD-07Nov16 git pull /home/pi/emonpi * master wifiap On branch master Your branch is behind 'origin/master' by 24 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: rc.local_jessieminimal Untracked files: (use "git add ..." to include in what will be committed) 1 Atmega328/emonPi_RFM69CW_RF12Demo_DiscreteSampling/compiled/emonPi_Firmware.hex hardware/emonpi/emonpi2c/ lcd/gsmhuaweistatus.pyc lcd/i2c_lib.pyc lcd/lcddriver.pyc no changes added to commit (use "git add" and/or "git commit -a") Updating 91d2e6f..fad6524 git pull /home/pi/RFM2Pi * 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/emonhub K0den-wibeee_interface * emon-pi hmm01i-syslogging On branch emon-pi Your branch is up-to-date with 'origin/emon-pi'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: src/interfacers/EmonModbusTcpInterfacer.py no changes added to commit (use "git add" and/or "git commit -a") Already up-to-date. 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 Requirement already up-to-date: paho-mqtt in /usr/local/lib/python2.7/dist-packages 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 [[12]] Node 12 already present [[13]] Node 13 already present [[14]] Node 14 already present #[[15]] [[15]] Node 15 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 15 May 14:54:22 UTC 2017 EUID: 1000 Checking cron tab for service runner entry... service runner crontab entry already installed git pull /var/www/emoncms dev-mosquitto-php master * stable symlinked_modules On branch stable Your branch is up-to-date with 'origin/stable'. Untracked files: (use "git add ..." to include in what will be committed) ##settings.php images/ nothing added to commit but untracked files present (use "git add" to track) Already up-to-date. 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 Already up-to-date. 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 Already up-to-date. 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 Already up-to-date. git pull /var/www/emoncms/Modules/dashboard environ-master * master On branch master Your branch is up-to-date with 'origin/master'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: Views/js/widget.css modified: Views/js/widgetlist.js Untracked files: (use "git add ..." to include in what will be committed) Views/js/widget.css-old Views/js/widgetlist.js-old widget/feed_10pt/ widget/feed_14pt/ widget/feed_8pt/ widget/feedhalfsize/ widget/jgaugegrid/ widget/jgaugesolar/ widget/nest/ widget/pvhorizontal/ widget/pvvertical/ widget/small_led/ widget/smallfeedvalue/ no changes added to commit (use "git add" and/or "git commit -a") Already up-to-date. 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 Already up-to-date. git pull /home/pi/postprocess Your branch is up-to-date with 'remotes/origin/emonpi'. git pull /home/pi/backup * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Already up-to-date. update mqtt_input systemd unit file Update Emoncms database [] 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.. Filesystem is locked - Read Only access type ' rpi-rw ' to unlock Mon 15 May 14:55:05 UTC 2017 ................... emonPi update done