From dc4215deafc9a67b3677cc27f74c81c89aa5ad28 Mon Sep 17 00:00:00 2001 From: Andrey Klimov Date: Sat, 4 May 2019 18:49:03 +0300 Subject: [PATCH] Publish while MQTT connection pending caused hungs/WDT sometime - fixed Default set 0 to all DMX out channels (include unused) --- lighthub/abstractin.cpp | 4 +++- lighthub/dmx.cpp | 1 + lighthub/modules/in_ccs811_hdc1080.cpp | 7 +------ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lighthub/abstractin.cpp b/lighthub/abstractin.cpp index bebe2c7..2461f55 100644 --- a/lighthub/abstractin.cpp +++ b/lighthub/abstractin.cpp @@ -4,7 +4,9 @@ #include "utils.h" #include #include "inputs.h" +#include "main.h" +extern lan_status lanStatus; extern PubSubClient mqttClient; int abstractIn::publish(long value, char* subtopic) @@ -32,7 +34,7 @@ int abstractIn::publish(char * value, char* subtopic) strncpy(addrstr,emit->valuestring,sizeof(addrstr)); if (!strchr(addrstr,'/')) setTopic(addrstr,sizeof(addrstr),T_OUT,emit->valuestring); strncat(addrstr,subtopic,sizeof(addrstr)); - if (mqttClient.connected()) + if (mqttClient.connected() && lanStatus == OPERATION) { mqttClient.publish(addrstr, value, true); return 1; diff --git a/lighthub/dmx.cpp b/lighthub/dmx.cpp index 9e6ad0c..3f49fc2 100644 --- a/lighthub/dmx.cpp +++ b/lighthub/dmx.cpp @@ -245,6 +245,7 @@ dmxout.begin(); dmxout.setTxMaxChannels(channels); #endif #endif +for (int i=1;i<=channels;i++) DmxWrite(i,0); } void ArtnetSetup() diff --git a/lighthub/modules/in_ccs811_hdc1080.cpp b/lighthub/modules/in_ccs811_hdc1080.cpp index 36630d3..00965ca 100644 --- a/lighthub/modules/in_ccs811_hdc1080.cpp +++ b/lighthub/modules/in_ccs811_hdc1080.cpp @@ -120,12 +120,7 @@ int in_ccs811::Poll() publish(co2,"/CO2"); publish(tvoc,"/TVOC"); publish(ccs811Baseline,"/base"); - - Serial.print("] millis["); - //Simply the time since program start - Serial.print(millis()); - Serial.print("]"); - Serial.println(); + Serial.println("]"); printSensorError(); #ifdef WAK_PIN