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

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