Merge pull request #266 from biveraxe/ver4dev

Корректировка конфигурации

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
     }
 ]

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

platformio.ini

@@ -289,7 +289,6 @@ build_src_filter =
 	+<modules/exec/Pcf8574>
 	+<modules/exec/Pwm8266>
 	+<modules/exec/TelegramLT>
-	+<modules/display/DwinI>
 	+<modules/display/Lcd2004>
 
 [env:esp32_4mb_fromitems]

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;
 }