andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-08 12:49:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into IS-DHT

Browse Source
This commit is contained in:
Andrey Klimov
2018-06-30 01:07:15 +03:00
committed by GitHub
parent a54c67e062 f219951630
commit 74689fcd8b
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lighthub/main.cpp
View File

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

15
platformio.ini
View File

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