From 9f733a153533b1b91c78089a5b9aa87c8939691a Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Wed, 5 Jan 2022 18:01:20 +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=20LCD2004=20=D0=B2=20=D1=8F=D0=B4?=
 =?UTF-8?q?=D1=80=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/items/vSensorLCD2004.h | 6 ++----
 src/BufferExecute.cpp          | 5 +++++
 src/Init.cpp                   | 6 ++++++
 src/items/vSensorLCD2004.cpp   | 6 +++---
 src/main.cpp                   | 8 ++++++++
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/include/items/vSensorLCD2004.h b/include/items/vSensorLCD2004.h
index 39555cd6..d9c7379f 100644
--- a/include/items/vSensorLCD2004.h
+++ b/include/items/vSensorLCD2004.h
@@ -4,19 +4,17 @@
 #include <OneWire.h>
 #include "Global.h"
 
-//ИНТЕГРИРУЮ: следим за наименованиями далее
 class SensorLCD2004;
 
 typedef std::vector<SensorLCD2004> MySensorLCD2004Vector;
 
 class SensorLCD2004 {
    public:
-   //ИНТЕГРИРУЮ: обращаем внимание на параметры, берутся из таблицы настроек
     SensorLCD2004(unsigned long interval, unsigned int pin, unsigned int index, String addr, String key);
     ~SensorLCD2004();
 
     void loop();
-    void readLCD2004();
+    void writeLCD2004();
 
    private:
     unsigned long currentMillis;
@@ -31,5 +29,5 @@ class SensorLCD2004 {
 
 extern MySensorLCD2004Vector* mySensorLCD20042;
 
-extern void LCD2004();
+extern void lcd2004();
 #endif
diff --git a/src/BufferExecute.cpp b/src/BufferExecute.cpp
index 44d92a3a..4c2b483f 100644
--- a/src/BufferExecute.cpp
+++ b/src/BufferExecute.cpp
@@ -16,6 +16,7 @@
 #include "items/vSensorBmp280.h"
 #include "items/vSensorCcs811.h"
 #include "items/vSensorDallas.h"
+#include "items/vSensorLCD2004.h"
 #include "items/vSensorDht.h"
 #include "items/vSensorNode.h"
 #include "items/vSensorPzem.h"
@@ -105,6 +106,10 @@ void csvCmdExecute(String& cmdStr) {
             } else if (order == F("dallas-temp")) {
 #ifdef EnableSensorDallas
                 sCmd.addCommand(order.c_str(), dallas);
+#endif
+            } else if (order == F("LCD2004")) {
+#ifdef EnableSensorLCD2004
+                sCmd.addCommand(order.c_str(), lcd2004);
 #endif
             } else if (order == F("dht")) {
 #ifdef EnableSensorDht
diff --git a/src/Init.cpp b/src/Init.cpp
index c782c4bc..ae9d692d 100644
--- a/src/Init.cpp
+++ b/src/Init.cpp
@@ -16,6 +16,7 @@
 #include "items/vSensorBmp280.h"
 #include "items/vSensorCcs811.h"
 #include "items/vSensorDallas.h"
+#include "items/vSensorLCD2004.h"
 #include "items/vSensorDht.h"
 #include "items/vSensorNode.h"
 #include "items/vSensorPzem.h"
@@ -169,6 +170,11 @@ void clearVectors() {
         mySensorDallas2->clear();
     }
 #endif
+#ifdef EnableSensorLCD2004
+    if (mySensorLCD20042 != nullptr) {
+        mySensorLCD20042->clear();
+    }
+#endif
 #ifdef EnableSensorUltrasonic
     if (mySensorUltrasonic != nullptr) {
         mySensorUltrasonic->clear();
diff --git a/src/items/vSensorLCD2004.cpp b/src/items/vSensorLCD2004.cpp
index e37f6e9f..e859ee01 100644
--- a/src/items/vSensorLCD2004.cpp
+++ b/src/items/vSensorLCD2004.cpp
@@ -26,11 +26,11 @@ void SensorLCD2004::loop() {
     difference = currentMillis - prevMillis;
     if (difference >= _interval) {
         prevMillis = millis();
-        readLCD2004();
+        writeLCD2004();
     }
 }
 
-void SensorLCD2004::readLCD2004() {
+void SensorLCD2004::writeLCD2004() {
     //if (_addr == "") {
     //    sensors->getAddress(deviceAddress, _index);
     //} else {
@@ -49,7 +49,7 @@ void SensorLCD2004::readLCD2004() {
 
 MySensorLCD2004Vector* mySensorLCD20042 = nullptr;
 
-void LCD2004() {
+void lcd2004() {
     myLineParsing.update();
     String interval = myLineParsing.gint();
     String pin = myLineParsing.gpin();
diff --git a/src/main.cpp b/src/main.cpp
index 86e7ebd6..274d5e23 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,6 +29,7 @@
 #include "items/vSensorBmp280.h"
 #include "items/vSensorCcs811.h"
 #include "items/vSensorDallas.h"
+#include "items/vSensorLCD2004.h"
 #include "items/vSensorDht.h"
 #include "items/vSensorNode.h"
 #include "items/vSensorPzem.h"
@@ -153,6 +154,13 @@ void loop() {
         }
     }
 #endif
+#ifdef EnableSensorLCD2004
+    if (mySensorLCD20042 != nullptr) {
+        for (unsigned int i = 0; i < mySensorLCD20042->size(); i++) {
+            mySensorLCD20042->at(i).loop();
+        }
+    }
+#endif
 #ifdef EnableSensorUltrasonic
     if (mySensorUltrasonic != nullptr) {
         for (unsigned int i = 0; i < mySensorUltrasonic->size(); i++) {