Merge branch 'develop' into IS-DHT

This commit is contained in:
2018-06-30 01:07:15 +03:00
committed by GitHub
2 changed files with 21 additions and 23 deletions

View File

@@ -577,6 +577,7 @@ void applyConfig() {
if (owArr && !owReady) {
aJsonObject *item = owArr->child;
owReady = owSetup(&Changed);
if (owReady) Serial.println(F("One wire Ready"));
t_count = 0;
while (item && owReady) {
if ((item->type == aJson_Object)) {
@@ -1034,7 +1035,7 @@ void setup_main() {
#endif
delay(20);
owReady = 0;
//owReady = 0;
#ifdef _owire
if (net) net->idle(&owIdle);

View File

@@ -10,7 +10,8 @@
[platformio]
src_dir = lighthub
env_default =
megaatmega2560
megaatmega2560-net
; due
; esp8266
; megaatmega2560-5500
@@ -18,6 +19,7 @@ env_default =
; controllino
build_dir = /tmp/pioenvs
libdeps_dir = /tmp/piolibdeps
[env:due]
platform = atmelsam
framework = arduino
@@ -70,7 +72,6 @@ lib_deps =
Adafruit Unified Sensor
DHT sensor library
[env:esp8266]
platform = espressif8266
framework = arduino
@@ -95,31 +96,27 @@ lib_deps =
WifiManager
[env:megaatmega2560-5500]
[env:megaatmega2560-net]
platform = atmelavr
board = megaatmega2560
framework = arduino
upload_port = net:192.168.88.2:23000
;lib_ldf_mode = chain+
build_flags = !echo -n "-DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
build_flags = -D Wiz5500 -D AVR_DMXOUT_PIN=18
build_flags = !echo -n "-DPIO_SRC_REV="$(git rev-parse --short HEAD)
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
https://github.com/anklimov/CmdArduino
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
FastLED
EEPROM
Adafruit Unified Sensor
DHT sensor library
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
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
https://github.com/anklimov/Ethernet
https://github.com/PaulStoffregen/SPI.git
https://github.com/knolleary/pubsubclient.git
https://github.com/anklimov/Artnet.git
FastLED
[env:due-5500]
platform = atmelsam