From 5f884e16afbe8fb5f0eb57683aa7255c14c7568f Mon Sep 17 00:00:00 2001 From: biver Date: Wed, 8 Mar 2023 15:19:21 +0300 Subject: [PATCH] =?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=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B0=20=D1=81=20=D0=BA?= =?UTF-8?q?=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=D0=B8=D1=86=D0=B5=D0=B9=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20Lcd2004?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/display/Lcd2004/Lcd2004.cpp | 10 +++++++--- src/modules/display/Lcd2004/modinfo.json | 6 ++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/modules/display/Lcd2004/Lcd2004.cpp b/src/modules/display/Lcd2004/Lcd2004.cpp index 968bed0b..0caf4ebe 100644 --- a/src/modules/display/Lcd2004/Lcd2004.cpp +++ b/src/modules/display/Lcd2004/Lcd2004.cpp @@ -1,12 +1,15 @@ #include "Global.h" #include "classes/IoTItem.h" -#include "LiquidCrystal_I2C.h" +//#include "LiquidCrystal_I2C.h" +#include + #include void scanI2C(); -LiquidCrystal_I2C *LCDI2C; +//LiquidCrystal_I2C *LCDI2C; +RobotClass_LiquidCrystal_I2C *LCDI2C; class Lcd2004 : public IoTItem { private: @@ -34,7 +37,8 @@ class Lcd2004 : public IoTItem { int w = selectFromMarkerToMarker(size, ",", 0).toInt(); //количество столбцов int h = selectFromMarkerToMarker(size, ",", 1).toInt(); //количество строк if (LCDI2C == nullptr) { //инициализации экрана еще не было - LCDI2C = new LiquidCrystal_I2C(hexStringToUint8(_addr), w, h); + //LCDI2C = new LiquidCrystal_I2C(hexStringToUint8(_addr), w, h); + LCDI2C = new RobotClass_LiquidCrystal_I2C(hexStringToUint8(_addr), w, h, CP_UTF8); if (LCDI2C != nullptr) { LCDI2C->init(); } diff --git a/src/modules/display/Lcd2004/modinfo.json b/src/modules/display/Lcd2004/modinfo.json index a543be7d..24faf854 100644 --- a/src/modules/display/Lcd2004/modinfo.json +++ b/src/modules/display/Lcd2004/modinfo.json @@ -105,21 +105,27 @@ "usedLibs": { "esp32_4mb": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", "marcoschwartz/LiquidCrystal_I2C@^1.1.4" ], "esp8266_4mb": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", "marcoschwartz/LiquidCrystal_I2C@^1.1.4" ], "esp8266_1mb": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", "marcoschwartz/LiquidCrystal_I2C@^1.1.4" ], "esp8266_1mb_ota": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", "marcoschwartz/LiquidCrystal_I2C@^1.1.4" ], "esp8285_1mb": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", "marcoschwartz/LiquidCrystal_I2C@^1.1.4" ], "esp8285_1mb_ota": [ + "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C", "marcoschwartz/LiquidCrystal_I2C@^1.1.4" ] }