Merge remote-tracking branch 'upstream/develop' into IS-ENC

This commit is contained in:
livello
2018-10-04 21:49:59 +03:00
12 changed files with 189 additions and 37 deletions

View File

@@ -10,13 +10,13 @@
[platformio]
src_dir = lighthub
env_default =
; megaatmega2560
megaatmega2560
; megaatmega2560-net
; due
; esp8266
; esp32
; megaatmega2560-5500
due-5500
; due-5500
; controllino
; stm32
@@ -99,12 +99,11 @@ lib_deps =
[env:megaatmega2560]
platform = atmelavr
board = megaatmega2560
;upload_port = net:192.168.88.31:23
framework = arduino
;lib_ldf_mode = chain+
build_flags = !sh build_flags_mega2560.sh
lib_deps =
https://github.com/anklimov/Arduino-Temperature-Control-Library.git
https://github.com/anklimov/DS2482_OneWire
https://github.com/anklimov/DmxSimple
https://github.com/anklimov/httpClient
https://github.com/anklimov/aJson
@@ -112,7 +111,6 @@ lib_deps =
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
https://github.com/anklimov/Ethernet
https://github.com/anklimov/Ethernet2
https://github.com/PaulStoffregen/SPI.git
https://github.com/knolleary/pubsubclient.git
https://github.com/anklimov/Artnet.git
@@ -120,6 +118,7 @@ lib_deps =
EEPROM
Adafruit Unified Sensor
DHT sensor library
https://github.com/arcao/Syslog.git
[env:esp8266]
platform = espressif8266
@@ -168,6 +167,7 @@ lib_deps =
Adafruit Unified Sensor
DHT sensor library
[env:due-5500]
platform = atmelsam
framework = arduino
@@ -211,7 +211,6 @@ lib_deps =
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
https://github.com/anklimov/Ethernet
https://github.com/anklimov/Ethernet2
https://github.com/PaulStoffregen/SPI.git
https://github.com/knolleary/pubsubclient.git
https://github.com/anklimov/Artnet.git