From de2075664b5aff21a253acecfeb8224061838080 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Fri, 3 Dec 2021 10:30:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=BD=D1=82=D0=B5=D0=B3=D1=80=D0=B8?=
 =?UTF-8?q?=D1=80=D1=83=D0=B5=D0=BC=20=D0=B4=D0=B0=D1=82=D1=87=D0=B8=D0=BA?=
 =?UTF-8?q?=20SHT20=20=D0=B2=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=B5=20=D1=84=D0=B0=D0=BB=D1=8B=20=D0=BF=D1=80=D0=BE=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=D0=B0=20=D0=BA=D1=80=D0=BE=D0=BC=D0=B5=20set.devic?=
 =?UTF-8?q?e.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_esp/items/items.txt | 4 +++-
 include/Consts.h         | 1 +
 src/BufferExecute.cpp    | 5 +++++
 src/Init.cpp             | 6 ++++++
 src/main.cpp             | 8 ++++++++
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/data_esp/items/items.txt b/data_esp/items/items.txt
index b75f01f0..bdacaa1a 100644
--- a/data_esp/items/items.txt
+++ b/data_esp/items/items.txt
@@ -31,4 +31,6 @@
 0;output-value;txtid;anydata;Вывод;Температура;order*
 0;logging;crtid;chart;Графики;История;order;val[any];int[60];cnt[100]*
 0;logging;crtid;chart3;Графики;История;order;val[any];int[23:30];cnt[100];st[0]*
-0;uptime;uptid;anydataTime;Системные;%name%#uptime;order;int[60]*
\ No newline at end of file
+0;uptime;uptid;anydataTime;Системные;%name%#uptime;order;int[60]*
+0;sht20;tmpid;anydataTemp;Сенсоры;Температура;1;c[1]
+0;sht20;humid;anydataHum;Сенсоры;Влажность;2;c[1];int[50]*
\ No newline at end of file
diff --git a/include/Consts.h b/include/Consts.h
index 959e00ff..aa914156 100644
--- a/include/Consts.h
+++ b/include/Consts.h
@@ -70,6 +70,7 @@
 #define EnablePwmOut
 #define EnableSensorAnalog
 #define EnableSensorBme280
+#define EnableSensorSht20
 #define EnableSensorBmp280
 #define EnableSensorCcs811
 #define EnableSensorDallas
diff --git a/src/BufferExecute.cpp b/src/BufferExecute.cpp
index e7972a03..b9c7d6ac 100644
--- a/src/BufferExecute.cpp
+++ b/src/BufferExecute.cpp
@@ -12,6 +12,7 @@
 #include "items/vPwmOut.h"
 #include "items/vSensorAnalog.h"
 #include "items/vSensorBme280.h"
+#include "items/vSensorSht20.h"
 #include "items/vSensorBmp280.h"
 #include "items/vSensorCcs811.h"
 #include "items/vSensorDallas.h"
@@ -110,6 +111,10 @@ void csvCmdExecute(String& cmdStr) {
             } else if (order == F("bme280")) {
 #ifdef EnableSensorBme280
                 sCmd.addCommand(order.c_str(), bme280Sensor);
+#endif
+            } else if (order == F("sht20")) {
+#ifdef EnableSensorSht20
+                sCmd.addCommand(order.c_str(), sht20Sensor);
 #endif
             } else if (order == F("bmp280")) {
 #ifdef EnableSensorBmp280
diff --git a/src/Init.cpp b/src/Init.cpp
index 3c9b2055..29a51585 100644
--- a/src/Init.cpp
+++ b/src/Init.cpp
@@ -13,6 +13,7 @@
 #include "items/vPwmOut.h"
 #include "items/vSensorAnalog.h"
 #include "items/vSensorBme280.h"
+#include "items/vSensorSht20.h"
 #include "items/vSensorBmp280.h"
 #include "items/vSensorCcs811.h"
 #include "items/vSensorDallas.h"
@@ -187,6 +188,11 @@ void clearVectors() {
         mySensorBme280->clear();
     }
 #endif
+#ifdef EnableSensorSht20
+    if (mySensorSht20 != nullptr) {
+        mySensorSht20->clear();
+    }
+#endif
 #ifdef EnableSensorBmp280
     if (mySensorBmp280 != nullptr) {
         mySensorBmp280->clear();
diff --git a/src/main.cpp b/src/main.cpp
index 158435c2..218cf9a9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,6 +25,7 @@
 #include "items/vLogging.h"
 #include "items/vSensorAnalog.h"
 #include "items/vSensorBme280.h"
+#include "items/vSensorSht20.h"
 #include "items/vSensorBmp280.h"
 #include "items/vSensorCcs811.h"
 #include "items/vSensorDallas.h"
@@ -173,6 +174,13 @@ void loop() {
         }
     }
 #endif
+#ifdef EnableSensorSht20
+    if (mySensorSht20 != nullptr) {
+        for (unsigned int i = 0; i < mySensorSht20->size(); i++) {
+            mySensorSht20->at(i).loop();
+        }
+    }
+#endif
 #ifdef EnableSensorBmp280
     if (mySensorBmp280 != nullptr) {
         for (unsigned int i = 0; i < mySensorBmp280->size(); i++) {