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 = + + + - + + [env:esp32_4mb_fromitems] @@ -111,8 +110,10 @@ lib_deps = dfrobot/DFRobotDFPlayerMini @ ^1.0.5 marcoschwartz/LiquidCrystal_I2C@^1.1.4 build_src_filter = + + + + + + + + + @@ -128,11 +129,9 @@ build_src_filter = + + + - + + + + + - + + 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