Starting update via service-runner-update.sh (v3.0) > Filesystem Size Used Avail Use% Mounted on /dev/root 5.8G 2.4G 3.2G 43% / devtmpfs 333M 0 333M 0% /dev tmpfs 462M 0 462M 0% /dev/shm tmpfs 185M 41M 144M 23% /run tmpfs 5.0M 4.0K 5.0M 1% /run/lock tmpfs 30M 0 30M 0% /tmp tmpfs 1.0M 8.0K 1016K 1% /var/lib/php/sessions tmpfs 1.0M 0 1.0M 0% /var/tmp /dev/mmcblk0p1 255M 50M 206M 20% /boot /dev/mmcblk0p3 8.1G 19K 7.7G 1% /var/opt/emoncms log2ram 50M 3.6M 47M 8% /var/log - emonSD version: emonSD-10Nov22 - supported images: emonSD-10Nov22 emonSD-21Jul21 emonSD-08May21 emonSD-24Jul20 emonSD-02Oct19 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'. Untracked files: (use "git add ..." to include in what will be committed) install/Mosquitto-PHP/ install/phpredis/ nothing added to commit but untracked files present (use "git add" to track) hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. From https://github.com/openenergymonitor/EmonScripts 3b6934d..a1c965e stable -> origin/stable 3b6934d..efb3b92 master -> origin/master * [new tag] 1.5.11 -> 1.5.11 * [new tag] 1.5.12 -> 1.5.12 * [new tag] 1.5.13 -> 1.5.13 * [new tag] 1.5.14 -> 1.5.14 * [new tag] 1.6.0 -> 1.6.0 * [new tag] 1.6.1 -> 1.6.1 * [new tag] 1.6.10 -> 1.6.10 * [new tag] 1.6.11 -> 1.6.11 * [new tag] 1.6.12 -> 1.6.12 * [new tag] 1.6.13 -> 1.6.13 * [new tag] 1.6.14 -> 1.6.14 * [new tag] 1.6.15 -> 1.6.15 * [new tag] 1.6.16 -> 1.6.16 * [new tag] 1.6.17 -> 1.6.17 * [new tag] 1.6.18 -> 1.6.18 * [new tag] 1.6.2 -> 1.6.2 * [new tag] 1.6.3 -> 1.6.3 * [new tag] 1.6.4 -> 1.6.4 * [new tag] 1.6.5 -> 1.6.5 * [new tag] 1.6.6 -> 1.6.6 * [new tag] 1.6.7 -> 1.6.7 * [new tag] 1.6.8 -> 1.6.8 * [new tag] 1.6.9 -> 1.6.9 Updating 3b6934d..a1c965e Fast-forward .gitignore | 1 + defaults/etc/logrotate.d/00_defaults | 14 +- defaults/etc/logrotate.d/emoncms | 1 + defaults/etc/logrotate.d/emoncms-non-emonsd | 2 +- defaults/etc/logrotate.d/emonhub | 8 +- defaults/etc/logrotate.d/logrotate | 9 + docs/developer.md | 95 +++ {install => docs}/digital-ocean-install.md | 6 +- docs/download.md | 1071 +++++++++++++++++++++++++++ docs/index.rst | 10 + {install => docs}/install-scripts.md | 0 install/readme.md => docs/install.md | 45 +- docs/rpi-install.md | 79 ++ emonupload2.py | 47 ++ firmware_available.json | 166 +++-- install/apache.sh | 19 + install/emoncms_core.sh | 17 +- install/emonhub_gateway.config.ini | 2 +- install/emonsd.config.ini | 2 +- install/emonsd.sh | 2 + install/main.sh | 7 +- install/php.sh | 25 +- install/rpi-install.md | 117 --- module.json | 2 +- readme.md | 2 +- update/emonhub.sh | 3 + update/emonsd.sh | 8 + update/get_firmware_download_url.py | 20 +- update/main.sh | 9 +- update/service-runner-update.sh | 2 +- 30 files changed, 1520 insertions(+), 271 deletions(-) create mode 100644 .gitignore create mode 100644 defaults/etc/logrotate.d/logrotate create mode 100644 docs/developer.md rename {install => docs}/digital-ocean-install.md (94%) create mode 100644 docs/download.md create mode 100644 docs/index.rst rename {install => docs}/install-scripts.md (100%) rename install/readme.md => docs/install.md (60%) create mode 100644 docs/rpi-install.md create mode 100755 emonupload2.py delete mode 100644 install/rpi-install.md ------------------------------------------------------------- Main Update Script ------------------------------------------------------------- Date: Sat 22 Jul 07:57:03 BST 2023 EUID: 1000 openenergymonitor_dir: /opt/openenergymonitor type: all serial_port: ttyAMA0 firmware: none Reading package lists... Building dependency tree... Reading state information... python3-pip is already the newest version (20.3.4-4+rpt1+deb11u1). 0 upgraded, 0 newly installed, 0 to remove and 13 not upgraded. Looking in indexes: https://pypi.org/simple, https://www.piwheels.org/simple Requirement already satisfied: redis in /usr/local/lib/python3.9/dist-packages (4.3.4) Requirement already satisfied: async-timeout>=4.0.2 in /usr/local/lib/python3.9/dist-packages (from redis) (4.0.2) Requirement already satisfied: packaging>=20.4 in /usr/local/lib/python3.9/dist-packages (from redis) (21.3) Requirement already satisfied: deprecated>=1.2.3 in /usr/local/lib/python3.9/dist-packages (from redis) (1.2.13) Requirement already satisfied: wrapt<2,>=1.10 in /usr/local/lib/python3.9/dist-packages (from deprecated>=1.2.3->redis) (1.14.1) Requirement already satisfied: pyparsing!=3.0.5,>=2.0.2 in /usr/local/lib/python3.9/dist-packages (from packaging>=20.4->redis) (3.0.9) Hardware detected: EmonPi Stopping emonPiLCD service Display update message on LCD Running apt-get update Get:1 https://download.docker.com/linux/raspbian bullseye InRelease [26.7 kB] Get:2 http://archive.raspberrypi.org/debian bullseye InRelease [23.6 kB] Hit:3 https://packages.sury.org/php bullseye InRelease Get:4 http://raspbian.raspberrypi.org/raspbian bullseye InRelease [15.0 kB] Get:5 https://download.docker.com/linux/raspbian bullseye/stable armhf Packages [24.3 kB] Get:6 http://raspbian.raspberrypi.org/raspbian bullseye/main armhf Packages [13.2 MB] Get:7 http://archive.raspberrypi.org/debian bullseye/main armhf Packages [314 kB] Get:8 http://raspbian.raspberrypi.org/raspbian bullseye/contrib armhf Packages [60.2 kB] Fetched 13.7 MB in 39s (347 kB/s) Reading package lists... 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 e3a5208..4eab18f master -> origin/master b661a17..b05a0e9 emonpi2lcd -> origin/emonpi2lcd 7a48f23..355d7f1 stable -> origin/stable * [new tag] 04-04-23 -> 04-04-23 * [new tag] 16-02-23 -> 16-02-23 * [new tag] 20-04-23 -> 20-04-23 * [new tag] 29-03-23 -> 29-03-23 hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. Updating e3a5208..4eab18f Fast-forward README.md | 36 +- docs/configuration.md | 128 ++ docs/connect.md | 113 ++ docs/firmware.md | 47 + docs/img/800px-Emonpi_ds18b20_rj45.JPG | Bin 0 -> 82622 bytes docs/img/DS3231rtc.jpg | Bin 0 -> 18038 bytes docs/img/EmonPi_RTC.JPG | Bin 0 -> 238230 bytes docs/img/EmonPi_V1_6_OOK_Tx.png | Bin 0 -> 955686 bytes docs/img/Emonpi_ook.jpg | Bin 0 -> 48965 bytes docs/img/Emonpi_rtc_i2c.png | Bin 0 -> 8063 bytes docs/img/RJ45-Pin-out.png | Bin 0 -> 226260 bytes docs/img/emonPi_System_Diagram.png | Bin 0 -> 85390 bytes docs/img/emonPi_firmware_upload.png | Bin 0 -> 33889 bytes docs/img/emonPi_shop_photo.png | Bin 0 -> 1060888 bytes docs/img/emonpi-network-wizard1.png | Bin 0 -> 41597 bytes docs/img/emonpi-network-wizard2.png | Bin 0 -> 55528 bytes docs/img/emonpi-network-wizard3.png | Bin 0 -> 45809 bytes docs/img/emonpi-network-wizard4.png | Bin 0 -> 59925 bytes docs/img/emonpi-wifi.png | Bin 0 -> 24047 bytes docs/img/emonpi_ethernet_first_boot.png | Bin 0 -> 42851 bytes docs/img/emonpi_wifi.png | Bin 0 -> 42657 bytes docs/img/emonpi_wired_pulse_input.jpg | Bin 0 -> 490491 bytes docs/img/optical_pulse.jpg | Bin 0 -> 15032 bytes docs/img/optical_pulse_emonpi.jpg | Bin 0 -> 98295 bytes docs/img/wifi9_0.png | Bin 0 -> 290012 bytes docs/index.rst | 15 + docs/{index.md => install.md} | 26 +- docs/modifications.md | 92 ++ docs/north-america.md | 39 + docs/pulse_counting.md | 61 + docs/technical.md | 95 ++ docs/temperature_sensing.md | 25 + .../Blink_LED/Blink_LED.cpp.hex | 0 .../Blink_LED/Blink_LED.ino | 0 .../DS18B20_temperature_test.cpp.hex | 0 .../DS18B20_temperature_test.ino | 0 .../Pi_shutdown_LCD/Pi_shutdown_LCD.cpp.hex | 0 .../Pi_shutdown_LCD/Pi_shutdown_LCD.ino | 0 .../RF12demo_RFM68CW_Test.cpp.hex | 0 .../RF12demo_RFM68CW_Test.ino | 0 .../RF12demo_RFM68CW_Test/dataflash.h | 0 .../emonPi_continuous_sampling_kwhd.ino | 0 .../emonPi_discrete_sampling_test.cpp.hex | 0 .../emonPi_discrete_sampling_test.ino | 0 .../encode_struct_packet_test2.ino | 0 .../{test_sketches => archive}/i2c_scan/.gitignore | 0 .../i2c_scan/.travis.yml | 0 .../i2c_scan/lib/readme.txt | 0 .../i2c_scan/platformio.ini | 0 .../i2c_scan/src/src.ino | 0 .../shutdown_button_test.cpp.hex | 0 .../shutdown_button_test/shutdown_button_test.ino | 0 firmware/compiled/archive/README.md | 3 - firmware/compiled/archive/emonPi_V1.1.hex | 1165 ------------------ .../compiled/archive/emonPi_V1.1_Bootloader.hex | 1025 ---------------- firmware/compiled/archive/emonPi_V1.2.1.hex | 1179 ------------------ firmware/compiled/archive/emonPi_V1.2.hex | 1179 ------------------ .../compiled/archive/emonPi_V1.2_Bootloader.hex | 1025 ---------------- firmware/compiled/archive/emonPi_V1.3.hex | 1188 ------------------- .../compiled/archive/emonPi_V1.3_bootloader.hex | 1025 ---------------- .../compiled/archive/emonPi_V1.4_bootloader.hex | 1025 ---------------- firmware/compiled/archive/emonPi_V1.5.hex | 1192 ------------------- .../compiled/archive/emonPi_V1.5_bootloader.hex | 1025 ---------------- firmware/compiled/archive/emonPi_V1.6.hex | 1197 ------------------- firmware/compiled/archive/emonPi_V1.7.hex | 1196 ------------------- firmware/compiled/archive/emonPi_V1.8.hex | 1196 ------------------- firmware/compiled/archive/emonPi_V1_Bootloader.hex | 1025 ---------------- firmware/compiled/archive/emonPi_V2.0.hex | 1194 ------------------- .../compiled/archive/emonPi_V2.0_bootloader.hex | 1025 ---------------- firmware/compiled/archive/emonPi_V2.2.hex | 1213 ------------------- firmware/compiled/archive/emonPi_V2.3.hex | 1213 ------------------- firmware/compiled/archive/emonPi_V2.4.hex | 1220 ------------------- firmware/compiled/archive/emonPi_V2.5.hex | 1224 ------------------- firmware/compiled/archive/emonPi_V2.6.hex | 1214 ------------------- firmware/compiled/archive/emonPi_V2.7.hex | 1195 ------------------- firmware/compiled/archive/emonPi_V2.8.1.hex | 1102 ----------------- firmware/compiled/archive/emonPi_V2.8.2.hex | 1120 ------------------ firmware/compiled/archive/emonPi_V2.8.4.hex | 1123 ------------------ firmware/compiled/archive/emonPi_V2.8.hex | 1194 ------------------- firmware/compiled/archive/emonPi_V2.9.0.hex | 1120 ------------------ firmware/compiled/latest.hex | 1195 ------------------- firmware/compiled/latest_bootloader.hex | 1248 -------------------- firmware/compiled/readme.md | 28 - firmware/compiled/reset | 17 - firmware/compiled/update | 7 - firmware/emonPi_CM/emonPi_CM.ino | 630 ++++++++++ firmware/emonPi_CM/emonPi_CM_config.ino | 586 +++++++++ firmware/emonPi_CM/platformio.ini | 18 + firmware/emonPi_CM/readme.md | 4 + .../interrupt.ino | 0 .../lcd_serial.ino | 0 .../src.ino => emonPi_DS_jeelib_classic/main.ino} | 0 .../{ => emonPi_DS_jeelib_classic}/platformio.ini | 1 + firmware/{ => emonPi_DS_jeelib_classic}/readme.md | 63 +- firmware/{src => emonPi_DS_jeelib_classic}/rf.ino | 0 .../{src => emonPi_DS_jeelib_classic}/startup.ino | 0 .../temperature.ino | 0 firmware/platformio.md | 77 -- firmware/upload.sh | 21 - hardware/emonpi/emonpi_V1_5/readme.md | 2 - hardware/emonpi/emonpi_V1_6/EmonPi_GPIO.png | Bin 0 -> 363321 bytes .../emonpi/emonpi_V1_6/EmonPi_case_CAD_drawing.png | Bin 0 -> 157080 bytes hardware/emonpi/emonpi_V1_6/readme.md | 84 +- wifiAP/readme.md | 2 +- 104 files changed, 1992 insertions(+), 33470 deletions(-) create mode 100644 docs/configuration.md create mode 100644 docs/connect.md create mode 100644 docs/firmware.md create mode 100644 docs/img/800px-Emonpi_ds18b20_rj45.JPG create mode 100644 docs/img/DS3231rtc.jpg create mode 100644 docs/img/EmonPi_RTC.JPG create mode 100644 docs/img/EmonPi_V1_6_OOK_Tx.png create mode 100644 docs/img/Emonpi_ook.jpg create mode 100644 docs/img/Emonpi_rtc_i2c.png create mode 100644 docs/img/RJ45-Pin-out.png create mode 100644 docs/img/emonPi_System_Diagram.png create mode 100644 docs/img/emonPi_firmware_upload.png create mode 100644 docs/img/emonPi_shop_photo.png create mode 100644 docs/img/emonpi-network-wizard1.png create mode 100644 docs/img/emonpi-network-wizard2.png create mode 100644 docs/img/emonpi-network-wizard3.png create mode 100644 docs/img/emonpi-network-wizard4.png create mode 100644 docs/img/emonpi-wifi.png create mode 100644 docs/img/emonpi_ethernet_first_boot.png create mode 100644 docs/img/emonpi_wifi.png create mode 100644 docs/img/emonpi_wired_pulse_input.jpg create mode 100644 docs/img/optical_pulse.jpg create mode 100644 docs/img/optical_pulse_emonpi.jpg create mode 100644 docs/img/wifi9_0.png create mode 100644 docs/index.rst rename docs/{index.md => install.md} (89%) create mode 100644 docs/modifications.md create mode 100644 docs/north-america.md create mode 100644 docs/pulse_counting.md create mode 100644 docs/technical.md create mode 100644 docs/temperature_sensing.md rename firmware/{test_sketches => archive}/Blink_LED/Blink_LED.cpp.hex (100%) rename firmware/{test_sketches => archive}/Blink_LED/Blink_LED.ino (100%) rename firmware/{test_sketches => archive}/DS18B20_temperature_test/DS18B20_temperature_test.cpp.hex (100%) rename firmware/{test_sketches => archive}/DS18B20_temperature_test/DS18B20_temperature_test.ino (100%) rename firmware/{test_sketches => archive}/Pi_shutdown_LCD/Pi_shutdown_LCD.cpp.hex (100%) rename firmware/{test_sketches => archive}/Pi_shutdown_LCD/Pi_shutdown_LCD.ino (100%) rename firmware/{test_sketches => archive}/RF12demo_RFM68CW_Test/RF12demo_RFM68CW_Test.cpp.hex (100%) rename firmware/{test_sketches => archive}/RF12demo_RFM68CW_Test/RF12demo_RFM68CW_Test.ino (100%) rename firmware/{test_sketches => archive}/RF12demo_RFM68CW_Test/dataflash.h (100%) rename firmware/{test_sketches => archive}/emonPi_continuous_sampling_kwhd/emonPi_continuous_sampling_kwhd.ino (100%) rename firmware/{test_sketches => archive}/emonPi_discrete_sampling_test/emonPi_discrete_sampling_test.cpp.hex (100%) rename firmware/{test_sketches => archive}/emonPi_discrete_sampling_test/emonPi_discrete_sampling_test.ino (100%) rename firmware/{test_sketches => archive}/encode_struct_packet_test2/encode_struct_packet_test2.ino (100%) rename firmware/{test_sketches => archive}/i2c_scan/.gitignore (100%) rename firmware/{test_sketches => archive}/i2c_scan/.travis.yml (100%) rename firmware/{test_sketches => archive}/i2c_scan/lib/readme.txt (100%) rename firmware/{test_sketches => archive}/i2c_scan/platformio.ini (100%) rename firmware/{test_sketches => archive}/i2c_scan/src/src.ino (100%) rename firmware/{test_sketches => archive}/shutdown_button_test/shutdown_button_test.cpp.hex (100%) rename firmware/{test_sketches => archive}/shutdown_button_test/shutdown_button_test.ino (100%) delete mode 100644 firmware/compiled/archive/README.md delete mode 100644 firmware/compiled/archive/emonPi_V1.1.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.1_Bootloader.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.2.1.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.2.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.2_Bootloader.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.3.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.3_bootloader.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.4_bootloader.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.5.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.5_bootloader.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.6.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.7.hex delete mode 100644 firmware/compiled/archive/emonPi_V1.8.hex delete mode 100644 firmware/compiled/archive/emonPi_V1_Bootloader.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.0.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.0_bootloader.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.2.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.3.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.4.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.5.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.6.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.7.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.8.1.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.8.2.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.8.4.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.8.hex delete mode 100644 firmware/compiled/archive/emonPi_V2.9.0.hex delete mode 100644 firmware/compiled/latest.hex delete mode 100644 firmware/compiled/latest_bootloader.hex delete mode 100755 firmware/compiled/readme.md delete mode 100755 firmware/compiled/reset delete mode 100755 firmware/compiled/update create mode 100644 firmware/emonPi_CM/emonPi_CM.ino create mode 100644 firmware/emonPi_CM/emonPi_CM_config.ino create mode 100644 firmware/emonPi_CM/platformio.ini create mode 100644 firmware/emonPi_CM/readme.md rename firmware/{src => emonPi_DS_jeelib_classic}/interrupt.ino (100%) rename firmware/{src => emonPi_DS_jeelib_classic}/lcd_serial.ino (100%) rename firmware/{src/src.ino => emonPi_DS_jeelib_classic/main.ino} (100%) rename firmware/{ => emonPi_DS_jeelib_classic}/platformio.ini (99%) rename firmware/{ => emonPi_DS_jeelib_classic}/readme.md (88%) rename firmware/{src => emonPi_DS_jeelib_classic}/rf.ino (100%) rename firmware/{src => emonPi_DS_jeelib_classic}/startup.ino (100%) rename firmware/{src => emonPi_DS_jeelib_classic}/temperature.ino (100%) delete mode 100644 firmware/platformio.md delete mode 100755 firmware/upload.sh create mode 100644 hardware/emonpi/emonpi_V1_6/EmonPi_GPIO.png create mode 100644 hardware/emonpi/emonpi_V1_6/EmonPi_case_CAD_drawing.png 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 077a930..3e5ce92 master -> origin/master 077a930..45ca387 stable -> origin/stable * [new tag] 29-03-23 -> 29-03-23 hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git config pull.rebase false # merge (the default strategy) hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. Updating 077a930..3e5ce92 Fast-forward .gitignore | 1 + README.md | 27 +- docs/img/v1/Front_rfm12pi.png | Bin 0 -> 177373 bytes docs/img/v1/Onpi_rfm12pi.png | Bin 0 -> 559582 bytes docs/img/v1/Rasppi.JPG | Bin 0 -> 478256 bytes docs/img/v1/Rasppirfm1.jpg | Bin 0 -> 473441 bytes docs/img/v1/Rasppirfm10.jpg | Bin 0 -> 287762 bytes docs/img/v1/Rasppirfm11.jpg | Bin 0 -> 406059 bytes docs/img/v1/Rasppirfm2.jpg | Bin 0 -> 423413 bytes docs/img/v1/Rasppirfm3.jpg | Bin 0 -> 478717 bytes docs/img/v1/Rasppirfm4.jpg | Bin 0 -> 419230 bytes docs/img/v1/Rasppirfm5.jpg | Bin 0 -> 421380 bytes docs/img/v1/Rasppirfm6.jpg | Bin 0 -> 835285 bytes docs/img/v1/Rasppirfm7.jpg | Bin 0 -> 475851 bytes docs/img/v1/Rasppirfm8.jpg | Bin 0 -> 396481 bytes docs/img/v1/Rasppirfm9.jpg | Bin 0 -> 305957 bytes docs/img/v2/RFM12PiV2_Pi_small.png | Bin 0 -> 473932 bytes docs/img/v2/RFM12Pi_V1_6_pinout_brd.png | Bin 0 -> 79077 bytes docs/img/v2/RFM12Pi_V1_6_sch.png | Bin 0 -> 9362 bytes docs/img/v2/RFM12Pi_serial.png | Bin 0 -> 72127 bytes docs/img/v3/RFM69Pi_RasPi.JPG | Bin 0 -> 1260321 bytes docs/img/v3/RFm69PiV3_1_brd.jpg | Bin 0 -> 235452 bytes docs/img/v3/RFm69PiV3_1_sch.png | Bin 0 -> 12197 bytes docs/rfm12pi_v1.md | 208 +++++++++++++++ docs/rfm12pi_v2.md | 246 ++++++++++++++++++ docs/rfm69pi_v3.md | 206 +++++++++++++++ .../RFM69CW_RF12_Demo_ATmega328/platformio.ini | 8 +- firmware/emonBase_rfm69pi/emonBase_rfm69pi.ino | 267 +++++++++++++++++++ .../emonBase_rfm69pi/emonBase_rfm69pi_config.ino | 285 +++++++++++++++++++++ firmware/emonBase_rfm69pi/platformio.ini | 26 ++ firmware/emonBase_rfm69pi/readme.md | 63 +++++ 31 files changed, 1319 insertions(+), 18 deletions(-) create mode 100644 docs/img/v1/Front_rfm12pi.png create mode 100644 docs/img/v1/Onpi_rfm12pi.png create mode 100644 docs/img/v1/Rasppi.JPG create mode 100644 docs/img/v1/Rasppirfm1.jpg create mode 100644 docs/img/v1/Rasppirfm10.jpg create mode 100644 docs/img/v1/Rasppirfm11.jpg create mode 100644 docs/img/v1/Rasppirfm2.jpg create mode 100644 docs/img/v1/Rasppirfm3.jpg create mode 100644 docs/img/v1/Rasppirfm4.jpg create mode 100644 docs/img/v1/Rasppirfm5.jpg create mode 100644 docs/img/v1/Rasppirfm6.jpg create mode 100644 docs/img/v1/Rasppirfm7.jpg create mode 100644 docs/img/v1/Rasppirfm8.jpg create mode 100644 docs/img/v1/Rasppirfm9.jpg create mode 100644 docs/img/v2/RFM12PiV2_Pi_small.png create mode 100644 docs/img/v2/RFM12Pi_V1_6_pinout_brd.png create mode 100644 docs/img/v2/RFM12Pi_V1_6_sch.png create mode 100644 docs/img/v2/RFM12Pi_serial.png create mode 100644 docs/img/v3/RFM69Pi_RasPi.JPG create mode 100644 docs/img/v3/RFm69PiV3_1_brd.jpg create mode 100644 docs/img/v3/RFm69PiV3_1_sch.png create mode 100644 docs/rfm12pi_v1.md create mode 100644 docs/rfm12pi_v2.md create mode 100644 docs/rfm69pi_v3.md create mode 100644 firmware/emonBase_rfm69pi/emonBase_rfm69pi.ino create mode 100644 firmware/emonBase_rfm69pi/emonBase_rfm69pi_config.ino create mode 100644 firmware/emonBase_rfm69pi/platformio.ini create mode 100644 firmware/emonBase_rfm69pi/readme.md Start emonhub update script: ------------------------------------------------------------- emonHub update ------------------------------------------------------------- Enabling SPI for RFM69SPI Updating /opt/openenergymonitor/emonhub - current branch: stable - local changes: no From https://github.com/openenergymonitor/emonhub 1a673f7..fc03a53 stable -> origin/stable * [new branch] ds18b20_error_check -> origin/ds18b20_error_check 1a673f7..d0f0dcf master -> origin/master * [new branch] mqtt_subscribe -> origin/mqtt_subscribe * [new tag] 2.5.8 -> 2.5.8 * [new tag] 2.5.3 -> 2.5.3 * [new tag] 2.5.4 -> 2.5.4 * [new tag] 2.5.5 -> 2.5.5 * [new tag] 2.5.6 -> 2.5.6 * [new tag] 2.5.7 -> 2.5.7 - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is behind 'origin/stable' by 37 commits, and can be fast-forwarded. (use "git pull" to update your local branch) - git pull: Updating 1a673f7..fc03a53 Fast-forward README.md | 110 +---- conf/available.conf | 37 ++ .../rayleigh-ri-d35-100.emonhub.conf | 18 + conf/interfacer_examples/samsung-ashp/readme.md | 24 +- .../samsung-ashp/samsung-ashp.emonhub.conf | 11 +- configuration.md => docs/configuration.md | 324 ++++---------- docs/default-configuration.md | 166 +++++++ docs/emonhub-interfacers.md | 494 +++++++++++++++++++++ docs/img/direct_pulse.jpeg | Bin 0 -> 46937 bytes docs/img/emonhubconf.png | Bin 0 -> 114432 bytes docs/img/emonhublog.png | Bin 0 -> 314181 bytes docs/img/mbus_emoncms.png | Bin 0 -> 32736 bytes docs/img/mbus_reader.png | Bin 0 -> 237077 bytes docs/img/samsung-ashp-emoncms.png | Bin 0 -> 42722 bytes docs/img/samsung-ashp.jpg | Bin 0 -> 46738 bytes docs/img/sdm120-230-ob415.png | Bin 0 -> 659055 bytes docs/img/sdm120_emoncms.png | Bin 0 -> 24233 bytes docs/img/sdm120_modbus.png | Bin 0 -> 125878 bytes docs/img/sds011.jpg | Bin 0 -> 22993 bytes docs/img/sds011_emoncms.png | Bin 0 -> 11206 bytes docs/index.md | 11 + docs/overview.md | 125 ++++++ install.sh | 4 +- module.json | 2 +- src/interfacers/EmonHubMBUSInterfacer.py | 7 +- src/interfacers/EmonHubMinimalModbusInterfacer.py | 34 +- src/interfacers/EmonModbusTcpInterfacer.py | 32 +- version.txt | 2 +- 28 files changed, 1009 insertions(+), 392 deletions(-) create mode 100644 conf/interfacer_examples/rayleigh-ri-d35-100/rayleigh-ri-d35-100.emonhub.conf rename configuration.md => docs/configuration.md (51%) create mode 100644 docs/default-configuration.md create mode 100644 docs/emonhub-interfacers.md create mode 100644 docs/img/direct_pulse.jpeg create mode 100644 docs/img/emonhubconf.png create mode 100644 docs/img/emonhublog.png create mode 100644 docs/img/mbus_emoncms.png create mode 100644 docs/img/mbus_reader.png create mode 100644 docs/img/samsung-ashp-emoncms.png create mode 100644 docs/img/samsung-ashp.jpg create mode 100644 docs/img/sdm120-230-ob415.png create mode 100644 docs/img/sdm120_emoncms.png create mode 100644 docs/img/sdm120_modbus.png create mode 100644 docs/img/sds011.jpg create mode 100644 docs/img/sds011_emoncms.png create mode 100644 docs/index.md create mode 100644 docs/overview.md - database update: no changes - running module install/update script (user=pi) EmonHub directory: /opt/openenergymonitor/emonhub emonSD_pi_env provided in arg = /opt/openenergymonitor user provided as arg = pi installing or updating emonhub dependencies Reading package lists... Building dependency tree... Reading state information... python3-configobj is already the newest version (5.0.6-4). python3-pymodbus is already the newest version (2.1.0+dfsg-2). python3-serial is already the newest version (3.5~b0-1). bluetooth is already the newest version (5.55-3.1+rpt2). libbluetooth-dev is already the newest version (5.55-3.1+rpt2). python3-pip is already the newest version (20.3.4-4+rpt1+deb11u1). python3-spidev is already the newest version (20200602~200721-1). 0 upgraded, 0 newly installed, 0 to remove and 105 not upgraded. Looking in indexes: https://pypi.org/simple, https://www.piwheels.org/simple Requirement already satisfied: paho-mqtt in /home/pi/.local/lib/python3.9/site-packages (1.6.1) Requirement already satisfied: requests in /usr/lib/python3/dist-packages (2.25.1) Requirement already satisfied: pybluez in /home/pi/.local/lib/python3.9/site-packages (0.23) Requirement already satisfied: py-sds011 in /home/pi/.local/lib/python3.9/site-packages (0.9) Requirement already satisfied: sdm_modbus in /home/pi/.local/lib/python3.9/site-packages (0.6.1) Requirement already satisfied: minimalmodbus in /home/pi/.local/lib/python3.9/site-packages (2.0.1) Requirement already satisfied: pyserial>=3.0 in /usr/lib/python3/dist-packages (from minimalmodbus) (3.5b0) Requirement already satisfied: pymodbus>=3.0.0 in /home/pi/.local/lib/python3.9/site-packages (from sdm_modbus) (3.0.2) Requirement already satisfied: pyserial-asyncio>=0.6.0 in /home/pi/.local/lib/python3.9/site-packages (from sdm_modbus) (0.6) Looking in indexes: https://pypi.org/simple, https://www.piwheels.org/simple Collecting https://github.com/openenergymonitor/rpi-rfm69/archive/refs/tags/v0.3.0-oem-4.zip Using cached https://github.com/openenergymonitor/rpi-rfm69/archive/refs/tags/v0.3.0-oem-4.zip Installing build dependencies: started Installing build dependencies: finished with status 'done' Getting requirements to build wheel: started Getting requirements to build wheel: finished with status 'done' Preparing wheel metadata: started Preparing wheel metadata: finished with status 'done' Requirement already satisfied: spidev in /usr/lib/python3/dist-packages (from rpi-rfm69==0.3.4) (3.5) Requirement already satisfied: RPI.GPIO in /usr/lib/python3/dist-packages (from rpi-rfm69==0.3.4) (0.7.0) /etc/emonhub directory already exists Setting ownership of /var/log/emonhub to pi Setting ownership of /var/log/emonhub/emonhub.log to pi and permissions to 644 Installing /usr/local/bin/emonhub symlink emonhub.service already installed - Service ActiveState=active - component updated Start emoncms update: ------------------------------------------------------------- Update Emoncms Core ------------------------------------------------------------- Updating /var/www/emoncms - current branch: stable - local changes: no From https://github.com/emoncms/emoncms - [deleted] (none) -> origin/padding_mode_naming - [deleted] (none) -> origin/serial_config_ui 0383ec0b..cdac8a0a stable -> origin/stable * [new branch] editor -> origin/editor 0383ec0b..37cf3920 master -> origin/master * [new tag] 11.3.22 -> 11.3.22 * [new tag] 11.2.10 -> 11.2.10 * [new tag] 11.2.11 -> 11.2.11 * [new tag] 11.2.12 -> 11.2.12 * [new tag] 11.2.13 -> 11.2.13 * [new tag] 11.2.9 -> 11.2.9 * [new tag] 11.3.0 -> 11.3.0 * [new tag] 11.3.20 -> 11.3.20 - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is behind 'origin/stable' by 78 commits, and can be fast-forwarded. (use "git pull" to update your local branch) - git pull: Updating 0383ec0b..cdac8a0a Fast-forward .gitignore | 1 + .htaccess | 3 +- Lib/process_old_settings.php | 2 +- Lib/units.php | 4 +- Lib/vis.helper.js | 55 ++- Modules/admin/Views/admin_main_view.php | 15 +- Modules/admin/Views/serial_config_view.php | 57 ++- Modules/admin/Views/userlist_view.php | 398 +++++++++++++-------- Modules/admin/admin_model.php | 31 +- Modules/feed/feed_controller.php | 1 + Modules/feed/feed_model.php | 2 +- Modules/input/Views/input_dialog.php | 6 +- Modules/input/Views/input_view.js | 1 - Modules/input/Views/input_view.php | 2 +- Modules/input/input_methods.php | 16 +- Modules/input/input_model.php | 2 +- Modules/process/process_processlist.php | 1 + Modules/user/user_controller.php | 7 +- .../vis/visualisations/common/daysmonthsyears.js | 37 +- Modules/vis/visualisations/editrealtime.php | 2 +- Modules/vis/visualisations/simplezoom.php | 8 +- Modules/vis/visualisations/zoom.php | 2 +- Theme/theme.php | 2 +- core.php | 36 +- docs/Cassandra.md | 38 -- docs/DebianInstall.md | 77 ---- docs/LinuxInstall.md | 214 ----------- docs/RaspberryPi/Low-write-mode.md | 124 ------- docs/RaspberryPi/MQTT.md | 179 --------- docs/RaspberryPi/USB_HDD.md | 48 --- docs/RaspberryPi/general.md | 148 -------- docs/RaspberryPi/install_Wheezy.md | 155 -------- docs/RaspberryPi/jessie.md | 193 ---------- docs/RaspberryPi/language_support.md | 49 --- docs/RaspberryPi/read-only.md | 173 --------- docs/RaspberryPi/readme.md | 217 ----------- docs/SharedLinuxHostingInstall.md | 28 -- docs/Update.md | 52 --- docs/Upgrading.md | 111 ------ docs/WindowsInstall.md | 133 ------- docs/{ => design}/architecture.md | 29 +- docs/{ => design}/developing-a-new-module.md | 0 docs/{ => design}/files/final.png | Bin .../files/inputproc/inputproc_ex02a.png | Bin .../files/inputproc/inputproc_ex02b.png | Bin .../files/inputproc/inputproc_ex02c.png | Bin .../files/inputproc/inputproc_ex03b.png | Bin .../files/inputproc/inputproc_ex03c.png | Bin .../files/inputproc/inputprocessing.jpg | Bin .../files/inputproc/inputprocessing01.png | Bin docs/{ => design}/gettext.md | 0 docs/{ => design}/global-variables.md | 12 +- docs/{ => design}/input-processing.md | 6 +- docs/files/emoncms_update.png | Bin 78097 -> 0 bytes docs/files/tablejs.png | Bin 12182 -> 0 bytes docs/files/wampserver.png | Bin 280880 -> 0 bytes docs/user_guide/agileapp.md | 102 ++++++ docs/user_guide/apps.md | 45 +++ docs/user_guide/coreconcepts.md | 64 ++++ docs/user_guide/daily-averages.md | 34 ++ docs/user_guide/daily-kwh.md | 75 ++++ docs/user_guide/dashboards.md | 17 + docs/user_guide/demandshaper.md | 154 ++++++++ docs/user_guide/export-csv.md | 39 ++ docs/user_guide/graphs.md | 66 ++++ docs/user_guide/histograms.md | 25 ++ docs/user_guide/img/agile/1.png | Bin 0 -> 89907 bytes docs/user_guide/img/agile/2.png | Bin 0 -> 222122 bytes docs/user_guide/img/agile/3.png | Bin 0 -> 80955 bytes docs/user_guide/img/agile/4.png | Bin 0 -> 141905 bytes docs/user_guide/img/agile/agile_app.png | Bin 0 -> 116149 bytes docs/user_guide/img/agile/agiletariff.png | Bin 0 -> 34189 bytes docs/user_guide/img/agile/solarpv_1.png | Bin 0 -> 103366 bytes docs/user_guide/img/agile/solarpv_2.png | Bin 0 -> 153561 bytes docs/user_guide/img/csvexport_datetime.png | Bin 0 -> 140162 bytes docs/user_guide/img/csvexport_feedlist.png | Bin 0 -> 120401 bytes docs/user_guide/img/csvexport_multiple.png | Bin 0 -> 241036 bytes docs/user_guide/img/csvexport_secondsstart.png | Bin 0 -> 137865 bytes docs/user_guide/img/csvexport_timestamp.png | Bin 0 -> 141018 bytes docs/user_guide/img/data-viewer.png | Bin 0 -> 116795 bytes docs/user_guide/img/dataplicity/1-dataplicity.png | Bin 0 -> 110356 bytes docs/user_guide/img/dataplicity/2-dataplicity.jpg | Bin 0 -> 33848 bytes docs/user_guide/img/dataplicity/3-dataplicity.png | Bin 0 -> 113866 bytes docs/user_guide/img/dataplicity/4-dataplicity.png | Bin 0 -> 28333 bytes docs/user_guide/img/dataplicity/5-dataplicity.png | Bin 0 -> 85922 bytes docs/user_guide/img/dataplicity/6-dataplicity.png | Bin 0 -> 38349 bytes docs/user_guide/img/demandshaper/demandshaper.png | Bin 0 -> 45000 bytes .../img/demandshaper/emonevse/demandshaper2.png | Bin 0 -> 98511 bytes .../demandshaper/emonevse/demandshaper_ovms.png | Bin 0 -> 40070 bytes .../img/demandshaper/emonevse/emonevse_hub.png | Bin 0 -> 100571 bytes .../emonevse/openevse_deviceconfig1.png | Bin 0 -> 68372 bytes .../emonevse/openevse_deviceconfig2.png | Bin 0 -> 120237 bytes .../img/demandshaper/emonevse/openevse_inputs.png | Bin 0 -> 72666 bytes .../img/demandshaper/emonevse/openevse_inputs2.png | Bin 0 -> 78395 bytes .../img/demandshaper/sonoffs20/EmonESP1.png | Bin 0 -> 66600 bytes .../img/demandshaper/sonoffs20/EmonESP2.png | Bin 0 -> 48221 bytes .../img/demandshaper/sonoffs20/demandshaper1.png | Bin 0 -> 61546 bytes .../img/demandshaper/sonoffs20/demandshaper2.png | Bin 0 -> 75970 bytes .../img/demandshaper/sonoffs20/demandshaper3.png | Bin 0 -> 90644 bytes .../img/demandshaper/sonoffs20/demandshaper4.png | Bin 0 -> 67203 bytes .../img/demandshaper/sonoffs20/demandshaper5.png | Bin 0 -> 89623 bytes .../img/demandshaper/sonoffs20/sonoffs20_hub.png | Bin 0 -> 89127 bytes docs/user_guide/img/emoncms_feeds_1.png | Bin 0 -> 144373 bytes docs/user_guide/img/emoncms_inputs.png | Bin 0 -> 88832 bytes docs/user_guide/img/emoncms_login.png | Bin 0 -> 27124 bytes docs/user_guide/img/emoncms_register.png | Bin 0 -> 30612 bytes docs/user_guide/img/emoncms_services.png | Bin 0 -> 68627 bytes docs/user_guide/img/emoncms_update.png | Bin 0 -> 176745 bytes docs/user_guide/img/emoncmsorg.png | Bin 0 -> 241117 bytes docs/user_guide/img/emoncmsorg_apikey.png | Bin 0 -> 121288 bytes docs/user_guide/img/emonhub_conf.png | Bin 0 -> 119750 bytes docs/user_guide/img/emonhub_log.png | Bin 0 -> 305989 bytes docs/user_guide/img/emonpi-input-list.png | Bin 0 -> 278333 bytes docs/user_guide/img/emonpi-pulse-input-process.png | Bin 0 -> 409238 bytes docs/user_guide/img/emonpi_sd_card.png | Bin 0 -> 6638343 bytes docs/user_guide/img/export.png | Bin 0 -> 119240 bytes docs/user_guide/img/graph1.png | Bin 0 -> 82972 bytes docs/user_guide/img/graph2.png | Bin 0 -> 176805 bytes docs/user_guide/img/graph3.png | Bin 0 -> 175534 bytes docs/user_guide/img/graph4.png | Bin 0 -> 19997 bytes docs/user_guide/img/graph5.png | Bin 0 -> 59996 bytes docs/user_guide/img/graph_averages_daily.png | Bin 0 -> 120394 bytes docs/user_guide/img/graph_averages_hourly.png | Bin 0 -> 167148 bytes docs/user_guide/img/graph_cumulative.png | Bin 0 -> 131013 bytes docs/user_guide/img/graph_kwhday.png | Bin 0 -> 119179 bytes docs/user_guide/img/histogram_kwhatpower.png | Bin 0 -> 122852 bytes docs/user_guide/img/histogram_power.png | Bin 0 -> 158002 bytes docs/user_guide/img/histogram_timeatvalue.png | Bin 0 -> 120164 bytes docs/user_guide/img/import.png | Bin 0 -> 104466 bytes docs/user_guide/img/inputproc_kwhacc.png | Bin 0 -> 87617 bytes docs/user_guide/img/inputproc_logfeedjoin.png | Bin 0 -> 80725 bytes docs/user_guide/img/inputproc_powertokwh.png | Bin 0 -> 89419 bytes docs/user_guide/img/local-log1.png | Bin 0 -> 99566 bytes docs/user_guide/img/local-log2.png | Bin 0 -> 94867 bytes docs/user_guide/img/local-log3.png | Bin 0 -> 89664 bytes docs/user_guide/img/local-log4.png | Bin 0 -> 94011 bytes docs/user_guide/img/local-log5.png | Bin 0 -> 62700 bytes docs/user_guide/img/local-log6.png | Bin 0 -> 31910 bytes docs/user_guide/img/my-solarpv1.png | Bin 0 -> 112423 bytes docs/user_guide/img/myelectric2.png | Bin 0 -> 45414 bytes docs/user_guide/img/myelectric_webapp.png | Bin 0 -> 78052 bytes docs/user_guide/img/myheatpump.png | Bin 0 -> 58044 bytes docs/user_guide/img/myheatpump2.jpeg | Bin 0 -> 75236 bytes docs/user_guide/img/postingdata1.png | Bin 0 -> 30486 bytes docs/user_guide/img/postprocess1.png | Bin 0 -> 88949 bytes docs/user_guide/img/remote-log1.png | Bin 0 -> 87743 bytes docs/user_guide/img/usb_import.png | Bin 0 -> 502143 bytes docs/user_guide/img/vis_bargraph_daily.png | Bin 0 -> 75391 bytes docs/user_guide/img/wh-accumulator-bargraph.png | Bin 0 -> 446079 bytes docs/user_guide/img/wh-accumulator.png | Bin 0 -> 249937 bytes docs/user_guide/import.md | 233 ++++++++++++ docs/user_guide/index.rst | 26 ++ docs/user_guide/intro-remote.md | 13 + docs/user_guide/intro-rpi.md | 159 ++++++++ docs/user_guide/mqtt.md | 103 ++++++ docs/user_guide/postingdata.md | 80 +++++ docs/user_guide/postprocess.md | 71 ++++ docs/user_guide/pulse-counting.md | 27 ++ docs/user_guide/remoteaccess.md | 49 +++ docs/user_guide/troubleshooting.md | 224 ++++++++++++ docs/user_guide/update.md | 22 ++ .../emoncms_graphic.png => emoncms_graphic.png | Bin process_settings.php | 2 +- readme.md | 128 +++---- scripts/emoncms-cli | 2 +- scripts/phpmqtt_input.php | 9 +- scripts/services/emoncms_mqtt/emoncms_mqtt.php | 25 +- version.json | 2 +- 168 files changed, 2189 insertions(+), 2284 deletions(-) delete mode 100644 docs/Cassandra.md delete mode 100644 docs/DebianInstall.md delete mode 100644 docs/LinuxInstall.md delete mode 100644 docs/RaspberryPi/Low-write-mode.md delete mode 100644 docs/RaspberryPi/MQTT.md delete mode 100644 docs/RaspberryPi/USB_HDD.md delete mode 100644 docs/RaspberryPi/general.md delete mode 100644 docs/RaspberryPi/install_Wheezy.md delete mode 100644 docs/RaspberryPi/jessie.md delete mode 100644 docs/RaspberryPi/language_support.md delete mode 100644 docs/RaspberryPi/read-only.md delete mode 100644 docs/RaspberryPi/readme.md delete mode 100644 docs/SharedLinuxHostingInstall.md delete mode 100644 docs/Update.md delete mode 100644 docs/Upgrading.md delete mode 100644 docs/WindowsInstall.md rename docs/{ => design}/architecture.md (93%) rename docs/{ => design}/developing-a-new-module.md (100%) rename docs/{ => design}/files/final.png (100%) rename docs/{ => design}/files/inputproc/inputproc_ex02a.png (100%) rename docs/{ => design}/files/inputproc/inputproc_ex02b.png (100%) rename docs/{ => design}/files/inputproc/inputproc_ex02c.png (100%) rename docs/{ => design}/files/inputproc/inputproc_ex03b.png (100%) rename docs/{ => design}/files/inputproc/inputproc_ex03c.png (100%) rename docs/{ => design}/files/inputproc/inputprocessing.jpg (100%) rename docs/{ => design}/files/inputproc/inputprocessing01.png (100%) rename docs/{ => design}/gettext.md (100%) rename docs/{ => design}/global-variables.md (96%) rename docs/{ => design}/input-processing.md (98%) delete mode 100644 docs/files/emoncms_update.png delete mode 100644 docs/files/tablejs.png delete mode 100644 docs/files/wampserver.png create mode 100644 docs/user_guide/agileapp.md create mode 100644 docs/user_guide/apps.md create mode 100644 docs/user_guide/coreconcepts.md create mode 100644 docs/user_guide/daily-averages.md create mode 100644 docs/user_guide/daily-kwh.md create mode 100644 docs/user_guide/dashboards.md create mode 100644 docs/user_guide/demandshaper.md create mode 100644 docs/user_guide/export-csv.md create mode 100644 docs/user_guide/graphs.md create mode 100644 docs/user_guide/histograms.md create mode 100644 docs/user_guide/img/agile/1.png create mode 100644 docs/user_guide/img/agile/2.png create mode 100644 docs/user_guide/img/agile/3.png create mode 100644 docs/user_guide/img/agile/4.png create mode 100644 docs/user_guide/img/agile/agile_app.png create mode 100644 docs/user_guide/img/agile/agiletariff.png create mode 100644 docs/user_guide/img/agile/solarpv_1.png create mode 100644 docs/user_guide/img/agile/solarpv_2.png create mode 100644 docs/user_guide/img/csvexport_datetime.png create mode 100644 docs/user_guide/img/csvexport_feedlist.png create mode 100644 docs/user_guide/img/csvexport_multiple.png create mode 100644 docs/user_guide/img/csvexport_secondsstart.png create mode 100644 docs/user_guide/img/csvexport_timestamp.png create mode 100644 docs/user_guide/img/data-viewer.png create mode 100644 docs/user_guide/img/dataplicity/1-dataplicity.png create mode 100644 docs/user_guide/img/dataplicity/2-dataplicity.jpg create mode 100644 docs/user_guide/img/dataplicity/3-dataplicity.png create mode 100644 docs/user_guide/img/dataplicity/4-dataplicity.png create mode 100644 docs/user_guide/img/dataplicity/5-dataplicity.png create mode 100644 docs/user_guide/img/dataplicity/6-dataplicity.png create mode 100644 docs/user_guide/img/demandshaper/demandshaper.png create mode 100644 docs/user_guide/img/demandshaper/emonevse/demandshaper2.png create mode 100644 docs/user_guide/img/demandshaper/emonevse/demandshaper_ovms.png create mode 100644 docs/user_guide/img/demandshaper/emonevse/emonevse_hub.png create mode 100644 docs/user_guide/img/demandshaper/emonevse/openevse_deviceconfig1.png create mode 100644 docs/user_guide/img/demandshaper/emonevse/openevse_deviceconfig2.png create mode 100644 docs/user_guide/img/demandshaper/emonevse/openevse_inputs.png create mode 100644 docs/user_guide/img/demandshaper/emonevse/openevse_inputs2.png create mode 100644 docs/user_guide/img/demandshaper/sonoffs20/EmonESP1.png create mode 100644 docs/user_guide/img/demandshaper/sonoffs20/EmonESP2.png create mode 100644 docs/user_guide/img/demandshaper/sonoffs20/demandshaper1.png create mode 100644 docs/user_guide/img/demandshaper/sonoffs20/demandshaper2.png create mode 100644 docs/user_guide/img/demandshaper/sonoffs20/demandshaper3.png create mode 100644 docs/user_guide/img/demandshaper/sonoffs20/demandshaper4.png create mode 100644 docs/user_guide/img/demandshaper/sonoffs20/demandshaper5.png create mode 100644 docs/user_guide/img/demandshaper/sonoffs20/sonoffs20_hub.png create mode 100644 docs/user_guide/img/emoncms_feeds_1.png create mode 100644 docs/user_guide/img/emoncms_inputs.png create mode 100644 docs/user_guide/img/emoncms_login.png create mode 100644 docs/user_guide/img/emoncms_register.png create mode 100644 docs/user_guide/img/emoncms_services.png create mode 100644 docs/user_guide/img/emoncms_update.png create mode 100644 docs/user_guide/img/emoncmsorg.png create mode 100644 docs/user_guide/img/emoncmsorg_apikey.png create mode 100644 docs/user_guide/img/emonhub_conf.png create mode 100644 docs/user_guide/img/emonhub_log.png create mode 100644 docs/user_guide/img/emonpi-input-list.png create mode 100644 docs/user_guide/img/emonpi-pulse-input-process.png create mode 100644 docs/user_guide/img/emonpi_sd_card.png create mode 100644 docs/user_guide/img/export.png create mode 100644 docs/user_guide/img/graph1.png create mode 100644 docs/user_guide/img/graph2.png create mode 100644 docs/user_guide/img/graph3.png create mode 100644 docs/user_guide/img/graph4.png create mode 100644 docs/user_guide/img/graph5.png create mode 100644 docs/user_guide/img/graph_averages_daily.png create mode 100644 docs/user_guide/img/graph_averages_hourly.png create mode 100644 docs/user_guide/img/graph_cumulative.png create mode 100644 docs/user_guide/img/graph_kwhday.png create mode 100644 docs/user_guide/img/histogram_kwhatpower.png create mode 100644 docs/user_guide/img/histogram_power.png create mode 100644 docs/user_guide/img/histogram_timeatvalue.png create mode 100644 docs/user_guide/img/import.png create mode 100644 docs/user_guide/img/inputproc_kwhacc.png create mode 100644 docs/user_guide/img/inputproc_logfeedjoin.png create mode 100644 docs/user_guide/img/inputproc_powertokwh.png create mode 100644 docs/user_guide/img/local-log1.png create mode 100644 docs/user_guide/img/local-log2.png create mode 100644 docs/user_guide/img/local-log3.png create mode 100644 docs/user_guide/img/local-log4.png create mode 100644 docs/user_guide/img/local-log5.png create mode 100644 docs/user_guide/img/local-log6.png create mode 100644 docs/user_guide/img/my-solarpv1.png create mode 100644 docs/user_guide/img/myelectric2.png create mode 100644 docs/user_guide/img/myelectric_webapp.png create mode 100644 docs/user_guide/img/myheatpump.png create mode 100644 docs/user_guide/img/myheatpump2.jpeg create mode 100644 docs/user_guide/img/postingdata1.png create mode 100644 docs/user_guide/img/postprocess1.png create mode 100644 docs/user_guide/img/remote-log1.png create mode 100644 docs/user_guide/img/usb_import.png create mode 100644 docs/user_guide/img/vis_bargraph_daily.png create mode 100644 docs/user_guide/img/wh-accumulator-bargraph.png create mode 100644 docs/user_guide/img/wh-accumulator.png create mode 100644 docs/user_guide/import.md create mode 100644 docs/user_guide/index.rst create mode 100644 docs/user_guide/intro-remote.md create mode 100644 docs/user_guide/intro-rpi.md create mode 100644 docs/user_guide/mqtt.md create mode 100644 docs/user_guide/postingdata.md create mode 100644 docs/user_guide/postprocess.md create mode 100644 docs/user_guide/pulse-counting.md create mode 100644 docs/user_guide/remoteaccess.md create mode 100644 docs/user_guide/troubleshooting.md create mode 100644 docs/user_guide/update.md rename docs/files/emoncms_graphic.png => emoncms_graphic.png (100%) - database update: no changes - component updated ------------------------------------------------------------- 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 - current branch: stable - local changes: no From https://github.com/emoncms/app d9c4c30..900e1e1 stable -> origin/stable * [new branch] heatpump_app_cooling -> origin/heatpump_app_cooling d9c4c30..b142ef9 master -> origin/master * [new tag] 2.7.3 -> 2.7.3 * [new tag] 2.6.10 -> 2.6.10 * [new tag] 2.6.9 -> 2.6.9 * [new tag] 2.7.2 -> 2.7.2 - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is behind 'origin/stable' by 44 commits, and can be fast-forwarded. (use "git pull" to update your local branch) - git pull: Updating d9c4c30..900e1e1 Fast-forward Lib/remotefeed.js | 43 ++ Views/css/config.css | 16 +- app_controller.php | 59 ++- .../costcomparison/costcomparison.php | 4 +- apps/OpenEnergyMonitor/feedin/feedin.php | 4 +- apps/OpenEnergyMonitor/myelectric2/myelectric2.php | 12 +- apps/OpenEnergyMonitor/myenergy/myenergy.php | 39 +- apps/OpenEnergyMonitor/myheatpump/myheatpump.js | 112 +++- apps/OpenEnergyMonitor/myheatpump/myheatpump.php | 40 +- .../myheatpump/myheatpump_api.php | 186 +++++++ apps/OpenEnergyMonitor/mysolarpv/mysolarpv.php | 154 ++++-- .../mysolarpvbattery/mysolarpvbattery.php | 50 +- .../mysolarpvdivert/mysolarpvdivert.php | 18 +- apps/OpenEnergyMonitor/octopus/octopus.php | 48 +- .../solarbatterysim/solarbatterysim.php | 2 +- apps/OpenEnergyMonitor/storagesim/app.json | 5 + apps/OpenEnergyMonitor/storagesim/storagesim.js | 565 +++++++++++++++++++++ apps/OpenEnergyMonitor/storagesim/storagesim.php | 320 ++++++++++++ apps/OpenEnergyMonitor/timeofuse/timeofuse.php | 95 +++- apps/OpenEnergyMonitor/timeofuse2/timeofuse2.php | 4 +- apps/OpenEnergyMonitor/timeofusecl/timeofusecl.php | 4 +- apps/OpenEnergyMonitor/ukgrid/app.json | 5 + apps/OpenEnergyMonitor/ukgrid/ukgrid.js | 305 +++++++++++ apps/OpenEnergyMonitor/ukgrid/ukgrid.php | 155 ++++++ apps/template/template.js | 187 +++++++ apps/template/template.php | 220 +++----- module.json | 2 +- 27 files changed, 2311 insertions(+), 343 deletions(-) create mode 100644 Lib/remotefeed.js create mode 100644 apps/OpenEnergyMonitor/myheatpump/myheatpump_api.php create mode 100644 apps/OpenEnergyMonitor/storagesim/app.json create mode 100644 apps/OpenEnergyMonitor/storagesim/storagesim.js create mode 100644 apps/OpenEnergyMonitor/storagesim/storagesim.php create mode 100644 apps/OpenEnergyMonitor/ukgrid/app.json create mode 100644 apps/OpenEnergyMonitor/ukgrid/ukgrid.js create mode 100644 apps/OpenEnergyMonitor/ukgrid/ukgrid.php create mode 100644 apps/template/template.js - database update: no changes - component updated Updating /var/www/emoncms/Modules/config - current branch: stable - local changes: no - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is up to date with 'origin/stable'. - git pull: Already up to date. - database update: no changes - component updated Updating /var/www/emoncms/Modules/dashboard - current branch: stable - local changes: no - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is up to date with 'origin/stable'. - git pull: Already up to date. - database update: no changes - component updated Updating /var/www/emoncms/Modules/device - current branch: stable - local changes: no From https://github.com/emoncms/device 4ec0093..17fe2cc stable -> origin/stable 4ec0093..17fe2cc master -> origin/master * [new tag] 2.2.2 -> 2.2.2 - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is behind 'origin/stable' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) - git pull: Updating 4ec0093..17fe2cc Fast-forward device_template.php | 8 +++++++- module.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) - database update: no changes - component updated Updating /var/www/emoncms/Modules/graph - current branch: stable - local changes: no - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is up to date with 'origin/stable'. - git pull: Already up to date. - database update: no changes - component updated Updating /var/www/emoncms/Modules/setup - current branch: stable - local changes: no - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is up to date with 'origin/stable'. - git pull: Already up to date. - database update: no changes - component updated Updating /var/www/emoncms/Modules/wifi - current branch: stable - local changes: no - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is up to date with 'origin/stable'. - git pull: Already up to date. - database update: no changes - component updated Updating /opt/emoncms/modules/backup - current branch: stable - local changes: no - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is up to date with 'origin/stable'. - git pull: Already up to date. - database update: no changes - running module install/update script (user=pi) - config.cfg already exists, left unmodified - creating /etc/php/8.1/mods-available/emoncmsbackup.ini post_max_size = 3G upload_max_filesize = 3G upload_tmp_dir = /var/opt/emoncms/backup/uploads - phpenmod emoncmsbackup - restarting apache - component updated Updating /opt/emoncms/modules/postprocess - current branch: stable - local changes: no From https://github.com/emoncms/postprocess ecdabfc..a2cddc1 master -> origin/master - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is up to date with 'origin/stable'. - git pull: Already up to date. - database update: no changes - component updated Updating /opt/emoncms/modules/sync - current branch: stable - local changes: no From https://github.com/emoncms/sync 66e4ca5..fcefe35 master -> origin/master - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is up to date with 'origin/stable'. - git pull: Already up to date. - database update: no changes - component updated Updating /opt/emoncms/modules/usefulscripts - current branch: stable - local changes: no From https://github.com/emoncms/usefulscripts 4381f87..122cea0 master -> origin/master - git fetch: Fetching origin Already on 'stable' - git checkout: Your branch is up to date with 'origin/stable'. - git pull: Already up to date. - database update: no changes - component updated /opt/openenergymonitor/EmonScripts/sudoers.d/wifi-sudoers: parsed OK wifi sudoers entry updated ------------------------------------------------------------- EmonPi Update logrotate ------------------------------------------------------------- ------------------------------------------------------------- EmonPi LCD Update ------------------------------------------------------------- Reading package lists... Building dependency tree... Reading state information... i2c-tools is already the newest version (4.2-1+b1). python3-rpi.gpio is already the newest version (0.7.0-0.2+b1). python3-smbus is already the newest version (4.2-1+b1). python3-gpiozero is already the newest version (1.6.2-1). 0 upgraded, 0 newly installed, 0 to remove and 105 not upgraded. Looking in indexes: https://pypi.org/simple, https://www.piwheels.org/simple Requirement already satisfied: redis in /usr/local/lib/python3.9/dist-packages (4.3.4) Requirement already satisfied: paho-mqtt in /home/pi/.local/lib/python3.9/site-packages (1.6.1) Requirement already satisfied: xmltodict in /home/pi/.local/lib/python3.9/site-packages (0.13.0) Requirement already satisfied: requests in /usr/lib/python3/dist-packages (2.25.1) Requirement already satisfied: async-timeout>=4.0.2 in /usr/local/lib/python3.9/dist-packages (from redis) (4.0.2) Requirement already satisfied: deprecated>=1.2.3 in /usr/local/lib/python3.9/dist-packages (from redis) (1.2.13) Requirement already satisfied: packaging>=20.4 in /usr/local/lib/python3.9/dist-packages (from redis) (21.3) Requirement already satisfied: wrapt<2,>=1.10 in /usr/local/lib/python3.9/dist-packages (from deprecated>=1.2.3->redis) (1.14.1) Requirement already satisfied: pyparsing!=3.0.5,>=2.0.2 in /usr/local/lib/python3.9/dist-packages (from packaging>=20.4->redis) (3.0.9) - reinstalling emonPiLCD.service Removed /etc/systemd/system/emonPiLCD.service. Removed /etc/systemd/system/multi-user.target.wants/emonPiLCD.service. - installing emonPiLCD.service Created symlink /etc/systemd/system/multi-user.target.wants/emonPiLCD.service → /opt/openenergymonitor/emonpi/lcd/emonPiLCD.service. Created symlink /etc/systemd/system/emonPiLCD.service → /opt/openenergymonitor/emonpi/lcd/emonPiLCD.service. - Service ActiveState=active Stopping emonPiLCD service Display update message on LCD Starting emonPi LCD service.. ------------------------------------------------------------- System update done: Sat 22 Jul 08:01:59 BST 2023 ------------------------------------------------------------- restarting service-runner