From 6374e8506d2669e5e09d404c84c4db24a7910616 Mon Sep 17 00:00:00 2001 From: biver Date: Sun, 19 Feb 2023 23:09:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D0=B4=D0=B5=D1=84=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=84=D0=B8=D0=BB=D1=8C=20=D0=B8=20=D0=BE=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=B2=D1=8B=D0=B9=D0=BB=D1=8B?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D1=81=D0=B1=D0=BE=D1=80?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_svelte/items.json | 24 ++++-------------------- myProfile.json | 8 ++++++++ platformio.ini | 1 - src/modules/API.cpp | 2 -- 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/data_svelte/items.json b/data_svelte/items.json index 1194fb68..8a7927f8 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -727,23 +727,7 @@ }, { "global": 0, - "name": "49. LCD Dwin экран", - "type": "Reading", - "subtype": "DwinI", - "id": "dwin", - "widget": "", - "page": "", - "descr": "", - "int": 15, - "TX": 17, - "RX": 16, - "line": 2, - "speed": 115200, - "num": 49 - }, - { - "global": 0, - "name": "50. LCD экран 2004", + "name": "49. LCD экран 2004", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -755,10 +739,10 @@ "size": "20,4", "coord": "0,0", "id2show": "id датчика", - "num": 50 + "num": 49 }, { - "name": "51. LCD экран 1602", + "name": "50. LCD экран 1602", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -770,6 +754,6 @@ "size": "16,2", "coord": "0,0", "id2show": "id датчика", - "num": 51 + "num": 50 } ] \ No newline at end of file diff --git a/myProfile.json b/myProfile.json index e5085537..4edd08a0 100644 --- a/myProfile.json +++ b/myProfile.json @@ -104,6 +104,10 @@ "path": "src/modules/sensors/Emon", "active": false }, + { + "path": "src/modules/sensors/ExternalMQTT", + "active": false + }, { "path": "src/modules/sensors/FreqMeter", "active": false @@ -148,6 +152,10 @@ "path": "src/modules/sensors/RCswitch", "active": false }, + { + "path": "src/modules/sensors/RTC", + "active": true + }, { "path": "src/modules/sensors/Sds011", "active": false diff --git a/platformio.ini b/platformio.ini index 85482de0..2c00f2c2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -289,7 +289,6 @@ build_src_filter = + + + - + + [env:esp32_4mb_fromitems] diff --git a/src/modules/API.cpp b/src/modules/API.cpp index 732a6db2..4de43be5 100644 --- a/src/modules/API.cpp +++ b/src/modules/API.cpp @@ -29,7 +29,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_DwinI(String subtype, String params); void* getAPI_Lcd2004(String subtype, String params); void* getAPI(String subtype, String params) { @@ -63,7 +62,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_DwinI(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Lcd2004(subtype, params)) != nullptr) return tmpAPI; return nullptr; } \ No newline at end of file