Merge branch 'master' into develop

This commit is contained in:
2019-03-04 04:57:02 +03:00
committed by GitHub
4 changed files with 8 additions and 0 deletions

View File

@@ -16,6 +16,9 @@ Lighthub allows connecting together:
[List of non-expensive compatible components from AliExpress here](http://ppv.alipromo.com/custom/promo.php?hash=pjagwaovaero6vkeabjpkpvy4gznbgkc&landing_id=39661) [List of non-expensive compatible components from AliExpress here](http://ppv.alipromo.com/custom/promo.php?hash=pjagwaovaero6vkeabjpkpvy4gznbgkc&landing_id=39661)
![alt text](LightHub.png "LightHub application diagram")
![alt text](docs/LightHubAppDiagram.png "LightHub application diagram") ![alt text](docs/LightHubAppDiagram.png "LightHub application diagram")
Where is possible both, to configure local control/mapping between inputs and outputs (light, floor heating thermostats) and remote control from MQTT enabled software. At the moment, LightHub tested and perfectly working with following set of complementary free software: Where is possible both, to configure local control/mapping between inputs and outputs (light, floor heating thermostats) and remote control from MQTT enabled software. At the moment, LightHub tested and perfectly working with following set of complementary free software:

1
_config.yml Normal file
View File

@@ -0,0 +1 @@
theme: jekyll-theme-cayman

Binary file not shown.

View File

@@ -9,6 +9,7 @@
; http://docs.platformio.org/page/projectconf.html ; http://docs.platformio.org/page/projectconf.html
[platformio] [platformio]
src_dir = lighthub src_dir = lighthub
env_default = megaatmega2560-net env_default = megaatmega2560-net
;monitor_speed = 115200 ;monitor_speed = 115200
; megaatmega2560 ; megaatmega2560
@@ -23,6 +24,7 @@ env_default = megaatmega2560-net
; esp32-evb ; esp32-evb
; nrf52840_dk ; nrf52840_dk
;build_dir = /tmp/pioenvs ;build_dir = /tmp/pioenvs
;libdeps_dir = /tmp/piolibdeps ;libdeps_dir = /tmp/piolibdeps
[env:nrf52840_dk] [env:nrf52840_dk]
@@ -274,6 +276,7 @@ lib_ignore =
WebServer WebServer
lib_deps = lib_deps =
https://github.com/sebnil/DueFlashStorage https://github.com/sebnil/DueFlashStorage
https://github.com/anklimov/Arduino-Temperature-Control-Library.git https://github.com/anklimov/Arduino-Temperature-Control-Library.git
https://github.com/anklimov/DS2482_OneWire https://github.com/anklimov/DS2482_OneWire
@@ -294,6 +297,7 @@ lib_deps =
Streaming Streaming
https://github.com/livello/PrintEx#is-select-redecl https://github.com/livello/PrintEx#is-select-redecl
[env:controllino] [env:controllino]
platform = atmelavr platform = atmelavr
board = megaatmega2560 board = megaatmega2560