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

применение нового модуля

Browse Source
This commit is contained in:
IoT Manager
2023-10-01 15:55:47 +02:00
parent 0eb6494772
commit 7c0ffe7af5
6 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
data_svelte/items.json
View File

@@ -813,28 +813,12 @@
{ {
"header": "Экраны" "header": "Экраны"
}, },
{
"name": "54. OLED экран 128*64",
"type": "Reading",
"subtype": "Oled128",
"id": "oled",
"widget": "",
"page": "",
"descr": "T",
"descr1": "C",
"int": 1,
"addr": "0x3C",
"coord": "0,10",
"id2show": "id датчика",
"shrift": "2",
"num": 54
},
{ {
"header": "screens" "header": "screens"
}, },
{ {
"global": 0, "global": 0,
"name": "55. LCD экран 2004", "name": "54. LCD экран 2004",
"type": "Reading", "type": "Reading",
"subtype": "Lcd2004", "subtype": "Lcd2004",
"id": "Lcd", "id": "Lcd",
@@ -847,10 +831,10 @@
"id2show": "", "id2show": "",
"prefix": "", "prefix": "",
"postfix": "", "postfix": "",
"num": 55 "num": 54
}, },
{ {
"name": "56. LCD экран 1602", "name": "55. LCD экран 1602",
"type": "Reading", "type": "Reading",
"subtype": "Lcd2004", "subtype": "Lcd2004",
"id": "Lcd", "id": "Lcd",
@@ -863,11 +847,11 @@
"id2show": "", "id2show": "",
"prefix": "", "prefix": "",
"postfix": "", "postfix": "",
"num": 56 "num": 55
}, },
{ {
"global": 0, "global": 0,
"name": "57. 7 сегментный дисплей TM16XX", "name": "56. 7 сегментный дисплей TM16XX",
"type": "Writing", "type": "Writing",
"subtype": "TM16XX", "subtype": "TM16XX",
"id": "tm", "id": "tm",
@@ -883,6 +867,6 @@
"intensity": "5", "intensity": "5",
"on": "1", "on": "1",
"id2show": "", "id2show": "",
"num": 57 "num": 56
} }
] ]

2
data_svelte/myProfile.json
View File

@@ -371,7 +371,7 @@
"Экраны": [ "Экраны": [
{ {
"path": "src/modules/display/Oled128", "path": "src/modules/display/Oled128",
"active": true "active": false
} }
], ],
"screens": [ "screens": [

2
myProfile.json
View File

@@ -371,7 +371,7 @@
"Экраны": [ "Экраны": [
{ {
"path": "src/modules/display/Oled128", "path": "src/modules/display/Oled128",
"active": true "active": false
} }
], ],
"screens": [ "screens": [

6
myProfileDef.json
View File

@@ -368,6 +368,12 @@
"active": false "active": false
} }
], ],
"Экраны": [
{
"path": "src/modules/display/Oled128",
"active": false
}
],
"screens": [ "screens": [
{ {
"path": "src/modules/display/DwinI", "path": "src/modules/display/DwinI",

2
platformio.ini
View File

@@ -410,7 +410,6 @@ lib_deps =
adafruit/Adafruit BusIO @ ^1.13.2 adafruit/Adafruit BusIO @ ^1.13.2
dfrobot/DFRobotDFPlayerMini @ ^1.0.5 dfrobot/DFRobotDFPlayerMini @ ^1.0.5
adafruit/Adafruit BusIO @ ^1.13.2 adafruit/Adafruit BusIO @ ^1.13.2
gyverlibs/GyverOLED @ 1.4
https://github.com/robotclass/RobotClass_LiquidCrystal_I2C https://github.com/robotclass/RobotClass_LiquidCrystal_I2C
marcoschwartz/LiquidCrystal_I2C@^1.1.4 marcoschwartz/LiquidCrystal_I2C@^1.1.4
https://github.com/maxint-rd/TM16xx https://github.com/maxint-rd/TM16xx
@@ -450,7 +449,6 @@ build_src_filter =
+<modules/exec/Pcf8574> +<modules/exec/Pcf8574>
+<modules/exec/Pwm8266> +<modules/exec/Pwm8266>
+<modules/exec/TelegramLT> +<modules/exec/TelegramLT>
+<modules/display/Oled128>
+<modules/display/Lcd2004> +<modules/display/Lcd2004>
+<modules/display/TM16XX> +<modules/display/TM16XX>

2
src/modules/API.cpp
View File

@@ -34,7 +34,6 @@ void* getAPI_Multitouch(String subtype, String params);
void* getAPI_Pcf8574(String subtype, String params); void* getAPI_Pcf8574(String subtype, String params);
void* getAPI_Pwm8266(String subtype, String params); void* getAPI_Pwm8266(String subtype, String params);
void* getAPI_TelegramLT(String subtype, String params); void* getAPI_TelegramLT(String subtype, String params);
void* getAPI_Oled128(String subtype, String params);
void* getAPI_Lcd2004(String subtype, String params); void* getAPI_Lcd2004(String subtype, String params);
void* getAPI_TM16XX(String subtype, String params); void* getAPI_TM16XX(String subtype, String params);
@@ -74,7 +73,6 @@ if ((tmpAPI = getAPI_Multitouch(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Pcf8574(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Pcf8574(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Pwm8266(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Pwm8266(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_TelegramLT(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_TelegramLT(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Oled128(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Lcd2004(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Lcd2004(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_TM16XX(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_TM16XX(subtype, params)) != nullptr) return tmpAPI;
return nullptr; return nullptr;