Starting emonPi Update > EUID: 1000 Wed 16 Nov 23:51:11 UTC 2016 emonSD-03May16 git pull /home/pi/emonpi Updating c3bee09..d61a329 Fast-forward .travis.yml | 26 +- README.md | 2 +- bash-rw-indicator | 18 + docs/SD-card-build.md | 7 + emonpiupdate | 15 +- factoryreset | 14 +- firmware/compiled/latest.hex | 2343 +++++++++++++++++++++--------------------- firmware/compiled/readme.md | 4 +- firmware/platformio.ini | 4 +- firmware/readme.md | 22 +- firmware/src/src.ino | 8 +- logrotate.conf | 2 +- master | 0 motd | 22 + rc.local_jessieminimal | 4 +- update | 1 + 16 files changed, 1266 insertions(+), 1226 deletions(-) create mode 100644 bash-rw-indicator delete mode 100644 master create mode 100644 motd git pull /home/pi/RFM2Pi git pull /home/pi/emonhub Updating 5698f4b..cd9f38a Fast-forward README.md | 27 ++- conf/modbusTCP.emonhub.conf | 235 ++++++++++++++++++++++ conf/modbusTCP.readme.md | 83 ++++++++ conf/nodes/Readme.md | 3 + service/emonhub | 8 +- src/emonhub.py | 16 +- src/interfacers/EmonFroniusModbusTcpInterfacer.py | 44 ++++ src/interfacers/EmonModbusTcpInterfacer.py | 141 +++++++++++++ src/interfacers/emonhub_interfacer.py | 3 +- 9 files changed, 548 insertions(+), 12 deletions(-) create mode 100644 conf/modbusTCP.emonhub.conf create mode 100644 conf/modbusTCP.readme.md create mode 100644 conf/nodes/Readme.md create mode 100644 src/interfacers/EmonFroniusModbusTcpInterfacer.py create mode 100644 src/interfacers/EmonModbusTcpInterfacer.py git pull /home/pi/oem_openHab git pull /home/pi/usefulscripts git pull /home/pi/huawei-hilink-status Start emonPi Atmega328 firmware update: ================================= EmonPi update started ================================= EUID: 1000 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. Add RW bash prompt indicator 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 Wed 16 Nov 23:51:47 UTC 2016 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 Updating 28208e4..dc70ba7 Fast-forward Lib/flot/plugin/saveAsImage/README.md | 51 +++++ .../plugin/saveAsImage/jquery.flot.saveAsImage.js | 169 +++++++++++++++ Lib/flot/plugin/saveAsImage/lib/base64.js | 111 ++++++++++ Lib/flot/plugin/saveAsImage/lib/canvas2image.js | 235 +++++++++++++++++++++ Modules/admin/admin_controller.php | 138 ++++++++++-- Modules/admin/admin_main_view.php | 31 ++- Modules/feed/engine/MysqlTimeSeries.php | 9 +- Modules/feed/engine/PHPFina.php | 8 +- Modules/feed/engine/PHPFiwa.php | 13 +- Modules/feed/engine/PHPTimeSeries.php | 1 + Modules/feed/engine/VirtualFeed.php | 5 +- Modules/feed/feed_model.php | 15 +- Modules/input/Views/input_api.php | 16 +- Modules/vis/Views/multigraph_edit.js | 124 ++++++++--- Modules/vis/Views/vis_main_view.php | 10 + Modules/vis/vis_controller.php | 14 +- Modules/vis/vis_object.php | 14 +- Modules/vis/visualisations/bargraph.php | 6 + Modules/vis/visualisations/common/vis.helper.js | 20 ++ Modules/vis/visualisations/compare.php | 8 + .../dailyhistogram/dailyhistogram.php | 5 + .../vis/visualisations/dailyhistogram/graphs.js | 1 + Modules/vis/visualisations/editdaily.php | 6 + Modules/vis/visualisations/editrealtime.php | 6 + Modules/vis/visualisations/graph.js | 1 + Modules/vis/visualisations/graph.php | 5 + Modules/vis/visualisations/histgraph.php | 7 + Modules/vis/visualisations/multigraph.php | 11 + .../vis/visualisations/multigraph/multigraph.js | 155 +++++++++++--- Modules/vis/visualisations/orderbars.php | 10 +- Modules/vis/visualisations/orderthreshold.php | 6 + Modules/vis/visualisations/rawdata.php | 6 + Modules/vis/visualisations/realtime.php | 7 + Modules/vis/visualisations/simplezoom.php | 10 +- Modules/vis/visualisations/stacked.php | 8 +- Modules/vis/visualisations/stackedsolar.php | 10 +- Modules/vis/visualisations/threshold.php | 6 + Modules/vis/visualisations/timecompare.php | 5 + .../vis/visualisations/timecompare/timecompare.js | 1 + Modules/vis/visualisations/timestoredaily.php | 6 + Modules/vis/visualisations/zoom.php | 5 + Modules/vis/visualisations/zoom/graphs.js | 1 + Modules/vis/widget/vis_render.js | 24 +-- Theme/basic/emon.css | 6 + Theme/basic/menu_view.php | 2 +- Theme/basic/theme.php | 1 - index.php | 4 +- readme.md | 1 + scripts/phpmqtt_input.php | 39 +++- 49 files changed, 1213 insertions(+), 140 deletions(-) create mode 100644 Lib/flot/plugin/saveAsImage/README.md create mode 100644 Lib/flot/plugin/saveAsImage/jquery.flot.saveAsImage.js create mode 100644 Lib/flot/plugin/saveAsImage/lib/base64.js create mode 100644 Lib/flot/plugin/saveAsImage/lib/canvas2image.js git pull /var/www/emoncms/Modules/app * 9.0 Already up-to-date. git pull /var/www/emoncms/Modules/config * 9.0 Updating 8438a27..a28f027 Fast-forward README.md | 12 ++++---- config.png | Bin 0 -> 471961 bytes config_controller.php | 42 ++++++++++++++++--------- edit.php | 84 ++++++++++++++++---------------------------------- 4 files changed, 61 insertions(+), 77 deletions(-) create mode 100644 config.png git pull /var/www/emoncms/Modules/wifi * 9.0 Already up-to-date. git pull /var/www/emoncms/Modules/dashboard environ-master * master Updating f318aea..73bf77c Fast-forward Readme.md | 22 ++++++++++- Views/dashboard_edit_view.php | 79 ++++++++++++++++++++++++++++++------- Views/dashboard_menu.php | 9 ++--- Views/dashboard_view.php | 7 +++- 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 0 -> 519 bytes Views/icons/emon-icon-delete.png | Bin 0 -> 519 bytes Views/icons/emon-icon-front.png | Bin 0 -> 510 bytes Views/icons/emon-icon-gear.png | Bin 0 -> 493 bytes Views/icons/emon-icon-redo.png | Bin 0 -> 494 bytes Views/icons/emon-icon-tool.png | Bin 0 -> 420 bytes Views/icons/emon-icon-undo.png | Bin 0 -> 483 bytes Views/icons/emon-icon-view.png | Bin 0 -> 552 bytes Views/icons/gear-icon-outlined.png | Bin 0 -> 2229 bytes Views/js/designer.js | 49 +---------------------- 19 files changed, 158 insertions(+), 70 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 create mode 100644 Views/icons/emon-icon-back.png create mode 100644 Views/icons/emon-icon-delete.png create mode 100644 Views/icons/emon-icon-front.png create mode 100644 Views/icons/emon-icon-gear.png create mode 100644 Views/icons/emon-icon-redo.png create mode 100644 Views/icons/emon-icon-tool.png create mode 100644 Views/icons/emon-icon-undo.png create mode 100644 Views/icons/emon-icon-view.png create mode 100644 Views/icons/gear-icon-outlined.png git pull /var/www/emoncms/Modules/graph * master Already up-to-date. 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 Updating 00617c2..f86ed05 Fast-forward backup/backup_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. Starting Daemon for the emoncms MQTT script: Restarting Daemon for the emoncms MQTT script: mqtt_input. set log rotate config owner to root Restarting Services... Starting emonPi LCD service.. Filesystem is locked - Read Only access type ' rpi-rw ' to unlock Wed 16 Nov 23:53:33 UTC 2016 ................... emonPi update done