mirror of
https://github.com/1technophile/OpenMQTTGateway.git
synced 2026-03-06 15:28:29 +01:00
585df9a420
* Update arduino core to 3.1.1 * Fix Blufi build * Update arduinojson, fix build errors with idf * Fix narrowing * fix RF builds * WIP-Convert ino files to cpp * Fix pilight build * Fix Somfy actuator build. * Update esp32dev-rf partition * Fix Weatherstation build * Fix GFSunInverter build * Fix esp32dev-ir build * Fix ble-aws build * Fix eth builds * Fix m5Stack missing pins_arduino.h * Fix build errors for M5 stack/tough, others are upstream issues. * Fix RTL 433 build - remaining errors are from radolib * Fix nodemcu build * fix 2g builds * Fix serial build * Fix actuator on off builds * Fix SSD1306 build - remaining errors are from radiolib * Fix multiple definition of OTAserver_cert * Fix nodemcu rf2 build * Fix ADC builds * Fix sensor builds * Fix LORA builds * Fix multi-receiver builds - remaining errors are in radiolib * Fix fastled builds * Fix theegns board builds * Fix broker builds * Update fastled - old version failed all-test build * Fix RN8209 builds * Fix max temp actuator builds * Fix PWM builds * Fix C37 sensor builds * Fix HTU21 builds * Fix INA266 builds * Fix undefined variables in mqtt discovery * Fix webui build * Fix fastled invalid pin error * Fix wifi manual setup builds * Fix onewire/all-test build - bin too big error remaining * Fix theengs plug build * Fix rfbridge builds * Fix blufi builds * Fix undefined functions in serial * Fix preprocessor definition checks * Set IDF log level to erre * Add delay in loop to prevent watchdog timeout * Use xTaskCreateUniveral to support single core processors * Remove old HTTPUpdate files - upsteam fixed. * Cleanup and move common declarations to header file * Use custom partiton table to fix builds where bin is too large * Update M5StickC - fixs esp32-m5stick-c-ble build * Revert to Arduino core 2.x for builds with incompatible libs * Remove "Z" from file names and rename omg_common to TheengsCommon * Fix gateway name when using MAC with new Arduino core * Update IDF config to reduce loop task stack use * Update esp-nimble-cpp version, corrects BLE uppercase ID's * Update wifi manager to fix watchdog timeout error
82 lines
2.5 KiB
C++
82 lines
2.5 KiB
C++
/*
|
|
Theengs OpenMQTTGateway - We Unite Sensors in One Open-Source Interface
|
|
|
|
Act as a gateway between your 433mhz, infrared IR, BLE, LoRa signal and one interface like an MQTT broker
|
|
Send and receiving command by MQTT
|
|
|
|
DHT reading Addon
|
|
|
|
Copyright: (c)Florian ROBERT
|
|
|
|
Contributors:
|
|
- prahjister
|
|
- 1technophile
|
|
|
|
This file is part of OpenMQTTGateway.
|
|
|
|
OpenMQTTGateway is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenMQTTGateway is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include "User_config.h"
|
|
|
|
#ifdef ZsensorDHT
|
|
# include <DHT.h>
|
|
# include <DHT_U.h>
|
|
|
|
# include "TheengsCommon.h"
|
|
# include "config_DHT.h"
|
|
|
|
DHT dht(DHT_RECEIVER_GPIO, DHT_SENSOR_TYPE);
|
|
|
|
//Time used to wait for an interval before resending temp and hum
|
|
unsigned long timedht = 0;
|
|
|
|
void setupDHT() {
|
|
Log.notice(F("Reading DHT on pin: %d" CR), DHT_RECEIVER_GPIO);
|
|
}
|
|
|
|
void MeasureTempAndHum() {
|
|
if (millis() > (timedht + TimeBetweenReadingDHT)) { //retrieving value of temperature and humidity of the box from DHT every xUL
|
|
timedht = millis();
|
|
static float persistedh;
|
|
static float persistedt;
|
|
float h = dht.readHumidity();
|
|
// Read temperature as Celsius (the default)
|
|
float t = dht.readTemperature();
|
|
// Check if any reads failed and exit early (to try again).
|
|
if (isnan(h) || isnan(t)) {
|
|
Log.error(F("Failed to read from DHT sensor!" CR));
|
|
} else {
|
|
Log.trace(F("Creating DHT buffer" CR));
|
|
StaticJsonDocument<JSON_MSG_BUFFER> DHTdataBuffer;
|
|
JsonObject DHTdata = DHTdataBuffer.to<JsonObject>();
|
|
if (h != persistedh || dht_always) {
|
|
DHTdata["hum"] = (float)h;
|
|
} else {
|
|
Log.trace(F("Same hum don't send it" CR));
|
|
}
|
|
if (t != persistedt || dht_always) {
|
|
DHTdata["tempc"] = (float)t;
|
|
DHTdata["tempf"] = dht.convertCtoF(t);
|
|
} else {
|
|
Log.trace(F("Same temp don't send it" CR));
|
|
}
|
|
DHTdata["origin"] = DHTTOPIC;
|
|
enqueueJsonObject(DHTdata);
|
|
}
|
|
persistedh = h;
|
|
persistedt = t;
|
|
}
|
|
}
|
|
#endif
|