Starting emonPi Update > Sat Mar 25 14:42:36 NZDT 2017 git pull /home/pi/emonpi Updating 039fddc..91d2e6f git pull /home/pi/RFM2Pi 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 Updating b061df9..3453090 Fast-forward .gitignore | 1 + README.md | 61 ++-- conf/emonhub.conf | 8 +- conf/emonpi.default.emonhub.conf | 11 +- 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 | 37 ++ .../graphite/graphite.emonhub.conf | 11 + conf/interfacer_examples/graphite/readme.md | 63 ++++ .../modbus/modbusTCP.emonhub.conf | 235 ++++++++++++ conf/interfacer_examples/modbus/readme.md | 83 +++++ conf/interfacer_examples/smasolar/readme.md | 68 ++++ .../smasolar/smasolar.emonhub.conf | 17 + .../smilices/readme.md} | 0 .../smilices}/smilics.emonhub.conf | 0 .../vedirect/readme.md} | 0 .../vedirect}/vedirect.emonhub.conf | 0 configuration.md | 16 +- src/emonhub.py | 34 ++ src/emonhub_setup.py | 4 +- src/interfacers/EmonFroniusModbusTcpInterfacer.py | 44 +++ src/interfacers/EmonHubBMWInterfacer.py | 294 ++++++++++++++++ src/interfacers/EmonHubEmoncmsHTTPInterfacer.py | 20 +- src/interfacers/EmonHubGraphiteInterfacer.py | 103 ++++++ src/interfacers/EmonHubJeeInterfacer.py | 7 +- src/interfacers/EmonHubSMASolarInterfacer.py | 313 ++++++++++++++++ src/interfacers/EmonHubTx3eInterfacer.py | 196 +++++++++++ src/interfacers/EmonModbusTcpInterfacer.py | 141 ++++++++ src/smalibrary/SMABluetoothPacket.py | 198 +++++++++++ src/smalibrary/SMANET2PlusPacket.py | 231 ++++++++++++ src/smalibrary/SMASolar_library.py | 392 +++++++++++++++++++++ src/smalibrary/__init__.py | 0 33 files changed, 2661 insertions(+), 51 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/directserial/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/modbusTCP.emonhub.conf 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 rename conf/{smilics.readme.md => interfacer_examples/smilices/readme.md} (100%) rename conf/{ => interfacer_examples/smilices}/smilics.emonhub.conf (100%) rename conf/{VEDirect.readme.md => interfacer_examples/vedirect/readme.md} (100%) rename conf/{ => interfacer_examples/vedirect}/vedirect.emonhub.conf (100%) create mode 100644 src/interfacers/EmonFroniusModbusTcpInterfacer.py create mode 100644 src/interfacers/EmonHubBMWInterfacer.py create mode 100644 src/interfacers/EmonHubGraphiteInterfacer.py create mode 100644 src/interfacers/EmonHubSMASolarInterfacer.py create mode 100644 src/interfacers/EmonHubTx3eInterfacer.py create mode 100644 src/interfacers/EmonModbusTcpInterfacer.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/usefulscripts Updating 6cf8e48..f07eda8 Fast-forward sdpart/sdpart_imagefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) git pull /home/pi/backup Updating 00617c2..f86ed05 Fast-forward backup/backup_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Start emonPi Atmega328 firmware update: ================================= EmonPi update started ================================= Stopping OpenEnergyMonitor emonHub: emonhub has been stopped ok. Start ATmega328 serial upload using avrdude with emonPi_latest.hex Discrete Sampling: avrdude -c arduino -p ATMEGA328P -P /dev/ttyAMA0 -b 115200 -U flash:w:/home/pi/emonpi/Atmega328/emonPi_RFM69CW_RF12Demo_DiscreteSampling/compiled/emonPi_latest.hex avrdude-original: Using autoreset DTR on GPIO Pin 7 Start emonhub update script: ================================= EmonPi update started ================================= Running emonhub automatic node addition script 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 Mar 25 14:42:56 NZDT 2017 EUID: 1000 Checking cron tab for service runner entry... service runner crontab entry already installed Install emonPi Emoncms admin reboot button sudoers entry git pull /var/www/emoncms * stable Updating dc70ba7..22c0ae9 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 | 80 ++++++++++------- Modules/feed/Views/feedlist_view.php | 2 +- Modules/input/input_menu.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/multigraph_model.php | 2 +- Modules/vis/visualisations/bargraph.php | 12 +-- Modules/vis/visualisations/compare.php | 14 +-- .../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 | 87 ++++++++++++------ docs/RaspberryPi/MQTT.md | 48 ++++++++-- docs/RaspberryPi/readme.md | 9 +- index.php | 2 +- process_settings.php | 43 ++++++++- readme.md | 8 +- scripts/logger/logrotate.conf | 2 +- scripts/mqtt_input.service | 56 ++++++++++++ scripts/phpmqtt_input.php | 18 ++-- 48 files changed, 550 insertions(+), 313 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 Updating b31ebc5..6d07ab2 git pull /var/www/emoncms/Modules/config * 9.0 Updating 12b2bb5..faabc47 Fast-forward README.md | 6 ++++++ config_controller.php | 11 ++++++++--- edit.php | 25 +++++++++++++++++++------ emonnhub-sudoers | 1 + 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 emonnhub-sudoers git pull /var/www/emoncms/Modules/wifi * 9.0 Already up-to-date. git pull /var/www/emoncms/Modules/dashboard * master Updating b82ed8f..6b0073d Fast-forward Views/dashboard_edit_view.php | 25 +- Views/dashboard_view.php | 10 +- dashboard_langjs.php | 28 ++ locale/de_DE/LC_MESSAGES/messages.po | 10 +- 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/battery/battery_render.js | 181 +++++++++++++ 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/sun/sun_render.js | 187 ++++++++++++++ widget/windrose/windrose_render.js | 8 +- 16 files changed, 841 insertions(+), 389 deletions(-) create mode 100644 widget/battery/battery_render.js create mode 100644 widget/sun/sun_render.js git pull /var/www/emoncms/Modules/graph * master Updating 84beb45..e68cdc7 Fast-forward embed.php | 5 ++++ graph.js | 86 +++++++++++++++++++++++++++++++++++++++++++++++---------------- view.php | 26 +++++++++++-------- 3 files changed, 85 insertions(+), 32 deletions(-) git pull /home/pi/postprocess Your branch is up-to-date with 'origin/emonpi'. Already up-to-date. git pull /home/pi/backup * master Already up-to-date. Update Emoncms database Could not open input file: /home/pi/emonpi/emoncmsdbupdate.php Restarting Services... Restarting OpenEnergyMonitor emonHub: emonhub has been restarted ok. Log is turned off Restarting feedwriter Starting Daemon for the emoncms MQTT script: Restarting Daemon for the emoncms MQTT script: mqtt_input. set log rotate config owner to root Restarting Services... Start emonPi LCD service Filesystem is locked - Read Only access type ' rpi-rw ' to unlock Sat Mar 25 14:44:03 NZDT 2017 ................... emonPi update done