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

domoticz dht22 support

Browse Source
This commit is contained in:
livello
2018-10-17 12:16:20 +03:00
parent 1b2646d0d0
commit fe9300f921
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@@ -3,3 +3,11 @@
.clang_complete .clang_complete
.gcc-flags.json .gcc-flags.json
CMakeListsPrivate.txt CMakeListsPrivate.txt
build_flags_due.sh
build_flags_due_cheb.sh
build_flags_due_riko.sh
build_flags_esp32.sh
build_flags_esp8266.sh
build_flags_stm32.sh
build_flags_due-5500.sh
build_flags_mega2560.sh

9
lighthub/inputs.cpp
View File

@@ -26,6 +26,7 @@ e-mail anklimov@gmail.com
#ifndef DHT_DISABLE #ifndef DHT_DISABLE
#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
#include <DHTesp.h> #include <DHTesp.h>
#else #else
#include "DHT.h" #include "DHT.h"
#endif #endif
@@ -40,7 +41,7 @@ static volatile int nextPollMillisPin[5] = {0,0,0,0,0};
static volatile long counter_value[6]; static volatile long counter_value[6];
#endif #endif
#if defined(ESP8266) #if defined(ARDUINO_ARCH_ESP8266)
static volatile long counter_value[6]; static volatile long counter_value[6];
#endif #endif
@@ -204,7 +205,7 @@ void Input::dht22Poll() {
#ifndef DHT_DISABLE #ifndef DHT_DISABLE
if(nextPollTime()>millis()) if(nextPollTime()>millis())
return; return;
#if defined(ESP8266) || defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
DHTesp dhtSensor; DHTesp dhtSensor;
dhtSensor.setup(pin, DHTesp::DHT22); dhtSensor.setup(pin, DHTesp::DHT22);
TempAndHumidity dhtSensorData = dhtSensor.getTempAndHumidity(); TempAndHumidity dhtSensorData = dhtSensor.getTempAndHumidity();
@@ -223,7 +224,7 @@ void Input::dht22Poll() {
if(idx&&idx->valuestring){//DOMOTICZ json format support if(idx&&idx->valuestring){//DOMOTICZ json format support
debugSerial<<endl<<idx->valuestring<<F(" Domoticz valstr:"); debugSerial<<endl<<idx->valuestring<<F(" Domoticz valstr:");
char valstr[80]; char valstr[80];
sprintf( valstr, "{\"command\":\"udevice\",\"idx\":%s,\"svalue\":\"%.1f;%.0f;0\"}",idx->valuestring,temp,humidity); sprintf( valstr,"{\"command\":\"udevice\",\"idx\":%s,\"svalue\":\"%.1f;%.0f;0\"}",idx->valuestring,temp,humidity);
debugSerial<<valstr; debugSerial<<valstr;
mqttClient.publish(emit->valuestring, valstr); mqttClient.publish(emit->valuestring, valstr);
} }
@@ -277,7 +278,7 @@ void Input::contactPoll() {
#if defined(ARDUINO_ARCH_STM32F1) #if defined(ARDUINO_ARCH_STM32F1)
WiringPinMode inputPinMode; WiringPinMode inputPinMode;
#endif #endif
#if defined(__SAM3X8E__)||defined(__AVR__)||defined(ESP8266)||defined(ARDUINO_ARCH_ESP32) #if defined(__SAM3X8E__)||defined(__AVR__)||defined(ARDUINO_ARCH_ESP8266)||defined(ARDUINO_ARCH_ESP32)
uint32_t inputPinMode; uint32_t inputPinMode;
#endif #endif