iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Добавляем поддержку экрана с кириллицей для Lcd2004

Browse Source
This commit is contained in:
biver
2023-03-08 15:19:21 +03:00
parent e0df67ccee
commit 5f884e16af
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/display/Lcd2004/Lcd2004.cpp
View File

@@ -1,12 +1,15 @@
#include "Global.h" #include "Global.h"
#include "classes/IoTItem.h" #include "classes/IoTItem.h"
#include "LiquidCrystal_I2C.h" //#include "LiquidCrystal_I2C.h"
#include <RobotClass_LiquidCrystal_I2C.h>
#include <map> #include <map>
void scanI2C(); void scanI2C();
LiquidCrystal_I2C *LCDI2C; //LiquidCrystal_I2C *LCDI2C;
RobotClass_LiquidCrystal_I2C *LCDI2C;
class Lcd2004 : public IoTItem { class Lcd2004 : public IoTItem {
private: private:
@@ -34,7 +37,8 @@ class Lcd2004 : public IoTItem {
int w = selectFromMarkerToMarker(size, ",", 0).toInt(); //количество столбцов int w = selectFromMarkerToMarker(size, ",", 0).toInt(); //количество столбцов
int h = selectFromMarkerToMarker(size, ",", 1).toInt(); //количество строк int h = selectFromMarkerToMarker(size, ",", 1).toInt(); //количество строк
if (LCDI2C == nullptr) { //инициализации экрана еще не было 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) { if (LCDI2C != nullptr) {
LCDI2C->init(); LCDI2C->init();
} }

6
src/modules/display/Lcd2004/modinfo.json
View File

@@ -105,21 +105,27 @@
"usedLibs": { "usedLibs": {
"esp32_4mb": [ "esp32_4mb": [
"https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
"marcoschwartz/LiquidCrystal_I2C@^1.1.4" "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
], ],
"esp8266_4mb": [ "esp8266_4mb": [
"https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
"marcoschwartz/LiquidCrystal_I2C@^1.1.4" "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
], ],
"esp8266_1mb": [ "esp8266_1mb": [
"https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
"marcoschwartz/LiquidCrystal_I2C@^1.1.4" "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
], ],
"esp8266_1mb_ota": [ "esp8266_1mb_ota": [
"https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
"marcoschwartz/LiquidCrystal_I2C@^1.1.4" "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
], ],
"esp8285_1mb": [ "esp8285_1mb": [
"https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
"marcoschwartz/LiquidCrystal_I2C@^1.1.4" "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
], ],
"esp8285_1mb_ota": [ "esp8285_1mb_ota": [
"https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
"marcoschwartz/LiquidCrystal_I2C@^1.1.4" "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
] ]
} }