From 044867ca009fbe0e9ffc785a5af01fd7e923af48 Mon Sep 17 00:00:00 2001 From: biver Date: Wed, 5 Jan 2022 23:38:32 +0300 Subject: [PATCH] =?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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 #include #include "Global.h" +#include "LiquidCrystal_I2C.h" +#include "LiquidCrystal.h" class SensorLCD2004; @@ -10,7 +12,7 @@ typedef std::vector 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 -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