Starting update via service-runner-update.sh (v2.0) > Filesystem is unlocked - Write access type ' rpi-ro ' to lock - emonSD version: emonSD-26Oct17 emonSD base image check passed...continue update 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 nothing added to commit but untracked files present (use "git add" to track) From https://github.com/openenergymonitor/emonpi a6e5b4b..73a63d2 master -> origin/master * [new tag] 2.9.2 -> 2.9.2 Updating a6e5b4b..73a63d2 Fast-forward defaults/emoncms/emonpi.settings.ini | 27 ++++++ emoncms_wifiscan.php | 18 ++-- emoncmsdbupdate_old.php | 14 +++ firmware/platformio.ini | 4 +- firmware/src/src.ino | 3 +- install/apache.sh | 29 ------ install/base.sh | 3 - install/config.ini | 70 -------------- install/default.settings.php | 182 ----------------------------------- install/emoncms_core.sh | 79 --------------- install/emoncms_modules.sh | 76 --------------- install/emonhub.sh | 26 ----- install/emonpilcd.sh | 45 --------- install/emonsd.sh | 58 ----------- install/firmware.sh | 20 ---- install/fstab | 9 -- install/init.sh | 19 ---- install/main.sh | 65 ------------- install/mosquitto.sh | 35 ------- install/mysql.sh | 17 ---- install/php.sh | 20 ---- install/readme.md | 107 -------------------- install/redis.sh | 25 ----- install/wifiap.sh | 107 -------------------- lcd/emonPiLCD.py | 16 +-- lcd/emonPiLCD.service | 3 +- lcd/emonPiLCD_update.py | 5 +- update/emoncms.sh | 94 ++++++++++++------ update/emoncmsdbupdate.php | 8 +- 29 files changed, 141 insertions(+), 1043 deletions(-) create mode 100644 defaults/emoncms/emonpi.settings.ini create mode 100644 emoncmsdbupdate_old.php delete mode 100755 install/apache.sh delete mode 100755 install/base.sh delete mode 100755 install/config.ini delete mode 100644 install/default.settings.php delete mode 100755 install/emoncms_core.sh delete mode 100755 install/emoncms_modules.sh delete mode 100755 install/emonhub.sh delete mode 100755 install/emonpilcd.sh delete mode 100755 install/emonsd.sh delete mode 100755 install/firmware.sh delete mode 100644 install/fstab delete mode 100755 install/init.sh delete mode 100755 install/main.sh delete mode 100755 install/mosquitto.sh delete mode 100755 install/mysql.sh delete mode 100755 install/php.sh delete mode 100644 install/readme.md delete mode 100755 install/redis.sh delete mode 100755 install/wifiap.sh ------------------------------------------------------------- Main Update Script ------------------------------------------------------------- Date: Sat 11 Apr 11:32:26 AEST 2020 EUID: 1000 usrdir: /home/pi type: all firmware: emonpi Checking environment: - pi user found EUID: 1000 Hardware detected: rfm2pi Stopping emonPiLCD service Display update message on LCD I2C LCD NOT DETECTED on either 0x['27', '3f'] ...exiting LCD script ------------------------------------------------------------- Ign http://dl.bintray.com stable InRelease Get:1 http://dl.bintray.com stable Release.gpg [821 B] Get:2 http://dl.bintray.com stable Release [2,665 B] Err http://dl.bintray.com stable Release Hit http://ppa.launchpad.net xenial InRelease Hit http://ppa.launchpad.net xenial/main Sources Hit http://ppa.launchpad.net xenial/main armhf Packages Hit http://ppa.launchpad.net xenial/main Translation-en Get:3 http://repo.mosquitto.org jessie InRelease [11.0 kB] Err http://repo.mosquitto.org jessie InRelease Get:4 http://archive.raspberrypi.org jessie InRelease [22.9 kB] Get:5 http://mirrordirector.raspbian.org jessie InRelease [15.0 kB] Get:6 http://mirrordirector.raspbian.org jessie/main armhf Packages [9,540 kB] Get:7 http://archive.raspberrypi.org jessie/main armhf Packages [170 kB] Get:8 http://archive.raspberrypi.org jessie/ui armhf Packages [58.9 kB] 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 Hit http://mirrordirector.raspbian.org jessie/contrib armhf Packages Hit http://mirrordirector.raspbian.org jessie/non-free armhf Packages Hit http://mirrordirector.raspbian.org jessie/rpi armhf Packages 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 9,821 kB in 50s (196 kB/s) Reading package lists... W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: http://dl.bintray.com stable Release: The following signatures were invalid: KEYEXPIRED 1564088422 KEYEXPIRED 1564088422 KEYEXPIRED 1564088422 W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: http://repo.mosquitto.org jessie InRelease: The following signatures were invalid: KEYEXPIRED 1515017477 KEYEXPIRED 1515017477 KEYEXPIRED 1515017477 W: Failed to fetch http://repo.mosquitto.org/debian/dists/jessie/InRelease W: Failed to fetch http://dl.bintray.com/openhab/apt-repo/dists/stable/Release W: Some index files failed to download. They have been ignored, or old ones used instead. Reading package lists... Building dependency tree... Reading state information... rng-tools is already the newest version. python-gpiozero is already the newest version. python-rpi.gpio is already the newest version. 0 upgraded, 0 newly installed, 0 to remove and 160 not upgraded. Collecting paho-mqtt Downloading https://files.pythonhosted.org/packages/59/11/1dd5c70f0f27a88a3a05772cd95f6087ac479fac66d9c7752ee5e16ddbbc/paho-mqtt-1.5.0.tar.gz (99kB) 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/02/94/6c/8474137cb7a5a3e001d70a22c8ff919caee69435376bccce79 Successfully built paho-mqtt Installing collected packages: paho-mqtt Found existing installation: paho-mqtt 1.4.0 Uninstalling paho-mqtt-1.4.0: Successfully uninstalled paho-mqtt-1.4.0 Successfully installed paho-mqtt-1.5.0 You are using pip version 8.1.2, however version 20.0.2 is available. You should consider upgrading via the 'pip install --upgrade pip' command. ------------------------------------------------------------- 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/usefulscripts * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean From https://github.com/emoncms/usefulscripts 6d3942c..9891110 master -> origin/master * [new branch] stable -> origin/stable Updating 6d3942c..9891110 Fast-forward .travis.yml | 13 +++ SDS011/.gitignore | 1 + SDS011/Dockerfile | 8 ++ SDS011/SDS011.py | 96 +++++++++++++++++ SDS011/SDS011.service | 52 ++++++++++ SDS011/default.env | 12 +++ SDS011/readme.md | 69 +++++++++++++ archive/backup/backupemoncms.php | 8 +- backup/backup.php | 29 ++++-- backup/lib/metadata.php | 2 + backup/lib/phptimeseries.php | 2 +- composer.json | 15 +++ convertdata/Lib/EmonLogger.php | 12 +-- convertdata/Lib/PHPFina.php | 6 +- convertdata/check_emoncms_feeds_for_conversion.php | 16 ++- convertdata/phpfina_convert_interval.php | 114 +++++++++++++++++++++ convertdata/phpfiwa_to_phpfina.php | 29 ++++-- convertdata/phptimeseries_to_phpfina.php | 31 ++++-- convertdata/phptimestore_to_phpfina.php | 49 +++++---- .../create_users_and_devices_add_to_group.php | 32 +++--- process/Lib/EmonLogger.php | 12 +-- process/power_to_kwh.php | 37 ++++--- process/power_to_kwh_manual.php | 12 +-- resetpassword.php | 8 +- sdpart/sdpart_imagefile | 40 ++++++-- writeloadtest/writeloadtest.php | 32 ++++++ writeloadtest/writeloadtest.service | 63 ++++++++++++ 27 files changed, 687 insertions(+), 113 deletions(-) create mode 100644 .travis.yml create mode 100644 SDS011/.gitignore create mode 100644 SDS011/Dockerfile create mode 100755 SDS011/SDS011.py create mode 100644 SDS011/SDS011.service create mode 100644 SDS011/default.env create mode 100644 SDS011/readme.md create mode 100644 composer.json create mode 100644 convertdata/phpfina_convert_interval.php create mode 100644 writeloadtest/writeloadtest.php create mode 100644 writeloadtest/writeloadtest.service 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 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/oem_node-red * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Already up-to-date. ------------------------------------------------------------- EmonPi Firmware Update ------------------------------------------------------------- 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_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 1 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 2 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 3 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 4 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 5 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 6 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 7 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 8 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 9 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 10 of 10: not in sync: resp=0x00 avrdude-original done. Thank you. strace: |autoreset: Broken pipe Start emonhub update script: ------------------------------------------------------------- emonHub update started ------------------------------------------------------------- - usr directory: /home/pi 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'. Untracked files: (use "git add ..." to include in what will be committed) src/src nothing added to commit but untracked files present (use "git add" to track) From https://github.com/openenergymonitor/emonhub ee1f537..bbd2e71 emon-pi -> origin/emon-pi * [new branch] python3 -> origin/python3 Updating ee1f537..bbd2e71 Fast-forward conf/emonpi.default.emonhub.conf | 18 ++++++++++++++++++ conf/nodes/15 | 8 ++++++++ conf/nodes/16 | 8 ++++++++ conf/nodes/emonpi_auto_add_nodes.sh | 2 +- 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 conf/nodes/15 create mode 100644 conf/nodes/16 Creating emonhub logfile Symlinking emonhub.conf to /etc/emonhub/emonhub.conf emonhub.service already installed Running emonhub automatic node addition script [[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 Added node 15 to emonhub.conf Added node 16 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.3 (26th March 2019) ------------------------------------------------------------- - usr directory: /home/pi - emoncms directory: /var/www/emoncms current settings.php md5: 59e80f731935867f5f93753d49c0fe86 Default settings.php md5: 59e80f731935867f5f93753d49c0fe86 settings.php has NOT been user modifed Checking status of /var/www/emoncms git repository Fetching origin From https://github.com/emoncms/emoncms x [deleted] (none) -> origin/emrysr-patch-1-embed-app-css x [deleted] (none) -> origin/pb66-patch-1-1 x [deleted] (none) -> origin/pb66-patch-phpmqtt_input x [deleted] (none) -> origin/settings-ini-v2 d207945..3448336 stable -> origin/stable * [new branch] emonmuc -> origin/emonmuc d07d5dd..4796586 master -> origin/master 03978db..439111a mqttauth -> origin/mqttauth * [new tag] 10.2.1 -> 10.2.1 * [new tag] 10.1.10 -> 10.1.10 * [new tag] 10.1.11 -> 10.1.11 * [new tag] 10.1.6 -> 10.1.6 * [new tag] 10.1.7 -> 10.1.7 * [new tag] 10.1.8 -> 10.1.8 * [new tag] 10.1.9 -> 10.1.9 * [new tag] 10.2.0 -> 10.2.0 - git branch: stable - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating d207945..3448336 Fast-forward .gitignore | 3 +- .htaccess | 1 + .travis.yml | 95 +- Lib/EmonLogger.php | 8 +- Lib/dbschemasetup.php | 7 +- Lib/email.php | 30 +- Lib/emoncms.js | 119 ++ Lib/gridjs/grid-demo.php | 6 +- Lib/gridjs/grid.html | 15 +- Lib/misc/nav_functions.php | 11 +- Lib/misc/sidebar.css | 44 +- Lib/misc/sidebar.js | 145 +-- Lib/process_old_settings.php | 204 ++++ Lib/units.php | 1 + Modules/admin/admin_controller.php | 109 +- Modules/admin/admin_db_view.php | 23 - Modules/admin/admin_main_view.php | 47 +- Modules/admin/admin_model.php | 94 +- Modules/admin/locale/it_IT/LC_MESSAGES/messages.mo | Bin 2392 -> 6742 bytes Modules/admin/locale/it_IT/LC_MESSAGES/messages.po | 537 +++++++-- Modules/admin/locale/messages.pot | 462 ++++++++ Modules/admin/pi-model.json | 623 +++++----- Modules/admin/static/admin_styles.css | 39 + Modules/admin/update_view.php | 3 +- Modules/admin/userlist_view.php | 3 +- Modules/eventp/eventp_processlist.php | 4 +- Modules/eventp/locale/eventp_messages.pot | 1138 ++++++++++++++++++ .../locale/it_IT/LC_MESSAGES/eventp_messages.mo | Bin 0 -> 999 bytes .../locale/it_IT/LC_MESSAGES/eventp_messages.po | 1167 +++++++++++++++++++ Modules/feed/Views/feedapi_view.php | 2 +- Modules/feed/Views/feedlist_view.php | 61 +- Modules/feed/engine/CassandraEngine.php | 4 +- Modules/feed/engine/MysqlTimeSeries.php | 12 +- Modules/feed/engine/PHPFina.php | 12 +- Modules/feed/engine/PHPFiwa.php | 4 +- Modules/feed/engine/PHPTimeSeries.php | 8 +- Modules/feed/engine/VirtualFeed.php | 52 +- Modules/feed/feed.js | 7 + Modules/feed/feed_controller.php | 44 +- Modules/feed/feed_model.php | 41 +- Modules/feed/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 13761 -> 13991 bytes Modules/feed/locale/fr_FR/LC_MESSAGES/messages.po | 265 +++-- Modules/feed/locale/it_IT/LC_MESSAGES/messages.mo | Bin 1827 -> 3995 bytes Modules/feed/locale/it_IT/LC_MESSAGES/messages.po | 742 ++++++++++-- Modules/feed/locale/messages.pot | 631 ++++++++++ Modules/input/Views/input.js | 6 + Modules/input/Views/input_api.php | 2 +- Modules/input/Views/input_dialog.php | 167 ++- Modules/input/Views/input_view.js | 1229 +++++++++++++++----- Modules/input/Views/input_view.php | 261 ++++- Modules/input/Views/schedule.php | 1 - Modules/input/input_controller.php | 13 +- Modules/input/input_menu.php | 18 +- Modules/input/input_model.php | 9 +- Modules/input/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 15244 -> 15818 bytes Modules/input/locale/fr_FR/LC_MESSAGES/messages.po | 146 ++- Modules/input/locale/it_IT/LC_MESSAGES/messages.mo | Bin 1153 -> 4010 bytes Modules/input/locale/it_IT/LC_MESSAGES/messages.po | 777 +++++++++---- Modules/input/locale/messages.pot | 543 +++++++++ Modules/input/que_input_controller.php | 4 +- Modules/process/Views/process_ui.js | 20 +- Modules/process/Views/process_ui.php | 21 +- .../locale/it_IT/LC_MESSAGES/process_messages.mo | Bin 0 -> 6119 bytes .../locale/it_IT/LC_MESSAGES/process_messages.po | 1166 +++++++++++++++++++ Modules/process/locale/process_messages.pot | 922 +++++++++++++++ Modules/process/process_controller.php | 4 +- Modules/process/process_model.php | 32 +- Modules/process/process_processlist.php | 81 +- Modules/schedule/Views/schedule_view.php | 1 - .../locale/it_IT/LC_MESSAGES/schedule_messages.mo | Bin 0 -> 2817 bytes .../locale/it_IT/LC_MESSAGES/schedule_messages.po | 317 +++++ Modules/schedule/locale/schedule_messages.pot | 261 +++++ Modules/schedule/schedule_menu.php | 4 +- Modules/user/Views/bookmarks.php | 4 +- Modules/user/deleteuser.php | 4 +- Modules/user/locale/it_IT/LC_MESSAGES/messages.mo | Bin 4776 -> 7188 bytes Modules/user/locale/it_IT/LC_MESSAGES/messages.po | 387 +++--- Modules/user/locale/messages.pot | 361 ++++++ Modules/user/login_block.php | 8 +- Modules/user/profile/profile.php | 1 - Modules/user/rememberme_model.php | 4 +- Modules/user/user_controller.php | 12 +- Modules/user/user_model.php | 43 +- Modules/vis/README.md | 38 + Modules/vis/Views/vis_main_view.php | 1 - .../vis/locale/fr_FR/LC_MESSAGES/vis_messages.mo | Bin 11922 -> 13087 bytes .../vis/locale/fr_FR/LC_MESSAGES/vis_messages.po | 374 +++--- .../vis/locale/it_IT/LC_MESSAGES/vis_messages.mo | Bin 4865 -> 8493 bytes .../vis/locale/it_IT/LC_MESSAGES/vis_messages.po | 1051 +++++++++++++---- Modules/vis/locale/vis_messages.pot | 941 +++++++++++++++ Modules/vis/vis_controller.php | 4 +- Modules/vis/vis_langjs.php | 1 + Modules/vis/vis_menu.php | 4 +- Modules/vis/vis_object.php | 15 +- Modules/vis/visualisations/bargraph.php | 80 +- Modules/vis/visualisations/compare.php | 4 +- .../vis/visualisations/comparison/comparison.php | 1 - .../dailyhistogram/dailyhistogram.php | 1 - Modules/vis/visualisations/editdaily.php | 1 - Modules/vis/visualisations/editrealtime.php | 59 +- Modules/vis/visualisations/graph.js | 6 +- Modules/vis/visualisations/graph.php | 49 +- Modules/vis/visualisations/histgraph.php | 4 +- Modules/vis/visualisations/multigraph.php | 87 +- .../vis/visualisations/multigraph/multigraph.js | 291 ++--- Modules/vis/visualisations/orderbars.php | 4 +- Modules/vis/visualisations/orderthreshold.php | 4 +- Modules/vis/visualisations/rawdata.php | 5 +- Modules/vis/visualisations/realtime.php | 20 +- Modules/vis/visualisations/simplezoom.php | 4 +- Modules/vis/visualisations/smoothie.php | 1 - Modules/vis/visualisations/stacked.php | 13 +- Modules/vis/visualisations/stackedsolar.php | 17 +- Modules/vis/visualisations/threshold.php | 4 +- Modules/vis/visualisations/timecompare.php | 1 - .../vis/visualisations/timecompare/timecompare.js | 7 +- Modules/vis/visualisations/timestoredaily.php | 5 +- Modules/vis/visualisations/zoom.php | 4 +- Modules/vis/widget/vis_render.js | 10 +- Theme/basic/embed.php | 27 +- Theme/basic/emoncms-base.css | 10 + .../locale/fr_FR/LC_MESSAGES/theme_messages.mo | Bin 0 -> 948 bytes .../locale/fr_FR/LC_MESSAGES/theme_messages.po | 54 + .../locale/it_IT/LC_MESSAGES/theme_messages.mo | Bin 0 -> 983 bytes .../locale/it_IT/LC_MESSAGES/theme_messages.po | 54 + Theme/basic/locale/theme_messages.pot | 54 + Theme/basic/menu_view.php | 45 +- Theme/basic/sidebar_view.php | 87 +- Theme/basic/theme.php | 60 +- core.php | 61 +- default-settings.ini | 206 ++++ default-settings.php | 210 ++++ default.settings.php | 193 --- docs/DebianInstall.md | 6 +- docs/LinuxInstall.md | 25 +- docs/RaspberryPi/Low-write-mode.md | 6 +- docs/RaspberryPi/MQTT.md | 6 +- docs/RaspberryPi/install_Wheezy.md | 6 +- docs/RaspberryPi/jessie.md | 6 +- docs/RaspberryPi/read-only.md | 6 +- docs/RaspberryPi/readme.md | 29 +- docs/SharedLinuxHostingInstall.md | 7 +- docs/WindowsInstall.md | 22 +- example.settings.ini | 74 ++ example.settings.php | 86 ++ index.php | 71 +- locale.php | 14 +- param.php | 12 +- process_settings.php | 235 ++-- readme.md | 51 +- scripts/feedwriter.php | 37 +- scripts/phpmqtt_input.php | 98 +- scripts/services/emoncms_mqtt/emoncms_mqtt.php | 131 ++- scripts/services/emoncms_mqtt/emoncms_mqtt.service | 3 +- scripts/services/feedwriter/feedwriter.service | 3 +- settings.env.ini | 14 + version.txt | 2 +- 157 files changed, 15489 insertions(+), 3285 deletions(-) create mode 100644 Lib/emoncms.js create mode 100644 Lib/process_old_settings.php delete mode 100644 Modules/admin/admin_db_view.php create mode 100644 Modules/admin/locale/messages.pot create mode 100644 Modules/eventp/locale/eventp_messages.pot create mode 100644 Modules/eventp/locale/it_IT/LC_MESSAGES/eventp_messages.mo create mode 100644 Modules/eventp/locale/it_IT/LC_MESSAGES/eventp_messages.po create mode 100644 Modules/feed/locale/messages.pot create mode 100644 Modules/input/locale/messages.pot create mode 100644 Modules/process/locale/it_IT/LC_MESSAGES/process_messages.mo create mode 100644 Modules/process/locale/it_IT/LC_MESSAGES/process_messages.po create mode 100644 Modules/process/locale/process_messages.pot create mode 100644 Modules/schedule/locale/it_IT/LC_MESSAGES/schedule_messages.mo create mode 100644 Modules/schedule/locale/it_IT/LC_MESSAGES/schedule_messages.po create mode 100644 Modules/schedule/locale/schedule_messages.pot create mode 100644 Modules/user/locale/messages.pot create mode 100644 Modules/vis/README.md create mode 100644 Modules/vis/locale/vis_messages.pot create mode 100644 Theme/basic/locale/fr_FR/LC_MESSAGES/theme_messages.mo create mode 100644 Theme/basic/locale/fr_FR/LC_MESSAGES/theme_messages.po create mode 100644 Theme/basic/locale/it_IT/LC_MESSAGES/theme_messages.mo create mode 100644 Theme/basic/locale/it_IT/LC_MESSAGES/theme_messages.po create mode 100644 Theme/basic/locale/theme_messages.pot create mode 100644 default-settings.ini create mode 100644 default-settings.php delete mode 100644 default.settings.php create mode 100644 example.settings.ini create mode 100644 example.settings.php create mode 100644 settings.env.ini NEW default settings.php md5: 59e80f731935867f5f93753d49c0fe86 settings.php not updated ------------------------------------------------------------- Updating Emoncms Modules ------------------------------------------------------------- ------------------------------------------ Updating /var/www/emoncms/Modules/app module ------------------------------------------ Fetching origin From https://github.com/emoncms/app x [deleted] (none) -> origin/dev_grid_co2 x [deleted] (none) -> origin/myelectric_timezone_fix x [deleted] (none) -> origin/mysolar_history e921d89..90a3dc4 stable -> origin/stable 6bb6958..c4b2ceb master -> origin/master * [new branch] octopus_outgoing -> origin/octopus_outgoing * [new tag] 1.1.1 -> 1.1.1 * [new tag] 1.2.0 -> 1.2.0 * [new tag] 1.2.1 -> 1.2.1 * [new tag] 2.0.0 -> 2.0.0 * [new tag] 2.0.1 -> 2.0.1 * [new tag] 2.1.1 -> 2.1.1 * [new tag] 2.1.0 -> 2.1.0 - git branch: stable - git tags: 2.0.1-38-ge921d89 - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating e921d89..90a3dc4 Fast-forward Lib/config.js | 49 +- Lib/feed.js | 1 + Lib/timeseries.js | 4 + Lib/vis.helper.js | 5 +- Views/app_sidebar.php | 82 --- Views/app_view.php | 62 ++- Views/css/app.css | 115 ++++ Views/css/dark.css | 87 +-- Views/js/app.js | 12 + app_controller.php | 10 +- apps/OpenEnergyMonitor/config-nav.php | 4 +- .../costcomparison/costcomparison.php | 23 +- apps/OpenEnergyMonitor/myelectric/myelectric.php | 68 ++- apps/OpenEnergyMonitor/myelectric2/myelectric2.php | 32 +- apps/OpenEnergyMonitor/myenergy/myenergy.php | 78 ++- apps/OpenEnergyMonitor/myheatpump/myheatpump.php | 32 +- apps/OpenEnergyMonitor/mysolarpv/mysolarpv.php | 167 ++++-- .../mysolarpvdivert/mysolarpvdivert.php | 114 ++-- apps/OpenEnergyMonitor/octopus/octopus.php | 398 +++++++++---- apps/OpenEnergyMonitor/openevse/app.json | 5 - apps/OpenEnergyMonitor/openevse/openevse.php | 618 --------------------- apps/OpenEnergyMonitor/timeofuse/timeofuse.php | 29 +- apps/OpenEnergyMonitor/timeofuse2/timeofuse2.php | 28 +- apps/OpenEnergyMonitor/timeofusecl/timeofusecl.php | 28 +- apps/blank/blank.php | 4 +- apps/template/template.php | 4 +- images/agile_app.png | Bin 0 -> 116149 bytes module.json | 2 +- 28 files changed, 850 insertions(+), 1211 deletions(-) delete mode 100644 Views/app_sidebar.php create mode 100644 Views/js/app.js delete mode 100644 apps/OpenEnergyMonitor/openevse/app.json delete mode 100644 apps/OpenEnergyMonitor/openevse/openevse.php create mode 100644 images/agile_app.png ------------------------------------------ Updating /var/www/emoncms/Modules/config module ------------------------------------------ Fetching origin From https://github.com/emoncms/config 373b2d7..8d278bc stable -> origin/stable f38b465..8d278bc master -> origin/master * [new tag] 1.1.0 -> 1.1.0 * [new tag] 2.0.0 -> 2.0.0 * [new tag] 2.0.1 -> 2.0.1 * [new tag] 2.0.2 -> 2.0.2 * [new tag] 2.0.5 -> 2.0.5 - git branch: stable - git tags: 2.0.2-6-g373b2d7 - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating 373b2d7..8d278bc Fast-forward calibration.php | 1 - config_controller.php | 25 +++++++++++++++---------- config_model.php | 34 +++++++++++++++++++++++----------- connect.php | 2 -- editor.php | 2 -- module.json | 2 +- view.php | 4 ++-- 7 files changed, 41 insertions(+), 29 deletions(-) ------------------------------------------ Updating /var/www/emoncms/Modules/dashboard module ------------------------------------------ Fetching origin From https://github.com/emoncms/dashboard x [deleted] (none) -> origin/content_editor x [deleted] (none) -> origin/feature/barwidget-rework x [deleted] (none) -> origin/palette2 x [deleted] (none) -> origin/tagname_option e88cdc7..3b92632 stable -> origin/stable 01fca03..38ca34b master -> origin/master * [new tag] 1.2.0 -> 1.2.0 * [new tag] 1.3.0 -> 1.3.0 * [new tag] 1.3.1 -> 1.3.1 * [new tag] 1.3.2 -> 1.3.2 * [new tag] 1.3.3 -> 1.3.3 * [new tag] 2.0.0 -> 2.0.0 * [new tag] 2.0.1 -> 2.0.1 * [new tag] 2.0.2 -> 2.0.2 * [new tag] 2.0.3 -> 2.0.3 * [new tag] 2.0.7 -> 2.0.7 * [new tag] 2.0.5 -> 2.0.5 - git branch: stable - git tags: 2.0.3-20-ge88cdc7 - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating e88cdc7..3b92632 Fast-forward Views/dashboard_config.php | 7 +- Views/dashboard_edit_view.php | 39 +- Views/dashboard_list.php | 16 +- Views/dashboard_view.php | 28 +- dashboard_controller.php | 5 +- dashboard_menu.php | 12 +- dashboard_model.php | 12 +- dashboard_schema.php | 1 + module.json | 2 +- widget/battery/battery_render.js | 4 +- widget/button/button_render.js | 15 +- widget/curl/curl_render.js | 2 +- widget/feedvalue/feedvalue_render.js | 23 +- widget/isactivefeed/isactivefeed_render.js | 41 +- widget/kwhperiod/kwhperiod_doco.png | Bin 0 -> 243205 bytes widget/kwhperiod/kwhperiod_render.js | 864 +++++++++++++++++++++++++++++ widget/kwhperiod/kwhperiod_render.md | 1 + widget/thresholds/thresholds_render.js | 37 +- 18 files changed, 1047 insertions(+), 62 deletions(-) create mode 100644 widget/kwhperiod/kwhperiod_doco.png create mode 100644 widget/kwhperiod/kwhperiod_render.js create mode 100644 widget/kwhperiod/kwhperiod_render.md ------------------------------------------ Updating /var/www/emoncms/Modules/device module ------------------------------------------ Fetching origin From https://github.com/emoncms/device x [deleted] (none) -> origin/remove_user_dependency a9c4dfe..b2fd821 master -> origin/master * [new branch] stable -> origin/stable * [new tag] 2.0.0 -> 2.0.0 * [new tag] 2.0.5 -> 2.0.5 * [new tag] 2.0.4 -> 2.0.4 - git branch: master - git tags: 2.0.0-6-ga9c4dfe - no local changes - running: git pull origin master Branch master set up to track remote branch master from origin. Updating a9c4dfe..b2fd821 Fast-forward Views/device_dialog.css | 16 +- Views/device_dialog.js | 5 +- Views/device_view.php | 5 +- .../circuitsetup-split-phase_solar.json | 318 ++++++++++++++++++ data/CircuitSetup/circuitsetup_split-phase.json | 374 ++++++++++----------- device_controller.php | 16 +- device_model.php | 72 +++- device_template.php | 4 +- examples/add_input.json | 68 ++++ examples/readme.md | 3 + examples/reset2original.json | 87 +++++ module.json | 2 +- 12 files changed, 760 insertions(+), 210 deletions(-) create mode 100644 data/CircuitSetup/circuitsetup-split-phase_solar.json create mode 100644 examples/add_input.json create mode 100644 examples/readme.md create mode 100644 examples/reset2original.json ------------------------------------------ Updating /var/www/emoncms/Modules/graph module ------------------------------------------ Fetching origin From https://github.com/emoncms/graph x [deleted] (none) -> origin/develop c69258c..7df046d stable -> origin/stable 8b74105..10b6855 emoncmsorg -> origin/emoncmsorg cff96ed..56355c1 master -> origin/master * [new tag] 1.2.1 -> 1.2.1 * [new tag] 1.2.2 -> 1.2.2 * [new tag] 1.2.3 -> 1.2.3 * [new tag] 2.0.0 -> 2.0.0 * [new tag] 2.0.1 -> 2.0.1 * [new tag] 2.0.8 -> 2.0.8 - git branch: stable - git tags: 2.0.1-22-gc69258c - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating c69258c..7df046d Fast-forward Views/sidebar.php | 45 ++- embed.php | 40 +- graph.css | 6 + graph.js | 735 ++++++++++++++++++++++------------- graph_controller.php | 118 ------ group_view.php | 1 - locale/fr_FR/LC_MESSAGES/messages.mo | Bin 3902 -> 4671 bytes locale/fr_FR/LC_MESSAGES/messages.po | 243 +++++++----- module.json | 2 +- view.php | 138 +++---- widget/graph_widget.php | 3 +- 11 files changed, 743 insertions(+), 588 deletions(-) ------------------------------------------ Updating /var/www/emoncms/Modules/wifi module ------------------------------------------ Fetching origin From https://github.com/emoncms/wifi 15ddf1e..274bcd5 stable -> origin/stable cb78a15..c81609e 9.0 -> origin/9.0 f3adb4c..274bcd5 master -> origin/master * [new branch] save_with_tee -> origin/save_with_tee * [new tag] 1.1.0 -> 1.1.0 * [new tag] 1.1.1 -> 1.1.1 * [new tag] 1.2.0 -> 1.2.0 * [new tag] 1.3.1 -> 1.3.1 * [new tag] 2.0.0 -> 2.0.0 - git branch: stable - git tags: 2.0.0-26-g15ddf1e - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating 15ddf1e..274bcd5 Fast-forward README.md | 2 -- module.json | 2 +- wifi.php | 14 +++++++------- wifi_controller.php | 10 +++++----- 4 files changed, 13 insertions(+), 15 deletions(-) ------------------------------------------ Updating postprocess module ------------------------------------------ Fetching origin From https://github.com/emoncms/postprocess * [new branch] master -> origin/master * [new branch] stable -> origin/stable - git branch: emonpi - git tags: 2.1.0-12-g5c7b36e - no local changes - running: git pull origin emonpi warning: refname 'origin/emonpi' is ambiguous. fatal: Ambiguous object name: 'origin/emonpi'. Already up-to-date. ------------------------------------------ Updating sync module ------------------------------------------ Fetching origin From https://github.com/emoncms/sync c090bfc..b2c9740 master -> origin/master * [new branch] stable -> origin/stable * [new tag] 2.0.5 -> 2.0.5 * [new tag] 2.0.3 -> 2.0.3 * [new tag] 2.0.4 -> 2.0.4 - git branch: master - git tags: 2.0.1-12-gc090bfc - no local changes - running: git pull origin master Branch master set up to track remote branch master from origin. Updating c090bfc..b2c9740 Fast-forward sync-module/Module.json | 2 +- sync-module/sync_controller.php | 57 +++++++++-------- sync-module/sync_view.php | 134 +++++++++++++++++++++++++++------------- sync_run.php | 22 +++---- 4 files changed, 134 insertions(+), 81 deletions(-) ------------------------------------------ Updating backup module ------------------------------------------ Fetching origin From https://github.com/emoncms/backup 52dd2d9..8b670a0 stable -> origin/stable 52dd2d9..7a24d19 master -> origin/master * [new tag] 2.2.2 -> 2.2.2 * [new tag] 2.2.1 -> 2.2.1 - git branch: stable - git tags: 2.0.0-16-g52dd2d9 - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating 52dd2d9..8b670a0 Fast-forward backup-module/backup_controller.php | 59 ++++++++-- backup-module/backup_view.php | 49 ++++++++- backup-module/module.json | 2 +- emoncms-export.sh | 8 ++ emoncms-import.sh | 49 ++++----- get_emoncms_feed_datadir.php | 6 +- get_emoncms_mysql_auth.php | 2 +- install.sh | 106 +++++++++++++----- readme.md | 32 +++--- usb-import.sh | 207 ++++++++++++++++++++++++++++++++++++ 10 files changed, 434 insertions(+), 86 deletions(-) create mode 100755 usb-import.sh switching postprocess module to stable branch Switched to a new branch 'stable' Branch stable set up to track remote branch stable from origin. switching device module to stable branch Switched to a new branch 'stable' Branch stable set up to track remote branch stable from origin. switching sync module to stable branch Switched to a new branch 'stable' Branch stable set up to track remote branch stable from origin. ------------------------------------------ Auto Installation of Emoncms Modules ------------------------------------------ - graph module already installed - device module already installed - postprocess module already installed - sync module already installed - backup module already installed /home/pi/emonpi/sudoers.d/emoncms-rebootbutton: parsed OK emoncms-rebootbutton sudoers entry installed /home/pi/emonpi/sudoers.d/emoncms-filesystem: parsed OK emoncms-filesystem sudoers entry installed /home/pi/emonpi/sudoers.d/wifi-sudoers: parsed OK wifi-sudoers sudoers entry installed www-data : www-data video systemd-journal ------------------------------------------ SERVICES ------------------------------------------ emoncms_mqtt.service already installed feedwriter.service already installed service-runner.service already installed ------------------------------------------ Reloading systemctl deamon Update Emoncms database ["ALTER TABLE `dashboard` MODIFY `alias` varchar(20) DEFAULT ''","ALTER TABLE `dashboard` ADD `fullscreen` tinyint(1) DEFAULT '0'","ALTER TABLE `users` MODIFY `email` varchar(64)","ALTER TABLE `users` MODIFY `preferences` text"] Restarting Services... - sudo systemctl restart feedwriter.service --- ActiveState=active --- - sudo systemctl restart emoncms_mqtt.service --- ActiveState=active --- - sudo systemctl restart emonhub.service --- ActiveState=active --- - sudo /etc/init.d/openhab restart Restarting openhab (via systemctl): openhab.service. ● openhab.service - Starts and stops the openHAB Home Automation Bus Loaded: loaded (/usr/lib/systemd/system/openhab.service; enabled) Active: active (running) since Sat 2020-04-11 11:35:44 AEST; 98ms ago Docs: http://www.openhab.org Process: 19011 ExecStartPre=/usr/share/openhab/bin/setpermissions.sh (code=exited, status=0/SUCCESS) Main PID: 19062 (openhab.sh) CGroup: /system.slice/openhab.service ├─19062 /bin/sh /usr/share/openhab/bin/openhab.sh -o └─19087 /usr/bin/java -Dlogback.configurationFile=/etc/openhab/logback.xml -Dosgi.clean=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Djetty.port=8080 -Dopenhab.configfile=/etc/openhab/configurations/openhab.cfg -Dopenhab.configdir=/etc/openhab/configurations -Dopenhab.logdir=/var/log/openhab -Dsmarthome.userdata=/var/lib/openhab -Djetty.home=/usr/share/openhab -Djetty.port.ssl=8443 -Djetty.config=/etc/openhab/jetty -Djetty.logs=/var/log/openhab -Djetty.rundir=/usr/share/openhab -Dfelix.fileinstall.dir=/usr/share/openhab/addons -Dfelix.fileinstall.filter=.*\.jar -Djava.library.path=/usr/share/openhab/lib -Djava.security.auth.login.config=/etc/openhab/login.conf -Dorg.quartz.properties=/etc/openhab/quartz.properties -Dequinox.ds.block_timeout=240000 -Dequinox.scr.waitTimeOnBlock=60000 -Dfelix.fileinstall.active.level=4 -Djava.awt.headless=true -jar /usr/share/openhab/server/plugins/org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar -configuration /var/lib/openhab/workspace -data /var/lib/openhab/workspace -console 5555 Apr 11 11:35:44 emonpi setpermissions.sh[19011]: setting owner openhab:openhab recursively for /var/lib/openhab Apr 11 11:35:44 emonpi setpermissions.sh[19011]: setting permissions and owner openhab:openhab recursively for /var/log/openhab Apr 11 11:35:44 emonpi setpermissions.sh[19011]: setting permissions and owner openhab:openhab recursively for /etc/openhab/configurations Apr 11 11:35:44 emonpi setpermissions.sh[19011]: setting permissions and owner openhab:openhab for /usr/share/openhab/webapps/static Apr 11 11:35:44 emonpi setpermissions.sh[19011]: setting permissions and owner openhab:openhab for /etc/openhab/jetty/etc/keystore Apr 11 11:35:44 emonpi setpermissions.sh[19011]: setting permissions and owner openhab:openhab for /etc/openhab/configurations/users.cfg Apr 11 11:35:44 emonpi systemd[1]: Started Starts and stops the openHAB Home Automation Bus. Symlinking emonpiupdate.log Installing emoncms logrotate... Now setting up Logrotate... Backing up old logrotate configuration... Linked to new logrotate configuration... Backing up old logrotate cron job... mv: cannot stat ‘/etc/cron.daily/logrotate’: No such file or directory Linked to new logrotate cron job... Completed Completed Running logrotate... set log rotate config owner to root ------------------------------------------ Emoncms update script complete ------------------------------------------ Starting emonPi LCD service.. Filesystem is locked - Read Only access type ' rpi-rw ' to unlock ------------------------------------------------------------- emonPi update done: Sat 11 Apr 11:35:52 AEST 2020 ------------------------------------------------------------- restarting service-runner