Starting update via service-runner-update.sh (v3.0) > - emonSD version: emonSD-17Oct19 emonSD base image check passed...continue update git pull /opt/openenergymonitor/EmonScripts master * stable On branch stable Your branch is up to date with 'origin/stable'. nothing to commit, working tree clean From https://github.com/openenergymonitor/EmonScripts 13d472a..7629d56 stable -> origin/stable * [new branch] emonhub_python3 -> origin/emonhub_python3 ff3d1c6..5f8e7a9 master -> origin/master * [new branch] remove_large_log -> origin/remove_large_log * [new tag] 1.0.7-beta -> 1.0.7-beta * [new tag] 1.0.3-beta -> 1.0.3-beta * [new tag] 1.0.4-beta -> 1.0.4-beta * [new tag] 1.0.5-beta -> 1.0.5-beta * [new tag] 1.0.6-beta -> 1.0.6-beta * [new tag] v1.0.2-beta -> v1.0.2-beta Updating 13d472a..7629d56 Fast-forward EmonPiFileSystem.md | 2 +- defaults/etc/logrotate.d/00_defaults | 12 ++++++ defaults/readme.md | 2 +- install/emoncms_core.sh | 76 ++++++++++++++++++++++-------------- install/emoncms_emonpi_modules.sh | 30 ++++++++++++++ install/emoncms_modules.sh | 29 +------------- install/emonsd.config.ini | 42 +++++++++++++------- install/emonsd.sh | 3 ++ install/init_resize.sh | 20 ++++++++-- install/main.sh | 5 ++- install/non_emonsd.sh | 1 + install/readme.md | 22 ++++++++++- install/rpi-install.md | 18 +++++++-- safe-update | 1 + update/config.ini | 19 --------- update/emoncms_core.sh | 57 +++++++++++++++------------ update/emoncms_modules.sh | 26 +++++------- update/emonhub.sh | 31 ++++++++++++--- update/emonpi.sh | 2 +- update/emontxv3cm.sh | 36 +++++++++++++++++ update/load_config.sh | 11 ++++++ update/main.sh | 9 ++++- update/rfm12pi.sh | 25 ++++++++++++ update/rfm69pi.sh | 2 +- update/service-runner-update.sh | 17 +++++++- version.txt | 2 +- 26 files changed, 342 insertions(+), 158 deletions(-) create mode 100755 install/emoncms_emonpi_modules.sh delete mode 100755 update/config.ini create mode 100755 update/emontxv3cm.sh create mode 100644 update/load_config.sh create mode 100755 update/rfm12pi.sh ------------------------------------------------------------- Main Update Script ------------------------------------------------------------- Date: Sun 21 Jun 14:50:07 BST 2020 EUID: 1000 openenergymonitor_dir: /opt/openenergymonitor type: all firmware: Hardware detected: EmonPi Stopping emonPiLCD service Display update message on LCD Traceback (most recent call last): File "/opt/openenergymonitor/emonpi/lcd/./emonPiLCD_update.py", line 15, in lcd_status = subprocess.check_output(["/home/pi/emonpi/lcd/emonPiLCD_detect.sh", "%s" % i2c_address]) File "/usr/lib/python2.7/subprocess.py", line 216, in check_output process = Popen(stdout=PIPE, *popenargs, **kwargs) File "/usr/lib/python2.7/subprocess.py", line 394, in __init__ errread, errwrite) File "/usr/lib/python2.7/subprocess.py", line 1047, in _execute_child raise child_exception OSError: [Errno 2] No such file or directory git pull /opt/openenergymonitor/emonpi * master On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean Fetching origin From https://github.com/openenergymonitor/emonpi - [deleted] (none) -> origin/settings_object a9839b7..73a63d2 master -> origin/master * [new tag] 2.9.2 -> 2.9.2 Updating a9839b7..73a63d2 Fast-forward emoncmsdbupdate_old.php | 14 ++++++++++++++ firmware/platformio.ini | 4 ++-- firmware/src/src.ino | 3 ++- lcd/emonPiLCD.py | 10 ++++------ lcd/emonPiLCD_update.py | 5 ++++- 5 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 emoncmsdbupdate_old.php git pull /opt/openenergymonitor/RFM2Pi * master On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean Fetching origin From https://github.com/openenergymonitor/RFM2Pi e5d874d..1658310 master -> origin/master Updating e5d874d..1658310 Fast-forward hardware/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Start emonhub update script: ------------------------------------------------------------- emonHub update ------------------------------------------------------------- git pull /opt/openenergymonitor/emonhub Migrating from emon-pi branch to stable branch git fetch --all --prune -v Fetching origin From https://github.com/openenergymonitor/emonhub - [deleted] (none) -> origin/service_update POST git-upload-pack (gzip 1434 to 793 bytes) bbd2e71..e443b94 emon-pi -> origin/emon-pi * [new branch] MQTTSubscriberInterfacer -> origin/MQTTSubscriberInterfacer * [new branch] SDS011 -> origin/SDS011 5d239b3..a97f849 env_example -> origin/env_example cb798e7..0a82be4 lanip-status -> origin/lanip-status * [new branch] master -> origin/master 5e0fa7d..1a49197 redis_config_interface -> origin/redis_config_interface * [new branch] stable -> origin/stable f3f78d8..1ce386a unitless_decoder -> origin/unitless_decoder * [new tag] 2.1.4 -> 2.1.4 * [new tag] 2.1.3 -> 2.1.3 git checkout stable Switched to a new branch 'stable' Branch 'stable' set up to track remote branch 'stable' from 'origin'. git pull origin stable From https://github.com/openenergymonitor/emonhub * branch stable -> FETCH_HEAD Already up to date. running emonhub install script emonSD_pi_env:1 WARNING: apt does not have a stable CLI interface. Use with caution in scripts. Get:1 http://raspbian.raspberrypi.org/raspbian buster InRelease [15.0 kB] Get:2 http://archive.raspberrypi.org/debian buster InRelease [32.6 kB] Get:3 http://raspbian.raspberrypi.org/raspbian buster/main armhf Packages [13.0 MB] Get:4 http://archive.raspberrypi.org/debian buster/main armhf Packages [330 kB] Get:5 http://raspbian.raspberrypi.org/raspbian buster/contrib armhf Packages [58.7 kB] Get:6 http://raspbian.raspberrypi.org/raspbian buster/non-free armhf Packages [104 kB] Fetched 13.5 MB in 24s (573 kB/s) Reading package lists... Building dependency tree... Reading state information... 147 packages can be upgraded. Run 'apt list --upgradable' to see them. Reading package lists... Building dependency tree... Reading state information... The following additional packages will be installed: dh-python libpython3-dev libpython3.7 libpython3.7-dev libpython3.7-minimal libpython3.7-stdlib python3-asn1crypto python3-cffi-backend python3-crypto python3-cryptography python3-dbus python3-dev python3-distutils python3-entrypoints python3-gi python3-keyring python3-keyrings.alt python3-lib2to3 python3-secretstorage python3-setuptools python3-wheel python3-xdg python3.7 python3.7-dev python3.7-minimal Suggested packages: python-configobj-doc python-crypto-doc python-cryptography-doc python3-cryptography-vectors python-dbus-doc python3-dbus-dbg gnome-keyring libkf5wallet-bin gir1.2-gnomekeyring-1.0 python-secretstorage-doc python3-wxgtk3.0 | python3-wxgtk python-setuptools-doc python3.7-venv python3.7-doc binfmt-support The following NEW packages will be installed: dh-python libpython3-dev libpython3.7-dev python3-asn1crypto python3-cffi-backend python3-configobj python3-crypto python3-cryptography python3-dbus python3-dev python3-distutils python3-entrypoints python3-gi python3-keyring python3-keyrings.alt python3-lib2to3 python3-pip python3-secretstorage python3-serial python3-setuptools python3-wheel python3-xdg python3.7-dev The following packages will be upgraded: libpython3.7 libpython3.7-minimal libpython3.7-stdlib python3.7 python3.7-minimal 5 upgraded, 23 newly installed, 0 to remove and 142 not upgraded. Need to get 54.9 MB of archives. After this operation, 81.1 MB of additional disk space will be used. Get:1 http://archive.raspberrypi.org/debian buster/main armhf python3-pip all 18.1-5+rpt1 [171 kB] Get:2 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3.7 armhf 3.7.3-2+deb10u1 [330 kB] Get:3 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf libpython3.7 armhf 3.7.3-2+deb10u1 [1,252 kB] Get:19 http://raspbian.raspberrypi.org/raspbian buster/main armhf python3-dev armhf 3.7.3-1 [1,264 B] Get:4 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf libpython3.7-stdlib armhf 3.7.3-2+deb10u1 [1,662 kB] Get:5 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3.7-minimal armhf 3.7.3-2+deb10u1 [1,463 kB] Get:6 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf libpython3.7-minimal armhf 3.7.3-2+deb10u1 [583 kB] Get:7 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-lib2to3 all 3.7.3-1 [76.7 kB] Get:8 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-distutils all 3.7.3-1 [142 kB] Get:9 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf dh-python all 3.20190308 [99.3 kB] Get:10 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf libpython3.7-dev armhf 3.7.3-2+deb10u1 [47.2 MB] Get:11 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf libpython3-dev armhf 3.7.3-1 [20.1 kB] Get:12 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-asn1crypto all 0.24.0-1 [78.2 kB] Get:13 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-cffi-backend armhf 1.12.2-1 [70.1 kB] Get:14 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-configobj all 5.0.6-3 [35.7 kB] Get:15 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-crypto armhf 2.6.1-9+b1 [251 kB] Get:16 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-cryptography armhf 2.6.1-3+deb10u2 [184 kB] Get:17 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-dbus armhf 1.2.8-3 [95.9 kB] Get:18 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3.7-dev armhf 3.7.3-2+deb10u1 [522 kB] Get:20 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-entrypoints all 0.3-1 [5,508 B] Get:21 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-gi armhf 3.30.4-1 [161 kB] Get:22 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-secretstorage all 2.3.1-2 [14.2 kB] Get:23 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-keyring all 17.1.1-1 [43.1 kB] Get:24 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-keyrings.alt all 3.1.1-1 [18.2 kB] Get:25 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-serial all 3.4-4 [67.6 kB] Get:26 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-setuptools all 40.8.0-1 [306 kB] Get:27 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-wheel all 0.32.3-2 [19.4 kB] Get:28 http://mirror.mythic-beasts.com/raspbian/raspbian buster/main armhf python3-xdg all 0.25-5 [35.9 kB] apt-listchanges: Reading changelogs... dpkg-preconfigure: unable to re-open stdin: No such file or directory Fetched 54.9 MB in 1min 48s (507 kB/s) (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 47086 files and directories currently installed.) Preparing to unpack .../00-python3.7_3.7.3-2+deb10u1_armhf.deb ... Unpacking python3.7 (3.7.3-2+deb10u1) over (3.7.3-2) ... Preparing to unpack .../01-libpython3.7_3.7.3-2+deb10u1_armhf.deb ... Unpacking libpython3.7:armhf (3.7.3-2+deb10u1) over (3.7.3-2) ... Preparing to unpack .../02-libpython3.7-stdlib_3.7.3-2+deb10u1_armhf.deb ... Unpacking libpython3.7-stdlib:armhf (3.7.3-2+deb10u1) over (3.7.3-2) ... Preparing to unpack .../03-python3.7-minimal_3.7.3-2+deb10u1_armhf.deb ... Unpacking python3.7-minimal (3.7.3-2+deb10u1) over (3.7.3-2) ... Preparing to unpack .../04-libpython3.7-minimal_3.7.3-2+deb10u1_armhf.deb ... Unpacking libpython3.7-minimal:armhf (3.7.3-2+deb10u1) over (3.7.3-2) ... Selecting previously unselected package python3-lib2to3. Preparing to unpack .../05-python3-lib2to3_3.7.3-1_all.deb ... Unpacking python3-lib2to3 (3.7.3-1) ... Selecting previously unselected package python3-distutils. Preparing to unpack .../06-python3-distutils_3.7.3-1_all.deb ... Unpacking python3-distutils (3.7.3-1) ... Selecting previously unselected package dh-python. Preparing to unpack .../07-dh-python_3.20190308_all.deb ... Unpacking dh-python (3.20190308) ... Selecting previously unselected package libpython3.7-dev:armhf. Preparing to unpack .../08-libpython3.7-dev_3.7.3-2+deb10u1_armhf.deb ... Unpacking libpython3.7-dev:armhf (3.7.3-2+deb10u1) ... Selecting previously unselected package libpython3-dev:armhf. Preparing to unpack .../09-libpython3-dev_3.7.3-1_armhf.deb ... Unpacking libpython3-dev:armhf (3.7.3-1) ... Selecting previously unselected package python3-asn1crypto. Preparing to unpack .../10-python3-asn1crypto_0.24.0-1_all.deb ... Unpacking python3-asn1crypto (0.24.0-1) ... Selecting previously unselected package python3-cffi-backend. Preparing to unpack .../11-python3-cffi-backend_1.12.2-1_armhf.deb ... Unpacking python3-cffi-backend (1.12.2-1) ... Selecting previously unselected package python3-configobj. Preparing to unpack .../12-python3-configobj_5.0.6-3_all.deb ... Unpacking python3-configobj (5.0.6-3) ... Selecting previously unselected package python3-crypto. Preparing to unpack .../13-python3-crypto_2.6.1-9+b1_armhf.deb ... Unpacking python3-crypto (2.6.1-9+b1) ... Selecting previously unselected package python3-cryptography. Preparing to unpack .../14-python3-cryptography_2.6.1-3+deb10u2_armhf.deb ... Unpacking python3-cryptography (2.6.1-3+deb10u2) ... Selecting previously unselected package python3-dbus. Preparing to unpack .../15-python3-dbus_1.2.8-3_armhf.deb ... Unpacking python3-dbus (1.2.8-3) ... Selecting previously unselected package python3.7-dev. Preparing to unpack .../16-python3.7-dev_3.7.3-2+deb10u1_armhf.deb ... Unpacking python3.7-dev (3.7.3-2+deb10u1) ... Selecting previously unselected package python3-dev. Preparing to unpack .../17-python3-dev_3.7.3-1_armhf.deb ... Unpacking python3-dev (3.7.3-1) ... Selecting previously unselected package python3-entrypoints. Preparing to unpack .../18-python3-entrypoints_0.3-1_all.deb ... Unpacking python3-entrypoints (0.3-1) ... Selecting previously unselected package python3-gi. Preparing to unpack .../19-python3-gi_3.30.4-1_armhf.deb ... Unpacking python3-gi (3.30.4-1) ... Selecting previously unselected package python3-secretstorage. Preparing to unpack .../20-python3-secretstorage_2.3.1-2_all.deb ... Unpacking python3-secretstorage (2.3.1-2) ... Selecting previously unselected package python3-keyring. Preparing to unpack .../21-python3-keyring_17.1.1-1_all.deb ... Unpacking python3-keyring (17.1.1-1) ... Selecting previously unselected package python3-keyrings.alt. Preparing to unpack .../22-python3-keyrings.alt_3.1.1-1_all.deb ... Unpacking python3-keyrings.alt (3.1.1-1) ... Selecting previously unselected package python3-pip. Preparing to unpack .../23-python3-pip_18.1-5+rpt1_all.deb ... Unpacking python3-pip (18.1-5+rpt1) ... Selecting previously unselected package python3-serial. Preparing to unpack .../24-python3-serial_3.4-4_all.deb ... Unpacking python3-serial (3.4-4) ... Selecting previously unselected package python3-setuptools. Preparing to unpack .../25-python3-setuptools_40.8.0-1_all.deb ... Unpacking python3-setuptools (40.8.0-1) ... Selecting previously unselected package python3-wheel. Preparing to unpack .../26-python3-wheel_0.32.3-2_all.deb ... Unpacking python3-wheel (0.32.3-2) ... Selecting previously unselected package python3-xdg. Preparing to unpack .../27-python3-xdg_0.25-5_all.deb ... Unpacking python3-xdg (0.25-5) ... Setting up python3-entrypoints (0.3-1) ... Setting up python3-dbus (1.2.8-3) ... Setting up python3-xdg (0.25-5) ... Setting up libpython3.7-minimal:armhf (3.7.3-2+deb10u1) ... Setting up python3-wheel (0.32.3-2) ... Setting up python3-serial (3.4-4) ... Setting up python3-configobj (5.0.6-3) ... Setting up python3-gi (3.30.4-1) ... Setting up python3.7-minimal (3.7.3-2+deb10u1) ... Setting up python3-crypto (2.6.1-9+b1) ... Setting up python3-lib2to3 (3.7.3-1) ... Setting up python3-asn1crypto (0.24.0-1) ... Setting up python3-cffi-backend (1.12.2-1) ... Setting up python3-distutils (3.7.3-1) ... Setting up dh-python (3.20190308) ... Setting up libpython3.7-stdlib:armhf (3.7.3-2+deb10u1) ... Setting up python3-setuptools (40.8.0-1) ... Setting up libpython3.7:armhf (3.7.3-2+deb10u1) ... Setting up libpython3.7-dev:armhf (3.7.3-2+deb10u1) ... Setting up python3-cryptography (2.6.1-3+deb10u2) ... Setting up python3-pip (18.1-5+rpt1) ... Setting up python3-keyrings.alt (3.1.1-1) ... Setting up python3.7 (3.7.3-2+deb10u1) ... Setting up libpython3-dev:armhf (3.7.3-1) ... Setting up python3.7-dev (3.7.3-2+deb10u1) ... Setting up python3-secretstorage (2.3.1-2) ... Setting up python3-dev (3.7.3-1) ... Setting up python3-keyring (17.1.1-1) ... Processing triggers for libc-bin (2.28-10+rpi1) ... Processing triggers for man-db (2.8.5-2) ... Processing triggers for mime-support (3.62) ... Looking in indexes: https://pypi.org/simple, https://www.piwheels.org/simple Collecting paho-mqtt Downloading https://www.piwheels.org/simple/paho-mqtt/paho_mqtt-1.5.0-py3-none-any.whl (61kB) Requirement already satisfied: requests in /usr/lib/python3/dist-packages (2.21.0) Installing collected packages: paho-mqtt Successfully installed paho-mqtt-1.5.0 Unit /etc/systemd/system/serial-getty@ttyAMA0.service is masked, ignoring. useradd: user 'emonhub' already exists - installing emonhub.service - Service ActiveState=active - Service ActiveState=active 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 [[15]] Node 15 already present [[16]] Node 16 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: ------------------------------------------------------------- Update Emoncms Core ------------------------------------------------------------- Checking status of /var/www/emoncms git repository - git branch: stable - no local changes - running: git pull origin stable Fetching origin From https://github.com/emoncms/emoncms 8a559545..8af639a9 stable -> origin/stable * [new branch] auto_detect_timezone -> origin/auto_detect_timezone * [new branch] emoncms_component_table -> origin/emoncms_component_table * [new branch] emonmuc -> origin/emonmuc * [new branch] kwh_hh -> origin/kwh_hh 8a559545..28fb790b master -> origin/master 03978db5..439111a9 mqttauth -> origin/mqttauth * [new branch] timezone_support_csv_export -> origin/timezone_support_csv_export * [new tag] 10.2.3 -> 10.2.3 * [new tag] 10.1.10 -> 10.1.10 * [new tag] 10.1.11 -> 10.1.11 * [new tag] 10.2.0 -> 10.2.0 * [new tag] 10.2.1 -> 10.2.1 * [new tag] 10.2.2 -> 10.2.2 From https://github.com/emoncms/emoncms * branch stable -> FETCH_HEAD Updating 8a559545..8af639a9 Fast-forward .travis.yml | 5 + Lib/EmonLogger.php | 59 +- Lib/dbschemasetup.php | 76 +- Lib/email.php | 105 +- Lib/enum.php | 29 +- Lib/misc/nav_functions.php | 11 +- Lib/misc/sidebar.css | 50 +- Lib/misc/sidebar.js | 7 +- Lib/process_old_settings.php | 11 +- Lib/units.php | 6 +- Modules/admin/admin_controller.php | 43 +- Modules/admin/admin_db_view.php | 23 - Modules/admin/admin_main_view.php | 16 +- Modules/admin/admin_menu.php | 2 +- Modules/admin/admin_model.php | 74 +- 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 | 6 +- 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 | 49 +- Modules/feed/engine/TemplateEngine.php | 67 +- Modules/feed/engine/VirtualFeed.php | 46 +- Modules/feed/feed_controller.php | 48 +- Modules/feed/feed_model.php | 43 +- Modules/feed/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 13798 -> 13991 bytes Modules/feed/locale/fr_FR/LC_MESSAGES/messages.po | 29 +- 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_api.php | 2 +- Modules/input/Views/input_view.js | 31 +- Modules/input/Views/input_view.php | 25 +- Modules/input/Views/schedule.php | 8 +- Modules/input/input_controller.php | 3 +- Modules/input/input_menu.php | 10 +- Modules/input/input_methods.php | 1 + Modules/input/input_model.php | 6 +- 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/process/Views/process_ui.js | 14 +- Modules/process/Views/process_ui.php | 9 +- .../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_model.php | 32 +- Modules/process/process_processlist.php | 151 ++- .../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/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/rememberme_model.php | 4 +- Modules/user/user_controller.php | 4 +- Modules/user/user_menu.php | 5 +- Modules/user/user_model.php | 31 +- Modules/vis/README.md | 38 + .../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_object.php | 40 +- Modules/vis/visualisations/editrealtime.php | 58 +- Modules/vis/visualisations/graph.js | 6 +- Modules/vis/visualisations/graph.php | 48 +- Modules/vis/visualisations/multigraph.php | 86 +- .../vis/visualisations/multigraph/multigraph.js | 290 ++--- Modules/vis/visualisations/rawdata.php | 1 + Modules/vis/visualisations/realtime.php | 2 +- Modules/vis/visualisations/stacked.php | 9 +- Modules/vis/visualisations/stackedsolar.php | 9 +- Theme/basic/embed.php | 9 +- Theme/basic/emon-blue.css | 4 +- Theme/basic/emon-standard.css | 4 +- Theme/basic/emon-sun.css | 4 +- .../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 | 19 +- Theme/basic/sidebar_view.php | 12 +- Theme/basic/theme.php | 8 +- composer.json | 12 +- core.php | 215 ++-- default-settings.ini | 23 +- default-settings.php | 36 +- 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/language_support.md | 49 + docs/RaspberryPi/read-only.md | 6 +- example.settings.ini | 14 +- example.settings.php | 86 ++ index.php | 704 ++++++------ locale.php | 31 +- param.php | 79 +- php-info.php | 2 +- process_settings.php | 87 +- readme.md | 41 +- route.php | 8 +- scripts/phpmqtt_input.php | 18 +- scripts/services/emoncms_mqtt/emoncms_mqtt.php | 110 +- settings.env.ini | 27 +- version.txt | 2 +- 115 files changed, 13485 insertions(+), 2483 deletions(-) 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 docs/RaspberryPi/language_support.md create mode 100644 example.settings.php Update Emoncms database [] ------------------------------------------------------------- Update Emoncms Services ------------------------------------------------------------- emoncms_mqtt.service already installed feedwriter.service already installed service-runner.service already installed Reloading systemctl deamon Restarting Services... - sudo systemctl restart feedwriter.service --- ActiveState=active --- - sudo systemctl restart emoncms_mqtt.service --- ActiveState=active --- - sudo systemctl restart emonhub.service --- ActiveState=active --- /opt/openenergymonitor/EmonScripts/sudoers.d/emoncms-rebootbutton: parsed OK emonPi emoncms admin reboot button sudoers updated ------------------------------------------------------------- Update Emoncms Modules ------------------------------------------------------------- ------------------------------------------ Updating /var/www/emoncms/Modules/app module ------------------------------------------ - git branch: stable - git tags: 2.0.1-78-gc170ae6 - no local changes - running: git pull origin stable Fetching origin From https://github.com/emoncms/app - [deleted] (none) -> origin/octopus_outgoing c170ae6..e5d51a4 stable -> origin/stable c170ae6..e5d51a4 master -> origin/master * [new tag] 2.1.0 -> 2.1.0 * [new tag] 2.1.1 -> 2.1.1 Already on 'stable' Your branch is behind 'origin/stable' by 65 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Updating c170ae6..e5d51a4 Fast-forward Lib/config.js | 47 +- Lib/feed.js | 1 + Lib/timeseries.js | 4 + Readme.md | 29 +- Views/css/app.css | 6 +- app_controller.php | 21 +- app_model.php | 2 +- .../costcomparison/costcomparison.php | 3 +- apps/OpenEnergyMonitor/graph-nav.php | 3 +- apps/OpenEnergyMonitor/myelectric/myelectric.php | 3 +- apps/OpenEnergyMonitor/myelectric2/myelectric2.php | 5 +- apps/OpenEnergyMonitor/myenergy/myenergy.php | 4 +- apps/OpenEnergyMonitor/myheatpump/myheatpump.php | 3 +- apps/OpenEnergyMonitor/mysolarpv/mysolarpv.php | 74 +- apps/OpenEnergyMonitor/mysolarpvbattery/app.json | 5 + .../mysolarpvbattery/mysolarpvbattery.php | 1210 ++++++++++++++++++++ .../mysolarpvdivert/mysolarpvdivert.php | 42 +- apps/OpenEnergyMonitor/octopus/octopus.php | 395 ++++--- apps/OpenEnergyMonitor/openevse/app.json | 5 - apps/OpenEnergyMonitor/openevse/openevse.php | 622 ---------- apps/OpenEnergyMonitor/timeofuse/timeofuse.php | 3 +- apps/OpenEnergyMonitor/timeofuse2/timeofuse2.php | 3 +- apps/OpenEnergyMonitor/timeofusecl/timeofusecl.php | 3 +- apps/blank/blank.php | 3 +- apps/template/app.json | 6 +- apps/template/template.php | 23 +- composer.json | 5 +- module.json | 2 +- 28 files changed, 1658 insertions(+), 874 deletions(-) create mode 100644 apps/OpenEnergyMonitor/mysolarpvbattery/app.json create mode 100644 apps/OpenEnergyMonitor/mysolarpvbattery/mysolarpvbattery.php delete mode 100644 apps/OpenEnergyMonitor/openevse/app.json delete mode 100644 apps/OpenEnergyMonitor/openevse/openevse.php ------------------------------------------ Updating /var/www/emoncms/Modules/config module ------------------------------------------ - git branch: stable - git tags: 2.0.2-9-g1bba25a - no local changes - running: git pull origin stable Fetching origin From https://github.com/emoncms/config 1bba25a..8d278bc stable -> origin/stable 1bba25a..d28ff1e master -> origin/master * [new tag] 2.0.5 -> 2.0.5 Already on 'stable' Your branch is behind 'origin/stable' by 8 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Updating 1bba25a..8d278bc Fast-forward calibration.php | 1 - config_controller.php | 10 ++++++---- config_model.php | 2 +- connect.php | 2 -- editor.php | 2 -- module.json | 2 +- view.php | 4 ++-- 7 files changed, 10 insertions(+), 13 deletions(-) ------------------------------------------ Updating /var/www/emoncms/Modules/dashboard module ------------------------------------------ - git branch: stable - git tags: 2.0.3-39-g5aa74d0 - no local changes - running: git pull origin stable Fetching origin From https://github.com/emoncms/dashboard 5aa74d0..3b92632 stable -> origin/stable 5aa74d0..7c73b21 master -> origin/master * [new branch] stability_testing -> origin/stability_testing * [new tag] 2.0.7 -> 2.0.7 * [new tag] 2.0.5 -> 2.0.5 Already on 'stable' Your branch is behind 'origin/stable' by 36 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Updating 5aa74d0..3b92632 Fast-forward Views/dashboard_config.php | 6 + Views/dashboard_edit_view.php | 38 +- Views/dashboard_view.php | 27 +- dashboard_controller.php | 3 +- 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/feedvalue/feedvalue_render.js | 22 +- widget/isactivefeed/isactivefeed_render.js | 41 +- widget/kwhlastperiod/kwhlastperiod_render.js | 323 ------- widget/kwhperiod/kwhperiod_doco.png | Bin 0 -> 243205 bytes widget/kwhperiod/kwhperiod_render.js | 1180 ++++++++++++++++++-------- widget/kwhperiod/kwhperiod_render.md | 1 + widget/thresholds/thresholds_render.js | 37 +- 17 files changed, 994 insertions(+), 730 deletions(-) delete mode 100644 widget/kwhlastperiod/kwhlastperiod_render.js create mode 100644 widget/kwhperiod/kwhperiod_doco.png create mode 100644 widget/kwhperiod/kwhperiod_render.md ------------------------------------------ Updating /var/www/emoncms/Modules/device module ------------------------------------------ - git branch: stable - git tags: 2.0.0-20-g4907021 - no local changes - running: git pull origin stable Fetching origin From https://github.com/emoncms/device - [deleted] (none) -> origin/remove_user_dependency 4907021..34f09b1 stable -> origin/stable 4907021..bfc5de3 master -> origin/master * [new tag] 2.0.5 -> 2.0.5 * [new tag] 2.0.4 -> 2.0.4 Already on 'stable' Your branch is behind 'origin/stable' by 12 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Updating 4907021..34f09b1 Fast-forward Views/device_dialog.js | 5 ++- device_controller.php | 8 ++-- device_model.php | 2 + examples/add_input.json | 68 ++++++++++++++++++++++++++++++++++ examples/readme.md | 3 ++ examples/reset2original.json | 87 ++++++++++++++++++++++++++++++++++++++++++++ module.json | 2 +- 7 files changed, 169 insertions(+), 6 deletions(-) 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 ------------------------------------------ - git branch: stable - git tags: 2.0.1-55-gebd9a9a - no local changes - running: git pull origin stable Fetching origin From https://github.com/emoncms/graph ebd9a9a..5124499 stable -> origin/stable ebd9a9a..b6e4ce1 master -> origin/master * [new branch] mobile -> origin/mobile * [new tag] 2.0.9 -> 2.0.9 * [new tag] 2.0.8 -> 2.0.8 Already on 'stable' Your branch is behind 'origin/stable' by 36 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Updating ebd9a9a..5124499 Fast-forward .travis.yml | 14 + LICENSE.txt | 619 +++++++++++++++++++++++++++++++++++ composer.json | 17 + embed.php | 43 ++- graph.css | 41 ++- graph.js | 413 ++++++++++++----------- graph_controller.php | 118 ------- locale/fr_FR/LC_MESSAGES/messages.mo | Bin 4454 -> 4671 bytes locale/fr_FR/LC_MESSAGES/messages.po | 46 ++- module.json | 2 +- view.php | 179 ++++------ vis.helper.js | 61 ++-- 12 files changed, 1075 insertions(+), 478 deletions(-) create mode 100644 .travis.yml create mode 100644 LICENSE.txt create mode 100644 composer.json ------------------------------------------ Updating /var/www/emoncms/Modules/setup module ------------------------------------------ - git branch: stable fatal: No names found, cannot describe anything. - git tags: - no local changes - running: git pull origin stable Fetching origin From https://github.com/emoncms/setup 5e525a2..ee65e22 master -> origin/master Already on 'stable' Your branch is up to date with 'origin/stable'. Already up to date. ------------------------------------------ Updating /var/www/emoncms/Modules/wifi module ------------------------------------------ - git branch: stable - git tags: 2.0.0-29-g274bcd5 - no local changes - running: git pull origin stable Fetching origin From https://github.com/emoncms/wifi 274bcd5..2b69da7 master -> origin/master Already on 'stable' Your branch is up to date with 'origin/stable'. Already up to date. /opt/openenergymonitor/EmonScripts/sudoers.d/wifi-sudoers: parsed OK wifi sudoers entry updated ------------------------------------------ Updating /opt/emoncms/modules/backup module ------------------------------------------ - git branch: stable - git tags: 2.0.0-28-g517ebab - no local changes - running: git pull origin stable From https://github.com/emoncms/backup 517ebab..70894e1 stable -> origin/stable 517ebab..d65a722 master -> origin/master * [new tag] 2.2.1 -> 2.2.1 * [new tag] 2.2.2 -> 2.2.2 Updating 517ebab..70894e1 Fast-forward .travis.yml | 14 + LICENSE.txt | 619 ++++++++++++++++++++++++++++++++++++ backup-module/backup_controller.php | 53 ++- backup-module/backup_view.php | 49 ++- backup-module/module.json | 2 +- composer.json | 17 + emoncms-import.sh | 49 +-- install.sh | 103 ++++-- readme.md | 32 +- usb-import.sh | 206 ++++++++++++ 10 files changed, 1066 insertions(+), 78 deletions(-) create mode 100644 .travis.yml create mode 100644 LICENSE.txt create mode 100644 composer.json create mode 100755 usb-import.sh Already on 'stable' Your branch is up to date with 'origin/stable'. ------------------------------------------ Updating /opt/emoncms/modules/demandshaper module ------------------------------------------ - git branch: stable - git tags: 1.1-21-g0d8d2bf - no local changes - running: git pull origin stable From https://github.com/emoncms/demandshaper 0d8d2bf..d689aae stable -> origin/stable 0d8d2bf..a64c5fe master -> origin/master * [new branch] modular_forecasts -> origin/modular_forecasts * [new tag] 1.2.0 -> 1.2.0 * [new tag] 1.2.4 -> 1.2.4 Updating 0d8d2bf..d689aae Fast-forward demandshaper-module/battery.js | 15 +- demandshaper-module/demandshaper.css | 3 +- demandshaper-module/demandshaper_controller.php | 81 ++- demandshaper-module/demandshaper_menu.php | 17 +- demandshaper-module/demandshaper_model.php | 61 ++- demandshaper-module/general.js | 241 ++++++--- demandshaper-module/general.php | 37 +- demandshaper-module/module.json | 2 +- demandshaper-module/scheduler.js | 6 +- demandshaper-module/view.php | 6 +- demandshaper_run.php | 623 ++++++++++++++---------- ovms_bridge/ovms_bridge.py | 64 +++ ovms_bridge/ovms_bridge.service | 36 ++ ovms_bridge/readme.md | 20 + readme.md | 90 +--- scheduler.php | 78 +-- 16 files changed, 870 insertions(+), 510 deletions(-) create mode 100644 ovms_bridge/ovms_bridge.py create mode 100644 ovms_bridge/ovms_bridge.service create mode 100644 ovms_bridge/readme.md Already on 'stable' Your branch is up to date with 'origin/stable'. ------------------------------------------ Updating /opt/emoncms/modules/postprocess module ------------------------------------------ - git branch: stable - git tags: 2.1.0-17-g48fcafd - no local changes - running: git pull origin stable From https://github.com/emoncms/postprocess 48fcafd..5c50627 stable -> origin/stable 48fcafd..5c50627 master -> origin/master * [new tag] 2.1.3 -> 2.1.3 Updating 48fcafd..5c50627 Fast-forward common.php | 184 +++++++++++++++++++-- composer.json | 2 +- postprocess-module/module.json | 2 +- postprocess-module/postprocess_controller.php | 67 +++++++- postprocess-module/view.js | 136 +++++++++------- processes/average.php | 120 ++++++++++++++ processes/basic_formula.php | 224 ++++++++++++++++---------- processes/batterysimulator.php | 185 +++++++++++++++++++++ processes/constantflow_tokwh.php | 32 ++-- processes/liquidorairflow_tokwh.php | 26 +-- processes/removenan.php | 116 ++++++------- 11 files changed, 837 insertions(+), 257 deletions(-) create mode 100644 processes/average.php create mode 100644 processes/batterysimulator.php Already on 'stable' Your branch is up to date with 'origin/stable'. ------------------------------------------ Updating /opt/emoncms/modules/sync module ------------------------------------------ - git branch: stable - git tags: 2.0.1-15-g39361e4 - no local changes - running: git pull origin stable From https://github.com/emoncms/sync 39361e4..afd953d stable -> origin/stable 39361e4..8096379 master -> origin/master * [new tag] 2.0.5 -> 2.0.5 * [new tag] 2.0.3 -> 2.0.3 * [new tag] 2.0.4 -> 2.0.4 Updating 39361e4..afd953d Fast-forward sync-module/Module.json | 2 +- sync-module/sync_controller.php | 49 ++++++++------- sync-module/sync_view.php | 128 +++++++++++++++++++++++++++------------- 3 files changed, 116 insertions(+), 63 deletions(-) Already on 'stable' Your branch is up to date with 'origin/stable'. ------------------------------------------ Updating /opt/emoncms/modules/usefulscripts module ------------------------------------------ - git branch: stable fatal: No names found, cannot describe anything. - git tags: - no local changes - running: git pull origin stable From https://github.com/emoncms/usefulscripts 34f8363..69b7831 stable -> origin/stable 34f8363..9700f78 master -> origin/master Updating 34f8363..69b7831 Fast-forward SDS011/.gitignore | 1 + SDS011/Dockerfile | 8 +++++ SDS011/SDS011.py | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ SDS011/SDS011.service | 52 +++++++++++++++++++++++++++ SDS011/default.env | 12 +++++++ SDS011/readme.md | 69 +++++++++++++++++++++++++++++++++++ backup/lib/metadata.php | 2 ++ sdpart/sdpart_imagefile | 40 +++++++++++++++------ 8 files changed, 270 insertions(+), 10 deletions(-) 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 Already on 'stable' Your branch is up to date with 'origin/stable'. -------------------------------------------- Backup module installation and update script -------------------------------------------- - Loading EmonScripts config.ini - Copying default.config.cfg to config.cfg - Setting config.cfg settings - Backup module symlink already exists - PHP Version: 7.3 - Creating /etc/php/7.3/mods-available/emoncmsbackup.ini post_max_size = 3G upload_max_filesize = 3G upload_tmp_dir = /var/opt/emoncms/backup/uploads - phpenmod emoncmsbackup - creating /var/opt/emoncms/backup directory - creating /var/opt/emoncms/backup/uploads directory - restarting apache Update Emoncms database ["ALTER TABLE `dashboard` ADD `fullscreen` tinyint(1) DEFAULT '0'"] Starting emonPi LCD service.. ------------------------------------------------------------- emonPi update done: Sun 21 Jun 14:58:17 BST 2020 ------------------------------------------------------------- restarting service-runner