diff --git a/lighthub/inputs.cpp b/lighthub/inputs.cpp index d6ca993..0771a2a 100644 --- a/lighthub/inputs.cpp +++ b/lighthub/inputs.cpp @@ -20,10 +20,11 @@ e-mail anklimov@gmail.com #include "inputs.h" #include "item.h" +#include "utils.h" #include #ifndef DHT_DISABLE -#if defined(ESP8266) || defined(ARDUINO_ARCH_ESP32) +#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) #include #else #include "DHT.h" @@ -149,7 +150,7 @@ void Input::counterPoll() { return; } long counterValue = counter_value[pin]; - Serial.print(F("IN:"));Serial.print(pin);Serial.print(F(" Counter type. val="));Serial.print(counterValue); + debugSerial<valuestring); - strcat(addrstr, "T"); - printFloatValueToStr(temp, valstr); - mqttClient.publish(addrstr, valstr); - addrstr[strlen(addrstr) - 1] = 'H'; - printFloatValueToStr(humidity, valstr); - mqttClient.publish(addrstr, valstr); + if(idx&&idx->valuestring){//DOMOTICZ json format support + debugSerial<valuestring<valuestring,temp,humidity); + debugSerial<valuestring, valstr); + } + else { + char valstr[10]; + strcat(addrstr, emit->valuestring); + strcat(addrstr, "T"); + printFloatValueToStr(temp, valstr); + mqttClient.publish(addrstr, valstr); + addrstr[strlen(addrstr) - 1] = 'H'; + printFloatValueToStr(humidity, valstr); + mqttClient.publish(addrstr, valstr); + } + setNextPollTime(millis() + DHT_POLL_DELAY_DEFAULT); - Serial.print(" NextPollMillis="); - Serial.println(nextPollTime()); + debugSerial<<" NextPollMillis="<