From 62d6cc586a591d385c94d38d1ef7bd613b53f5a3 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Mon, 22 Aug 2022 21:25:12 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?=
 =?UTF-8?q?=D0=B5=D0=BC=20SysExt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_svelte/items.json | 19 ++++---------------
 platformio.ini         |  5 ++---
 src/modules/API.cpp    |  2 --
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/data_svelte/items.json b/data_svelte/items.json
index 6668aad2..df00ea79 100644
--- a/data_svelte/items.json
+++ b/data_svelte/items.json
@@ -455,22 +455,11 @@
         "apin": -1,
         "num": 34
     },
-    {
-        "name": "35. Доп. функции системы",
-        "type": "Reading",
-        "subtype": "SysExt",
-        "id": "SysExt",
-        "widget": "",
-        "page": "",
-        "descr": "",
-        "int": 15,
-        "num": 35
-    },
     {
         "header": "Экраны"
     },
     {
-        "name": "36. LCD экран 2004",
+        "name": "35. LCD экран 2004",
         "type": "Reading",
         "subtype": "Lcd2004",
         "id": "Lcd",
@@ -482,10 +471,10 @@
         "size": "20,4",
         "coord": "0,0",
         "id2show": "id датчика",
-        "num": 36
+        "num": 35
     },
     {
-        "name": "37. LCD экран 1602",
+        "name": "36. LCD экран 1602",
         "type": "Reading",
         "subtype": "Lcd2004",
         "id": "Lcd",
@@ -497,6 +486,6 @@
         "size": "16,2",
         "coord": "0,0",
         "id2show": "id датчика",
-        "num": 37
+        "num": 36
     }
 ]
\ No newline at end of file
diff --git a/platformio.ini b/platformio.ini
index e8940188..5067c0ce 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -89,7 +89,6 @@ build_src_filter =
 	+<modules\exec\Mcp23017>
 	+<modules\exec\Mp3>
 	+<modules\exec\Pwm8266>
-	+<modules\exec\SysExt>
 	+<modules\display\Lcd2004>
 
 [env:esp32_4mb_fromitems]
@@ -111,8 +110,10 @@ lib_deps =
 	dfrobot/DFRobotDFPlayerMini @ ^1.0.5
 	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 build_src_filter = 
+	+<modules\virtual\Logging>
 	+<modules\virtual\Timer>
 	+<modules\virtual\Variable>
+	+<modules\virtual\VButton>
 	+<modules\sensors\Aht20>
 	+<modules\sensors\AnalogAdc>
 	+<modules\sensors\Bme280>
@@ -128,11 +129,9 @@ build_src_filter =
 	+<modules\sensors\Sonar>
 	+<modules\exec\ButtonIn>
 	+<modules\exec\ButtonOut>
-	+<modules\exec\IarduinoRTC>
 	+<modules\exec\IoTServo>
 	+<modules\exec\Mcp23017>
 	+<modules\exec\Mp3>
 	+<modules\exec\Pwm32>
-	+<modules\exec\SysExt>
 	+<modules\display\Lcd2004>
 
diff --git a/src/modules/API.cpp b/src/modules/API.cpp
index 33431763..e570b3b6 100644
--- a/src/modules/API.cpp
+++ b/src/modules/API.cpp
@@ -23,7 +23,6 @@ void* getAPI_IoTServo(String subtype, String params);
 void* getAPI_Mcp23017(String subtype, String params);
 void* getAPI_Mp3(String subtype, String params);
 void* getAPI_Pwm8266(String subtype, String params);
-void* getAPI_SysExt(String subtype, String params);
 void* getAPI_Lcd2004(String subtype, String params);
 
 void* getAPI(String subtype, String params) {
@@ -51,7 +50,6 @@ if ((tmpAPI = getAPI_IoTServo(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Mcp23017(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Mp3(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Pwm8266(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_SysExt(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Lcd2004(subtype, params)) != nullptr) return tmpAPI;
 return nullptr;
 }
\ No newline at end of file