From 2d2148d2c4668df1fbbbdac5db43ecfaf3427ca6 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Sun, 3 Jan 2021 19:44:09 +0100 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB=D1=8C=D0=BA?= =?UTF-8?q?=D0=B8=D1=85=20DHT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/items/vSensorDht.h | 6 +++--- src/items/vSensorDht.cpp | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/items/vSensorDht.h b/include/items/vSensorDht.h index 608db0a8..5f57f3b7 100644 --- a/include/items/vSensorDht.h +++ b/include/items/vSensorDht.h @@ -5,8 +5,6 @@ #include "Global.h" #include "GyverFilters.h" -extern DHTesp* dht; - class SensorDht; typedef std::vector MySensorDhtVector; @@ -24,13 +22,15 @@ class SensorDht { SensorDht(const paramsDht& paramsTmp, const paramsDht& paramsHum); ~SensorDht(); + DHTesp* dht; + void loop(); void readTmpHum(); private: paramsDht _paramsTmp; paramsDht _paramsHum; - + unsigned long prevMillis; unsigned long difference; }; diff --git a/src/items/vSensorDht.cpp b/src/items/vSensorDht.cpp index 04dd4e80..5c79d74c 100644 --- a/src/items/vSensorDht.cpp +++ b/src/items/vSensorDht.cpp @@ -6,15 +6,11 @@ #include "Class/LineParsing.h" #include "Global.h" -DHTesp* dht = nullptr; - SensorDht::SensorDht(const paramsDht& paramsTmp, const paramsDht& paramsHum) { _paramsTmp = paramsDht(paramsTmp); _paramsHum = paramsDht(paramsHum); - if (!dht) { - dht = new DHTesp(); - } + dht = new DHTesp(); if (_paramsHum.type == "dht11") { dht->setup(_paramsHum.pin, DHTesp::DHT11); @@ -92,5 +88,7 @@ void dhtSensor() { if (firstTime) mySensorDht = new MySensorDhtVector(); firstTime = false; mySensorDht->push_back(SensorDht(paramsTmp, paramsHum)); + + enterCnt = -1; } }