mirror of
https://github.com/1technophile/OpenMQTTGateway.git
synced 2026-03-03 05:54:23 +01:00
eb5b8fa291
Add semaphore to the enqueue calls to avoid concurrency issues Add new BT controller to avoid scan evt timeout bug
79 lines
2.5 KiB
C++
79 lines
2.5 KiB
C++
/*
|
|
OpenMQTTGateway Addon - ESP8266 or Arduino program for home automation
|
|
|
|
Act as a wifi or ethernet gateway between your 433mhz/infrared IR signal and a 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>
|
|
|
|
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;
|
|
handleJsonEnqueue(DHTdata);
|
|
}
|
|
persistedh = h;
|
|
persistedt = t;
|
|
}
|
|
}
|
|
#endif
|