From 7c0ffe7af595124f5fb7dd5c92f552a80d996bc0 Mon Sep 17 00:00:00 2001
From: IoT Manager <67171972+IoTManagerProject@users.noreply.github.com>
Date: Sun, 1 Oct 2023 15:55:47 +0200
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_svelte/items.json     | 28 ++++++----------------------
 data_svelte/myProfile.json |  2 +-
 myProfile.json             |  2 +-
 myProfileDef.json          |  6 ++++++
 platformio.ini             |  2 --
 src/modules/API.cpp        |  2 --
 6 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/data_svelte/items.json b/data_svelte/items.json
index 2730d052..339ee7e9 100644
--- a/data_svelte/items.json
+++ b/data_svelte/items.json
@@ -813,28 +813,12 @@
     {
         "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"
     },
     {
         "global": 0,
-        "name": "55. LCD экран 2004",
+        "name": "54. LCD экран 2004",
         "type": "Reading",
         "subtype": "Lcd2004",
         "id": "Lcd",
@@ -847,10 +831,10 @@
         "id2show": "",
         "prefix": "",
         "postfix": "",
-        "num": 55
+        "num": 54
     },
     {
-        "name": "56. LCD экран 1602",
+        "name": "55. LCD экран 1602",
         "type": "Reading",
         "subtype": "Lcd2004",
         "id": "Lcd",
@@ -863,11 +847,11 @@
         "id2show": "",
         "prefix": "",
         "postfix": "",
-        "num": 56
+        "num": 55
     },
     {
         "global": 0,
-        "name": "57. 7 сегментный дисплей TM16XX",
+        "name": "56. 7 сегментный дисплей TM16XX",
         "type": "Writing",
         "subtype": "TM16XX",
         "id": "tm",
@@ -883,6 +867,6 @@
         "intensity": "5",
         "on": "1",
         "id2show": "",
-        "num": 57
+        "num": 56
     }
 ]
\ No newline at end of file
diff --git a/data_svelte/myProfile.json b/data_svelte/myProfile.json
index 436647c6..b864c59a 100644
--- a/data_svelte/myProfile.json
+++ b/data_svelte/myProfile.json
@@ -371,7 +371,7 @@
         "Экраны": [
             {
                 "path": "src/modules/display/Oled128",
-                "active": true
+                "active": false
             }
         ],
         "screens": [
diff --git a/myProfile.json b/myProfile.json
index 436647c6..b864c59a 100644
--- a/myProfile.json
+++ b/myProfile.json
@@ -371,7 +371,7 @@
         "Экраны": [
             {
                 "path": "src/modules/display/Oled128",
-                "active": true
+                "active": false
             }
         ],
         "screens": [
diff --git a/myProfileDef.json b/myProfileDef.json
index 3ea1cffd..b864c59a 100644
--- a/myProfileDef.json
+++ b/myProfileDef.json
@@ -368,6 +368,12 @@
                 "active": false
             }
         ],
+        "Экраны": [
+            {
+                "path": "src/modules/display/Oled128",
+                "active": false
+            }
+        ],
         "screens": [
             {
                 "path": "src/modules/display/DwinI",
diff --git a/platformio.ini b/platformio.ini
index ad8c7641..fdfd75eb 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -410,7 +410,6 @@ lib_deps =
 	adafruit/Adafruit BusIO @ ^1.13.2
 	dfrobot/DFRobotDFPlayerMini @ ^1.0.5
 	adafruit/Adafruit BusIO @ ^1.13.2
-	gyverlibs/GyverOLED @ 1.4
 	https://github.com/robotclass/RobotClass_LiquidCrystal_I2C
 	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 	https://github.com/maxint-rd/TM16xx
@@ -450,7 +449,6 @@ build_src_filter =
 	+<modules/exec/Pcf8574>
 	+<modules/exec/Pwm8266>
 	+<modules/exec/TelegramLT>
-	+<modules/display/Oled128>
 	+<modules/display/Lcd2004>
 	+<modules/display/TM16XX>
 
diff --git a/src/modules/API.cpp b/src/modules/API.cpp
index 5ca6bc50..f40b7c13 100644
--- a/src/modules/API.cpp
+++ b/src/modules/API.cpp
@@ -34,7 +34,6 @@ void* getAPI_Multitouch(String subtype, String params);
 void* getAPI_Pcf8574(String subtype, String params);
 void* getAPI_Pwm8266(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_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_Pwm8266(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_TM16XX(subtype, params)) != nullptr) return tmpAPI;
 return nullptr;