From d78907d854d48b30a411d7ae0320b453779a08de Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Wed, 5 Jan 2022 17:49:33 +0300
Subject: [PATCH 1/9] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=BD=D0=B5=D0=BE=D0=B1=D1=85=D0=BE=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=BC=D1=8B=D0=B5=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B=20=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B2=D1=8B=D0=B5=20=D0=B7=D0=B0=D0=BF=D0=B8?=
 =?UTF-8?q?=D1=81=D0=B8=20=D0=B2=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D0=B2?=
 =?UTF-8?q?=D0=B5=D0=B9=D1=81=20=D0=B4=D0=BB=D1=8F=20=D1=8D=D0=BA=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B0=20LCD2004?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_esp/items/items.txt       |  3 +-
 include/Consts.h               |  1 +
 include/items/vSensorLCD2004.h | 35 ++++++++++++++++++
 src/items/vSensorLCD2004.cpp   | 66 ++++++++++++++++++++++++++++++++++
 4 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 include/items/vSensorLCD2004.h
 create mode 100644 src/items/vSensorLCD2004.cpp

diff --git a/data_esp/items/items.txt b/data_esp/items/items.txt
index 5e43e747..ece28a84 100644
--- a/data_esp/items/items.txt
+++ b/data_esp/items/items.txt
@@ -38,6 +38,5 @@
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[HDC1080_hum];addr[0x76]*
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[AHTX0_temp];addr[0x76]
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[AHTX0_hum];addr[0x76]*
-0;sensor;anyid;anydata;Page;Tmp;1;c[0];k[0];int[10];type[LCD];val[any]
-0;sensor;anyid;anydata;Page;Hum;1;c[8];k[1];int[10];type[LCD];val[any]*
+0;LCD2004;lcdid;anydata;Вывод;Пример;1;addr[0х27];pin[16,2];int[10];c[0,0];val[ip]*
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[type1];addr[0x76]*
\ No newline at end of file
diff --git a/include/Consts.h b/include/Consts.h
index e0d1740a..1738cd18 100644
--- a/include/Consts.h
+++ b/include/Consts.h
@@ -87,6 +87,7 @@
 #define EnableSensorAny
 #define EnableTelegram
 #define EnableUart
+#define EnableSensorLCD2004
 #endif
 
 #ifdef GATE_MODE
