Starting emonPi Update > EUID: 1000 Sat 24 Mar 00:40:17 UTC 2018 emonSD-03May16 git pull /home/pi/emonpi Updating f538a4b..2f9dae5 git pull /home/pi/RFM2Pi git pull /home/pi/emonhub Updating f767e61..8200b42 Fast-forward .gitignore | 1 + README.md | 61 +-- conf/VEDirect.readme.md | 55 --- conf/emonhub.conf | 39 +- conf/emonpi.default.emonhub.conf | 40 +- 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 | 47 +++ .../graphite/graphite.emonhub.conf | 11 + conf/interfacer_examples/graphite/readme.md | 63 +++ .../modbus/modbusTCP.emonhub.conf | 235 +++++++++++ conf/interfacer_examples/modbus/readme.md | 86 ++++ conf/interfacer_examples/smasolar/readme.md | 70 ++++ .../smasolar/smasolar.emonhub.conf | 17 + .../smilices/readme.md} | 0 .../smilices}/smilics.emonhub.conf | 4 +- .../vedirect/bmv700.vedirect.emonhub.conf} | 4 +- .../vedirect/mppt.vedirect.emonhub.conf | 22 ++ conf/interfacer_examples/vedirect/readme.md | 47 +++ conf/nodes/11 | 8 +- conf/nodes/12 | 7 + conf/nodes/13 | 7 + conf/nodes/14 | 7 + conf/nodes/Readme.md | 3 + conf/old.default.emonhub.conf | 4 +- configuration.md | 93 +++-- examples/mqtt_reader.py | 2 +- service/emonhub | 8 +- src/{interfacers => }/Cargo.py | 0 src/emonhub.py | 87 ++-- src/emonhub_buffer.py | 115 ++++++ src/{interfacers => }/emonhub_interfacer.py | 223 +++++++++-- src/emonhub_setup.py | 4 +- src/interfacers/EmonHubBMWInterfacer.py | 287 ++++++++++++++ src/interfacers/EmonHubEmoncmsHTTPInterfacer.py | 163 ++++---- src/interfacers/EmonHubGraphiteInterfacer.py | 140 +++++++ src/interfacers/EmonHubJeeInterfacer.py | 34 +- src/interfacers/EmonHubMqttInterfacer.py | 280 ++++++++----- src/interfacers/EmonHubPacketGenInterfacer.py | 1 - src/interfacers/EmonHubSMASolarInterfacer.py | 299 ++++++++++++++ src/interfacers/EmonHubSerialInterfacer.py | 16 +- src/interfacers/EmonHubSocketInterfacer.py | 7 +- src/interfacers/EmonHubTemplateInterfacer.py | 139 +++++++ src/interfacers/EmonHubTesterInterfacer.py | 61 --- src/interfacers/EmonHubTx3eInterfacer.py | 100 +++++ src/interfacers/EmonHubVEDirectInterfacer.py | 73 ++-- src/interfacers/__init__.py | 18 + .../tmp/EmonFroniusModbusTcpInterfacer.py | 42 ++ .../{ => tmp}/EmonHubSmilicsInterfacer.py | 26 +- src/interfacers/tmp/EmonModbusTcpInterfacer.py | 147 +++++++ src/smalibrary/SMABluetoothPacket.py | 138 +++++++ src/smalibrary/SMANET2PlusPacket.py | 276 +++++++++++++ src/smalibrary/SMASolar_library.py | 438 +++++++++++++++++++++ src/smalibrary/__init__.py | 0 55 files changed, 3650 insertions(+), 529 deletions(-) delete mode 100644 conf/VEDirect.readme.md 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 (91%) rename conf/{vedirect.emonhub.conf => interfacer_examples/vedirect/bmv700.vedirect.emonhub.conf} (92%) create mode 100644 conf/interfacer_examples/vedirect/mppt.vedirect.emonhub.conf create mode 100644 conf/interfacer_examples/vedirect/readme.md create mode 100644 conf/nodes/12 create mode 100644 conf/nodes/13 create mode 100644 conf/nodes/14 create mode 100644 conf/nodes/Readme.md 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/EmonHubBMWInterfacer.py create mode 100644 src/interfacers/EmonHubGraphiteInterfacer.py create mode 100644 src/interfacers/EmonHubSMASolarInterfacer.py create mode 100644 src/interfacers/EmonHubTemplateInterfacer.py delete mode 100644 src/interfacers/EmonHubTesterInterfacer.py create mode 100644 src/interfacers/EmonHubTx3eInterfacer.py create mode 100644 src/interfacers/tmp/EmonFroniusModbusTcpInterfacer.py rename src/interfacers/{ => tmp}/EmonHubSmilicsInterfacer.py (79%) create mode 100644 src/interfacers/tmp/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 git pull /home/pi/usefulscripts git pull /home/pi/backup Updating 8e09c14..f985c0a Fast-forward backup/backup_view.php | 81 ++++++++++++++++++++++++++++++-------------------- backup/module.json | 4 +++ emoncms-export.sh | 62 +++++++++++++++++++++++++++++++------- 3 files changed, 103 insertions(+), 44 deletions(-) create mode 100644 backup/module.json git pull /home/pi/huawei-hilink-status Start emonPi Atmega328 firmware update: ================================= EmonPi update started ================================= EUID: 1000 Downloading/unpacking paho-mqtt from https://pypi.python.org/packages/2a/5f/cf14b8f9f8ed1891cda893a2a7d1d6fa23de2a9fb4832f05cef02b79d01f/paho-mqtt-1.3.1.tar.gz#md5=2cc27d8b369700b1fc99325add0dadd2 Running setup.py (path:/tmp/pip-build-1UZJZO/paho-mqtt/setup.py) egg_info for package paho-mqtt Installing collected packages: paho-mqtt Found existing installation: paho-mqtt 1.1 Uninstalling paho-mqtt: Successfully uninstalled paho-mqtt Running setup.py install for paho-mqtt Successfully installed paho-mqtt Cleaning up... 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 moving ~./npm to ~/data/npm and create symlink node-red-node-emoncms@0.1.0 node_modules/node-red-node-emoncms Start emonhub update script: ================================= EmonPi update started ================================= Running emonhub automatic node addition script EUID: 1000 EUID: 1000 [[5]] Node 5 already present Added node 6 to emonhub.conf Added node 7 to emonhub.conf Added node 8 to emonhub.conf Added node 9 to emonhub.conf Added node 10 to emonhub.conf Added node 11 to emonhub.conf Added node 12 to emonhub.conf Added node 13 to emonhub.conf Added node 14 to emonhub.conf [[19]] Node 19 already present Added node 20 to emonhub.conf [[21]] Node 21 already present Added node 22 to emonhub.conf [[23]] Node 23 already present [[24]] Node 24 already present [[25]] Node 25 already present [[26]] Node 26 already present [[27]] Node 27 already present [[28]] Node 28 already present Start emoncms update: ================================= Emoncms update started Emoncms update script V1.1.1 Sat 24 Mar 00:41:21 UTC 2018 ############################################################# emonSD version: emonSD-03May16 emonSD base image check pass...continue update ############################################################# EUID: 1000 Checking cron tab for service runner entry... service runner crontab entry already installed /home/pi/emonpi/emoncms-rebootbutton: parsed OK Install emonPi Emoncms admin reboot button sudoers entry /home/pi/emonpi/emoncms-filesystem: parsed OK emonPi Emoncms admin file-system toggle buttons sudoers entry installed /home/pi/emonpi/emonhub-sudoers: parsed OK emonhub service constol sudoers entry installed /home/pi/emonpi/emoncms-setup/emoncms-setup-sudoers: parsed OK Emoncms setup module sudoers entry installed current settings.php md5: ee57b1cd696914354fff01c2fdca631a 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 89a76ff..86adaec Fast-forward .gitignore | 1 + .htaccess | 19 +- .travis.yml | 11 + 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 +- Lib/dbschemasetup.php | 5 +- Lib/email.php | 4 +- Lib/enum.php | 1 + 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/user/profile => Lib/misc}/clipboard.js | 6 +- {Modules/user/profile => Lib/misc}/qrcode.js | 0 Lib/tablejs/COPYRIGHT.txt | 5 +- Lib/tablejs/custom-table-fields.js | 144 +- Lib/tablejs/expandtables.html | 91 + Lib/tablejs/table.js | 283 ++- Modules/admin/admin_controller.php | 171 +- Modules/admin/admin_main_view.php | 470 +++-- Modules/admin/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 2132 -> 3219 bytes Modules/admin/locale/fr_FR/LC_MESSAGES/messages.po | 261 ++- Modules/admin/module.json | 4 + Modules/eventp/eventp_processlist.php | 13 +- Modules/eventp/module.json | 4 + Modules/feed/Views/feedapi_view.php | 29 +- Modules/feed/Views/feedlist_view.php | 120 +- Modules/feed/engine/CassandraEngine.php | 264 +++ Modules/feed/engine/MysqlTimeSeries.php | 16 +- Modules/feed/engine/PHPFina.php | 283 ++- Modules/feed/engine/PHPFiwa.php | 13 +- Modules/feed/engine/PHPTimeSeries.php | 91 +- Modules/feed/engine/VirtualFeed.php | 46 +- Modules/feed/feed_controller.php | 59 +- Modules/feed/feed_model.php | 353 +++- Modules/feed/feed_schema.php | 6 +- Modules/feed/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 3537 -> 11179 bytes Modules/feed/locale/fr_FR/LC_MESSAGES/messages.po | 2016 +++++++++++--------- Modules/feed/module.json | 4 + Modules/input/Views/input.js | 2 +- Modules/input/Views/input_api.php | 126 +- 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 | 361 ++-- Modules/input/input_menu.php | 2 +- Modules/input/input_methods.php | 272 +++ Modules/input/input_model.php | 443 ++++- Modules/input/input_schema.php | 2 +- Modules/input/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 7444 -> 11421 bytes Modules/input/locale/fr_FR/LC_MESSAGES/messages.po | 746 +++++--- Modules/input/module.json | 4 + Modules/input/que_input_controller.php | 7 +- Modules/input/readme.md | 9 +- Modules/process/Views/process_ui.js | 111 +- Modules/process/Views/process_ui.php | 1 + Modules/process/module.json | 4 + Modules/process/process_model.php | 44 +- Modules/process/process_processlist.php | 132 +- Modules/schedule/Views/schedule_view.php | 36 +- .../schedule/locale/et_EE/LC_MESSAGES/messages.mo | Bin 0 -> 2817 bytes .../schedule/locale/et_EE/LC_MESSAGES/messages.po | 167 ++ .../schedule/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 0 -> 5964 bytes .../schedule/locale/fr_FR/LC_MESSAGES/messages.po | 260 +++ Modules/schedule/module.json | 4 + Modules/schedule/schedule_model.php | 47 +- Modules/schedule/schedule_processlist.php | 10 +- Modules/time/module.json | 4 + Modules/time/time_controller.php | 16 +- Modules/user/images/appstore.png | Bin 0 -> 8888 bytes Modules/user/images/en-play-badge.png | Bin 0 -> 4290 bytes Modules/user/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 4393 -> 5345 bytes Modules/user/locale/fr_FR/LC_MESSAGES/messages.po | 1833 +++++++++--------- Modules/user/login_block.php | 53 +- Modules/user/module.json | 4 + Modules/user/profile/profile.php | 82 +- Modules/user/rememberme_model.php | 413 +++- Modules/user/user.js | 48 +- Modules/user/user_controller.php | 5 +- Modules/user/user_menu.php | 2 +- Modules/user/user_model.php | 462 +++-- Modules/user/user_schema.php | 9 +- Modules/vis/Views/multigraph_edit.js | 526 +++-- Modules/vis/Views/vis_main_view.php | 19 +- Modules/vis/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 2236 -> 7153 bytes Modules/vis/locale/fr_FR/LC_MESSAGES/messages.po | 1992 +++++++++++-------- Modules/vis/module.json | 4 + Modules/vis/multigraph_model.php | 40 +- Modules/vis/vis_controller.php | 14 +- Modules/vis/vis_object.php | 18 +- Modules/vis/vis_schema.php | 4 +- Modules/vis/visualisations/bargraph.php | 31 +- Modules/vis/visualisations/common/vis.helper.js | 51 +- Modules/vis/visualisations/compare.php | 20 +- .../vis/visualisations/comparison/comparison.php | 9 +- .../dailyhistogram/dailyhistogram.php | 23 +- .../vis/visualisations/dailyhistogram/graphs.js | 1 + Modules/vis/visualisations/editdaily.php | 14 +- Modules/vis/visualisations/editrealtime.php | 14 +- Modules/vis/visualisations/graph.js | 1 + Modules/vis/visualisations/graph.php | 11 +- Modules/vis/visualisations/histgraph.php | 11 +- Modules/vis/visualisations/multigraph.php | 30 +- .../vis/visualisations/multigraph/multigraph.js | 348 ++-- Modules/vis/visualisations/orderbars.php | 12 +- Modules/vis/visualisations/orderthreshold.php | 18 +- Modules/vis/visualisations/rawdata.php | 22 +- Modules/vis/visualisations/realtime.php | 31 +- Modules/vis/visualisations/simplezoom.php | 22 +- Modules/vis/visualisations/stacked.php | 18 +- Modules/vis/visualisations/stackedsolar.php | 20 +- Modules/vis/visualisations/threshold.php | 22 +- Modules/vis/visualisations/timecompare.php | 8 + .../vis/visualisations/timecompare/timecompare.js | 3 +- Modules/vis/visualisations/timestoredaily.php | 20 +- Modules/vis/visualisations/zoom.php | 7 +- Modules/vis/visualisations/zoom/graphs.js | 1 + Modules/vis/widget/vis_render.js | 75 +- Theme/basic/ajax-loader.gif | Bin 0 -> 4663 bytes Theme/basic/embed.php | 8 +- Theme/basic/emon-blue.css | 144 ++ Theme/basic/{emon.css => emon-standard.css} | 32 +- Theme/basic/emon-sun.css | 159 ++ Theme/basic/{emoncms_logo.png => logo_login.png} | Bin Theme/basic/menu_view.php | 6 +- Theme/basic/theme.php | 107 +- Vagrantfile | 48 - core.php | 2 +- default.emonpi.settings.php | 12 +- default.settings.php | 13 +- docs/Cassandra.md | 9 + docs/LinuxInstall.md | 117 +- docs/RaspberryPi/Low-write-mode.md | 8 +- docs/RaspberryPi/MQTT.md | 70 +- docs/RaspberryPi/USB_HDD.md | 8 +- docs/RaspberryPi/general.md | 26 +- docs/RaspberryPi/jessie.md | 189 ++ docs/RaspberryPi/readme.md | 125 +- docs/gettext.md | 17 +- index.php | 84 +- locale.php | 14 +- param.php | 54 + php-info.php | 3 + process_settings.php | 46 +- readme.md | 141 +- route.php | 89 +- scripts/logger/logrotate.conf | 2 +- scripts/mqtt_input.service | 56 + scripts/phpmqtt_input.php | 215 ++- test.php | 16 + 154 files changed, 11407 insertions(+), 5332 deletions(-) create mode 100644 .travis.yml 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 rename {Modules/user/profile => Lib/misc}/clipboard.js (93%) rename {Modules/user/profile => Lib/misc}/qrcode.js (100%) create mode 100644 Lib/tablejs/expandtables.html create mode 100644 Modules/admin/module.json create mode 100644 Modules/eventp/module.json create mode 100644 Modules/feed/engine/CassandraEngine.php create mode 100644 Modules/feed/module.json create mode 100644 Modules/input/Views/input_dialog.js create mode 100644 Modules/input/Views/input_dialog.php create mode 100644 Modules/input/input_methods.php create mode 100644 Modules/input/module.json create mode 100644 Modules/process/module.json create mode 100644 Modules/schedule/locale/et_EE/LC_MESSAGES/messages.mo create mode 100644 Modules/schedule/locale/et_EE/LC_MESSAGES/messages.po create mode 100644 Modules/schedule/locale/fr_FR/LC_MESSAGES/messages.mo create mode 100644 Modules/schedule/locale/fr_FR/LC_MESSAGES/messages.po create mode 100644 Modules/schedule/module.json create mode 100644 Modules/time/module.json create mode 100644 Modules/user/images/appstore.png create mode 100644 Modules/user/images/en-play-badge.png create mode 100644 Modules/user/module.json create mode 100644 Modules/vis/module.json create mode 100644 Theme/basic/ajax-loader.gif create mode 100644 Theme/basic/emon-blue.css rename Theme/basic/{emon.css => emon-standard.css} (81%) create mode 100644 Theme/basic/emon-sun.css rename Theme/basic/{emoncms_logo.png => logo_login.png} (100%) delete mode 100644 Vagrantfile create mode 100644 docs/Cassandra.md create mode 100644 docs/RaspberryPi/jessie.md create mode 100644 param.php create mode 100755 php-info.php create mode 100644 scripts/mqtt_input.service create mode 100644 test.php NEW default settings.php md5: a828cb3e3c9f015e348d86defd1a5d53 settings.php HAS been user modified Update required to settings.php... **ERROR: unable to autoupdate settings.php since user changes are present, manual review required** 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 fd2a3a4..94afc98 Fast-forward AppConfig_model.php | 177 ++-- Readme.md | 5 +- app2.js | 176 ---- app_controller.php | 142 +++- app_menu.php | 18 +- 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 | 82 +- 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 | 111 --- myelectric/myelectric.js | 427 ---------- mysolarpv/mysolarpv.html | 121 --- mysolarpv/mysolarpv.js | 579 ------------- sidebar.php | 82 ++ style.css | 155 ---- vis.helper.js | 103 ++- 41 files changed, 8865 insertions(+), 2075 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 (80%) 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 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 8438a27..cf5b1a6 Fast-forward README.md | 18 ++++++--- config.png | Bin 0 -> 471961 bytes config_controller.php | 51 +++++++++++++++++-------- edit.php | 103 +++++++++++++++++++++----------------------------- emonhub-sudoers | 1 + module.json | 4 ++ 6 files changed, 95 insertions(+), 82 deletions(-) create mode 100644 config.png create mode 100644 emonhub-sudoers 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 515310d..cb78a15 Fast-forward README.md | 4 +-- 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 | 40 +++++++++++++++++++-------- wifi.php | 16 +++++++++++ wifi_controller.php | 75 ++++++++++++++++++++++++++++++++------------------ wifi_menu.php | 3 +- 16 files changed, 97 insertions(+), 41 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 4d98fee..fcc92c3 Fast-forward LICENSE.txt | 619 +++++++++++++ Readme.md | 22 +- Views/dashboard_config.php | 24 + Views/dashboard_edit_view.php | 118 ++- Views/dashboard_menu.php | 9 +- Views/dashboard_view.php | 21 +- 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 | 632 +++++++++++--- Views/js/render.js | 10 + Views/js/widget.css | 8 - Views/js/widgetlist.js | 12 +- dashboard.js | 4 +- dashboard_controller.php | 4 +- dashboard_langjs.php | 548 +++++++++++- dashboard_menu.php | 2 +- dashboard_model.php | 72 +- dashboard_schema.php | 5 +- locale/de_DE/LC_MESSAGES/messages.po | 10 +- locale/es_ES/LC_MESSAGES/messages.mo | Bin 7487 -> 8583 bytes locale/es_ES/LC_MESSAGES/messages.po | 268 ++++-- locale/fr_FR/LC_MESSAGES/messages.mo | Bin 5200 -> 14689 bytes locale/fr_FR/LC_MESSAGES/messages.po | 1259 ++++++++++++++++++++++----- module.json | 4 + widget/bar/bar_render.js | 771 ++++++++++------ widget/bar/bar_widget.php | 15 + widget/battery/battery_render.js | 264 ++++++ widget/curl/curl_render.js | 24 +- widget/cylinder/cylinder_render.js | 225 +++-- widget/dewpoint/dewpoint_render.js | 281 ++++-- widget/dial/dial_render.js | 565 +++++++++--- widget/dial/dial_widget.php | 15 + widget/feedtime/feedtime_render.js | 260 ++++++ widget/feedtime/feedtime_widget.php | 15 + widget/feedvalue/feedvalue_render.js | 306 +++++-- widget/feedvalue/feedvalue_widget.php | 15 + widget/frostpoint/frostpoint_render.js | 309 +++++++ widget/heatindex/heatindex_render.js | 348 ++++++++ widget/humidex/humidex_render.js | 283 ++++++ widget/isactivefeed/isactivefeed_render.js | 205 +++++ widget/isactivefeed/isactivefeed_widget.php | 15 + widget/jgauge/jgauge_render.js | 9 +- widget/jgauge2/jgauge2_render.js | 15 +- widget/led/led_render.js | 213 +++-- widget/signal/signal_render.js | 205 +++++ widget/sun/sun_render.js | 246 ++++++ widget/thermometer/thermometer_render.js | 524 +++++++++++ widget/thresholds/thresholds_render.js | 174 ++++ widget/windrose/windrose_render.js | 15 +- 61 files changed, 7727 insertions(+), 1303 deletions(-) create mode 100644 LICENSE.txt 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 create mode 100644 module.json create mode 100644 widget/bar/bar_widget.php create mode 100644 widget/battery/battery_render.js create mode 100644 widget/dial/dial_widget.php create mode 100644 widget/feedtime/feedtime_render.js create mode 100644 widget/feedtime/feedtime_widget.php create mode 100644 widget/feedvalue/feedvalue_widget.php 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/isactivefeed/isactivefeed_widget.php create mode 100644 widget/signal/signal_render.js create mode 100644 widget/sun/sun_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 19aa1b5..cff96ed Fast-forward Lib/bootstrap-switch.css | 187 ++++++ Lib/bootstrap-switch.js | 784 ++++++++++++++++++++++++ embed.php | 120 ++++ graph.css | 121 ++++ graph.js | 1287 ++++++++++++++++++++++++++++++++++++++++ graph2.js | 770 ------------------------ graph_controller.php | 73 ++- graph_menu.php | 6 + graph_model.php | 185 ++++++ graph_schema.php | 8 + group_graph.js | 1482 ++++++++++++++++++++++++++++++++++++++++++++++ group_view.php | 354 +++++++++++ module.json | 4 + view.php | 266 ++++++--- vis.helper.js | 183 ++++++ widget/graph_render.js | 79 +++ widget/graph_widget.php | 32 + 17 files changed, 5082 insertions(+), 859 deletions(-) create mode 100644 Lib/bootstrap-switch.css create mode 100644 Lib/bootstrap-switch.js create mode 100644 embed.php create mode 100644 graph.css create mode 100644 graph.js delete mode 100644 graph2.js create mode 100644 graph_menu.php create mode 100644 graph_model.php create mode 100644 graph_schema.php create mode 100644 group_graph.js create mode 100644 group_view.php create mode 100644 module.json create mode 100644 vis.helper.js create mode 100644 widget/graph_render.js create mode 100644 widget/graph_widget.php 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..c827999 Fast-forward exportcalc.php | 109 ------------ .../postprocess_controller.php | 113 +++++++++--- postprocess-module/postprocess_menu.php | 7 + .../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 | 13 +- storageserver/html/postprocess/.htaccess | 196 --------------------- storageserver/html/postprocess/index.php | 47 ----- 22 files changed, 1113 insertions(+), 419 deletions(-) delete mode 100644 exportcalc.php rename {mainserver/postprocess => postprocess-module}/postprocess_controller.php (62%) create mode 100644 postprocess-module/postprocess_menu.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 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. Branch stable set up to track remote branch stable from origin. Installing emoncms/emonPi setup module: symlink from ~/emonpi/emoncms-setup replacing initd mqtt_input with systemd mqtt input Stopping Daemon for the emoncms MQTT script: mqtt_input. 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 Sat 24 Mar 00:43:17 UTC 2018 ................... emonPi update done