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

Поддержка нескольких DHT

Browse Source
This commit is contained in:
Dmitry Borisenko
2021-01-03 19:44:09 +01:00
parent 6ae001232d
commit 2d2148d2c4
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/items/vSensorDht.h
View File

@@ -5,8 +5,6 @@
#include "Global.h" #include "Global.h"
#include "GyverFilters.h" #include "GyverFilters.h"
extern DHTesp* dht;
class SensorDht; class SensorDht;
typedef std::vector<SensorDht> MySensorDhtVector; typedef std::vector<SensorDht> MySensorDhtVector;
@@ -24,13 +22,15 @@ class SensorDht {
SensorDht(const paramsDht& paramsTmp, const paramsDht& paramsHum); SensorDht(const paramsDht& paramsTmp, const paramsDht& paramsHum);
~SensorDht(); ~SensorDht();
DHTesp* dht;
void loop(); void loop();
void readTmpHum(); void readTmpHum();
private: private:
paramsDht _paramsTmp; paramsDht _paramsTmp;
paramsDht _paramsHum; paramsDht _paramsHum;
unsigned long prevMillis; unsigned long prevMillis;
unsigned long difference; unsigned long difference;
}; };

8
src/items/vSensorDht.cpp
View File

@@ -6,15 +6,11 @@
#include "Class/LineParsing.h" #include "Class/LineParsing.h"
#include "Global.h" #include "Global.h"
DHTesp* dht = nullptr;
SensorDht::SensorDht(const paramsDht& paramsTmp, const paramsDht& paramsHum) { SensorDht::SensorDht(const paramsDht& paramsTmp, const paramsDht& paramsHum) {
_paramsTmp = paramsDht(paramsTmp); _paramsTmp = paramsDht(paramsTmp);
_paramsHum = paramsDht(paramsHum); _paramsHum = paramsDht(paramsHum);
if (!dht) { dht = new DHTesp();
dht = new DHTesp();
}
if (_paramsHum.type == "dht11") { if (_paramsHum.type == "dht11") {
dht->setup(_paramsHum.pin, DHTesp::DHT11); dht->setup(_paramsHum.pin, DHTesp::DHT11);
@@ -92,5 +88,7 @@ void dhtSensor() {
if (firstTime) mySensorDht = new MySensorDhtVector(); if (firstTime) mySensorDht = new MySensorDhtVector();
firstTime = false; firstTime = false;
mySensorDht->push_back(SensorDht(paramsTmp, paramsHum)); mySensorDht->push_back(SensorDht(paramsTmp, paramsHum));
enterCnt = -1;
} }
} }