diff --git a/include/items/vSensorLCD2004.h b/include/items/vSensorLCD2004.h
new file mode 100644
index 00000000..39555cd6
--- /dev/null
+++ b/include/items/vSensorLCD2004.h
@@ -0,0 +1,35 @@
+#ifdef EnableSensorLCD2004
+#pragma once
+#include <Arduino.h>
+#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();
+
+   private:
+    unsigned long currentMillis;
+    unsigned long prevMillis;
+    unsigned long difference;
+    unsigned long _interval;
+    String _key;
+    String _addr;
+    unsigned int _pin;
+    unsigned int _index;
+};
+
+extern MySensorLCD2004Vector* mySensorLCD20042;
+
+extern void LCD2004();
+#endif
diff --git a/src/items/vSensorLCD2004.cpp b/src/items/vSensorLCD2004.cpp
new file mode 100644
index 00000000..e37f6e9f
--- /dev/null
+++ b/src/items/vSensorLCD2004.cpp
@@ -0,0 +1,66 @@
+#include "Consts.h"
+#ifdef EnableSensorLCD2004
+#include "items/vSensorLCD2004.h"
+#include "BufferExecute.h"
+#include "Class/LineParsing.h"
+#include "Global.h"
+#include "Utils/StringUtils.h"
+#include <map>
+
+#include <Arduino.h>
+
+SensorLCD2004::SensorLCD2004(unsigned long interval, unsigned int pin, unsigned int index, String addr, String key) {
+    _interval = interval * 1000;
+    _key = key;
+    _pin = pin;
+    _index = index;
+    _addr = addr;
+
+
+}
+
+SensorLCD2004::~SensorLCD2004() {}
+
+void SensorLCD2004::loop() {
+    currentMillis = millis();
+    difference = currentMillis - prevMillis;
+    if (difference >= _interval) {
+        prevMillis = millis();
+        readLCD2004();
+    }
+}
+
+void SensorLCD2004::readLCD2004() {
+    //if (_addr == "") {
+    //    sensors->getAddress(deviceAddress, _index);
+    //} else {
+    //    string2hex(_addr.c_str(), deviceAddress);
+    //}
+
+    
+
+    //eventGen2(_key, String(value));
+    //jsonWriteStr(configLiveJson, _key, String(value));
+    //publishStatus(_key, String(value));
+    //char addrStr[20] = "";
+    //hex2string(deviceAddress, 8, addrStr); 
+    //SerialPrint("I", "Sensor", "'" + _key + "' data: " + String(value) + "' addr: " + String(addrStr));
+}
+
+MySensorLCD2004Vector* mySensorLCD20042 = nullptr;
+
+void LCD2004() {
+    myLineParsing.update();
+    String interval = myLineParsing.gint();
+    String pin = myLineParsing.gpin();
+    String index = myLineParsing.gindex();
+    String key = myLineParsing.gkey();
+    String addr = myLineParsing.gaddr();
+    myLineParsing.clear();
+
+    static bool firstTime = true;
+    if (firstTime) mySensorLCD20042 = new MySensorLCD2004Vector();
+    firstTime = false;
+    mySensorLCD20042->push_back(SensorLCD2004(interval.toInt(), pin.toInt(), index.toInt(), addr, key));
+}
+#endif

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 2/9] =?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++) {

From 044867ca009fbe0e9ffc785a5af01fd7e923af48 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Wed, 5 Jan 2022 23:38:32 +0300
Subject: [PATCH 3/9] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=B8=D1=81=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=B5=D0=BC=20=D0=B8=D0=BD=D1=82=D0=B5=D0=B3=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8E=20LCD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_esp/items/items.txt       |   2 +-
 data_esp/set.device.json.gz    | Bin 3081 -> 3153 bytes
 include/items/vSensorLCD2004.h |  12 +++--
 platformio.ini                 |   5 ++
 src/items/vSensorLCD2004.cpp   |  91 +++++++++++++++++++++++++--------
 5 files changed, 83 insertions(+), 27 deletions(-)

diff --git a/data_esp/items/items.txt b/data_esp/items/items.txt
index ece28a84..c7e7a660 100644
--- a/data_esp/items/items.txt
+++ b/data_esp/items/items.txt
@@ -38,5 +38,5 @@
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[HDC1080_hum];addr[0x76]*
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[AHTX0_temp];addr[0x76]
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[AHTX0_hum];addr[0x76]*
-0;LCD2004;lcdid;anydata;Вывод;Пример;1;addr[0х27];pin[16,2];int[10];c[0,0];val[ip]*
+0;LCD2004;lcdid;anydata;Вывод;IP;1;addr[0х27];k[16,2];int[10];c[0,0];val[ip]*
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[type1];addr[0x76]*
\ No newline at end of file
diff --git a/data_esp/set.device.json.gz b/data_esp/set.device.json.gz
index f484816e797851e5b40ba97fada4d42be67f7218..bd42d625048aa4914821987106e47e655bb0b86d 100644
GIT binary patch
literal 3153
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

literal 3081
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
X5UFX7d2{9Y=QjTW&zVsHt1<up_j&FH

diff --git a/include/items/vSensorLCD2004.h b/include/items/vSensorLCD2004.h
index d9c7379f..1b677c89 100644
--- a/include/items/vSensorLCD2004.h
+++ b/include/items/vSensorLCD2004.h
@@ -3,6 +3,8 @@
 #include <Arduino.h>
 #include <OneWire.h>
 #include "Global.h"
+#include "LiquidCrystal_I2C.h"
+#include "LiquidCrystal.h"
 
 class SensorLCD2004;
 
@@ -10,7 +12,7 @@ typedef std::vector<SensorLCD2004> MySensorLCD2004Vector;
 
 class SensorLCD2004 {
    public:
-    SensorLCD2004(unsigned long interval, unsigned int pin, unsigned int index, String addr, String key);
+    SensorLCD2004(String key, unsigned long interval, unsigned int x, unsigned int y, String val, String descr);
     ~SensorLCD2004();
 
     void loop();
@@ -20,11 +22,13 @@ class SensorLCD2004 {
     unsigned long currentMillis;
     unsigned long prevMillis;
     unsigned long difference;
+ 
     unsigned long _interval;
+    unsigned int _x;
+    unsigned int _y;
+    String _val;
     String _key;
-    String _addr;
-    unsigned int _pin;
-    unsigned int _index;
+    String _descr;
 };
 
 extern MySensorLCD2004Vector* mySensorLCD20042;
diff --git a/platformio.ini b/platformio.ini
index c7c184f2..da9411d9 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -45,6 +45,7 @@ lib_deps =
 	Adafruit AHTX0
 	LiquidCrystal_I2C
 	BH1750
+	fmalpartida/LiquidCrystal@^1.5.0
 monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
@@ -73,6 +74,7 @@ lib_deps =
 	Adafruit AHTX0
 	LiquidCrystal_I2C
 	BH1750
+	fmalpartida/LiquidCrystal@^1.5.0
 monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
@@ -90,6 +92,7 @@ lib_deps =
 	ESPAsyncUDP
 	CTBot @2.1.6
 	MySensors @2.3.2
+	fmalpartida/LiquidCrystal@^1.5.0
 monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
@@ -119,6 +122,7 @@ lib_deps =
 	Adafruit AHTX0
 	LiquidCrystal_I2C
 	BH1750
+	fmalpartida/LiquidCrystal@^1.5.0
 monitor_filters = esp32_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
@@ -138,6 +142,7 @@ lib_deps =
 	ESP32 AnalogWrite
 	ESP32Servo
 	MySensors @2.3.2
+	fmalpartida/LiquidCrystal@^1.5.0
 monitor_filters = esp32_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
diff --git a/src/items/vSensorLCD2004.cpp b/src/items/vSensorLCD2004.cpp
index e859ee01..aca92d17 100644
--- a/src/items/vSensorLCD2004.cpp
+++ b/src/items/vSensorLCD2004.cpp
@@ -9,13 +9,17 @@
 
 #include <Arduino.h>
 
-SensorLCD2004::SensorLCD2004(unsigned long interval, unsigned int pin, unsigned int index, String addr, String key) {
-    _interval = interval * 1000;
-    _key = key;
-    _pin = pin;
-    _index = index;
-    _addr = addr;
 
+LiquidCrystal     *LCDLPT;
+LiquidCrystal_I2C *LCDI2C;
+
+SensorLCD2004::SensorLCD2004(String key, unsigned long interval, unsigned int x, unsigned int y, String val, String descr) {
+    _key = key;
+    _interval = interval * 1000;
+    _x = x;
+    _y = y;
+    _val = val;
+    _descr = descr;
 
 }
 
@@ -31,36 +35,79 @@ void SensorLCD2004::loop() {
 }
 
 void SensorLCD2004::writeLCD2004() {
-    //if (_addr == "") {
-    //    sensors->getAddress(deviceAddress, _index);
-    //} else {
-    //    string2hex(_addr.c_str(), deviceAddress);
-    //}
+    String tmpStr;
+    tmpStr = getValue(_val);
+    if (tmpStr == "no value") tmpStr = _val;
 
-    
+    if (_descr != "none") tmpStr = _descr + " " + tmpStr;
 
-    //eventGen2(_key, String(value));
-    //jsonWriteStr(configLiveJson, _key, String(value));
-    //publishStatus(_key, String(value));
-    //char addrStr[20] = "";
-    //hex2string(deviceAddress, 8, addrStr); 
-    //SerialPrint("I", "Sensor", "'" + _key + "' data: " + String(value) + "' addr: " + String(addrStr));
+    if(LCDI2C != nullptr) {
+        LCDI2C->setCursor(_x, _y); 
+        LCDI2C->print(tmpStr);    
+    }
+
+    if(LCDLPT != nullptr) {
+        LCDLPT->setCursor(_x, _y); 
+        LCDLPT->print(tmpStr);    
+    }
+
+    //eventGen2(_key, String(_val));
+    //jsonWriteStr(configLiveJson, _key, String(_val));
+    //publishStatus(_key, String(_val));
+    SerialPrint("I", "Sensor", "'" + _key + "' data2: " + String(tmpStr));
 }
 
 MySensorLCD2004Vector* mySensorLCD20042 = nullptr;
 
 void lcd2004() {
     myLineParsing.update();
-    String interval = myLineParsing.gint();
-    String pin = myLineParsing.gpin();
-    String index = myLineParsing.gindex();
     String key = myLineParsing.gkey();
+    String pin = myLineParsing.gpin();
     String addr = myLineParsing.gaddr();
+    String interval = myLineParsing.gint();
+    String c = myLineParsing.gc();
+    String k = myLineParsing.gk();
+    String val = myLineParsing.gval();
+    String descr = myLineParsing.gdescr();
     myLineParsing.clear();
+    
+    int x = selectFromMarkerToMarker(c, ",", 0).toInt();
+    int y = selectFromMarkerToMarker(c, ",", 1).toInt();
+    int w = selectFromMarkerToMarker(k, ",", 1).toInt();  //количество столбцов
+    int h = selectFromMarkerToMarker(k, ",", 1).toInt();  //количество строк
+ 
+    if (LCDI2C == nullptr && LCDLPT == nullptr) {  //инициализации экрана еще не было
+        if (addr == "") {
+            int pin1 = selectFromMarkerToMarker(pin, ",", 0).toInt();
+            int pin2 = selectFromMarkerToMarker(pin, ",", 1).toInt();
+            int pin3 = selectFromMarkerToMarker(pin, ",", 2).toInt();
+            int pin4 = selectFromMarkerToMarker(pin, ",", 3).toInt();
+            int pin5 = selectFromMarkerToMarker(pin, ",", 4).toInt();
+            int pin6 = selectFromMarkerToMarker(pin, ",", 5).toInt();
+            int pin7 = selectFromMarkerToMarker(pin, ",", 6).toInt();
+            int pin8 = selectFromMarkerToMarker(pin, ",", 7).toInt();
+            int pin9 = selectFromMarkerToMarker(pin, ",", 8).toInt();
+            int pin10 = selectFromMarkerToMarker(pin, ",", 9).toInt();
+            if (pin7) {
+                LCDLPT = new LiquidCrystal(pin1, pin2, pin3, pin4, pin5, pin6, pin7, pin8, pin9, pin10);
+            } else {
+                LCDLPT = new LiquidCrystal(pin1, pin2, pin3, pin4, pin5, pin6);
+            }
+            if(LCDLPT != nullptr) LCDLPT->begin(w, h);
+            //val = (String)pin1 + " " + (String)pin2 + " " + (String)pin3 + " " + (String)pin4 + " " + (String)pin5 + " " + (String)pin6 + " " + (String)pin7 + " " + (String)pin8 + " " + (String)pin9 + " " + (String)pin10; 
+        } else {
+            LCDI2C = new LiquidCrystal_I2C(hexStringToUint8(addr));
+            if(LCDI2C != nullptr) {
+                LCDI2C->begin(w, h);
+                LCDI2C->backlight();
+            }
+        }
+    }
+
 
     static bool firstTime = true;
     if (firstTime) mySensorLCD20042 = new MySensorLCD2004Vector();
     firstTime = false;
-    mySensorLCD20042->push_back(SensorLCD2004(interval.toInt(), pin.toInt(), index.toInt(), addr, key));
+    mySensorLCD20042->push_back(SensorLCD2004(key, interval.toInt(), x, y, val, descr));
 }
 #endif

From c2010c4979368cd794edc85bc859f28b05795aa4 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Wed, 5 Jan 2022 23:39:04 +0300
Subject: [PATCH 4/9] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=B2=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=82=D1=80=20ip[]=20=D0=B4=D0=BE=2015=20=D0=BF=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/Class/LineParsing.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/Class/LineParsing.h b/include/Class/LineParsing.h
index ff8a3965..dee7f7d1 100644
--- a/include/Class/LineParsing.h
+++ b/include/Class/LineParsing.h
@@ -127,6 +127,7 @@ class LineParsing {
         }
 
         if (_pin != "") {
+            /*
             if (_pin.indexOf(",") == -1) {
                 if (!isPinExist(_pin.toInt()) || !isDigitStr(_pin)) {
                     pinErrors++;
@@ -139,6 +140,17 @@ class LineParsing {
                     pinErrors++;
                     _pin = "";
                 }
+            }*/
+
+            String tmpstr;
+            for (int i=0; i<15; i++) {
+                tmpstr = selectFromMarkerToMarker(_pin, ",", i);
+                if(tmpstr == "not found") break;
+                if(!isDigitStr(tmpstr) || !isPinExist(tmpstr.toInt())){
+                    pinErrors++;
+                    _pin = "";
+                    break;
+                }
             }
         }
 

From 1abe6b20bc30b57bc32488f45adef631f5d85231 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Wed, 5 Jan 2022 23:40:17 +0300
Subject: [PATCH 5/9] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E=20LCD=20?=
 =?UTF-8?q?=D0=B8=D0=B7=20=D0=BF=D0=B5=D1=81=D0=BE=D1=87=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/YourSensor.cpp | 50 +++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/YourSensor.cpp b/src/YourSensor.cpp
index 054e1c8c..8a488366 100644
--- a/src/YourSensor.cpp
+++ b/src/YourSensor.cpp
@@ -9,7 +9,7 @@
 #include "Adafruit_AHTX0.h"
 #include "BH1750.h"
 #include "ClosedCube_HDC1080.h"
-#include "LiquidCrystal_I2C.h"
+//#include "LiquidCrystal_I2C.h"
 
 //создаем объект HDC1080
 ClosedCube_HDC1080 hdc1080;
@@ -20,7 +20,7 @@ Adafruit_Sensor *aht_humidity, *aht_temp;
 sensors_event_t tmpEvent_t;
 
 //создаем объект LCD
-LiquidCrystal_I2C LCD(0x27, 16, 2);
+//LiquidCrystal_I2C LCD(0x27, 16, 2);
 
 //создаем объект BH1750
 BH1750 lightMeter;
@@ -29,7 +29,7 @@ BH1750 lightMeter;
 // Adafruit_ADS1015 ads;
 
 // co2 sensor
-SoftwareSerial K_30_Serial(13, 15);                           //Программный порт
+//SoftwareSerial K_30_Serial(13, 15);                           //Программный порт
 byte readCO2[] = {0xFE, 0X44, 0X00, 0X08, 0X02, 0X9F, 0X25};  //Команды для запроса показаний с датчика
 byte response[] = {0, 0, 0, 0, 0, 0, 0};                      //массив для ответа от датчика
 unsigned long getValue(byte packet[]) {
@@ -39,10 +39,10 @@ unsigned long getValue(byte packet[]) {
     return val_1;
 }
 void sendRequest(byte packet[]) {
-    while (!K_30_Serial.available()) {
-        K_30_Serial.write(readCO2, 7);
-        delay(50);
-    }
+    //while (!K_30_Serial.available()) {
+    //    K_30_Serial.write(readCO2, 7);
+    //    delay(50);
+    //}
 }
 
 float yourSensorReading(String type, String paramsAny) {
@@ -68,12 +68,12 @@ float yourSensorReading(String type, String paramsAny) {
         value = tmpEvent_t.relative_humidity;
     }
     //==========================================================LCD=================================================================
-    if (type == "LCD") {
-        LCD_init();
-        LCD.setCursor(jsonReadInt(paramsAny, "c"), jsonReadInt(paramsAny, "k"));
-        String toPrint = jsonReadStr(paramsAny, "descr") + " " + jsonReadStr(configLiveJson, jsonReadStr(paramsAny, "val"));
-        LCD.print(toPrint);
-    }
+    //if (type == "LCD") {
+        //LCD_init();
+    //    LCD.setCursor(jsonReadInt(paramsAny, "c"), jsonReadInt(paramsAny, "k"));
+    //    String toPrint = jsonReadStr(paramsAny, "descr") + " " + jsonReadStr(configLiveJson, jsonReadStr(paramsAny, "val"));
+    //    LCD.print(toPrint);
+    //}
     //==========================================================BH1750=================================================================
     if (type == "BH1750_lux") {
         BH1750_init();
@@ -81,10 +81,10 @@ float yourSensorReading(String type, String paramsAny) {
     }
     //==========================================================co2=================================================================
     if (type == "valCO2") {
-        K_30_Serial.begin(9600);
-        sendRequest(readCO2);
-        int valCO2 = getValue(response);
-        value = valCO2;
+        //K_30_Serial.begin(9600);
+        //sendRequest(readCO2);
+        //int valCO2 = getValue(response);
+        //value = valCO2;
         // Serial.println(valCO2);
     }
 
@@ -115,14 +115,14 @@ void AHTX0_init() {
     }
 }
 
-void LCD_init() {
-    static bool LCD_flag = true;
-    if (LCD_flag) {
-        LCD.init();       //инициализация дисплея
-        LCD.backlight();  //включаем подсветку
-    }
-    LCD_flag = false;
-}
+//void LCD_init() {
+    //static bool LCD_flag = true;
+    //if (LCD_flag) {
+        //LCD.init();       //инициализация дисплея
+        //LCD.backlight();  //включаем подсветку
+    //}
+    //LCD_flag = false;
+//}
 
 void BH1750_init() {
     static bool BH1750_flag = true;

From 3f1fbf647a16d796431f2c3794f1570bbc3cdb11 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Sat, 8 Jan 2022 08:32:23 +0300
Subject: [PATCH 6/9] =?UTF-8?q?=D0=A3=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B8?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=B5=D0=BC=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=B6=D0=B4=D1=83=20=D0=BF=D0=BE=D0=BF=D1=8B=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=BC=D0=B8=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B8=D1=82=D1=8C=20=D1=81=D0=BE=D0=B5=D0=B4=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=20=D0=B1=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BA=D0=B5=D1=80=D0=B0.=20=D0=9D=D0=B0=20esp32=20=D0=B2=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=8F=20=D0=BE=D0=B6=D0=B8=D0=B4=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=B4=D0=BE=D1=85=D0=BE=D0=B4=D0=B8=D0=BB=D0=BE=20?=
 =?UTF-8?q?=D0=B4=D0=BE=2020=20=D1=81=D0=B5=D0=BA=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BA=D0=BE=D0=BC=20=D0=B6=D0=B5=20=D0=B8=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B5=D1=80=D0=B2=D0=B0=D0=BB=D0=B5=20=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/Consts.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/Consts.h b/include/Consts.h
index 1738cd18..02df2cb4 100644
--- a/include/Consts.h
+++ b/include/Consts.h
@@ -53,7 +53,7 @@
 #define NUM_BUTTONS 8
 #endif
 
-#define MQTT_RECONNECT_INTERVAL 20000
+#define MQTT_RECONNECT_INTERVAL 60000
 #define CHANGE_BROKER_AFTER 5
 #define TELEMETRY_UPDATE_INTERVAL_MIN 60
 #define DEVICE_CONFIG_FILE "s.conf.csv"

From 46a87ebe2618a25915aa10cb76eb4de9a1319be0 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Wed, 12 Jan 2022 10:00:19 +0300
Subject: [PATCH 7/9] =?UTF-8?q?=D0=98=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?=
 =?UTF-8?q?=D1=83=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BB=D0=BB=D0=B5=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20LCD2004=20=D0=B8=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BE=D0=B4=D0=B8=D0=BC=20=D0=BF=D0=BE=D1=80=D1=8F?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BA=20=D1=81=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B5=D0=BA=D0=B0=D0=BC=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_esp/items/items.txt       |   2 +-
 data_esp/set.device.json.gz    | Bin 3153 -> 3151 bytes
 include/items/vSensorLCD2004.h |   6 ++-
 platformio.ini                 |  12 ++---
 src/Init.cpp                   |   6 +++
 src/items/vSensorLCD2004.cpp   |  86 +++++++++++++++------------------
 6 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/data_esp/items/items.txt b/data_esp/items/items.txt
index c7e7a660..4da9efd9 100644
--- a/data_esp/items/items.txt
+++ b/data_esp/items/items.txt
@@ -38,5 +38,5 @@
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[HDC1080_hum];addr[0x76]*
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[AHTX0_temp];addr[0x76]
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[AHTX0_hum];addr[0x76]*
-0;LCD2004;lcdid;anydata;Вывод;IP;1;addr[0х27];k[16,2];int[10];c[0,0];val[ip]*
+0;LCD2004;lcdid;anydata;Вывод;IP;1;addr[0x27];k[16,2];int[10];c[0,0];val[ip]*
 0;sensor;anyid;anydata;Сенсоры;Параметр;1;c[1];int[10];type[type1];addr[0x76]*
\ No newline at end of file
diff --git a/data_esp/set.device.json.gz b/data_esp/set.device.json.gz
index bd42d625048aa4914821987106e47e655bb0b86d..329723f7f2fc2e79fd4b93bf63d76e7e30fdb397 100644
GIT binary patch
delta 3050
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

delta 3052
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

diff --git a/include/items/vSensorLCD2004.h b/include/items/vSensorLCD2004.h
index 1b677c89..eecc392b 100644
--- a/include/items/vSensorLCD2004.h
+++ b/include/items/vSensorLCD2004.h
@@ -4,7 +4,7 @@
 #include <OneWire.h>
 #include "Global.h"
 #include "LiquidCrystal_I2C.h"
-#include "LiquidCrystal.h"
+
 
 class SensorLCD2004;
 
@@ -17,6 +17,8 @@ class SensorLCD2004 {
 
     void loop();
     void writeLCD2004();
+    void execute(String command);
+    String _key;
 
    private:
     unsigned long currentMillis;
@@ -27,8 +29,8 @@ class SensorLCD2004 {
     unsigned int _x;
     unsigned int _y;
     String _val;
-    String _key;
     String _descr;
+    int _prevStrSize;
 };
 
 extern MySensorLCD2004Vector* mySensorLCD20042;
diff --git a/platformio.ini b/platformio.ini
index da9411d9..bc2ece4d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -43,9 +43,8 @@ lib_deps =
 	robtillaart/SHT2x@^0.1.1
 	ClosedCube HDC1080
 	Adafruit AHTX0
-	LiquidCrystal_I2C
 	BH1750
-	fmalpartida/LiquidCrystal@^1.5.0
+	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
@@ -72,9 +71,8 @@ lib_deps =
 	robtillaart/SHT2x@^0.1.1
 	ClosedCube HDC1080
 	Adafruit AHTX0
-	LiquidCrystal_I2C
 	BH1750
-	fmalpartida/LiquidCrystal@^1.5.0
+	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
@@ -92,7 +90,7 @@ lib_deps =
 	ESPAsyncUDP
 	CTBot @2.1.6
 	MySensors @2.3.2
-	fmalpartida/LiquidCrystal@^1.5.0
+	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
@@ -120,9 +118,8 @@ lib_deps =
 	robtillaart/SHT2x@^0.1.1
 	ClosedCube HDC1080
 	Adafruit AHTX0
-	LiquidCrystal_I2C
 	BH1750
-	fmalpartida/LiquidCrystal@^1.5.0
+	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 monitor_filters = esp32_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
@@ -143,6 +140,7 @@ lib_deps =
 	ESP32Servo
 	MySensors @2.3.2
 	fmalpartida/LiquidCrystal@^1.5.0
+	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 monitor_filters = esp32_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
diff --git a/src/Init.cpp b/src/Init.cpp
index ae9d692d..19781682 100644
--- a/src/Init.cpp
+++ b/src/Init.cpp
@@ -24,6 +24,10 @@
 #include "items/vSensorUltrasonic.h"
 #include "items/vSensorUptime.h"
 
+#ifdef EnableSensorLCD2004
+extern LiquidCrystal_I2C *LCDI2C;
+#endif
+
 void loadConfig() {
     configSetupJson = readFile("config.json", 4096);
     configSetupJson.replace("\r\n", "");
@@ -172,7 +176,9 @@ void clearVectors() {
 #endif
 #ifdef EnableSensorLCD2004
     if (mySensorLCD20042 != nullptr) {
+        if(LCDI2C != nullptr) LCDI2C->clear();
         mySensorLCD20042->clear();
+        
     }
 #endif
 #ifdef EnableSensorUltrasonic
diff --git a/src/items/vSensorLCD2004.cpp b/src/items/vSensorLCD2004.cpp
index aca92d17..dfb66eb6 100644
--- a/src/items/vSensorLCD2004.cpp
+++ b/src/items/vSensorLCD2004.cpp
@@ -9,8 +9,6 @@
 
 #include <Arduino.h>
 
-
-LiquidCrystal     *LCDLPT;
 LiquidCrystal_I2C *LCDI2C;
 
 SensorLCD2004::SensorLCD2004(String key, unsigned long interval, unsigned int x, unsigned int y, String val, String descr) {
@@ -20,11 +18,18 @@ SensorLCD2004::SensorLCD2004(String key, unsigned long interval, unsigned int x,
     _y = y;
     _val = val;
     _descr = descr;
-
+    _prevStrSize = 0;
 }
 
 SensorLCD2004::~SensorLCD2004() {}
 
+void SensorLCD2004::execute(String command) {
+    //if (command == "back") 
+    
+    String par = sCmd.next();
+    //SerialPrint("I", "execute", command + " " + par);
+}
+
 void SensorLCD2004::loop() {
     currentMillis = millis();
     difference = currentMillis - prevMillis;
@@ -35,34 +40,36 @@ void SensorLCD2004::loop() {
 }
 
 void SensorLCD2004::writeLCD2004() {
-    String tmpStr;
-    tmpStr = getValue(_val);
-    if (tmpStr == "no value") tmpStr = _val;
-
-    if (_descr != "none") tmpStr = _descr + " " + tmpStr;
-
-    if(LCDI2C != nullptr) {
+    if (LCDI2C != nullptr) {
+        String tmpStr = "";
+        for(int i=0; i<_prevStrSize; i++) tmpStr += " ";
         LCDI2C->setCursor(_x, _y); 
-        LCDI2C->print(tmpStr);    
-    }
+        LCDI2C->print(tmpStr); 
 
-    if(LCDLPT != nullptr) {
-        LCDLPT->setCursor(_x, _y); 
-        LCDLPT->print(tmpStr);    
-    }
+        tmpStr = getValue(_val);
+        if (tmpStr == "no value") tmpStr = _val;
+        if (_descr != "none") tmpStr = _descr + " " + tmpStr;    
+        LCDI2C->setCursor(_x, _y);
+        LCDI2C->print(tmpStr); 
 
-    //eventGen2(_key, String(_val));
-    //jsonWriteStr(configLiveJson, _key, String(_val));
-    //publishStatus(_key, String(_val));
-    SerialPrint("I", "Sensor", "'" + _key + "' data2: " + String(tmpStr));
+        _prevStrSize = tmpStr.length();
+    }
 }
 
 MySensorLCD2004Vector* mySensorLCD20042 = nullptr;
 
+void lcd2004Execute() {
+    String key = sCmd.order();
+    String command = sCmd.next();
+    
+    for (unsigned int i = 0; i < mySensorLCD20042->size(); i++) {
+        if (mySensorLCD20042->at(i)._key == key) mySensorLCD20042->at(i).execute(command);
+    }
+}
+
 void lcd2004() {
     myLineParsing.update();
     String key = myLineParsing.gkey();
-    String pin = myLineParsing.gpin();
     String addr = myLineParsing.gaddr();
     String interval = myLineParsing.gint();
     String c = myLineParsing.gc();
@@ -73,35 +80,15 @@ void lcd2004() {
     
     int x = selectFromMarkerToMarker(c, ",", 0).toInt();
     int y = selectFromMarkerToMarker(c, ",", 1).toInt();
-    int w = selectFromMarkerToMarker(k, ",", 1).toInt();  //количество столбцов
+    int w = selectFromMarkerToMarker(k, ",", 0).toInt();  //количество столбцов
     int h = selectFromMarkerToMarker(k, ",", 1).toInt();  //количество строк
  
-    if (LCDI2C == nullptr && LCDLPT == nullptr) {  //инициализации экрана еще не было
-        if (addr == "") {
-            int pin1 = selectFromMarkerToMarker(pin, ",", 0).toInt();
-            int pin2 = selectFromMarkerToMarker(pin, ",", 1).toInt();
-            int pin3 = selectFromMarkerToMarker(pin, ",", 2).toInt();
-            int pin4 = selectFromMarkerToMarker(pin, ",", 3).toInt();
-            int pin5 = selectFromMarkerToMarker(pin, ",", 4).toInt();
-            int pin6 = selectFromMarkerToMarker(pin, ",", 5).toInt();
-            int pin7 = selectFromMarkerToMarker(pin, ",", 6).toInt();
-            int pin8 = selectFromMarkerToMarker(pin, ",", 7).toInt();
-            int pin9 = selectFromMarkerToMarker(pin, ",", 8).toInt();
-            int pin10 = selectFromMarkerToMarker(pin, ",", 9).toInt();
-            if (pin7) {
-                LCDLPT = new LiquidCrystal(pin1, pin2, pin3, pin4, pin5, pin6, pin7, pin8, pin9, pin10);
-            } else {
-                LCDLPT = new LiquidCrystal(pin1, pin2, pin3, pin4, pin5, pin6);
-            }
-            if(LCDLPT != nullptr) LCDLPT->begin(w, h);
-            //val = (String)pin1 + " " + (String)pin2 + " " + (String)pin3 + " " + (String)pin4 + " " + (String)pin5 + " " + (String)pin6 + " " + (String)pin7 + " " + (String)pin8 + " " + (String)pin9 + " " + (String)pin10; 
-        } else {
-            LCDI2C = new LiquidCrystal_I2C(hexStringToUint8(addr));
-            if(LCDI2C != nullptr) {
-                LCDI2C->begin(w, h);
-                LCDI2C->backlight();
-            }
-        }
+    if (LCDI2C == nullptr) {  //инициализации экрана еще не было
+        LCDI2C = new LiquidCrystal_I2C(hexStringToUint8(addr), w, h);//hexStringToUint8(addr), w, h);
+        if(LCDI2C != nullptr) {
+            LCDI2C->init();
+            LCDI2C->backlight();
+        }    
     }
 
 
@@ -109,5 +96,8 @@ void lcd2004() {
     if (firstTime) mySensorLCD20042 = new MySensorLCD2004Vector();
     firstTime = false;
     mySensorLCD20042->push_back(SensorLCD2004(key, interval.toInt(), x, y, val, descr));
+
+    sCmd.addCommand(key.c_str(), lcd2004Execute);
 }
+
 #endif

From e97971137226928169f5c98ef6e282b7f331359e Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Wed, 12 Jan 2022 10:51:28 +0300
Subject: [PATCH 8/9] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?=
 =?UTF-8?q?=D1=83=20=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20lCD2004=20=D0=B8=D0=B7=20=D1=81=D1=86=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/items/vSensorLCD2004.cpp | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/items/vSensorLCD2004.cpp b/src/items/vSensorLCD2004.cpp
index dfb66eb6..afdf1f48 100644
--- a/src/items/vSensorLCD2004.cpp
+++ b/src/items/vSensorLCD2004.cpp
@@ -23,10 +23,34 @@ SensorLCD2004::SensorLCD2004(String key, unsigned long interval, unsigned int x,
 
 SensorLCD2004::~SensorLCD2004() {}
 
+//печать пустой строки нужной длинны для затирания предыдущего значения на экране
+void printBlankStr(int x, int y, int strSize){
+    String tmpStr = "";
+    for(int i=0; i<strSize; i++) tmpStr += " ";
+    LCDI2C->setCursor(x, y); 
+    LCDI2C->print(tmpStr);
+}
+
 void SensorLCD2004::execute(String command) {
-    //if (command == "back") 
+    if (command == "noBacklight") LCDI2C->noBacklight();
+    else if (command == "backlight") LCDI2C->backlight();
+    else if (command == "noDisplay") LCDI2C->noDisplay();
+    else if (command == "display") LCDI2C->display();
+    else if (command == "x") {
+        printBlankStr(_x, _y, _prevStrSize);
+        String par = sCmd.next();
+        _x = par.toInt();
+    }
+    else if (command == "y") {
+        String par = sCmd.next();
+        _y = par.toInt();
+    }
+    else {  //не команда, значит данные (параметры - x и y) 
+
+    }
+
+    writeLCD2004();
     
-    String par = sCmd.next();
     //SerialPrint("I", "execute", command + " " + par);
 }
 
@@ -41,12 +65,9 @@ void SensorLCD2004::loop() {
 
 void SensorLCD2004::writeLCD2004() {
     if (LCDI2C != nullptr) {
-        String tmpStr = "";
-        for(int i=0; i<_prevStrSize; i++) tmpStr += " ";
-        LCDI2C->setCursor(_x, _y); 
-        LCDI2C->print(tmpStr); 
+        printBlankStr(_x, _y, _prevStrSize);
 
-        tmpStr = getValue(_val);
+        String tmpStr = getValue(_val);
         if (tmpStr == "no value") tmpStr = _val;
         if (_descr != "none") tmpStr = _descr + " " + tmpStr;    
         LCDI2C->setCursor(_x, _y);

From 5a029fb1593a42cacbbd7d64ddddf4d74607b883 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Wed, 12 Jan 2022 11:05:56 +0300
Subject: [PATCH 9/9] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B4=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D0=BA?=
 =?UTF-8?q?=20=D0=B8=20=D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=B5=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B8=D0=BC=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/items/vSensorLCD2004.h |  1 +
 src/items/vSensorLCD2004.cpp   | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/include/items/vSensorLCD2004.h b/include/items/vSensorLCD2004.h
index eecc392b..a280315c 100644
--- a/include/items/vSensorLCD2004.h
+++ b/include/items/vSensorLCD2004.h
@@ -19,6 +19,7 @@ class SensorLCD2004 {
     void writeLCD2004();
     void execute(String command);
     String _key;
+    void printBlankStr(int strSize);
 
    private:
     unsigned long currentMillis;
diff --git a/src/items/vSensorLCD2004.cpp b/src/items/vSensorLCD2004.cpp
index afdf1f48..a0330ef0 100644
--- a/src/items/vSensorLCD2004.cpp
+++ b/src/items/vSensorLCD2004.cpp
@@ -24,10 +24,10 @@ SensorLCD2004::SensorLCD2004(String key, unsigned long interval, unsigned int x,
 SensorLCD2004::~SensorLCD2004() {}
 
 //печать пустой строки нужной длинны для затирания предыдущего значения на экране
-void printBlankStr(int x, int y, int strSize){
+void SensorLCD2004::printBlankStr(int strSize){
     String tmpStr = "";
     for(int i=0; i<strSize; i++) tmpStr += " ";
-    LCDI2C->setCursor(x, y); 
+    LCDI2C->setCursor(_x, _y); 
     LCDI2C->print(tmpStr);
 }
 
@@ -37,21 +37,25 @@ void SensorLCD2004::execute(String command) {
     else if (command == "noDisplay") LCDI2C->noDisplay();
     else if (command == "display") LCDI2C->display();
     else if (command == "x") {
-        printBlankStr(_x, _y, _prevStrSize);
+        printBlankStr(_prevStrSize);
         String par = sCmd.next();
         _x = par.toInt();
     }
     else if (command == "y") {
+        printBlankStr(_prevStrSize);
         String par = sCmd.next();
         _y = par.toInt();
     }
-    else {  //не команда, значит данные (параметры - x и y) 
-
+    else if (command == "descr") {
+        printBlankStr(_prevStrSize);
+        String par = sCmd.next();
+        _descr = par;
+    }
+    else {  //не команда, значит данные
+        _val = command;
     }
 
     writeLCD2004();
-    
-    //SerialPrint("I", "execute", command + " " + par);
 }
 
 void SensorLCD2004::loop() {
@@ -65,7 +69,7 @@ void SensorLCD2004::loop() {
 
 void SensorLCD2004::writeLCD2004() {
     if (LCDI2C != nullptr) {
-        printBlankStr(_x, _y, _prevStrSize);
+        printBlankStr(_prevStrSize);
 
         String tmpStr = getValue(_val);
         if (tmpStr == "no value") tmpStr = _val;