I2C LCD DETECTED Ox3f Starting emonPi Update > EUID: 1000 Sat 28 Jan 08:02:21 UTC 2017 emonSD-07Nov16 git pull /home/pi/emonpi Updating a4263e5..a682108 Fast-forward docs/SD-card-build.md | 2 +- emoncmsupdate | 38 ++++++++++++++++++++++++-------------- rfm69piupdate.sh | 31 ++++++++++++++++++------------- service-runner | 11 ++++++++--- service-runner-update.sh | 41 +++++++++++++++++++++++++++++++++-------- update | 3 +++ 6 files changed, 87 insertions(+), 39 deletions(-) git pull /home/pi/RFM2Pi git pull /home/pi/emonhub Already up-to-date. git pull /home/pi/oem_openHab Already up-to-date. git pull /home/pi/usefulscripts Already up-to-date. git pull /home/pi/huawei-hilink-status Start emonPi Atmega328 firmware update: ================================= EmonPi update started ================================= EUID: 1000 Requirement already up-to-date: paho-mqtt in /usr/local/lib/python2.7/dist-packages 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 [[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 Sat 28 Jan 08:02:47 UTC 2017 EUID: 1000 Checking cron tab for service runner entry... service runner crontab entry already installed 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 Already up-to-date. 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 Updating d69d8dc..faabc47 Fast-forward config_controller.php | 6 +++--- edit.php | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) 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 036e8ab..149f909 Fast-forward view.html | 17 +++++++++-------- wifi_menu.php | 2 +- 2 files changed, 10 insertions(+), 9 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 Updating 0f8271b..0687caa Fast-forward Views/dashboard_edit_view.php | 2 +- dashboard_langjs.php | 6 + locale/es_ES/LC_MESSAGES/messages.mo | Bin 8208 -> 8583 bytes locale/es_ES/LC_MESSAGES/messages.po | 214 ++++++++++++++++++++--------------- widget/curl/curl_render.js | 22 +++- 5 files changed, 148 insertions(+), 96 deletions(-) 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 Already up-to-date. git pull /home/pi/postprocess 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 Already up-to-date. update mqtt_input systemd unit file Update Emoncms database [] Restarting Services... Restarting OpenEnergyMonitor emonHub: emonhub has been restarted ok. Log is turned off Restarting feedwriter Restarting openhab (via systemctl): openhab.service. set log rotate config owner to root Restarting Services... Starting emonPi LCD service.. Filesystem is locked - Read Only access type ' rpi-rw ' to unlock Sat 28 Jan 08:03:35 UTC 2017 ................... emonPi update done Filesystem is unlocked - Write access type ' rpi-ro ' to lock ############################################################# I2C LCD DETECTED Ox3f Starting emonPi Update > via service-runner-update.sh EUID: 1000 Argument: Wed 8 Feb 19:55:11 UTC 2017 ############################################################# emonSD-07Nov16 git pull /home/pi/emonpi * master wifiap On branch master Your branch is up-to-date with 'origin/master'. Untracked files: (use "git add ..." to include in what will be committed) 1 hardware/emonpi/emonpi2c/ lcd/gsmhuaweistatus.pyc lcd/i2c_lib.pyc lcd/lcddriver.pyc nothing added to commit but untracked files present (use "git add" to track) Updating a682108..f97ec20 Fast-forward docs/SD-card-build.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..30e650d Fast-forward .travis.yml | 21 ++ README.md | 6 +- .../RFM69CW_RF12_Demo_ATmega328/.gitignore | 2 + .../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 +++-------- update-RFM12.sh | 2 +- 8 files changed, 145 insertions(+), 493 deletions(-) create mode 100644 .travis.yml create mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/.gitignore 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%) 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..c496fc0 Fast-forward conf/emonhub.conf | 8 +-- conf/emonpi.default.emonhub.conf | 8 +-- .../graphite/graphite.emonhub.conf | 11 +++ conf/interfacer_examples/graphite/readme.md | 63 ++++++++++++++++ conf/interfacer_examples/modbus/readme.md | 83 ++++++++++++++++++++++ conf/interfacer_examples/smilices/readme.md | 36 ++++++++++ conf/interfacer_examples/vedirect/readme.md | 55 ++++++++++++++ src/emonhub_setup.py | 4 +- 8 files changed, 258 insertions(+), 10 deletions(-) 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/smilices/readme.md create mode 100644 conf/interfacer_examples/vedirect/readme.md git pull /home/pi/oem_openHab * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean Already up-to-date. git pull /home/pi/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 Requirement already up-to-date: paho-mqtt in /usr/local/lib/python2.7/dist-packages 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 [[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 Wed 8 Feb 19:55:48 UTC 2017 EUID: 1000 Checking cron tab for service runner entry... service runner crontab entry already installed 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..f7151ca Fast-forward .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 +- Modules/admin/admin_controller.php | 46 ++++++------ Modules/admin/admin_main_view.php | 31 ++++++-- Modules/input/input_menu.php | 2 +- Modules/vis/multigraph_model.php | 2 +- docs/LinuxInstall.md | 10 +-- docs/RaspberryPi/MQTT.md | 2 + docs/RaspberryPi/readme.md | 4 +- index.php | 2 +- readme.md | 4 ++ 16 files changed, 144 insertions(+), 98 deletions(-) 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 Already up-to-date. 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 Already up-to-date. 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 Already up-to-date. 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 Already up-to-date. git pull /home/pi/postprocess 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 Already up-to-date. update mqtt_input systemd unit file Update Emoncms database [] 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 Wed 8 Feb 19:56:47 UTC 2017 ................... emonPi update done Filesystem is unlocked - Write access type ' rpi-ro ' to lock ############################################################# I2C LCD DETECTED Ox3f Starting emonPi Update > via service-runner-update.sh EUID: 1000 Argument: emonpi Mon 25 Dec 10:16:13 UTC 2017 ############################################################# emonSD-07Nov16 git pull /home/pi/emonpi * master wifiap On branch master Your branch is up-to-date with 'origin/master'. Untracked files: (use "git add ..." to include in what will be committed) 1 hardware/emonpi/emonpi2c/ lcd/gsmhuaweistatus.pyc lcd/i2c_lib.pyc lcd/lcddriver.pyc nothing added to commit but untracked files present (use "git add" to track) Updating f97ec20..d7ebe03 Fast-forward .gitignore | 3 +- UDPBroadcast/broadcast.php | 8 + UDPBroadcast/readme.php | 5 + docs/SD-card-build.md | 369 +++-- emoncms-filesystem | 1 + emoncms-setup/emoncms-setup-sudoers | 1 + emoncms-setup/hello.php | 252 +++ emoncms-setup/setup_controller.php | 45 + emoncms-setup/setup_model.php | 47 + emoncms-setup/setup_schema.php | 6 + emoncmsupdate | 110 +- emonpiupdate | 21 +- factoryreset | 3 +- firmware/compiled/latest.hex | 1661 ++++++++++---------- firmware/lib/readme.txt | 38 - .../libraries/Arduino-Temperature-Control-Library | 1 - firmware/libraries/LiquidCrystal_I2C | 1 - firmware/libraries/OneWire | 1 - firmware/libraries/Readme.md | 34 - firmware/libraries/emonlib | 1 - firmware/libraries/jeelib | 1 - firmware/readme.md | 28 + firmware/src/src.ino | 8 +- firstbootupdate | 2 +- md5sum.py | 24 + ntp_update.sh | 11 + rc.local_jessieminimal | 15 +- service-runner | 10 +- service-runner-update.sh | 31 +- sudo_crontab | 5 + sudoers | 2 +- update | 33 +- wifiAP/hostapd.conf | 2 +- wifiAP/networklog.sh | 5 + wifiAP/startAP.sh | 27 + wifiAP/stopAP.sh | 5 + wifiAP/wifiAP.sh | 42 +- wifiAP/wpa_supplicant_check.conf | 2 + 38 files changed, 1763 insertions(+), 1098 deletions(-) create mode 100644 UDPBroadcast/broadcast.php create mode 100644 UDPBroadcast/readme.php create mode 100644 emoncms-filesystem create mode 100644 emoncms-setup/emoncms-setup-sudoers create mode 100644 emoncms-setup/hello.php create mode 100644 emoncms-setup/setup_controller.php create mode 100644 emoncms-setup/setup_model.php create mode 100644 emoncms-setup/setup_schema.php delete mode 100644 firmware/lib/readme.txt delete mode 160000 firmware/libraries/Arduino-Temperature-Control-Library delete mode 160000 firmware/libraries/LiquidCrystal_I2C delete mode 160000 firmware/libraries/OneWire delete mode 100644 firmware/libraries/Readme.md delete mode 160000 firmware/libraries/emonlib delete mode 160000 firmware/libraries/jeelib create mode 100755 md5sum.py create mode 100755 ntp_update.sh create mode 100755 wifiAP/networklog.sh create mode 100755 wifiAP/startAP.sh create mode 100755 wifiAP/stopAP.sh create mode 100644 wifiAP/wpa_supplicant_check.conf 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 30e650d..e5d874d Fast-forward .../RFM69CW_RF12_Demo_ATmega328/.travis.yml | 65 + 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 41 files changed, 44191 insertions(+) create mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328/.travis.yml 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 c496fc0..001120d Fast-forward README.md | 26 +- conf/emonhub.conf | 28 +- conf/emonpi.default.emonhub.conf | 26 +- 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 +- conf/interfacer_examples/modbus/readme.md | 23 +- conf/interfacer_examples/smasolar/readme.md | 70 ++++ .../smasolar/smasolar.emonhub.conf | 17 + ...t.emonhub.conf => bmv700.vedirect.emonhub.conf} | 0 .../vedirect/mppt.vedirect.emonhub.conf | 22 ++ conf/interfacer_examples/vedirect/readme.md | 64 ++- conf/nodes/11 | 8 +- conf/nodes/12 | 7 + conf/nodes/13 | 7 + conf/nodes/14 | 7 + examples/mqtt_reader.py | 2 +- src/emonhub.py | 81 +++- src/interfacers/EmonFroniusModbusTcpInterfacer.py | 8 +- src/interfacers/EmonHubBMWInterfacer.py | 292 ++++++++++++++ src/interfacers/EmonHubEmoncmsHTTPInterfacer.py | 86 ++-- src/interfacers/EmonHubJeeInterfacer.py | 28 +- src/interfacers/EmonHubMqttInterfacer.py | 158 ++++---- src/interfacers/EmonHubSMASolarInterfacer.py | 298 ++++++++++++++ src/interfacers/EmonHubSerialInterfacer.py | 1 - src/interfacers/EmonHubSmilicsInterfacer.py | 25 +- src/interfacers/EmonHubTx3eInterfacer.py | 100 +++++ src/interfacers/EmonHubVEDirectInterfacer.py | 58 ++- src/interfacers/EmonModbusTcpInterfacer.py | 72 ++-- src/interfacers/emonhub_interfacer.py | 43 +- src/smalibrary/SMABluetoothPacket.py | 138 +++++++ src/smalibrary/SMANET2PlusPacket.py | 276 +++++++++++++ src/smalibrary/SMASolar_library.py | 438 +++++++++++++++++++++ src/smalibrary/__init__.py | 0 35 files changed, 2243 insertions(+), 316 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/smasolar/readme.md create mode 100644 conf/interfacer_examples/smasolar/smasolar.emonhub.conf rename conf/interfacer_examples/vedirect/{vedirect.emonhub.conf => bmv700.vedirect.emonhub.conf} (100%) create mode 100644 conf/interfacer_examples/vedirect/mppt.vedirect.emonhub.conf create mode 100644 conf/nodes/12 create mode 100644 conf/nodes/13 create mode 100644 conf/nodes/14 create mode 100644 src/interfacers/EmonHubBMWInterfacer.py create mode 100644 src/interfacers/EmonHubSMASolarInterfacer.py create mode 100644 src/interfacers/EmonHubTx3eInterfacer.py create mode 100644 src/smalibrary/SMABluetoothPacket.py create mode 100644 src/smalibrary/SMANET2PlusPacket.py create mode 100644 src/smalibrary/SMASolar_library.py create mode 100644 src/smalibrary/__init__.py git pull /home/pi/oem_openHab * 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 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/20/d8/0d/acdc8f2890111b7be7de71deebef0642fb83be0313dfff0493 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. moving ~./npm to ~/data/npm and create symlink node-red-node-emoncms@0.0.15 node_modules/node-red-node-emoncms Start emonhub update script: ================================= EmonPi update started ================================= Running emonhub automatic node addition script EUID: 1000 EUID: 1000 [[5]] Node 5 already present [[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 Emoncms update script V1.1.1 Mon 25 Dec 10:17:49 UTC 2017 ############################################################# emonSD version: emonSD-07Nov16 emonSD base image check pass...continue update ############################################################# EUID: 1000 Checking cron tab for service runner entry... service runner crontab entry already installed /home/pi/emonpi/emoncms-filesystem: parsed OK emonPi Emoncms admin file-system toggle buttons sudoers entry installed /home/pi/emonpi/emoncms-setup/emoncms-setup-sudoers: parsed OK Emoncms setup module sudoers entry installed current settings.php md5: 6922362a0a23fa0918bcc91b1fcf1ca3 Default settings.php md5: 6922362a0a23fa0918bcc91b1fcf1ca3 git pull /var/www/emoncms dev-mosquitto-php master * stable symlinked_modules On branch stable Your branch is up-to-date with 'origin/stable'. nothing to commit, working directory clean Updating f7151ca..d1bce95 Fast-forward .htaccess | 10 +- Lib/email.php | 4 +- Lib/enum.php | 1 + Lib/tablejs/COPYRIGHT.txt | 5 +- Lib/tablejs/custom-table-fields.js | 144 +- Lib/tablejs/expandtables.html | 91 + Lib/tablejs/table.js | 283 ++- Modules/admin/admin_controller.php | 15 + Modules/admin/admin_main_view.php | 57 +- Modules/admin/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 2132 -> 3219 bytes Modules/admin/locale/fr_FR/LC_MESSAGES/messages.po | 261 ++- Modules/admin/module.json | 4 + Modules/eventp/eventp_processlist.php | 13 +- Modules/eventp/module.json | 4 + Modules/feed/Views/feedapi_view.php | 29 +- Modules/feed/Views/feedlist_view.php | 118 +- Modules/feed/engine/CassandraEngine.php | 264 +++ Modules/feed/engine/MysqlTimeSeries.php | 7 +- Modules/feed/engine/PHPFina.php | 269 ++- Modules/feed/engine/PHPTimeSeries.php | 90 +- Modules/feed/engine/VirtualFeed.php | 13 +- Modules/feed/feed_controller.php | 55 +- Modules/feed/feed_model.php | 338 +++- Modules/feed/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 3537 -> 11179 bytes Modules/feed/locale/fr_FR/LC_MESSAGES/messages.po | 2016 +++++++++++--------- Modules/feed/module.json | 4 + Modules/input/Views/input.js | 2 +- Modules/input/Views/input_api.php | 132 +- Modules/input/Views/input_dialog.js | 33 + Modules/input/Views/input_dialog.php | 24 + Modules/input/Views/input_view.php | 185 +- Modules/input/input_controller.php | 361 ++-- Modules/input/input_methods.php | 272 +++ Modules/input/input_model.php | 424 +++- Modules/input/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 7444 -> 11421 bytes Modules/input/locale/fr_FR/LC_MESSAGES/messages.po | 746 +++++--- Modules/input/module.json | 4 + Modules/process/Views/process_ui.js | 111 +- Modules/process/Views/process_ui.php | 1 + Modules/process/module.json | 4 + Modules/process/process_model.php | 40 +- Modules/process/process_processlist.php | 115 +- Modules/schedule/Views/schedule_view.php | 36 +- .../schedule/locale/et_EE/LC_MESSAGES/messages.mo | Bin 0 -> 2817 bytes .../schedule/locale/et_EE/LC_MESSAGES/messages.po | 167 ++ .../schedule/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 0 -> 5964 bytes .../schedule/locale/fr_FR/LC_MESSAGES/messages.po | 260 +++ Modules/schedule/module.json | 4 + Modules/schedule/schedule_model.php | 47 +- Modules/schedule/schedule_processlist.php | 10 +- Modules/time/module.json | 4 + Modules/time/time_controller.php | 16 +- Modules/user/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 4393 -> 5345 bytes Modules/user/locale/fr_FR/LC_MESSAGES/messages.po | 1833 +++++++++--------- Modules/user/login_block.php | 53 +- Modules/user/module.json | 4 + Modules/user/profile/profile.php | 50 +- Modules/user/rememberme_model.php | 413 +++- Modules/user/user.js | 44 +- Modules/user/user_controller.php | 5 +- Modules/user/user_menu.php | 2 +- Modules/user/user_model.php | 462 +++-- Modules/user/user_schema.php | 5 +- Modules/vis/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 2236 -> 7153 bytes Modules/vis/locale/fr_FR/LC_MESSAGES/messages.po | 1992 +++++++++++-------- Modules/vis/module.json | 4 + Modules/vis/multigraph_model.php | 38 +- Modules/vis/vis_controller.php | 4 +- Modules/vis/visualisations/bargraph.php | 15 +- Modules/vis/visualisations/compare.php | 4 +- .../vis/visualisations/comparison/comparison.php | 9 +- .../dailyhistogram/dailyhistogram.php | 12 +- Modules/vis/widget/vis_render.js | 9 +- Theme/basic/ajax-loader.gif | Bin 0 -> 4663 bytes Theme/basic/emon-blue.css | 144 ++ Theme/basic/{emon.css => emon-standard.css} | 26 +- Theme/basic/emon-sun.css | 159 ++ Theme/basic/{emoncms_logo.png => logo_login.png} | Bin Theme/basic/menu_view.php | 4 +- Theme/basic/theme.php | 102 +- core.php | 2 +- default.emonpi.settings.php | 11 +- default.settings.php | 12 +- docs/Cassandra.md | 9 + docs/LinuxInstall.md | 9 +- docs/RaspberryPi/Low-write-mode.md | 8 +- docs/RaspberryPi/MQTT.md | 16 +- docs/RaspberryPi/USB_HDD.md | 8 +- docs/RaspberryPi/general.md | 26 +- docs/RaspberryPi/jessie.md | 189 ++ docs/RaspberryPi/readme.md | 123 +- docs/gettext.md | 17 +- index.php | 61 +- param.php | 54 + process_settings.php | 89 +- readme.md | 93 +- route.php | 12 +- scripts/phpmqtt_input.php | 230 ++- test.php | 8 +- 99 files changed, 8929 insertions(+), 4534 deletions(-) create mode 100644 Lib/tablejs/expandtables.html create mode 100644 Modules/admin/module.json create mode 100644 Modules/eventp/module.json create mode 100644 Modules/feed/engine/CassandraEngine.php create mode 100644 Modules/feed/module.json create mode 100644 Modules/input/Views/input_dialog.js create mode 100644 Modules/input/Views/input_dialog.php create mode 100644 Modules/input/input_methods.php create mode 100644 Modules/input/module.json create mode 100644 Modules/process/module.json create mode 100644 Modules/schedule/locale/et_EE/LC_MESSAGES/messages.mo create mode 100644 Modules/schedule/locale/et_EE/LC_MESSAGES/messages.po create mode 100644 Modules/schedule/locale/fr_FR/LC_MESSAGES/messages.mo create mode 100644 Modules/schedule/locale/fr_FR/LC_MESSAGES/messages.po create mode 100644 Modules/schedule/module.json create mode 100644 Modules/time/module.json create mode 100644 Modules/user/module.json create mode 100644 Modules/vis/module.json create mode 100644 Theme/basic/ajax-loader.gif create mode 100644 Theme/basic/emon-blue.css rename Theme/basic/{emon.css => emon-standard.css} (85%) 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 param.php NEW default settings.php md5: c000f614aacbb38d288f0e3dbe9cfb88 settings.php had NOT been user modifed Update required to settings.php... settings.php autoupdated 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 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 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 git pull /var/www/emoncms/Modules/dashboard On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean