iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 20:09:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

последние изменения

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-12-21 20:51:59 +01:00
parent d9672d17b0
commit 0df63ba642
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BufferExecute.cpp
View File

@@ -86,7 +86,7 @@ void csvCmdExecute(String& cmdStr) {
sCmd.addCommand(order.c_str(), bme280Temp); sCmd.addCommand(order.c_str(), bme280Temp);
} }
else if (order == F("bme280-hum")) { else if (order == F("bme280-hum")) {
//sCmd.addCommand(order.c_str(), bme280Hum); sCmd.addCommand(order.c_str(), bme280Hum);
} }
else if (order == F("bme280-press")) { else if (order == F("bme280-press")) {
sCmd.addCommand(order.c_str(), bme280Press); sCmd.addCommand(order.c_str(), bme280Press);

22
src/items/vSensorDht.cpp
View File

@@ -18,6 +18,7 @@ void SensorDht::tmpInit(const tmpParams& tmpSet) {
dht = new DHTesp(); dht = new DHTesp();
} }
dht->setup(_tmpSet.pin, DHTesp::DHT11); dht->setup(_tmpSet.pin, DHTesp::DHT11);
_tmpSet.interval = dht->getMinimumSamplingPeriod() + _tmpSet.interval;
} }
void SensorDht::humInit(const humParams& humSet) { void SensorDht::humInit(const humParams& humSet) {
@@ -26,6 +27,7 @@ void SensorDht::humInit(const humParams& humSet) {
dht = new DHTesp(); dht = new DHTesp();
} }
dht->setup(_tmpSet.pin, DHTesp::DHT11); dht->setup(_tmpSet.pin, DHTesp::DHT11);
_tmpSet.interval = dht->getMinimumSamplingPeriod() + _tmpSet.interval;
} }
void SensorDht::loopTmp() { void SensorDht::loopTmp() {
@@ -49,10 +51,10 @@ void SensorDht::loopHum() {
void SensorDht::readTmp() { void SensorDht::readTmp() {
float value; float value;
static int counter; static int counter;
if (dht->getStatus() != 0 && counter < 5) { //if (dht->getStatus() != 0 && counter < 5) {
counter++; // counter++;
SerialPrint("E", "Sensor", "Disconnected"); // SerialPrint("E", "Sensor", "Disconnected " + String(counter) + " " + dht->getStatusString());
} else { //} else {
counter = 0; counter = 0;
value = dht->getTemperature(); value = dht->getTemperature();
if (String(value) != "nan") { if (String(value) != "nan") {
@@ -65,16 +67,16 @@ void SensorDht::readTmp() {
} else { } else {
SerialPrint("E", "Sensor", "'" + _tmpSet.key + "' data: " + String(value)); SerialPrint("E", "Sensor", "'" + _tmpSet.key + "' data: " + String(value));
} }
} //}
} }
void SensorDht::readHum() { void SensorDht::readHum() {
float value; float value;
static int counter; static int counter;
if (dht->getStatus() != 0 && counter < 5) { //if (dht->getStatus() != 0 && counter < 5) {
counter++; // counter++;
SerialPrint("E", "Sensor", "Disconnected"); // SerialPrint("E", "Sensor", "Disconnected " + String(counter) + " " + dht->getStatusString());
} else { //} else {
counter = 0; counter = 0;
value = dht->getHumidity(); value = dht->getHumidity();
if (String(value) != "nan") { if (String(value) != "nan") {
@@ -87,7 +89,7 @@ void SensorDht::readHum() {
} else { } else {
SerialPrint("E", "Sensor", "'" + _humSet.key + "' data: " + String(value)); SerialPrint("E", "Sensor", "'" + _humSet.key + "' data: " + String(value));
} }
} //}
} }
MySensorDhtVector* mySensorDht = nullptr; MySensorDhtVector* mySensorDht = nullptr;