Starting emonPi Update > EUID: 1000 Mon 20 Feb 21:11:07 UTC 2017 emonSD-03May16 git pull /home/pi/emonpi Updating 9fdd992..e60cb72 git pull /home/pi/RFM2Pi git pull /home/pi/emonhub Updating f767e61..c496fc0 Fast-forward .gitignore | 1 + README.md | 43 ++-- conf/emonhub.conf | 9 +- conf/emonpi.default.emonhub.conf | 12 +- 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 ++++++++ .../smilices/readme.md} | 0 .../smilices}/smilics.emonhub.conf | 0 .../vedirect/readme.md} | 0 .../vedirect}/vedirect.emonhub.conf | 0 conf/nodes/Readme.md | 3 + configuration.md | 33 ++- service/emonhub | 8 +- src/emonhub.py | 18 +- src/emonhub_setup.py | 4 +- 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 +- 24 files changed, 830 insertions(+), 48 deletions(-) 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 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 conf/nodes/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 git pull /home/pi/usefulscripts git pull /home/pi/backup Updating 8e09c14..f86ed05 Fast-forward backup/backup_view.php | 2 +- emoncms-export.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) git pull /home/pi/huawei-hilink-status Start emonPi Atmega328 firmware update: ================================= EmonPi update started ================================= EUID: 1000 Downloading/unpacking paho-mqtt from https://pypi.python.org/packages/82/d9/7064d3a0a1d62756a1a809c85b99f864c641b66de84c15458f72193b7708/paho-mqtt-1.2.tar.gz#md5=241150b3fcb920ddca4d33181f3238b1 Running setup.py (path:/tmp/pip-build-IAysui/paho-mqtt/setup.py) egg_info for package paho-mqtt Installing collected packages: paho-mqtt Found existing installation: paho-mqtt 1.1 Uninstalling paho-mqtt: Successfully uninstalled paho-mqtt Running setup.py install for paho-mqtt Successfully installed paho-mqtt Cleaning up... 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. Add RW bash prompt indicator 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 20 Feb 21:11:52 UTC 2017 EUID: 1000 Checking cron tab for service runner entry... service runner crontab entry already installed /home/pi/emonpi/emoncms-rebootbutton: parsed OK Install emonPi Emoncms admin reboot button sudoers entry /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 Updating e44f264..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 +- Lib/flot/plugin/saveAsImage/README.md | 51 +++++ .../plugin/saveAsImage/jquery.flot.saveAsImage.js | 169 +++++++++++++++ Lib/flot/plugin/saveAsImage/lib/base64.js | 111 ++++++++++ Lib/flot/plugin/saveAsImage/lib/canvas2image.js | 235 +++++++++++++++++++++ Modules/admin/admin_controller.php | 156 ++++++++++++-- Modules/admin/admin_main_view.php | 81 +++++-- Modules/feed/Views/feedlist_view.php | 2 +- Modules/feed/engine/MysqlTimeSeries.php | 9 +- Modules/feed/engine/PHPFina.php | 8 +- Modules/feed/engine/PHPFiwa.php | 13 +- Modules/feed/engine/PHPTimeSeries.php | 1 + Modules/feed/engine/VirtualFeed.php | 5 +- Modules/feed/feed_controller.php | 2 +- Modules/feed/feed_model.php | 15 +- Modules/input/Views/input_api.php | 16 +- 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/multigraph_edit.js | 124 ++++++++--- Modules/vis/Views/vis_main_view.php | 14 +- Modules/vis/multigraph_model.php | 2 +- Modules/vis/vis_controller.php | 14 +- Modules/vis/vis_object.php | 18 +- Modules/vis/visualisations/bargraph.php | 16 +- Modules/vis/visualisations/common/vis.helper.js | 20 ++ Modules/vis/visualisations/compare.php | 20 +- .../dailyhistogram/dailyhistogram.php | 11 +- .../vis/visualisations/dailyhistogram/graphs.js | 1 + Modules/vis/visualisations/editdaily.php | 14 +- Modules/vis/visualisations/editrealtime.php | 14 +- Modules/vis/visualisations/graph.js | 1 + Modules/vis/visualisations/graph.php | 11 +- Modules/vis/visualisations/histgraph.php | 11 +- Modules/vis/visualisations/multigraph.php | 23 +- .../vis/visualisations/multigraph/multigraph.js | 155 +++++++++++--- Modules/vis/visualisations/orderbars.php | 12 +- Modules/vis/visualisations/orderthreshold.php | 18 +- Modules/vis/visualisations/rawdata.php | 22 +- Modules/vis/visualisations/realtime.php | 31 ++- Modules/vis/visualisations/simplezoom.php | 20 +- Modules/vis/visualisations/stacked.php | 18 +- Modules/vis/visualisations/stackedsolar.php | 20 +- Modules/vis/visualisations/threshold.php | 22 +- Modules/vis/visualisations/timecompare.php | 8 + .../vis/visualisations/timecompare/timecompare.js | 3 +- Modules/vis/visualisations/timestoredaily.php | 20 +- Modules/vis/visualisations/zoom.php | 5 + Modules/vis/visualisations/zoom/graphs.js | 1 + Modules/vis/widget/vis_render.js | 74 ++++--- Theme/basic/embed.php | 8 +- Theme/basic/emon.css | 6 + Theme/basic/menu_view.php | 2 +- Theme/basic/theme.php | 3 +- docs/LinuxInstall.md | 87 +++++--- docs/RaspberryPi/MQTT.md | 48 ++++- docs/RaspberryPi/readme.md | 9 +- index.php | 4 +- process_settings.php | 43 +++- readme.md | 40 ++-- scripts/logger/logrotate.conf | 2 +- scripts/mqtt_input.service | 56 +++++ scripts/phpmqtt_input.php | 57 +++-- 71 files changed, 1752 insertions(+), 415 deletions(-) create mode 100644 Lib/flot/plugin/saveAsImage/README.md create mode 100644 Lib/flot/plugin/saveAsImage/jquery.flot.saveAsImage.js create mode 100644 Lib/flot/plugin/saveAsImage/lib/base64.js create mode 100644 Lib/flot/plugin/saveAsImage/lib/canvas2image.js 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 Updating fd2a3a4..14345bc Fast-forward Readme.md | 5 +- app_menu.php | 3 +- myelectric/myelectric.js | 1 + mysolarpv/mysolarpv.js | 25 +- mysolarpvdivert/mysolarpvdivert.html | 274 ++++++++++++ mysolarpvdivert/mysolarpvdivert.js | 827 +++++++++++++++++++++++++++++++++++ style.css | 21 + vis.helper.js | 18 +- 8 files changed, 1166 insertions(+), 8 deletions(-) create mode 100644 mysolarpvdivert/mysolarpvdivert.html create mode 100644 mysolarpvdivert/mysolarpvdivert.js 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 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 Updating 515310d..149f909 Fast-forward README.md | 2 +- view.html | 23 ++++++++++++++--------- wifi_menu.php | 2 +- 3 files changed, 16 insertions(+), 11 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 4d98fee..0687caa Fast-forward Readme.md | 22 +- Views/dashboard_config.php | 9 + Views/dashboard_edit_view.php | 106 ++++++-- Views/dashboard_menu.php | 9 +- Views/dashboard_view.php | 7 +- 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 0 -> 519 bytes Views/icons/emon-icon-delete.png | Bin 0 -> 519 bytes Views/icons/emon-icon-front.png | Bin 0 -> 510 bytes Views/icons/emon-icon-gear.png | Bin 0 -> 493 bytes Views/icons/emon-icon-redo.png | Bin 0 -> 494 bytes Views/icons/emon-icon-tool.png | Bin 0 -> 420 bytes Views/icons/emon-icon-undo.png | Bin 0 -> 483 bytes Views/icons/emon-icon-view.png | Bin 0 -> 552 bytes Views/icons/gear-icon-outlined.png | Bin 0 -> 2229 bytes Views/js/designer.js | 509 +++++++++++++++++++++++++++++------ Views/js/render.js | 1 + dashboard_langjs.php | 23 ++ dashboard_menu.php | 2 +- dashboard_model.php | 2 + dashboard_schema.php | 5 +- locale/es_ES/LC_MESSAGES/messages.mo | Bin 7487 -> 8583 bytes locale/es_ES/LC_MESSAGES/messages.po | 268 ++++++++++++------ widget/bar/bar_render.js | 484 +++++++++++++++++---------------- widget/curl/curl_render.js | 24 +- widget/cylinder/cylinder_render.js | 31 +-- widget/dial/dial_render.js | 33 +-- widget/feedvalue/feedvalue_render.js | 36 ++- widget/jgauge/jgauge_render.js | 4 +- widget/jgauge2/jgauge2_render.js | 8 +- widget/led/led_render.js | 15 +- widget/windrose/windrose_render.js | 8 +- 36 files changed, 1163 insertions(+), 505 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 create mode 100644 Views/icons/emon-icon-back.png create mode 100644 Views/icons/emon-icon-delete.png create mode 100644 Views/icons/emon-icon-front.png create mode 100644 Views/icons/emon-icon-gear.png create mode 100644 Views/icons/emon-icon-redo.png create mode 100644 Views/icons/emon-icon-tool.png create mode 100644 Views/icons/emon-icon-undo.png create mode 100644 Views/icons/emon-icon-view.png create mode 100644 Views/icons/gear-icon-outlined.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 Updating 19aa1b5..28e1536 Fast-forward embed.php | 87 ++++ graph.js | 1035 +++++++++++++++++++++++++++++++++++++++++++++++ graph2.js | 770 ----------------------------------- graph_controller.php | 40 +- graph_menu.php | 6 + graph_model.php | 102 +++++ graph_schema.php | 7 + view.php | 129 +++--- vis.helper.js | 170 ++++++++ widget/graph_render.js | 79 ++++ widget/graph_widget.php | 15 + 11 files changed, 1614 insertions(+), 826 deletions(-) create mode 100644 embed.php create mode 100644 graph.js delete mode 100644 graph2.js create mode 100644 graph_menu.php create mode 100644 graph_model.php create mode 100644 graph_schema.php create mode 100644 vis.helper.js create mode 100644 widget/graph_render.js create mode 100644 widget/graph_widget.php 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. replacing initd mqtt_input with systemd mqtt input Stopping Daemon for the emoncms MQTT script: mqtt_input. Update Emoncms database ["ALTER TABLE `dashboard` ADD `gridsize` tinyint(1) NOT NULL DEFAULT '20'","CREATE TABLE graph (`id` int(11) not null auto_increment primary key, `userid` int(11), `data` text) ENGINE=MYISAM"] 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 Mon 20 Feb 21:13:15 UTC 2017 ................... emonPi update done Filesystem is unlocked - Write access type ' rpi-ro ' to lock ############################################################# I2C LCD DETECTED Ox27 Starting emonPi Update > via service-runner-update.sh EUID: 1000 Argument: emonpi Thu 27 Apr 05:35:31 UTC 2017 ############################################################# emonSD-03May16 git pull /home/pi/emonpi * master wifiap On branch master Your branch is behind 'origin/master' by 141 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: .gitignore modified: .travis.yml deleted: Atmega328/Readme.md~ deleted: Atmega328/update~ modified: README.md modified: docs/SD-card-build.md modified: emoncmsupdate modified: emonpiupdate modified: factoryreset modified: firmware/compiled/latest.hex modified: firmware/compiled/readme.md modified: firmware/libraries/Readme.md modified: firmware/platformio.ini modified: firmware/readme.md modified: firstbootupdate modified: lcd/emonPiLCD.py modified: lcd/emonPiLCD_update.py modified: lcd/lcd_test.py modified: lcd/lcddriver.py modified: logrotate.conf deleted: master modified: rc.local_jessieminimal modified: service-runner modified: service-runner-update.sh modified: update Untracked files: (use "git add ..." to include in what will be committed) 1 bash-rw-indicator emoncms-rebootbutton emonhub-sudoers firmware/compile.sh firmware/compiled/archive/emonPi_V2.7.hex firmware/compiled/archive/emonPi_V2.8.1.hex firmware/compiled/archive/emonPi_V2.8.2.hex firmware/compiled/archive/emonPi_V2.8.hex firmware/test_sketches/i2c_scan/ firmware/upload.sh hardware/emonpi/emonpi2c/ lcd/gsmhuaweistatus.pyc lcd/i2c_lib.pyc lcd/lcddriver.pyc motd rfm69piupdate.sh no changes added to commit (use "git add" and/or "git commit -a") Updating 9fdd992..ec62210 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 3ad91c6..e5d874d Fast-forward .gitignore | 14 +- .travis.yml | 21 + README.md | 6 +- .../RFM69CW_RF12_Demo_ATmega328_Pulse/dataflash.h | 358 - firmware/RFM69CW_RF_Demo_ATmega328/Blink.cpp.hex | 161 - ...oot328_8mhz_RFM69CW_RF12_Demo_ATmega328.cpp.hex | 476 +- .../RFM12_Demo_ATmega328.cpp.hex.readme | 2 - .../RFM69CW_RF12_Demo_ATmega328.cpp.hex.hex | 595 + .../RFM69CW_RF12_Demo_ATmega328/.gitignore | 2 + .../RFM69CW_RF12_Demo_ATmega328/.travis.yml | 65 + .../RFM69CW_RF12_Demo_ATmega328/lib/readme.txt | 36 + .../RFM69CW_RF12_Demo_ATmega328/platformio.ini | 31 + .../src.ino} | 182 +- ...hex => V12_RFM69CW_RF12_Demo_ATmega328.cpp.hex} | 0 .../RFM69CW_RF12_Demo_ATmega328_Pulse.cpp.hex | 0 .../RFM69CW_RF12_Demo_ATmega328_Pulse.ino | 0 .../RFM69CW_RF12_Demo_ATmega328_Pulse}/dataflash.h | 0 .../RFM69CW_RF12_Demo_ATmega328_Pulse/pulse.ino | 0 .../RFM69CW_RF12_Demo_ATmega328_Pulse_DS18B20.ino | 0 .../compiled.hex | 0 .../dataflash.h | 0 .../ds18b20.ino | 0 .../pulse.ino | 0 .../Full_RF12demo_atmega328.cpp.hex | 0 .../Full_RF12demo_atmega328.ino | 0 .../ATtiny84_RF12_Demo.cpp.hex | 0 .../Optiboot328_8mhz_RF12_Demo.hex | 0 .../RF12_Demo_atmega328.cpp.hex | 0 .../RF12_Demo_atmega328/RF12_Demo_atmega328.ino | 0 .../RF12_Demo_atmega328_OLED/DigoleSerial.cpp | 0 .../RF12_Demo_atmega328_OLED/DigoleSerial.h | 0 .../RF12_Demo_atmega328_OLED.ino | 0 .../RF12_Demo_atmega328_OLED/RF12mods.cpp | 0 .../{ => old}/RF12_Demo_atmega328_OLED/RF12mods.h | 0 .../TinySensor_RF12_Demo/TinySensor_RF12_Demo.ino | 0 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 => update-RFM12.sh | 2 +- update-RFM12 => update-RFM69.sh | 2 +- update-RFM69 => update_dev_pulse_ds18b20.sh | 2 +- 78 files changed, 45173 insertions(+), 908 deletions(-) create mode 100644 .travis.yml delete mode 100644 firmware/RFM69CW_RF12_Demo_ATmega328_Pulse/dataflash.h delete mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/Blink.cpp.hex delete mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM12_Demo_ATmega328.cpp.hex.readme create mode 100644 firmware/RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328.cpp.hex.hex 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 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%) rename firmware/RFM69CW_RF_Demo_ATmega328/{RFM69CW_RF12_Demo_ATmega328.cpp.hex => V12_RFM69CW_RF12_Demo_ATmega328.cpp.hex} (100%) rename firmware/{ => dev}/RFM69CW_RF12_Demo_ATmega328_Pulse/RFM69CW_RF12_Demo_ATmega328_Pulse.cpp.hex (100%) rename firmware/{ => dev}/RFM69CW_RF12_Demo_ATmega328_Pulse/RFM69CW_RF12_Demo_ATmega328_Pulse.ino (100%) rename firmware/{RFM69CW_RF_Demo_ATmega328/RFM69CW_RF12_Demo_ATmega328 => dev/RFM69CW_RF12_Demo_ATmega328_Pulse}/dataflash.h (100%) rename firmware/{ => dev}/RFM69CW_RF12_Demo_ATmega328_Pulse/pulse.ino (100%) rename firmware/{ => dev}/RFM69CW_RF12_Demo_ATmega328_Pulse_DS18B20/RFM69CW_RF12_Demo_ATmega328_Pulse_DS18B20.ino (100%) rename firmware/{ => dev}/RFM69CW_RF12_Demo_ATmega328_Pulse_DS18B20/compiled.hex (100%) rename firmware/{ => dev}/RFM69CW_RF12_Demo_ATmega328_Pulse_DS18B20/dataflash.h (100%) rename firmware/{ => dev}/RFM69CW_RF12_Demo_ATmega328_Pulse_DS18B20/ds18b20.ino (100%) rename firmware/{ => dev}/RFM69CW_RF12_Demo_ATmega328_Pulse_DS18B20/pulse.ino (100%) rename firmware/{ => old}/Full_RF12demo_atmega328/Full_RF12demo_atmega328.cpp.hex (100%) rename firmware/{ => old}/Full_RF12demo_atmega328/Full_RF12demo_atmega328.ino (100%) rename firmware/{ => old}/Pre_compiled_ATtiny84_RF12_Demo_hex/ATtiny84_RF12_Demo.cpp.hex (100%) rename firmware/{ => old}/RF12_Demo_atmega328/Optiboot328_8mhz_RF12_Demo.hex (100%) rename firmware/{ => old}/RF12_Demo_atmega328/RF12_Demo_atmega328.cpp.hex (100%) rename firmware/{ => old}/RF12_Demo_atmega328/RF12_Demo_atmega328.ino (100%) rename firmware/{ => old}/RF12_Demo_atmega328_OLED/DigoleSerial.cpp (100%) rename firmware/{ => old}/RF12_Demo_atmega328_OLED/DigoleSerial.h (100%) rename firmware/{ => old}/RF12_Demo_atmega328_OLED/RF12_Demo_atmega328_OLED.ino (100%) rename firmware/{ => old}/RF12_Demo_atmega328_OLED/RF12mods.cpp (100%) rename firmware/{ => old}/RF12_Demo_atmega328_OLED/RF12mods.h (100%) rename firmware/{ => old}/RFM2Pi_RF12_Demo/TinySensor_RF12_Demo/TinySensor_RF12_Demo.ino (100%) 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 rename update => update-RFM12.sh (64%) rename update-RFM12 => update-RFM69.sh (60%) rename update-RFM69 => update_dev_pulse_ds18b20.sh (58%) 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..0a4da93 Fast-forward README.md | 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/smasolar/readme.md | 70 ++++ .../smasolar/smasolar.emonhub.conf | 17 + src/emonhub.py | 28 +- src/interfacers/EmonHubBMWInterfacer.py | 294 ++++++++++++++ src/interfacers/EmonHubSMASolarInterfacer.py | 299 ++++++++++++++ src/interfacers/EmonHubTx3eInterfacer.py | 100 +++++ src/smalibrary/SMABluetoothPacket.py | 138 +++++++ src/smalibrary/SMANET2PlusPacket.py | 276 +++++++++++++ src/smalibrary/SMASolar_library.py | 438 +++++++++++++++++++++ src/smalibrary/__init__.py | 0 15 files changed, 1811 insertions(+), 25 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 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 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 Downloading/unpacking paho-mqtt from https://pypi.python.org/packages/ce/27/28ac0859fb8d63754ec51659be265bf3b89d1568c5f6736d21026e11ea85/paho-mqtt-1.2.3.tar.gz#md5=4bd192ea24e7aa347f6d240101ef82f6 Running setup.py (path:/tmp/pip-build-5B672A/paho-mqtt/setup.py) egg_info for package paho-mqtt Installing collected packages: paho-mqtt Found existing installation: paho-mqtt 1.2 Uninstalling paho-mqtt: Successfully uninstalled paho-mqtt Running setup.py install for paho-mqtt Successfully installed paho-mqtt Cleaning up... 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 Thu 27 Apr 05:36:35 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 22c0ae9..1044bec Fast-forward .travis.yml | 1 - Lib/tablejs/COPYRIGHT.txt | 5 +- Lib/tablejs/custom-table-fields.js | 99 ++++++----- Lib/tablejs/expandtables.html | 91 ++++++++++ Lib/tablejs/table.js | 277 ++++++++++++++++++++---------- Modules/eventp/eventp_processlist.php | 10 +- Modules/feed/Views/feedapi_view.php | 9 +- Modules/feed/Views/feedlist_view.php | 44 +++-- Modules/feed/engine/PHPFina.php | 3 +- Modules/feed/engine/VirtualFeed.php | 13 +- Modules/feed/feed_controller.php | 4 +- Modules/feed/feed_model.php | 21 ++- Modules/input/Views/input_api.php | 1 + 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 | 94 ++++++---- Modules/process/Views/process_ui.js | 113 ++++++++---- Modules/process/process_model.php | 36 +++- Modules/process/process_processlist.php | 105 +++++------ Modules/schedule/Views/schedule_view.php | 31 ++-- Modules/schedule/schedule_processlist.php | 8 +- Modules/vis/vis_controller.php | 4 +- Theme/basic/ajax-loader.gif | Bin 0 -> 4663 bytes Theme/basic/emon.css | 10 ++ Theme/basic/theme.php | 4 +- core.php | 2 +- default.emonpi.settings.php | 5 +- default.settings.php | 5 +- docs/LinuxInstall.md | 2 +- docs/RaspberryPi/readme.md | 4 +- index.php | 2 +- process_settings.php | 86 +++++----- readme.md | 89 ++++++++-- 34 files changed, 931 insertions(+), 489 deletions(-) create mode 100644 Lib/tablejs/expandtables.html create mode 100644 Modules/input/Views/input_dialog.js create mode 100644 Modules/input/Views/input_dialog.php create mode 100644 Theme/basic/ajax-loader.gif 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..6d07ab2 Fast-forward myelectric/myelectric.html | 5 ++--- myelectric/myelectric.js | 6 ------ myenergy/myenergy.js | 6 ------ mysolarpv/mysolarpv.js | 6 ------ mysolarpvdivert/mysolarpvdivert.js | 6 ------ style.css | 3 +-- 6 files changed, 3 insertions(+), 29 deletions(-) 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 Updating 149f909..14fa926 Fast-forward view.html | 4 ++-- 1 file changed, 2 insertions(+), 2 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 0687caa..a06cd2f Fast-forward Views/dashboard_edit_view.php | 13 +-- Views/dashboard_view.php | 10 +- dashboard_langjs.php | 22 +++++ locale/de_DE/LC_MESSAGES/messages.po | 10 +- widget/battery/battery_render.js | 181 +++++++++++++++++++++++++++++++++ widget/signal/signal_render.js | 185 ++++++++++++++++++++++++++++++++++ widget/sun/sun_render.js | 187 +++++++++++++++++++++++++++++++++++ 7 files changed, 593 insertions(+), 15 deletions(-) create mode 100644 widget/battery/battery_render.js create mode 100644 widget/signal/signal_render.js create mode 100644 widget/sun/sun_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 28e1536..e68cdc7 Fast-forward graph.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Already up-to-date. 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 Thu 27 Apr 05:37:52 UTC 2017 ................... emonPi update done