I2C LCD NOT DETECTED Starting emonPi Update > EUID: 1000 Mon 30 Jan 22:39:50 UTC 2017 emonSD-07Nov16 git pull /home/pi/emonpi From https://github.com/openenergymonitor/emonpi 008c2b6..a682108 master -> origin/master * [new branch] emonhub-restart -> origin/emonhub-restart * [new tag] 2.8.0 -> 2.8.0 * [new tag] 2.8.1 -> 2.8.1 * [new tag] 2.8.2 -> 2.8.2 Updating 008c2b6..a682108 Fast-forward .travis.yml | 26 +- README.md | 2 +- bash-rw-indicator | 7 +- docs/SD-card-build.md | 2 +- emoncmsupdate | 44 +- emonhub-sudoers | 1 + emonpiupdate | 1 + 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.hex | 1194 ++++++++++++ firmware/compiled/latest.hex | 2340 +++++++++++------------- firmware/compiled/readme.md | 4 +- firmware/libraries/Readme.md | 4 +- firmware/platformio.ini | 19 +- firmware/readme.md | 61 +- firmware/src/lcd_serial.ino | 38 +- firmware/src/rf.ino | 75 +- firmware/src/src.ino | 97 +- firmware/src/startup.ino | 6 +- firmware/test_sketches/i2c_scan/.gitignore | 2 + firmware/test_sketches/i2c_scan/.travis.yml | 65 + firmware/test_sketches/i2c_scan/lib/readme.txt | 36 + firmware/test_sketches/i2c_scan/platformio.ini | 22 + firmware/test_sketches/i2c_scan/src/src.ino | 66 + firstbootupdate | 18 +- lcd/emonPiLCD.py | 43 +- lcd/emonPiLCD_update.py | 21 +- lcd/lcd_test.py | 10 +- lcd/lcddriver.py | 7 +- logrotate.conf | 2 +- rc.local_jessieminimal | 5 +- rfm69piupdate.sh | 33 + service-runner | 11 +- service-runner-update.sh | 41 +- update | 5 + 36 files changed, 6327 insertions(+), 1398 deletions(-) create mode 100644 emonhub-sudoers create mode 100644 firmware/compiled/archive/emonPi_V2.7.hex create mode 100644 firmware/compiled/archive/emonPi_V2.8.1.hex create mode 100644 firmware/compiled/archive/emonPi_V2.8.2.hex create mode 100644 firmware/compiled/archive/emonPi_V2.8.hex create mode 100644 firmware/test_sketches/i2c_scan/.gitignore create mode 100644 firmware/test_sketches/i2c_scan/.travis.yml create mode 100644 firmware/test_sketches/i2c_scan/lib/readme.txt create mode 100644 firmware/test_sketches/i2c_scan/platformio.ini create mode 100644 firmware/test_sketches/i2c_scan/src/src.ino create mode 100755 rfm69piupdate.sh git pull /home/pi/RFM2Pi error: insufficient permission for adding an object to repository database .git/objects fatal: failed to write object fatal: unpack-objects failed git pull /home/pi/emonhub From https://github.com/openenergymonitor/emonhub afdb53e..9ab0f49 emon-pi -> origin/emon-pi Updating afdb53e..9ab0f49 Fast-forward .gitignore | 1 + README.md | 43 ++-- conf/VEDirect.readme.md | 55 ----- conf/emonpi.default.emonhub.conf | 3 +- conf/interfacer_examples/directserial/readme.md | 37 ++++ .../modbus/modbusTCP.emonhub.conf | 235 +++++++++++++++++++++ .../smilices}/smilics.emonhub.conf | 0 .../vedirect}/vedirect.emonhub.conf | 0 conf/smilics.readme.md | 36 ---- configuration.md | 16 +- service/emonhub | 2 +- src/emonhub.py | 16 ++ src/interfacers/EmonFroniusModbusTcpInterfacer.py | 44 ++++ src/interfacers/EmonHubEmoncmsHTTPInterfacer.py | 20 +- src/interfacers/EmonHubGraphiteInterfacer.py | 103 +++++++++ src/interfacers/EmonHubJeeInterfacer.py | 7 +- src/interfacers/EmonModbusTcpInterfacer.py | 141 +++++++++++++ src/interfacers/emonhub_interfacer.py | 3 +- 18 files changed, 636 insertions(+), 126 deletions(-) delete mode 100644 conf/VEDirect.readme.md create mode 100644 conf/interfacer_examples/directserial/readme.md create mode 100644 conf/interfacer_examples/modbus/modbusTCP.emonhub.conf rename conf/{ => interfacer_examples/smilices}/smilics.emonhub.conf (100%) rename conf/{ => interfacer_examples/vedirect}/vedirect.emonhub.conf (100%) delete mode 100644 conf/smilics.readme.md create mode 100644 src/interfacers/EmonFroniusModbusTcpInterfacer.py create mode 100644 src/interfacers/EmonHubGraphiteInterfacer.py create mode 100644 src/interfacers/EmonModbusTcpInterfacer.py git pull /home/pi/oem_openHab From https://github.com/openenergymonitor/oem_openHab 04c7caa..125ea33 master -> origin/master Updating 04c7caa..125ea33 Fast-forward Readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) git pull /home/pi/usefulscripts error: insufficient permission for adding an object to repository database .git/objects fatal: failed to write object fatal: unpack-objects failed git pull /home/pi/huawei-hilink-status error: cannot open .git/FETCH_HEAD: Permission denied Start emonPi Atmega328 firmware update: ================================= EmonPi update started ================================= EUID: 1000 Collecting paho-mqtt Downloading paho-mqtt-1.2.tar.gz (49kB) Building wheels for collected packages: paho-mqtt Running setup.py bdist_wheel for paho-mqtt: started Running setup.py bdist_wheel for paho-mqtt: finished with status 'done' Stored in directory: /root/.cache/pip/wheels/fa/db/fb/b495e37057e2f40534726b3c00ab26a58fc80fb8d17223df07 Successfully built paho-mqtt Installing collected packages: paho-mqtt Found existing installation: paho-mqtt 1.1 Uninstalling paho-mqtt-1.1: Successfully uninstalled paho-mqtt-1.1 Successfully installed paho-mqtt-1.2 You are using pip version 8.1.2, however version 9.0.1 is available. You should consider upgrading via the 'pip install --upgrade pip' command. Stopping OpenEnergyMonitor emonHub: emonhub has been stopped ok. Start ATmega328 serial upload using avrdude with latest.hex Discrete Sampling avrdude -c arduino -p ATMEGA328P -P /dev/ttyAMA0 -b 115200 -U flash:w:/home/pi/emonpi/firmware/compiled/latest.hex avrdude-original: Using autoreset DTR on GPIO Pin 7 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 1 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 2 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 3 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 4 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 5 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 6 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 7 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 8 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 9 of 10: not in sync: resp=0x00 avrdude-original: stk500_recv(): programmer is not responding avrdude-original: stk500_getsync() attempt 10 of 10: not in sync: resp=0x00 avrdude-original done. Thank you. strace: |autoreset: Broken pipe Starting OpenEnergyMonitor emonHub: emonhub has been started ok. Start emonhub update script: ================================= EmonPi update started ================================= Running emonhub automatic node addition script EUID: 1000 EUID: 1000 [[5]] Node 5 already present [[6]] Node 6 already present [[7]] Node 7 already present [[8]] Node 8 already present [[9]] Node 9 already present [[10]] Node 10 already present [[11]] Node 11 already present [[19]] Node 19 already present [[20]] Node 20 already present [[21]] Node 21 already present [[22]] Node 22 already present [[23]] Node 23 already present [[24]] Node 24 already present [[25]] Node 25 already present [[26]] Node 26 already present Start emoncms update: ================================= Emoncms update started Mon 30 Jan 22:40:56 UTC 2017 EUID: 1000 Checking cron tab for service runner entry... service runner crontab entry already installed /home/pi/emonpi/emonhub-sudoers: parsed OK Install emonhub reboot sudoers entry git pull /var/www/emoncms dev-mosquitto-php master * stable symlinked_modules On branch stable Your branch is up-to-date with 'origin/stable'. nothing to commit, working directory clean From https://github.com/emoncms/emoncms dc70ba7..5aace47 stable -> origin/stable 0c52196..2bedcad master -> origin/master * [new branch] revert-604-master_contribution -> origin/revert-604-master_contribution * [new tag] 9.3.0 -> 9.3.0 * [new tag] 9.5.0 -> 9.5.0 * [new tag] 9.5.1 -> 9.5.1 * [new tag] 9.6.0 -> 9.6.0 * [new tag] 9.7.0 -> 9.7.0 * [new tag] 9.7.1 -> 9.7.1 * [new tag] 9.7.9 -> 9.7.9 Updating dc70ba7..5aace47 Fast-forward Modules/admin/admin_main_view.php | 53 +++++++------- Modules/feed/Views/feedlist_view.php | 2 +- Modules/user/images/appstore.png | Bin 0 -> 8888 bytes Modules/user/images/en-play-badge.png | Bin 0 -> 4290 bytes Modules/user/profile/profile.php | 38 +++++----- Modules/user/user.js | 6 +- Modules/vis/Views/vis_main_view.php | 6 +- Modules/vis/visualisations/bargraph.php | 12 +-- Modules/vis/visualisations/compare.php | 10 +-- .../dailyhistogram/dailyhistogram.php | 8 +- Modules/vis/visualisations/editdaily.php | 10 +-- Modules/vis/visualisations/editrealtime.php | 10 +-- Modules/vis/visualisations/graph.php | 8 +- Modules/vis/visualisations/histgraph.php | 6 +- Modules/vis/visualisations/multigraph.php | 14 ++-- Modules/vis/visualisations/orderbars.php | 4 +- Modules/vis/visualisations/orderthreshold.php | 16 ++-- Modules/vis/visualisations/rawdata.php | 18 +++-- Modules/vis/visualisations/realtime.php | 14 ++-- Modules/vis/visualisations/simplezoom.php | 12 +-- Modules/vis/visualisations/stacked.php | 12 +-- Modules/vis/visualisations/stackedsolar.php | 12 +-- Modules/vis/visualisations/threshold.php | 18 +++-- Modules/vis/visualisations/timecompare.php | 5 +- .../vis/visualisations/timecompare/timecompare.js | 2 +- Modules/vis/visualisations/timestoredaily.php | 16 ++-- Modules/vis/visualisations/zoom.php | 2 +- Modules/vis/widget/vis_render.js | 54 +++++++------- Theme/basic/theme.php | 2 +- docs/LinuxInstall.md | 81 ++++++++++++++------- docs/RaspberryPi/MQTT.md | 46 ++++++++++-- docs/RaspberryPi/readme.md | 5 ++ index.php | 2 +- process_settings.php | 43 ++++++++++- readme.md | 4 +- scripts/logger/logrotate.conf | 2 +- scripts/mqtt_input.service | 56 ++++++++++++++ scripts/phpmqtt_input.php | 18 +++-- 38 files changed, 409 insertions(+), 218 deletions(-) create mode 100644 Modules/user/images/appstore.png create mode 100644 Modules/user/images/en-play-badge.png create mode 100644 scripts/mqtt_input.service git pull /var/www/emoncms/Modules/app * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean Already up-to-date. git pull /var/www/emoncms/Modules/config * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean From https://github.com/emoncms/config 8438a27..faabc47 9.0 -> origin/9.0 Updating 8438a27..faabc47 Fast-forward README.md | 18 ++++++--- config.png | Bin 0 -> 471961 bytes config_controller.php | 51 +++++++++++++++++-------- edit.php | 103 +++++++++++++++++++++----------------------------- emonnhub-sudoers | 1 + 5 files changed, 91 insertions(+), 82 deletions(-) create mode 100644 config.png create mode 100644 emonnhub-sudoers git pull /var/www/emoncms/Modules/wifi * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean From https://github.com/emoncms/wifi 8598aec..149f909 9.0 -> origin/9.0 Updating 8598aec..149f909 Fast-forward view.html | 23 ++++++++++++++--------- wifi_menu.php | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) git pull /var/www/emoncms/Modules/dashboard environ-master * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean From https://github.com/emoncms/dashboard d47bcc0..0687caa master -> origin/master Updating d47bcc0..0687caa Fast-forward Views/dashboard_edit_view.php | 37 ++- Views/dashboard_view.php | 6 +- Views/dashboardeditor.css | 62 +++++ Views/icons/Containers.png | Bin 0 -> 729 bytes Views/icons/Text.png | Bin 0 -> 756 bytes Views/icons/Visualisations.png | Bin 0 -> 926 bytes Views/icons/Widgets.png | Bin 0 -> 958 bytes Views/icons/emon-icon-back.png | Bin 3110 -> 519 bytes Views/icons/emon-icon-delete.png | Bin 3404 -> 519 bytes Views/icons/emon-icon-dial.png | Bin 5214 -> 0 bytes Views/icons/emon-icon-frame.png | Bin 3616 -> 0 bytes Views/icons/emon-icon-front.png | Bin 2605 -> 510 bytes Views/icons/emon-icon-gear.png | Bin 5168 -> 493 bytes Views/icons/emon-icon-plot.png | Bin 4814 -> 0 bytes Views/icons/emon-icon-redo.png | Bin 2664 -> 494 bytes Views/icons/emon-icon-save.png | Bin 1387 -> 0 bytes Views/icons/emon-icon-text.png | Bin 1695 -> 0 bytes Views/icons/emon-icon-tool.png | Bin 1764 -> 420 bytes Views/icons/emon-icon-undo.png | Bin 2751 -> 483 bytes Views/icons/emon-icon-view.png | Bin 4986 -> 552 bytes Views/icons/gear-icon-outlined.png | Bin 17273 -> 2229 bytes Views/js/designer.js | 4 +- dashboard_langjs.php | 6 + locale/es_ES/LC_MESSAGES/messages.mo | Bin 8208 -> 8583 bytes locale/es_ES/LC_MESSAGES/messages.po | 214 +++++++++------- widget/bar/bar_render.js | 484 ++++++++++++++++++----------------- widget/curl/curl_render.js | 22 +- widget/cylinder/cylinder_render.js | 31 +-- widget/dial/dial_render.js | 6 +- widget/feedvalue/feedvalue_render.js | 12 +- widget/jgauge/jgauge_render.js | 4 +- widget/jgauge2/jgauge2_render.js | 8 +- widget/windrose/windrose_render.js | 8 +- 33 files changed, 514 insertions(+), 390 deletions(-) create mode 100644 Views/dashboardeditor.css create mode 100644 Views/icons/Containers.png create mode 100644 Views/icons/Text.png create mode 100644 Views/icons/Visualisations.png create mode 100644 Views/icons/Widgets.png delete mode 100644 Views/icons/emon-icon-dial.png delete mode 100644 Views/icons/emon-icon-frame.png delete mode 100644 Views/icons/emon-icon-plot.png delete mode 100644 Views/icons/emon-icon-save.png delete mode 100644 Views/icons/emon-icon-text.png git pull /var/www/emoncms/Modules/graph * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean From https://github.com/emoncms/graph 84beb45..3d18ee5 master -> origin/master Updating 84beb45..3d18ee5 Fast-forward graph.js | 67 ++++++++++++++++++++++++++++++++++++++++++++++++---------------- view.php | 19 +++++++++--------- 2 files changed, 60 insertions(+), 26 deletions(-) git pull /home/pi/postprocess Already on 'emonpi' Your branch is up-to-date with 'remotes/origin/emonpi'. Already up-to-date. git pull /home/pi/backup * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean From https://github.com/emoncms/backup 00617c2..f86ed05 master -> origin/master Updating 00617c2..f86ed05 Fast-forward backup/backup_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) replacing initd mqtt_input with systemd mqtt input Stopping Daemon for the emoncms MQTT script: mqtt_input. Created symlink from /etc/systemd/system/multi-user.target.wants/mqtt_input.service to /etc/systemd/system/mqtt_input.service. Update Emoncms database ["ALTER TABLE dashboard MODIFY `main` tinyint(1) Default '0'","ALTER TABLE dashboard MODIFY `public` tinyint(1) Default '0'","ALTER TABLE dashboard MODIFY `published` tinyint(1) Default '0'","ALTER TABLE dashboard MODIFY `showdescription` tinyint(1) Default '0'"] Restarting Services... Restarting OpenEnergyMonitor emonHub: emonhub has been restarted ok. Log is turned off Restarting feedwriter Restarting openhab (via systemctl): openhab.service. set log rotate config owner to root Restarting Services... Starting emonPi LCD service.. mount: / is busy Filesystem is locked - Read Only access type ' rpi-rw ' to unlock Mon 30 Jan 22:41:42 UTC 2017 ................... emonPi update done Filesystem is unlocked - Write access type ' rpi-ro ' to lock ############################################################# I2C LCD NOT DETECTED on either 0x['27', '3f'] ...exiting LCD script Starting emonPi Update > via service-runner-update.sh EUID: 1000 Argument: Fri 17 Aug 22:33:57 UTC 2018 ############################################################# emonSD-07Nov16 git pull /home/pi/emonpi * master wifiap On branch master Your branch is up-to-date with 'origin/master'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: rc.local_jessieminimal Untracked files: (use "git add ..." to include in what will be committed) 1 hardware/emonpi/emonpi2c/ lcd/gsmhuaweistatus.pyc lcd/i2c_lib.pyc lcd/lcddriver.pyc rc.local_jessieminimal_17-07-17 no changes added to commit (use "git add" and/or "git commit -a") Updating a682108..d2be4f4 git pull /home/pi/RFM2Pi * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Updating 5830c86..e5d874d Fast-forward .travis.yml | 21 + README.md | 6 +- .../RFM69CW_RF12_Demo_ATmega328/.gitignore | 2 + .../RFM69CW_RF12_Demo_ATmega328/.travis.yml | 65 + .../RFM69CW_RF12_Demo_ATmega328/dataflash.h | 358 - .../RFM69CW_RF12_Demo_ATmega328/lib/readme.txt | 36 + .../RFM69CW_RF12_Demo_ATmega328/platformio.ini | 31 + .../src.ino} | 182 +- hardware/RFM12Pi_V2.6/RFM12Pi_V1.6_pinout_brd.png | Bin 0 -> 81927 bytes hardware/RFM12Pi_V2.6/RFM12Pi_V1.6_sch.png | Bin 0 -> 10348 bytes hardware/RFM12Pi_V2.6/RFM12Pi_V2.6 GERBERS.zip | Bin 0 -> 22511 bytes hardware/RFM12Pi_V2.6/RFM12Pi_V2.6_brd.png | Bin 0 -> 43049 bytes hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GBL | 758 ++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GBS | 35 + hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTL | 1227 ++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTO | 1312 ++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTS | 249 + hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.TXT | 42 + hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b## | 3182 +++++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b#1 | 3175 +++++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b#2 | 3175 +++++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.brd | 3175 +++++ hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.dri | 39 + hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.gpi | 40 + hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.sch | 11844 ++++++++++++++++++ hardware/RFM69Pi_V3.1/.gitignore | 3 + hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_ISP_program.jpg | Bin 0 -> 1117958 bytes hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_bottom.JPG | Bin 0 -> 585909 bytes hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top.JPG | Bin 0 -> 689387 bytes hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top_side.JPG | Bin 0 -> 585123 bytes hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top_side2.JPG | Bin 0 -> 414696 bytes hardware/RFM69Pi_V3.1/RFM69Pi_RasPi.JPG | Bin 0 -> 1296118 bytes hardware/RFM69Pi_V3.1/RFM69Pi_RasPi_small.JPG | Bin 0 -> 136594 bytes hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.brd | 3648 ++++++ hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.dru | 69 + hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.pdf | Bin 0 -> 35060 bytes hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.sch | 12106 +++++++++++++++++++ hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_large.pdf | Bin 0 -> 34591 bytes hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_sch.pdf | Bin 0 -> 27187 bytes hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_sch_brd.pdf | Bin 0 -> 61345 bytes hardware/RFM69Pi_V3.1/RFm69PiV3.1_brd.jpg | Bin 0 -> 273735 bytes hardware/RFM69Pi_V3.1/RFm69PiV3.1_brd_white.png | Bin 0 -> 2674 bytes hardware/RFM69Pi_V3.1/RFm69PiV3.1_sch.png | Bin 0 -> 14310 bytes hardware/RFM69Pi_V3.1/Readme.md | 24 + hardware/RFM69Pi_V3_BOM.ods | Bin 0 -> 40734 bytes hardware/board.png | Bin 0 -> 36604 bytes hardware/readme.md | 23 + hardware/schematic.png | Bin 0 -> 63645 bytes update-RFM12.sh | 2 +- 49 files changed, 44336 insertions(+), 493 deletions(-) create mode 100644 .travis.yml create mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/.gitignore create mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/.travis.yml delete mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/dataflash.h create mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/lib/readme.txt create mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/platformio.ini rename firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/{RFM69CW_RF12_Demo_ATmega328.ino => src/src.ino} (85%) create mode 100644 hardware/RFM12Pi_V2.6/RFM12Pi_V1.6_pinout_brd.png create mode 100644 hardware/RFM12Pi_V2.6/RFM12Pi_V1.6_sch.png create mode 100644 hardware/RFM12Pi_V2.6/RFM12Pi_V2.6 GERBERS.zip create mode 100644 hardware/RFM12Pi_V2.6/RFM12Pi_V2.6_brd.png create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GBL create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GBS create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTL create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTO create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.GTS create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.TXT create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b## create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b#1 create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.b#2 create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.brd create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.dri create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.gpi create mode 100644 hardware/RFM12Pi_V2.6/RFM2Pi_v2.6.sch create mode 100644 hardware/RFM69Pi_V3.1/.gitignore create mode 100644 hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_ISP_program.jpg create mode 100644 hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_bottom.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top_side.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM12Pi_V3.1_top_side2.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_RasPi.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_RasPi_small.JPG create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.brd create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.dru create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.pdf create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1.sch create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_large.pdf create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_sch.pdf create mode 100644 hardware/RFM69Pi_V3.1/RFM69Pi_V3.1_sch_brd.pdf create mode 100644 hardware/RFM69Pi_V3.1/RFm69PiV3.1_brd.jpg create mode 100644 hardware/RFM69Pi_V3.1/RFm69PiV3.1_brd_white.png create mode 100644 hardware/RFM69Pi_V3.1/RFm69PiV3.1_sch.png create mode 100644 hardware/RFM69Pi_V3.1/Readme.md create mode 100644 hardware/RFM69Pi_V3_BOM.ods create mode 100644 hardware/board.png create mode 100644 hardware/readme.md create mode 100644 hardware/schematic.png git pull /home/pi/emonhub K0den-wibeee_interface * emon-pi hmm01i-syslogging On branch emon-pi Your branch is up-to-date with 'origin/emon-pi'. nothing to commit, working directory clean Updating 9ab0f49..899e526 Fast-forward README.md | 26 +- conf/emonhub.conf | 38 +- conf/emonpi.default.emonhub.conf | 36 +- conf/interfacer_examples/bmw/bmw.emonhub.conf | 18 + conf/interfacer_examples/bmw/readme.md | 65 +++ .../directserial-serialtx3e/readme.md | 41 ++ conf/interfacer_examples/directserial/readme.md | 26 +- .../graphite/graphite.emonhub.conf | 11 + conf/interfacer_examples/graphite/readme.md | 63 +++ .../modbus/modbusTCP.emonhub.conf | 12 +- conf/interfacer_examples/modbus/readme.md | 86 ++++ conf/interfacer_examples/smasolar/readme.md | 70 ++++ .../smasolar/smasolar.emonhub.conf | 17 + conf/interfacer_examples/smilices/readme.md | 36 ++ .../smilices/smilics.emonhub.conf | 4 +- ...t.emonhub.conf => bmv700.vedirect.emonhub.conf} | 4 +- .../vedirect/mppt.vedirect.emonhub.conf | 22 ++ conf/interfacer_examples/vedirect/readme.md | 47 +++ conf/nodes/11 | 8 +- conf/nodes/12 | 7 + conf/nodes/13 | 7 + conf/nodes/14 | 7 + conf/old.default.emonhub.conf | 4 +- configuration.md | 60 ++- examples/mqtt_reader.py | 2 +- install.systemd | 39 ++ service/emonhub.default.conf | 1 + service/emonhub.service | 17 + src/{interfacers => }/Cargo.py | 0 src/emonhub.py | 99 +++-- src/emonhub_buffer.py | 115 ++++++ src/{interfacers => }/emonhub_interfacer.py | 224 +++++++++-- src/emonhub_setup.py | 4 +- src/interfacers/EmonHubBMWInterfacer.py | 287 ++++++++++++++ src/interfacers/EmonHubEmoncmsHTTPInterfacer.py | 165 ++++---- src/interfacers/EmonHubGraphiteInterfacer.py | 159 +++++--- src/interfacers/EmonHubJeeInterfacer.py | 27 +- src/interfacers/EmonHubMqttInterfacer.py | 280 ++++++++----- src/interfacers/EmonHubPacketGenInterfacer.py | 1 - src/interfacers/EmonHubSMASolarInterfacer.py | 299 ++++++++++++++ src/interfacers/EmonHubSerialInterfacer.py | 16 +- src/interfacers/EmonHubSocketInterfacer.py | 7 +- src/interfacers/EmonHubTemplateInterfacer.py | 139 +++++++ src/interfacers/EmonHubTesterInterfacer.py | 61 --- src/interfacers/EmonHubTx3eInterfacer.py | 100 +++++ src/interfacers/EmonHubVEDirectInterfacer.py | 73 ++-- src/interfacers/__init__.py | 18 + .../{ => tmp}/EmonFroniusModbusTcpInterfacer.py | 16 +- .../{ => tmp}/EmonHubSmilicsInterfacer.py | 26 +- .../{ => tmp}/EmonModbusTcpInterfacer.py | 88 +++-- src/smalibrary/SMABluetoothPacket.py | 138 +++++++ src/smalibrary/SMANET2PlusPacket.py | 276 +++++++++++++ src/smalibrary/SMASolar_library.py | 438 +++++++++++++++++++++ src/smalibrary/__init__.py | 0 54 files changed, 3237 insertions(+), 593 deletions(-) create mode 100644 conf/interfacer_examples/bmw/bmw.emonhub.conf create mode 100644 conf/interfacer_examples/bmw/readme.md create mode 100644 conf/interfacer_examples/directserial-serialtx3e/readme.md create mode 100644 conf/interfacer_examples/graphite/graphite.emonhub.conf create mode 100644 conf/interfacer_examples/graphite/readme.md create mode 100644 conf/interfacer_examples/modbus/readme.md create mode 100644 conf/interfacer_examples/smasolar/readme.md create mode 100644 conf/interfacer_examples/smasolar/smasolar.emonhub.conf create mode 100644 conf/interfacer_examples/smilices/readme.md rename conf/interfacer_examples/vedirect/{vedirect.emonhub.conf => bmv700.vedirect.emonhub.conf} (92%) create mode 100644 conf/interfacer_examples/vedirect/mppt.vedirect.emonhub.conf create mode 100644 conf/interfacer_examples/vedirect/readme.md create mode 100644 conf/nodes/12 create mode 100644 conf/nodes/13 create mode 100644 conf/nodes/14 create mode 100755 install.systemd create mode 100644 service/emonhub.default.conf create mode 100644 service/emonhub.service rename src/{interfacers => }/Cargo.py (100%) create mode 100644 src/emonhub_buffer.py rename src/{interfacers => }/emonhub_interfacer.py (72%) create mode 100644 src/interfacers/EmonHubBMWInterfacer.py create mode 100644 src/interfacers/EmonHubSMASolarInterfacer.py create mode 100644 src/interfacers/EmonHubTemplateInterfacer.py delete mode 100644 src/interfacers/EmonHubTesterInterfacer.py create mode 100644 src/interfacers/EmonHubTx3eInterfacer.py rename src/interfacers/{ => tmp}/EmonFroniusModbusTcpInterfacer.py (84%) rename src/interfacers/{ => tmp}/EmonHubSmilicsInterfacer.py (79%) rename src/interfacers/{ => tmp}/EmonModbusTcpInterfacer.py (61%) create mode 100644 src/smalibrary/SMABluetoothPacket.py create mode 100644 src/smalibrary/SMANET2PlusPacket.py create mode 100644 src/smalibrary/SMASolar_library.py create mode 100644 src/smalibrary/__init__.py git pull /home/pi/oem_openHab * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Updating 125ea33..f7a12a1 Fast-forward oem.items | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) git pull /home/pi/usefulscripts * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean git pull /home/pi/huawei-hilink-status * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Start emonPi Atmega328 firmware update: ================================= EmonPi update started ================================= EUID: 1000 Collecting paho-mqtt Downloading https://files.pythonhosted.org/packages/2a/5f/cf14b8f9f8ed1891cda893a2a7d1d6fa23de2a9fb4832f05cef02b79d01f/paho-mqtt-1.3.1.tar.gz (80kB) Building wheels for collected packages: paho-mqtt Running setup.py bdist_wheel for paho-mqtt: started Running setup.py bdist_wheel for paho-mqtt: finished with status 'done' Stored in directory: /root/.cache/pip/wheels/38/ca/67/86c7e4acc659ce5ab74cbb8cc38de50c90ed4f827133e36994 Successfully built paho-mqtt Installing collected packages: paho-mqtt Found existing installation: paho-mqtt 1.2 Uninstalling paho-mqtt-1.2: Successfully uninstalled paho-mqtt-1.2 Successfully installed paho-mqtt-1.3.1 Stopping OpenEnergyMonitor emonHub: emonhub has been stopped ok. Start ATmega328 serial upload using avrdude with latest.hex Discrete Sampling avrdude -c arduino -p ATMEGA328P -P /dev/ttyAMA0 -b 115200 -U flash:w:/home/pi/emonpi/firmware/compiled/latest.hex avrdude-original: Using autoreset DTR on GPIO Pin 7 Starting OpenEnergyMonitor emonHub: emonhub has been started ok. Start emonhub update script: ================================= EmonPi update started ================================= Running emonhub automatic node addition script EUID: 1000 EUID: 1000 [[5]] Node 5 already present [[6]] Node 6 already present [[7]] Node 7 already present [[8]] Node 8 already present [[9]] Node 9 already present [[10]] Node 10 already present [[11]] Node 11 already present Added node 12 to emonhub.conf Added node 13 to emonhub.conf Added node 14 to emonhub.conf [[19]] Node 19 already present [[20]] Node 20 already present [[21]] Node 21 already present [[22]] Node 22 already present [[23]] Node 23 already present [[24]] Node 24 already present [[25]] Node 25 already present [[26]] Node 26 already present Start emoncms update: ================================= Emoncms update started Fri 17 Aug 22:35:10 UTC 2018 EUID: 1000 Checking cron tab for service runner entry... Add service runner cron entry git pull /var/www/emoncms dev-mosquitto-php master * stable symlinked_modules On branch stable Your branch is up-to-date with 'origin/stable'. nothing to commit, working directory clean Updating 5aace47..237a26c Fast-forward .gitignore | 3 + .htaccess | 10 +- .travis.yml | 2 - Lib/bootstrap/css/bootstrap-responsive.css | 6 +- Lib/bootstrap/css/bootstrap-responsive.min.css | 6 +- Lib/bootstrap/css/bootstrap.css | 15 +- Lib/bootstrap/css/bootstrap.min.css | 8 +- Lib/bootstrap/js/bootstrap.js | 98 +- Lib/bootstrap/js/bootstrap.min.js | 4 +- Lib/dbschemasetup.php | 35 +- Lib/email.php | 6 +- Lib/enum.php | 31 + Lib/flot/jquery.flot.merged.js | 879 +++++++++ Lib/flot/merge.php | 27 + Lib/listjs/list.js | 7 +- Lib/misc/sidebar.css | 69 + Lib/misc/sidebar.js | 61 + Lib/phpMQTT.php | 412 ---- Lib/tablejs/COPYRIGHT.txt | 5 +- Lib/tablejs/custom-table-fields.js | 144 +- Lib/tablejs/expandtables.html | 91 + Lib/tablejs/table.js | 308 ++- Modules/admin/admin_controller.php | 96 +- Modules/admin/admin_main_view.php | 271 ++- Modules/admin/admin_menu.php | 2 +- Modules/admin/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 2132 -> 3422 bytes Modules/admin/locale/fr_FR/LC_MESSAGES/messages.po | 272 ++- Modules/admin/module.json | 4 + Modules/admin/pi-model.json | 237 +++ Modules/admin/update_view.php | 7 + Modules/admin/userlist_view.php | 4 +- Modules/eventp/eventp_processlist.php | 19 +- .../locale/fr_FR/LC_MESSAGES/eventp_messages.mo | Bin 0 -> 3418 bytes .../locale/fr_FR/LC_MESSAGES/eventp_messages.po | 1135 +++++++++++ Modules/eventp/module.json | 4 + Modules/feed/Views/feedapi_view.php | 31 +- Modules/feed/Views/feedlist_view.php | 178 +- Modules/feed/engine/CassandraEngine.php | 286 +++ Modules/feed/engine/MysqlTimeSeries.php | 7 +- Modules/feed/engine/PHPFina.php | 284 ++- Modules/feed/engine/PHPTimeSeries.php | 108 +- Modules/feed/engine/VirtualFeed.php | 13 +- Modules/feed/feed.js | 8 +- Modules/feed/feed_controller.php | 70 +- Modules/feed/feed_model.php | 418 +++- Modules/feed/feed_schema.php | 9 +- Modules/feed/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 3537 -> 11628 bytes Modules/feed/locale/fr_FR/LC_MESSAGES/messages.po | 2038 ++++++++++++-------- Modules/feed/module.json | 4 + Modules/input/Views/input.js | 2 +- Modules/input/Views/input_api.php | 158 +- Modules/input/Views/input_dialog.js | 33 + Modules/input/Views/input_dialog.php | 24 + Modules/input/Views/input_view.php | 185 +- Modules/input/input_controller.php | 362 ++-- Modules/input/input_menu.php | 2 +- Modules/input/input_methods.php | 272 +++ Modules/input/input_model.php | 437 ++++- Modules/input/input_schema.php | 2 +- Modules/input/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 7444 -> 12274 bytes Modules/input/locale/fr_FR/LC_MESSAGES/messages.po | 774 +++++--- Modules/input/module.json | 4 + Modules/process/Views/process_api.php | 34 +- Modules/process/Views/process_ui.js | 197 +- Modules/process/Views/process_ui.php | 85 +- .../locale/fr_FR/LC_MESSAGES/process_messages.mo | Bin 0 -> 25526 bytes .../locale/fr_FR/LC_MESSAGES/process_messages.po | 1367 +++++++++++++ Modules/process/module.json | 4 + Modules/process/process_langjs.php | 45 + Modules/process/process_model.php | 56 +- Modules/process/process_processlist.php | 207 +- Modules/schedule/Views/schedule_api.php | 63 +- Modules/schedule/Views/schedule_view.php | 70 +- .../{messages.mo => schedule_messages.mo} | Bin .../{messages.po => schedule_messages.po} | 0 .../{messages.mo => schedule_messages.mo} | Bin .../{messages.po => schedule_messages.po} | 0 .../locale/et_EE/LC_MESSAGES/schedule_messages.mo | Bin 0 -> 2817 bytes .../locale/et_EE/LC_MESSAGES/schedule_messages.po | 167 ++ .../locale/fr_FR/LC_MESSAGES/schedule_messages.mo | Bin 0 -> 7349 bytes .../locale/fr_FR/LC_MESSAGES/schedule_messages.po | 303 +++ Modules/schedule/module.json | 4 + Modules/schedule/schedule_menu.php | 4 +- Modules/schedule/schedule_model.php | 47 +- Modules/schedule/schedule_processlist.php | 14 +- Modules/time/module.json | 4 + Modules/time/time_controller.php | 16 +- Modules/user/deleteuser.php | 90 + Modules/user/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 4393 -> 6185 bytes Modules/user/locale/fr_FR/LC_MESSAGES/messages.po | 1860 +++++++++--------- Modules/user/login_block.php | 108 +- Modules/user/module.json | 4 + Modules/user/profile/profile.php | 129 +- Modules/user/rememberme_model.php | 413 +++- Modules/user/user.js | 44 +- Modules/user/user_controller.php | 64 +- Modules/user/user_menu.php | 2 +- Modules/user/user_model.php | 580 ++++-- Modules/user/user_schema.php | 14 +- Modules/vis/Views/multigraph_edit.js | 546 ++++-- Modules/vis/Views/vis_main_view.php | 31 +- .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 Modules/vis/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 2236 -> 0 bytes Modules/vis/locale/fr_FR/LC_MESSAGES/messages.po | 809 -------- .../vis/locale/fr_FR/LC_MESSAGES/vis_messages.mo | Bin 0 -> 11710 bytes .../vis/locale/fr_FR/LC_MESSAGES/vis_messages.po | 1487 ++++++++++++++ .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 .../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin .../LC_MESSAGES/{messages.po => vis_messages.po} | 0 Modules/vis/module.json | 4 + Modules/vis/multigraph_model.php | 40 +- Modules/vis/vis_controller.php | 18 +- Modules/vis/vis_langjs.php | 132 ++ Modules/vis/vis_menu.php | 8 +- Modules/vis/vis_object.php | 158 +- Modules/vis/vis_schema.php | 4 +- Modules/vis/visualisations/bargraph.php | 32 +- Modules/vis/visualisations/compare.php | 14 +- .../vis/visualisations/comparison/comparison.php | 9 +- .../dailyhistogram/dailyhistogram.php | 21 +- Modules/vis/visualisations/editdaily.php | 12 +- Modules/vis/visualisations/editrealtime.php | 10 +- Modules/vis/visualisations/graph.php | 9 +- Modules/vis/visualisations/histgraph.php | 8 +- Modules/vis/visualisations/multigraph.php | 19 +- .../vis/visualisations/multigraph/multigraph.js | 222 ++- Modules/vis/visualisations/orderbars.php | 7 +- Modules/vis/visualisations/orderthreshold.php | 12 +- Modules/vis/visualisations/rawdata.php | 13 +- Modules/vis/visualisations/realtime.php | 8 +- Modules/vis/visualisations/simplezoom.php | 13 +- Modules/vis/visualisations/stacked.php | 10 +- Modules/vis/visualisations/stackedsolar.php | 10 +- Modules/vis/visualisations/threshold.php | 10 +- Modules/vis/visualisations/timecompare.php | 10 +- Modules/vis/visualisations/timestoredaily.php | 11 +- Modules/vis/visualisations/zoom.php | 13 +- Modules/vis/widget/vis_render.js | 75 +- Modules/vis/widget/vis_widget.php | 6 +- Theme/basic/ajax-loader.gif | Bin 0 -> 4663 bytes Theme/basic/emon-blue.css | 144 ++ Theme/basic/{emon.css => emon-standard.css} | 28 +- Theme/basic/emon-sun.css | 159 ++ Theme/basic/{emoncms_logo.png => logo_login.png} | Bin Theme/basic/menu_view.php | 10 +- Theme/basic/theme.php | 102 +- core.php | 26 +- default.emonpi.settings.php | 19 +- default.settings.php | 18 +- docs/Cassandra.md | 38 + docs/LinuxInstall.md | 89 +- docs/RaspberryPi/Low-write-mode.md | 17 +- docs/RaspberryPi/MQTT.md | 30 +- docs/RaspberryPi/USB_HDD.md | 8 +- docs/RaspberryPi/general.md | 26 +- docs/RaspberryPi/jessie.md | 189 ++ docs/RaspberryPi/readme.md | 122 +- docs/Upgrading.md | 22 +- docs/gettext.md | 17 +- docs/input_encrypted.md | 52 + index.php | 68 +- param.php | 113 ++ process_settings.php | 90 +- readme.md | 105 +- route.php | 22 +- scripts/examples/mqtt_feed_subscriber.php | 65 +- scripts/examples/mqtt_input_publisher.php | 69 +- scripts/logger/install.sh | 29 +- scripts/logger/rc.local | 2 +- scripts/logger/readme.md | 4 +- scripts/old.phpmqtt_input.php | 163 -- scripts/phpmqtt_input.php | 264 ++- scripts/process_langjs_builder.php | 57 + scripts/vis_langjs_builder.php | 57 + test.php | 8 +- 185 files changed, 15756 insertions(+), 6249 deletions(-) create mode 100644 Lib/flot/jquery.flot.merged.js create mode 100644 Lib/flot/merge.php create mode 100644 Lib/misc/sidebar.css create mode 100644 Lib/misc/sidebar.js delete mode 100644 Lib/phpMQTT.php create mode 100644 Lib/tablejs/expandtables.html create mode 100644 Modules/admin/module.json create mode 100644 Modules/admin/pi-model.json create mode 100644 Modules/eventp/locale/fr_FR/LC_MESSAGES/eventp_messages.mo create mode 100644 Modules/eventp/locale/fr_FR/LC_MESSAGES/eventp_messages.po create mode 100644 Modules/eventp/module.json create mode 100644 Modules/feed/engine/CassandraEngine.php create mode 100644 Modules/feed/module.json create mode 100644 Modules/input/Views/input_dialog.js create mode 100644 Modules/input/Views/input_dialog.php create mode 100644 Modules/input/input_methods.php create mode 100644 Modules/input/module.json create mode 100644 Modules/process/locale/fr_FR/LC_MESSAGES/process_messages.mo create mode 100644 Modules/process/locale/fr_FR/LC_MESSAGES/process_messages.po create mode 100644 Modules/process/module.json create mode 100644 Modules/process/process_langjs.php rename Modules/schedule/locale/en_EN/LC_MESSAGES/{messages.mo => schedule_messages.mo} (100%) rename Modules/schedule/locale/en_EN/LC_MESSAGES/{messages.po => schedule_messages.po} (100%) rename Modules/schedule/locale/es_ES/LC_MESSAGES/{messages.mo => schedule_messages.mo} (100%) rename Modules/schedule/locale/es_ES/LC_MESSAGES/{messages.po => schedule_messages.po} (100%) create mode 100644 Modules/schedule/locale/et_EE/LC_MESSAGES/schedule_messages.mo create mode 100644 Modules/schedule/locale/et_EE/LC_MESSAGES/schedule_messages.po create mode 100644 Modules/schedule/locale/fr_FR/LC_MESSAGES/schedule_messages.mo create mode 100644 Modules/schedule/locale/fr_FR/LC_MESSAGES/schedule_messages.po create mode 100644 Modules/schedule/module.json create mode 100644 Modules/time/module.json create mode 100644 Modules/user/deleteuser.php create mode 100644 Modules/user/module.json rename Modules/vis/locale/da_DK/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/da_DK/LC_MESSAGES/{messages.po => vis_messages.po} (100%) rename Modules/vis/locale/de_DE/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/de_DE/LC_MESSAGES/{messages.po => vis_messages.po} (100%) rename Modules/vis/locale/en_EN/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/en_EN/LC_MESSAGES/{messages.po => vis_messages.po} (100%) rename Modules/vis/locale/es_ES/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/es_ES/LC_MESSAGES/{messages.po => vis_messages.po} (100%) delete mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/messages.mo delete mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/messages.po create mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/vis_messages.mo create mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/vis_messages.po rename Modules/vis/locale/it_IT/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/it_IT/LC_MESSAGES/{messages.po => vis_messages.po} (100%) rename Modules/vis/locale/nl_BE/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/nl_BE/LC_MESSAGES/{messages.po => vis_messages.po} (100%) rename Modules/vis/locale/nl_NL/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%) rename Modules/vis/locale/nl_NL/LC_MESSAGES/{messages.po => vis_messages.po} (100%) create mode 100644 Modules/vis/module.json create mode 100644 Modules/vis/vis_langjs.php create mode 100644 Theme/basic/ajax-loader.gif create mode 100644 Theme/basic/emon-blue.css rename Theme/basic/{emon.css => emon-standard.css} (84%) create mode 100644 Theme/basic/emon-sun.css rename Theme/basic/{emoncms_logo.png => logo_login.png} (100%) create mode 100644 docs/Cassandra.md create mode 100644 docs/RaspberryPi/jessie.md create mode 100644 docs/input_encrypted.md create mode 100644 param.php delete mode 100644 scripts/old.phpmqtt_input.php create mode 100644 scripts/process_langjs_builder.php create mode 100644 scripts/vis_langjs_builder.php git pull /var/www/emoncms/Modules/app * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean Updating 14345bc..94afc98 Fast-forward AppConfig_model.php | 177 ++-- app2.js | 176 ---- app_controller.php | 142 +++- app_menu.php | 19 +- apps/blank.php | 103 +++ apps/costcomparison.php | 780 +++++++++++++++++ apps/myelectric.php | 606 ++++++++++++++ apps/myelectric2.php | 816 ++++++++++++++++++ apps/myenergy.php | 515 ++++++++++++ apps/myheatpump.php | 811 ++++++++++++++++++ apps/mysolarpv.php | 762 +++++++++++++++++ apps/mysolarpvdivert.php | 1163 ++++++++++++++++++++++++++ apps/openevse.php | 618 ++++++++++++++ apps/template.php | 120 +++ apps/timeofuse.php | 847 +++++++++++++++++++ {myenergy => archive/myenergy}/myenergy.html | 0 {myenergy => archive/myenergy}/myenergy.js | 82 +- available_apps.php | 53 ++ client.php | 100 --- css/app (copy).css | 220 +++++ css/config.css | 53 ++ css/dark.css | 135 +++ css/light.css | 92 ++ css/pagenav.css | 69 ++ images/costcomparison_app.png | Bin 0 -> 38798 bytes lib/config.js | 505 ++++++----- lib/costcomparison_rates.js | 198 +++++ lib/feed.js | 41 +- lib/graph_bars.js | 2 +- lib/graph_lines.js | 23 + lib/timeseries.js | 14 +- list_view.php | 112 +++ module.json | 4 + myelectric/myelectric.html | 111 --- myelectric/myelectric.js | 428 ---------- mysolarpv/mysolarpv.html | 121 --- mysolarpv/mysolarpv.js | 596 ------------- mysolarpvdivert/mysolarpvdivert.html | 274 ------ mysolarpvdivert/mysolarpvdivert.js | 827 ------------------ sidebar.php | 82 ++ style.css | 176 ---- vis.helper.js | 85 +- 42 files changed, 8845 insertions(+), 3213 deletions(-) delete mode 100644 app2.js create mode 100644 apps/blank.php create mode 100644 apps/costcomparison.php create mode 100644 apps/myelectric.php create mode 100644 apps/myelectric2.php create mode 100644 apps/myenergy.php create mode 100644 apps/myheatpump.php create mode 100644 apps/mysolarpv.php create mode 100644 apps/mysolarpvdivert.php create mode 100644 apps/openevse.php create mode 100644 apps/template.php create mode 100644 apps/timeofuse.php rename {myenergy => archive/myenergy}/myenergy.html (100%) rename {myenergy => archive/myenergy}/myenergy.js (80%) create mode 100644 available_apps.php delete mode 100644 client.php create mode 100644 css/app (copy).css create mode 100644 css/config.css create mode 100644 css/dark.css create mode 100644 css/light.css create mode 100644 css/pagenav.css create mode 100644 images/costcomparison_app.png create mode 100644 lib/costcomparison_rates.js create mode 100644 list_view.php create mode 100644 module.json delete mode 100644 myelectric/myelectric.html delete mode 100644 myelectric/myelectric.js delete mode 100644 mysolarpv/mysolarpv.html delete mode 100644 mysolarpv/mysolarpv.js delete mode 100644 mysolarpvdivert/mysolarpvdivert.html delete mode 100644 mysolarpvdivert/mysolarpvdivert.js create mode 100644 sidebar.php delete mode 100644 style.css git pull /var/www/emoncms/Modules/config * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean Updating faabc47..cf5b1a6 Fast-forward emonnhub-sudoers => emonhub-sudoers | 0 module.json | 4 ++++ 2 files changed, 4 insertions(+) rename emonnhub-sudoers => emonhub-sudoers (100%) create mode 100644 module.json git pull /var/www/emoncms/Modules/wifi * 9.0 On branch 9.0 Your branch is up-to-date with 'origin/9.0'. nothing to commit, working directory clean Updating 149f909..cb78a15 Fast-forward README.md | 2 +- icons/ajax-loader.gif | Bin 0 -> 3208 bytes icons/wifi0.png | Bin 0 -> 760 bytes icons/wifi0secure.png | Bin 0 -> 1331 bytes icons/wifi1.png | Bin 0 -> 766 bytes icons/wifi1secure.png | Bin 0 -> 1332 bytes icons/wifi2.png | Bin 0 -> 755 bytes icons/wifi2secure.png | Bin 0 -> 1301 bytes icons/wifi3.png | Bin 0 -> 766 bytes icons/wifi3secure.png | Bin 0 -> 1263 bytes icons/wifi4.png | Bin 0 -> 1353 bytes icons/wifi4secure.png | Bin 0 -> 1422 bytes view.html | 21 +++++++++++--- wifi.php | 16 +++++++++++ wifi_controller.php | 75 ++++++++++++++++++++++++++++++++------------------ wifi_menu.php | 1 + 16 files changed, 83 insertions(+), 32 deletions(-) create mode 100644 icons/ajax-loader.gif create mode 100644 icons/wifi0.png create mode 100644 icons/wifi0secure.png create mode 100644 icons/wifi1.png create mode 100644 icons/wifi1secure.png create mode 100644 icons/wifi2.png create mode 100644 icons/wifi2secure.png create mode 100644 icons/wifi3.png create mode 100644 icons/wifi3secure.png create mode 100644 icons/wifi4.png create mode 100644 icons/wifi4secure.png git pull /var/www/emoncms/Modules/dashboard environ-master * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Updating 0687caa..fcece2f Fast-forward AntiXSS/filter_test.php | 24 + AntiXSS/php5/AntiXSS.php | 2905 +++++++++ AntiXSS/php5/Bootup.php | 194 + AntiXSS/php5/UTF8.php | 7491 +++++++++++++++++++++++ AntiXSS/php5/data/caseFolding_full.php | 222 + AntiXSS/php5/data/chr.php | 264 + AntiXSS/php5/data/encodings.php | 428 ++ AntiXSS/php5/data/ord.php | 264 + AntiXSS/php5/data/utf8_fix.php | 94 + AntiXSS/php5/data/utf8_msword.php | 23 + AntiXSS/php5/data/win1252_to_utf8.php | 130 + AntiXSS/php7/AntiXSS.php | 2905 +++++++++ AntiXSS/php7/Bootup.php | 195 + AntiXSS/php7/UTF8.php | 7201 ++++++++++++++++++++++ AntiXSS/php7/data/caseFolding_full.php | 222 + AntiXSS/php7/data/chr.php | 264 + AntiXSS/php7/data/encodings.php | 428 ++ AntiXSS/php7/data/ord.php | 264 + AntiXSS/php7/data/utf8_fix.php | 94 + AntiXSS/php7/data/utf8_msword.php | 23 + AntiXSS/php7/data/win1252_to_utf8.php | 130 + LICENSE.txt | 619 ++ Views/dashboard_config.php | 65 +- Views/dashboard_edit_view.php | 41 +- Views/dashboard_list.php | 5 +- Views/dashboard_view.php | 23 +- Views/js/designer.js | 263 +- Views/js/render.js | 11 + Views/js/widget.css | 8 - Views/js/widgetlist.js | 12 +- dashboard | 1 + dashboard.js | 4 +- dashboard_controller.php | 5 +- dashboard_langjs.php | 555 +- dashboard_model.php | 127 +- dashboard_schema.php | 5 +- locale/de_DE/LC_MESSAGES/messages.po | 10 +- locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo | Bin locale/{en_EN => en_GB}/LC_MESSAGES/messages.po | 0 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 5200 -> 15370 bytes locale/fr_FR/LC_MESSAGES/messages.po | 1291 +++- module.json | 4 + widget/bar/bar_render.js | 564 +- widget/bar/bar_widget.php | 15 + widget/battery/battery_render.js | 265 + widget/button/button_render.js | 2 + widget/curl/curl_render.js | 8 +- widget/cylinder/cylinder_render.js | 211 +- widget/dewpoint/dewpoint_render.js | 283 +- widget/dial/dial_render.js | 552 +- widget/dial/dial_widget.php | 15 + widget/feedtime/feedtime_render.js | 261 + widget/feedtime/feedtime_widget.php | 15 + widget/feedvalue/feedvalue_render.js | 323 +- widget/feedvalue/feedvalue_widget.php | 15 + widget/frostpoint/frostpoint_render.js | 311 + widget/heatindex/heatindex_render.js | 350 ++ widget/humidex/humidex_render.js | 285 + widget/isactivefeed/isactivefeed_render.js | 206 + widget/isactivefeed/isactivefeed_widget.php | 15 + widget/jgauge/jgauge_render.js | 6 +- widget/jgauge2/jgauge2_render.js | 9 +- widget/led/led_render.js | 205 +- widget/signal/signal_render.js | 206 + widget/sun/sun_render.js | 247 + widget/thermometer/thermometer_render.js | 552 ++ widget/thresholds/thresholds_render.js | 175 + widget/windrose/windrose_render.js | 9 +- 68 files changed, 30842 insertions(+), 1077 deletions(-) create mode 100644 AntiXSS/filter_test.php create mode 100644 AntiXSS/php5/AntiXSS.php create mode 100644 AntiXSS/php5/Bootup.php create mode 100644 AntiXSS/php5/UTF8.php create mode 100644 AntiXSS/php5/data/caseFolding_full.php create mode 100644 AntiXSS/php5/data/chr.php create mode 100644 AntiXSS/php5/data/encodings.php create mode 100644 AntiXSS/php5/data/ord.php create mode 100644 AntiXSS/php5/data/utf8_fix.php create mode 100644 AntiXSS/php5/data/utf8_msword.php create mode 100644 AntiXSS/php5/data/win1252_to_utf8.php create mode 100644 AntiXSS/php7/AntiXSS.php create mode 100644 AntiXSS/php7/Bootup.php create mode 100644 AntiXSS/php7/UTF8.php create mode 100644 AntiXSS/php7/data/caseFolding_full.php create mode 100644 AntiXSS/php7/data/chr.php create mode 100644 AntiXSS/php7/data/encodings.php create mode 100644 AntiXSS/php7/data/ord.php create mode 100644 AntiXSS/php7/data/utf8_fix.php create mode 100644 AntiXSS/php7/data/utf8_msword.php create mode 100644 AntiXSS/php7/data/win1252_to_utf8.php create mode 100644 LICENSE.txt create mode 120000 dashboard rename locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo (100%) rename locale/{en_EN => en_GB}/LC_MESSAGES/messages.po (100%) create mode 100644 module.json create mode 100644 widget/bar/bar_widget.php create mode 100644 widget/battery/battery_render.js create mode 100644 widget/dial/dial_widget.php create mode 100644 widget/feedtime/feedtime_render.js create mode 100644 widget/feedtime/feedtime_widget.php create mode 100644 widget/feedvalue/feedvalue_widget.php create mode 100644 widget/frostpoint/frostpoint_render.js create mode 100644 widget/heatindex/heatindex_render.js create mode 100644 widget/humidex/humidex_render.js create mode 100644 widget/isactivefeed/isactivefeed_render.js create mode 100644 widget/isactivefeed/isactivefeed_widget.php create mode 100644 widget/signal/signal_render.js create mode 100644 widget/sun/sun_render.js create mode 100644 widget/thermometer/thermometer_render.js create mode 100644 widget/thresholds/thresholds_render.js git pull /var/www/emoncms/Modules/graph * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Updating 3d18ee5..127861b Fast-forward Lib/bootstrap-switch.css | 187 ++++++ Lib/bootstrap-switch.js | 784 ++++++++++++++++++++++++ embed.php | 42 +- graph.css | 121 ++++ graph.js | 469 +++++++++++---- graph_controller.php | 38 +- graph_model.php | 109 +++- graph_schema.php | 1 + group_graph.js | 1482 ++++++++++++++++++++++++++++++++++++++++++++++ group_view.php | 367 ++++++++++++ module.json | 4 + view.php | 190 ++++-- vis.helper.js | 13 + widget/graph_widget.php | 39 +- 14 files changed, 3662 insertions(+), 184 deletions(-) create mode 100644 Lib/bootstrap-switch.css create mode 100644 Lib/bootstrap-switch.js create mode 100644 graph.css create mode 100644 group_graph.js create mode 100644 group_view.php create mode 100644 module.json git pull /home/pi/postprocess Your branch is up-to-date with 'remotes/origin/emonpi'. git pull /home/pi/backup * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Updating f86ed05..c54b905 Fast-forward backup/backup_controller.php | 12 ++----- backup/backup_view.php | 81 ++++++++++++++++++++++++++------------------ backup/module.json | 4 +++ emoncms-export.sh | 69 ++++++++++++++++++++++++++++++------- emoncms-import.sh | 4 ++- service-runner | 24 +++++++------ 6 files changed, 128 insertions(+), 66 deletions(-) create mode 100644 backup/module.json update mqtt_input systemd unit file Update Emoncms database

settings.php file error

settings.php config file has new settings for this version. Copy default.settings.php to settings.php and modify the later.

To fix, check that the settings are set in settings.php or try re-creating your settings.php file from default.settings.php template

Restarting Services... Restarting OpenEnergyMonitor emonHub: emonhub has been restarted ok. Log is turned off Restarting feedwriter Restarting openhab (via systemctl): openhab.service. set log rotate config owner to root Restarting Services... Starting emonPi LCD service.. Filesystem is locked - Read Only access type ' rpi-rw ' to unlock Fri 17 Aug 22:36:05 UTC 2018 ................... emonPi update done