Merge pull request #31 from IoTManagerProject/ver4dev

Ver4dev

PrepareProject.py

@@ -131,7 +131,11 @@ if deviceName == 'esp8266_1mb_ota' or deviceName == 'esp8285_1mb_ota' or deviceN
     copy_tree("data_lite", "data_svelte")
 else:
     copy_tree("data_full", "data_svelte")
-    
+
+deviceType = 'esp32*'
+if not 'esp32' in deviceName:
+    deviceType = 'esp82*'
+
 # генерируем файлы проекта на основе подготовленного профиля
 # заполняем конфигурационный файл прошивки параметрами из профиля
 with open("data_svelte/settings.json", "r", encoding='utf-8') as read_file:
@@ -158,15 +162,28 @@ for section, modules in profJson['modules'].items():
             with open(module['path'] + "/modinfo.json", "r", encoding='utf-8') as read_file:
                 moduleJson = json.load(read_file)
                 if deviceName in moduleJson['usedLibs']:   # проверяем поддерживает ли модуль текущее устройство
-                    activeModulesName.append(moduleJson['about']['moduleName'])     # запоминаем имена для использования на след шагах
+                    if not 'exclude' in moduleJson['usedLibs'][deviceName]: # смотрим не нужно ли исключить данный модуль из указанной платы deviceName
-                    includeDirs = includeDirs + "\n+<" + module['path'].replace("src/", "") + ">"  # запоминаем пути к модулям для компиляции
+                        activeModulesName.append(moduleJson['about']['moduleName'])     # запоминаем имена для использования на след шагах
-                    for libPath in moduleJson['usedLibs'][deviceName]:               # запоминаем библиотеки необходимые модулю для текущей платы
+                        includeDirs = includeDirs + "\n+<" + module['path'].replace("src/", "") + ">"  # запоминаем пути к модулям для компиляции
-                        allLibs = allLibs + "\n" + libPath       
+                        for libPath in moduleJson['usedLibs'][deviceName]:               # запоминаем библиотеки необходимые модулю для текущей платы
-                    for configItemsJson in moduleJson['configItem']:
+                            allLibs = allLibs + "\n" + libPath       
-                        configItemsJson['num'] = itemsCount
+                        for configItemsJson in moduleJson['configItem']:
-                        configItemsJson['name'] = str(itemsCount) + ". " + configItemsJson['name']
+                            configItemsJson['num'] = itemsCount
-                        itemsCount = itemsCount + 1
+                            configItemsJson['name'] = str(itemsCount) + ". " + configItemsJson['name']
-                        itemsJson.append(configItemsJson)        
+                            itemsCount = itemsCount + 1
+                            itemsJson.append(configItemsJson)    
+                else: # В первую очередь ищем по имени deviceName, чтобы для данной платы можно было уточнить либы. Если не нашли плату по имени в usedLibs пробуем найти её по типу deviceType
+                    if deviceType in moduleJson['usedLibs']:   # проверяем поддерживает ли модуль текущее устройство
+                        activeModulesName.append(moduleJson['about']['moduleName'])     # запоминаем имена для использования на след шагах
+                        includeDirs = includeDirs + "\n+<" + module['path'].replace("src/", "") + ">"  # запоминаем пути к модулям для компиляции
+                        for libPath in moduleJson['usedLibs'][deviceType]:               # запоминаем библиотеки необходимые модулю для текущей платы
+                            allLibs = allLibs + "\n" + libPath       
+                        for configItemsJson in moduleJson['configItem']:
+                            configItemsJson['num'] = itemsCount
+                            configItemsJson['name'] = str(itemsCount) + ". " + configItemsJson['name']
+                            itemsCount = itemsCount + 1
+                            itemsJson.append(configItemsJson)    
+
 with open("data_svelte/items.json", "w", encoding='utf-8') as write_file:
     json.dump(itemsJson, write_file, ensure_ascii=False, indent=4, sort_keys=False)
 

compilerProfile.json

@@ -59,7 +59,7 @@
                     "bootloader_qio_80m": "0x1000",
                     "firmware": "0x10000",
                     "partitions": "0x8000",
-                    "littlefs": "0x290000"
+                    "littlefs": "0x310000"
                 },
                 {
                     "name": "esp32_16mb",
@@ -146,7 +146,7 @@
             },
             {
                 "path": "src/modules/virtual/Math",
-                "active": false
+                "active": true
             },
             {
                 "path": "src/modules/virtual/owmWeather",
@@ -290,12 +290,20 @@
                 "path": "src/modules/sensors/Mhz19",
                 "active": false
             },
+            {
+                "path": "src/modules/sensors/MQgas",
+                "active": true
+            },
             {
                 "path": "src/modules/sensors/Ntc",
                 "active": false
             },
             {
                 "path": "src/modules/sensors/Pzem004t",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Pzem004t_v2",
                 "active": true
             },
             {
@@ -340,6 +348,10 @@
             }
         ],
         "executive_devices": [
+            {
+                "path": "src/modules/exec/AnalogBtn",
+                "active": true
+            },
             {
                 "path": "src/modules/exec/ButtonIn",
                 "active": true
@@ -436,12 +448,16 @@
         "screens": [
             {
                 "path": "src/modules/display/DwinI",
-                "active": false
+                "active": true
             },
             {
                 "path": "src/modules/display/Lcd2004",
                 "active": true
             },
+            {
+                "path": "src/modules/display/Nextion",
+                "active": false
+            },
             {
                 "path": "src/modules/display/NextionUpload",
                 "active": false
@@ -460,7 +476,7 @@
             },
             {
                 "path": "src/modules/display/TM16XX",
-                "active": true
+                "active": false
             },
             {
                 "path": "src/modules/display/Ws2812b",

data_svelte/flashProfile.json

@@ -24,7 +24,7 @@
             },
             {
                 "path": "src/modules/virtual/Math",
-                "active": false
+                "active": true
             },
             {
                 "path": "src/modules/virtual/owmWeather",
@@ -168,12 +168,20 @@
                 "path": "src/modules/sensors/Mhz19",
                 "active": false
             },
+            {
+                "path": "src/modules/sensors/MQgas",
+                "active": true
+            },
             {
                 "path": "src/modules/sensors/Ntc",
                 "active": false
             },
             {
                 "path": "src/modules/sensors/Pzem004t",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Pzem004t_v2",
                 "active": true
             },
             {
@@ -218,6 +226,10 @@
             }
         ],
         "executive_devices": [
+            {
+                "path": "src/modules/exec/AnalogBtn",
+                "active": true
+            },
             {
                 "path": "src/modules/exec/ButtonIn",
                 "active": true
@@ -314,12 +326,16 @@
         "screens": [
             {
                 "path": "src/modules/display/DwinI",
-                "active": false
+                "active": true
             },
             {
                 "path": "src/modules/display/Lcd2004",
                 "active": true
             },
+            {
+                "path": "src/modules/display/Nextion",
+                "active": false
+            },
             {
                 "path": "src/modules/display/NextionUpload",
                 "active": false
@@ -338,7 +354,7 @@
             },
             {
                 "path": "src/modules/display/TM16XX",
-                "active": true
+                "active": false
             },
             {
                 "path": "src/modules/display/Ws2812b",

data_svelte/items.json

@@ -68,7 +68,18 @@
     },
     {
         "global": 0,
-        "name": "5. Погода OWM",
+        "name": "5. Math library",
+        "type": "Reading",
+        "subtype": "IoTMath",
+        "id": "math",
+        "widget": "anydataValue",
+        "page": "Математика",
+        "descr": "",
+        "num": 5
+    },
+    {
+        "global": 0,
+        "name": "6. Погода OWM",
         "type": "Reading",
         "subtype": "owmWeather",
         "id": "owm",
@@ -86,11 +97,11 @@
         "round": 1,
         "val": "...",
         "debug": 0,
-        "num": 5
+        "num": 6
     },
     {
         "global": 0,
-        "name": "6. Таймер",
+        "name": "7. Таймер",
         "type": "Writing",
         "subtype": "Timer",
         "id": "timer",
@@ -102,11 +113,11 @@
         "ticker": 1,
         "repeat": 1,
         "needSave": 0,
-        "num": 6
+        "num": 7
     },
     {
         "global": 0,
-        "name": "7. Окно ввода числа (переменная)",
+        "name": "8. Окно ввода числа (переменная)",
         "type": "Reading",
         "subtype": "Variable",
         "id": "value",
@@ -120,11 +131,11 @@
         "plus": 0,
         "multiply": 1,
         "round": 0,
-        "num": 7
+        "num": 8
     },
     {
         "global": 0,
-        "name": "8. Окно ввода времени",
+        "name": "9. Окно ввода времени",
         "type": "Reading",
         "subtype": "Variable",
         "id": "time",
@@ -134,11 +145,11 @@
         "descr": "Введите время",
         "int": "0",
         "val": "02:00",
-        "num": 8
+        "num": 9
     },
     {
         "global": 0,
-        "name": "9. Окно ввода даты",
+        "name": "10. Окно ввода даты",
         "type": "Reading",
         "subtype": "Variable",
         "id": "time",
@@ -148,11 +159,11 @@
         "descr": "Введите дату",
         "int": "0",
         "val": "24.05.2022",
-        "num": 9
+        "num": 10
     },
     {
         "global": 0,
-        "name": "10. Окно ввода текста",
+        "name": "11. Окно ввода текста",
         "type": "Reading",
         "subtype": "Variable",
         "id": "txt",
@@ -162,11 +173,11 @@
         "descr": "Введите текст",
         "int": "0",
         "val": "текст",
-        "num": 10
+        "num": 11
     },
     {
         "global": 0,
-        "name": "11. Вывод значения",
+        "name": "12. Вывод значения",
         "type": "Reading",
         "subtype": "Variable",
         "id": "vout",
@@ -180,11 +191,11 @@
         "plus": 0,
         "multiply": 1,
         "round": 0,
-        "num": 11
+        "num": 12
     },
     {
         "global": 0,
-        "name": "12. Виртуальная кнопка",
+        "name": "13. Виртуальная кнопка",
         "type": "Reading",
         "subtype": "VButton",
         "id": "vbtn",
@@ -194,13 +205,13 @@
         "descr": "Кнопка",
         "int": "0",
         "val": "0",
-        "num": 12
+        "num": 13
     },
     {
         "header": "sensors"
     },
     {
-        "name": "13. A02 Дальность",
+        "name": "14. A02 Дальность",
         "type": "Reading",
         "subtype": "A02Distance",
         "id": "dist",
@@ -209,10 +220,14 @@
         "descr": "Дальность",
         "int": 5,
         "round": 1,
-        "num": 13
+        "tx": 17,
+        "rx": 16,
+        "line": 2,
+        "speed": 9600,
+        "num": 14
     },
     {
-        "name": "14. Acs712 Ток",
+        "name": "15. Acs712 Ток",
         "type": "Reading",
         "subtype": "Acs712",
         "id": "amp",
@@ -227,11 +242,11 @@
         "sens": 100,
         "adczero": 512,
         "btn-setZero": "nil",
-        "num": 14
+        "num": 15
     },
     {
         "global": 0,
-        "name": "15. AHTXX Температура",
+        "name": "16. AHTXX Температура",
         "type": "Reading",
         "subtype": "AhtXXt",
         "id": "Temp20",
@@ -242,11 +257,11 @@
         "addr": "0x38",
         "shtType": 1,
         "round": 1,
-        "num": 15
+        "num": 16
     },
     {
         "global": 0,
-        "name": "16. AHTXX Влажность",
+        "name": "17. AHTXX Влажность",
         "type": "Reading",
         "subtype": "AhtXXh",
         "id": "Hum20",
@@ -257,11 +272,11 @@
         "addr": "0x38",
         "shtType": 1,
         "round": 1,
-        "num": 16
+        "num": 17
     },
     {
         "global": 0,
-        "name": "17. Аналоговый сенсор",
+        "name": "18. Аналоговый сенсор",
         "type": "Reading",
         "subtype": "AnalogAdc",
         "id": "t",
@@ -275,11 +290,11 @@
         "pin": 0,
         "int": 15,
         "avgSteps": 1,
-        "num": 17
+        "num": 18
     },
     {
         "global": 0,
-        "name": "18. BME280 Температура",
+        "name": "19. BME280 Температура",
         "type": "Reading",
         "subtype": "Bme280t",
         "id": "Tmp3",
@@ -289,11 +304,11 @@
         "int": 15,
         "addr": "0x77",
         "round": 1,
-        "num": 18
+        "num": 19
     },
     {
         "global": 0,
-        "name": "19. BME280 Давление",
+        "name": "20. BME280 Давление",
         "type": "Reading",
         "subtype": "Bme280p",
         "id": "Press3",
@@ -303,11 +318,11 @@
         "int": 15,
         "addr": "0x77",
         "round": 1,
-        "num": 19
+        "num": 20
     },
     {
         "global": 0,
-        "name": "20. BME280 Влажность",
+        "name": "21. BME280 Влажность",
         "type": "Reading",
         "subtype": "Bme280h",
         "id": "Hum3",
@@ -317,11 +332,11 @@
         "int": 15,
         "addr": "0x77",
         "round": 1,
-        "num": 20
+        "num": 21
     },
     {
         "global": 0,
-        "name": "21. BME280 Tочка росы",
+        "name": "22. BME280 Tочка росы",
         "type": "Reading",
         "subtype": "Bme280dp",
         "id": "Dew3",
@@ -331,11 +346,11 @@
         "int": 15,
         "addr": "0x77",
         "round": 1,
-        "num": 21
+        "num": 22
     },
     {
         "global": 0,
-        "name": "22. BMP280 Температура",
+        "name": "23. BMP280 Температура",
         "type": "Reading",
         "subtype": "Bmp280t",
         "id": "tmp3",
@@ -345,11 +360,11 @@
         "int": 15,
         "addr": "0x77",
         "round": 1,
-        "num": 22
+        "num": 23
     },
     {
         "global": 0,
-        "name": "23. BMP280 Давление",
+        "name": "24. BMP280 Давление",
         "type": "Reading",
         "subtype": "Bmp280p",
         "id": "Press3",
@@ -359,11 +374,11 @@
         "int": 15,
         "addr": "0x77",
         "round": 1,
-        "num": 23
+        "num": 24
     },
     {
         "global": 0,
-        "name": "24. DHT11 Температура",
+        "name": "25. DHT11 Температура",
         "type": "Reading",
         "subtype": "Dht1122t",
         "id": "tmp3",
@@ -373,11 +388,11 @@
         "int": 15,
         "pin": 0,
         "senstype": "dht11",
-        "num": 24
+        "num": 25
     },
     {
         "global": 0,
-        "name": "25. DHT11 Влажность",
+        "name": "26. DHT11 Влажность",
         "type": "Reading",
         "subtype": "Dht1122h",
         "id": "Hum3",
@@ -387,11 +402,11 @@
         "int": 15,
         "pin": 0,
         "senstype": "dht11",
-        "num": 25
+        "num": 26
     },
     {
         "global": 0,
-        "name": "26. DS18B20 Температура",
+        "name": "27. DS18B20 Температура",
         "type": "Reading",
         "subtype": "Ds18b20",
         "id": "dstmp",
@@ -403,11 +418,11 @@
         "index": 0,
         "addr": "",
         "round": 1,
-        "num": 26
+        "num": 27
     },
     {
         "global": 0,
-        "name": "27. Аналоговый счетчик импульсов",
+        "name": "28. Аналоговый счетчик импульсов",
         "type": "Writing",
         "subtype": "Impulse",
         "id": "impulse",
@@ -420,11 +435,52 @@
         "pinMode": "INPUT",
         "debounceDelay": 3,
         "multiply": 1,
-        "num": 27
+        "num": 28
     },
     {
         "global": 0,
-        "name": "28. PZEM 004t Напряжение",
+        "name": "29. MQ газовые анализаторы",
+        "type": "Reading",
+        "subtype": "MQgas",
+        "id": "MQ",
+        "widget": "anydataPpm",
+        "page": "Сенсоры",
+        "descr": "MQ-135",
+        "Series": 135,
+        "Gas": "CO2",
+        "Rl on board": 10,
+        "Ro in clean air": 0,
+        "Rl/Ro in clean air": 0,
+        "PPM in clean air": 397.13,
+        "aLimit": -0.42,
+        "bLimit": 1.92,
+        "Warm up time": 60,
+        "Sample interval": 20,
+        "Sample times": 10,
+        "Calibtation intensity": 5,
+        "autoCalibration": 1,
+        "autoCalib.Period": 24,
+        "TempHum correction": 1,
+        "temperature": 20,
+        "idTempSensor": "",
+        "humidity": 50,
+        "idHumSensor": "",
+        "k1": 0.00672096284322792,
+        "k2": -0.0159038179354688,
+        "b1": -0.741244323718154,
+        "b2": 1.77535862501753,
+        "Debug": 1,
+        "plus": 0,
+        "multiply": 1,
+        "round": 1,
+        "pin-Esp32": 34,
+        "operating voltage": 3.3,
+        "int": 15,
+        "num": 29
+    },
+    {
+        "global": 0,
+        "name": "30. PZEM 004t Напряжение",
         "type": "Reading",
         "subtype": "Pzem004v",
         "id": "v",
@@ -434,11 +490,11 @@
         "int": 15,
         "addr": "0xF8",
         "round": 1,
-        "num": 28
+        "num": 30
     },
     {
         "global": 0,
-        "name": "29. PZEM 004t Сила тока",
+        "name": "31. PZEM 004t Сила тока",
         "type": "Reading",
         "subtype": "Pzem004a",
         "id": "a",
@@ -448,11 +504,11 @@
         "int": 15,
         "addr": "0xF8",
         "round": 1,
-        "num": 29
+        "num": 31
     },
     {
         "global": 0,
-        "name": "30. PZEM 004t Мощность",
+        "name": "32. PZEM 004t Мощность",
         "type": "Reading",
         "subtype": "Pzem004w",
         "id": "w",
@@ -462,11 +518,11 @@
         "int": 15,
         "addr": "0xF8",
         "round": 1,
-        "num": 30
+        "num": 32
     },
     {
         "global": 0,
-        "name": "31. PZEM 004t Энергия",
+        "name": "33. PZEM 004t Энергия",
         "type": "Reading",
         "subtype": "Pzem004wh",
         "id": "wh",
@@ -476,11 +532,11 @@
         "int": 15,
         "addr": "0xF8",
         "round": 1,
-        "num": 31
+        "num": 33
     },
     {
         "global": 0,
-        "name": "32. PZEM 004t Частота",
+        "name": "34. PZEM 004t Частота",
         "type": "Reading",
         "subtype": "Pzem004hz",
         "id": "hz",
@@ -490,11 +546,11 @@
         "int": 15,
         "addr": "0xF8",
         "round": 1,
-        "num": 32
+        "num": 34
     },
     {
         "global": 0,
-        "name": "33. PZEM 004t Косинус",
+        "name": "35. PZEM 004t Косинус",
         "type": "Reading",
         "subtype": "Pzem004pf",
         "id": "pf",
@@ -504,11 +560,11 @@
         "int": 15,
         "addr": "0xF8",
         "round": 1,
-        "num": 33
+        "num": 35
     },
     {
         "global": 0,
-        "name": "34. PZEM настройка",
+        "name": "36. PZEM настройка",
         "type": "Reading",
         "subtype": "Pzem004cmd",
         "id": "set",
@@ -517,14 +573,28 @@
         "descr": "",
         "int": 15,
         "addr": "0xF8",
-        "changeaddr": 0,
+        "btn-changeaddr": "0x01",
-        "setaddr": "0x01",
+        "btn-reset": "",
-        "reset": 0,
+        "num": 36
-        "num": 34
     },
     {
         "global": 0,
-        "name": "35. Часы реального времени",
+        "name": "37. PZEM uart",
+        "type": "Reading",
+        "subtype": "Pzem004uart",
+        "id": "upzem",
+        "widget": "nil",
+        "page": "",
+        "descr": "",
+        "tx": 17,
+        "rx": 16,
+        "line": 2,
+        "speed": 9600,
+        "num": 37
+    },
+    {
+        "global": 0,
+        "name": "38. Часы реального времени",
         "type": "Reading",
         "subtype": "RTC",
         "id": "rtc",
@@ -540,11 +610,12 @@
         "int": 5,
         "btn-setUTime": "0",
         "btn-setSysTime": "nil",
-        "num": 35
+        "num": 38
     },
     {
-        "name": "36. (S8) Cенсор качества воздуха",
+        "global": 0,
-        "num": 36,
+        "name": "39. (S8) Cенсор качества воздуха",
+        "num": 39,
         "type": "Reading",
         "subtype": "S8co",
         "id": "s8co",
@@ -558,7 +629,7 @@
     },
     {
         "global": 0,
-        "name": "37. Sht20 Температура",
+        "name": "40. Sht20 Температура",
         "type": "Reading",
         "subtype": "Sht20t",
         "id": "tmp2",
@@ -567,11 +638,11 @@
         "descr": "Температура",
         "int": 15,
         "round": 1,
-        "num": 37
+        "num": 40
     },
     {
         "global": 0,
-        "name": "38. Sht20 Влажность",
+        "name": "41. Sht20 Влажность",
         "type": "Reading",
         "subtype": "Sht20h",
         "id": "Hum2",
@@ -580,11 +651,11 @@
         "descr": "Влажность",
         "int": 15,
         "round": 1,
-        "num": 38
+        "num": 41
     },
     {
         "global": 0,
-        "name": "39. Sht30 Температура",
+        "name": "42. Sht30 Температура",
         "type": "Reading",
         "subtype": "Sht30t",
         "id": "tmp30",
@@ -593,11 +664,11 @@
         "descr": "SHT30 Температура",
         "int": 15,
         "round": 1,
-        "num": 39
+        "num": 42
     },
     {
         "global": 0,
-        "name": "40. Sht30 Влажность",
+        "name": "43. Sht30 Влажность",
         "type": "Reading",
         "subtype": "Sht30h",
         "id": "Hum30",
@@ -606,12 +677,12 @@
         "descr": "SHT30 Влажность",
         "int": 15,
         "round": 1,
-        "num": 40
+        "num": 43
     },
     {
         "global": 0,
-        "name": "41. HC-SR04 Ультразвуковой дальномер",
+        "name": "44. HC-SR04 Ультразвуковой дальномер",
-        "num": 41,
+        "num": 44,
         "type": "Reading",
         "subtype": "Sonar",
         "id": "sonar",
@@ -623,7 +694,7 @@
         "int": 5
     },
     {
-        "name": "42. UART",
+        "name": "45. UART",
         "type": "Reading",
         "subtype": "UART",
         "page": "",
@@ -635,14 +706,28 @@
         "line": 2,
         "speed": 9600,
         "eventFormat": 0,
-        "num": 42
+        "num": 45
     },
     {
         "header": "executive_devices"
     },
     {
         "global": 0,
-        "name": "43. Кнопка подключенная к пину",
+        "name": "46. Аналоговая кнопка",
+        "type": "Reading",
+        "subtype": "AnalogBtn",
+        "id": "abtn",
+        "widget": "toggle",
+        "page": "Кнопки",
+        "descr": "Освещение",
+        "pin": 34,
+        "aValue": -1,
+        "delta": 50,
+        "num": 46
+    },
+    {
+        "global": 0,
+        "name": "47. Кнопка подключенная к пину",
         "type": "Writing",
         "subtype": "ButtonIn",
         "id": "btn",
@@ -657,11 +742,11 @@
         "debounceDelay": 50,
         "fixState": 0,
         "inv": 0,
-        "num": 43
+        "num": 47
     },
     {
         "global": 0,
-        "name": "44. Управление пином",
+        "name": "48. Управление пином",
         "type": "Writing",
         "subtype": "ButtonOut",
         "needSave": 0,
@@ -672,11 +757,11 @@
         "int": 0,
         "inv": 0,
         "pin": 2,
-        "num": 44
+        "num": 48
     },
     {
         "global": 0,
-        "name": "45. Пассивный звуковой извещатель",
+        "name": "49. Пассивный звуковой извещатель",
         "type": "Writing",
         "subtype": "Buzzer",
         "id": "buzzer",
@@ -695,11 +780,11 @@
         "cycle": 0,
         "indication": 1,
         "val": 0,
-        "num": 45
+        "num": 49
     },
     {
         "global": 0,
-        "name": "46. Энкодер",
+        "name": "50. Энкодер",
         "type": "Writing",
         "subtype": "Encoder",
         "id": "enc",
@@ -712,11 +797,11 @@
         "step": 1,
         "stepOnPress": 5,
         "pins": "4,5,2",
-        "num": 46
+        "num": 50
     },
     {
         "global": 0,
-        "name": "47. Сервопривод",
+        "name": "51. Сервопривод",
         "type": "Writing",
         "subtype": "IoTServo",
         "id": "servo",
@@ -726,13 +811,14 @@
         "pin": 12,
         "minPulseWidth": 544,
         "maxPulseWidth": 2400,
-        "neutralPulseWidth": 1500,
+        "minAngle": 0,
+        "maxAngle": 180,
         "trackingID": "",
-        "num": 47
+        "num": 51
     },
     {
         "global": 0,
-        "name": "48. Расширитель портов Mcp23017",
+        "name": "52. Расширитель портов Mcp23017",
         "type": "Reading",
         "subtype": "Mcp23017",
         "id": "Mcp",
@@ -742,11 +828,11 @@
         "int": "0",
         "addr": "0x20",
         "index": 1,
-        "num": 48
+        "num": 52
     },
     {
         "global": 0,
-        "name": "49. MP3 плеер",
+        "name": "53. MP3 плеер",
         "type": "Reading",
         "subtype": "Mp3",
         "id": "mp3",
@@ -756,11 +842,11 @@
         "int": 1,
         "pins": "14,12",
         "volume": 20,
-        "num": 49
+        "num": 53
     },
     {
         "global": 0,
-        "name": "50. Сенсорная кнопка",
+        "name": "54. Сенсорная кнопка",
         "type": "Writing",
         "subtype": "Multitouch",
         "id": "impulse",
@@ -774,11 +860,11 @@
         "pinMode": "INPUT",
         "debounceDelay": 50,
         "PWMDelay": 500,
-        "num": 50
+        "num": 54
     },
     {
         "global": 0,
-        "name": "51. Расширитель портов Pcf8574",
+        "name": "55. Расширитель портов Pcf8574",
         "type": "Reading",
         "subtype": "Pcf8574",
         "id": "Pcf",
@@ -788,11 +874,11 @@
         "int": "0",
         "addr": "0x20",
         "index": 1,
-        "num": 51
+        "num": 55
     },
     {
         "global": 0,
-        "name": "52. PWM ESP8266",
+        "name": "56. PWM ESP8266",
         "type": "Writing",
         "subtype": "Pwm8266",
         "id": "pwm",
@@ -804,11 +890,11 @@
         "freq": 5000,
         "val": 0,
         "apin": -1,
-        "num": 52
+        "num": 56
     },
     {
         "global": 0,
-        "name": "53. Телеграм-Лайт",
+        "name": "57. Телеграм-Лайт",
         "type": "Writing",
         "subtype": "TelegramLT",
         "id": "tg",
@@ -817,14 +903,29 @@
         "descr": "",
         "token": "",
         "chatID": "",
-        "num": 53
+        "num": 57
     },
     {
         "header": "screens"
     },
+    {
+        "name": "58. LCD Dwin экран",
+        "type": "Reading",
+        "subtype": "DwinI",
+        "id": "dwin",
+        "widget": "",
+        "page": "",
+        "descr": "",
+        "tx": 17,
+        "rx": 16,
+        "line": 2,
+        "speed": 9600,
+        "btn-uploadUI": "",
+        "num": 58
+    },
     {
         "global": 0,
-        "name": "54. LCD экран 2004",
+        "name": "59. LCD экран 2004",
         "type": "Reading",
         "subtype": "Lcd2004",
         "id": "Lcd",
@@ -837,10 +938,10 @@
         "id2show": "",
         "prefix": "",
         "postfix": "",
-        "num": 54
+        "num": 59
     },
     {
-        "name": "55. LCD экран 1602",
+        "name": "60. LCD экран 1602",
         "type": "Reading",
         "subtype": "Lcd2004",
         "id": "Lcd",
@@ -853,11 +954,11 @@
         "id2show": "",
         "prefix": "",
         "postfix": "",
-        "num": 55
+        "num": 60
     },
     {
         "global": 0,
-        "name": "56. OLED экран 64 8266",
+        "name": "61. OLED экран 64 8266",
         "type": "Reading",
         "subtype": "Oled64",
         "id": "Oled",
@@ -870,26 +971,6 @@
         "id2show": "",
         "prefix": "",
         "postfix": "",
-        "num": 56
+        "num": 61
-    },
-    {
-        "global": 0,
-        "name": "57. 7 сегментный дисплей TM16XX",
-        "type": "Writing",
-        "subtype": "TM16XX",
-        "id": "tm",
-        "widget": "inputTxt",
-        "page": "screens",
-        "descr": "Экран",
-        "round": 0,
-        "chip": 1637,
-        "numDigits": 4,
-        "DIO": "13",
-        "CLK": "14",
-        "STB": "12",
-        "intensity": "5",
-        "on": "1",
-        "id2show": "",
-        "num": 57
     }
 ]

include/Const.h

@@ -2,7 +2,7 @@
 #include "BuildTime.h"
 
 // Версия прошивки
-#define FIRMWARE_VERSION 455
+#define FIRMWARE_VERSION 456
 
 #ifdef esp8266_1mb_ota
 #define FIRMWARE_NAME "esp8266_1mb_ota"

myProfile.json

@@ -146,7 +146,7 @@
             },
             {
                 "path": "src/modules/virtual/Math",
-                "active": false
+                "active": true
             },
             {
                 "path": "src/modules/virtual/owmWeather",
@@ -290,12 +290,20 @@
                 "path": "src/modules/sensors/Mhz19",
                 "active": false
             },
+            {
+                "path": "src/modules/sensors/MQgas",
+                "active": true
+            },
             {
                 "path": "src/modules/sensors/Ntc",
                 "active": false
             },
             {
                 "path": "src/modules/sensors/Pzem004t",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Pzem004t_v2",
                 "active": true
             },
             {
@@ -340,6 +348,10 @@
             }
         ],
         "executive_devices": [
+            {
+                "path": "src/modules/exec/AnalogBtn",
+                "active": true
+            },
             {
                 "path": "src/modules/exec/ButtonIn",
                 "active": true
@@ -436,12 +448,16 @@
         "screens": [
             {
                 "path": "src/modules/display/DwinI",
-                "active": false
+                "active": true
             },
             {
                 "path": "src/modules/display/Lcd2004",
                 "active": true
             },
+            {
+                "path": "src/modules/display/Nextion",
+                "active": false
+            },
             {
                 "path": "src/modules/display/NextionUpload",
                 "active": false
@@ -460,7 +476,7 @@
             },
             {
                 "path": "src/modules/display/TM16XX",
-                "active": true
+                "active": false
             },
             {
                 "path": "src/modules/display/Ws2812b",

platformio.ini

@@ -544,17 +544,16 @@ lib_deps =
 	adafruit/Adafruit BusIO @ ^1.13.2
 	dfrobot/DFRobotDFPlayerMini @ ^1.0.5
 	adafruit/Adafruit BusIO @ ^1.13.2
+	plerup/EspSoftwareSerial
 	https://github.com/robotclass/RobotClass_LiquidCrystal_I2C
 	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 	https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED
 	https://github.com/adafruit/Adafruit-GFX-Library
-	https://github.com/maxint-rd/TM16xx
-	adafruit/Adafruit GFX Library @ ^1.11.5
-	adafruit/Adafruit BusIO @ ^1.13.2
 build_src_filter = 
 	+<modules/virtual/Cron>
 	+<modules/virtual/Loging>
 	+<modules/virtual/LogingDaily>
+	+<modules/virtual/Math>
 	+<modules/virtual/owmWeather>
 	+<modules/virtual/Timer>
 	+<modules/virtual/Variable>
@@ -568,13 +567,15 @@ build_src_filter =
 	+<modules/sensors/Dht1122>
 	+<modules/sensors/Ds18b20>
 	+<modules/sensors/Impulse>
-	+<modules/sensors/Pzem004t>
+	+<modules/sensors/MQgas>
+	+<modules/sensors/Pzem004t_v2>
 	+<modules/sensors/RTC>
 	+<modules/sensors/S8>
 	+<modules/sensors/Sht20>
 	+<modules/sensors/Sht30>
 	+<modules/sensors/Sonar>
 	+<modules/sensors/UART>
+	+<modules/exec/AnalogBtn>
 	+<modules/exec/ButtonIn>
 	+<modules/exec/ButtonOut>
 	+<modules/exec/Buzzer>
@@ -586,9 +587,9 @@ build_src_filter =
 	+<modules/exec/Pcf8574>
 	+<modules/exec/Pwm8266>
 	+<modules/exec/TelegramLT>
+	+<modules/display/DwinI>
 	+<modules/display/Lcd2004>
 	+<modules/display/Oled64>
-	+<modules/display/TM16XX>
 
 [env:esp32_4mb_fromitems]
 lib_deps = 
@@ -606,21 +607,24 @@ lib_deps =
 	adafruit/Adafruit BusIO @ ^1.13.2
 	dfrobot/DFRobotDFPlayerMini @ ^1.0.5
 	adafruit/Adafruit BusIO @ ^1.13.2
+	plerup/EspSoftwareSerial
 	https://github.com/robotclass/RobotClass_LiquidCrystal_I2C
 	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 	https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED
 	https://github.com/adafruit/Adafruit-GFX-Library
 	https://github.com/maxint-rd/TM16xx
-	adafruit/Adafruit GFX Library @ ^1.11.5
+	https://github.com/adafruit/Adafruit-GFX-Library
 	adafruit/Adafruit BusIO @ ^1.13.2
 build_src_filter = 
 	+<modules/virtual/Cron>
 	+<modules/virtual/Loging>
 	+<modules/virtual/LogingDaily>
+	+<modules/virtual/Math>
 	+<modules/virtual/owmWeather>
 	+<modules/virtual/Timer>
 	+<modules/virtual/Variable>
 	+<modules/virtual/VButton>
+	+<modules/sensors/A02Distance>
 	+<modules/sensors/Acs712>
 	+<modules/sensors/AhtXX>
 	+<modules/sensors/AnalogAdc>
@@ -629,13 +633,15 @@ build_src_filter =
 	+<modules/sensors/Dht1122>
 	+<modules/sensors/Ds18b20>
 	+<modules/sensors/Impulse>
-	+<modules/sensors/Pzem004t>
+	+<modules/sensors/MQgas>
+	+<modules/sensors/Pzem004t_v2>
 	+<modules/sensors/RTC>
 	+<modules/sensors/S8>
 	+<modules/sensors/Sht20>
 	+<modules/sensors/Sht30>
 	+<modules/sensors/Sonar>
 	+<modules/sensors/UART>
+	+<modules/exec/AnalogBtn>
 	+<modules/exec/ButtonIn>
 	+<modules/exec/ButtonOut>
 	+<modules/exec/Buzzer>
@@ -644,10 +650,10 @@ build_src_filter =
 	+<modules/exec/Mcp23017>
 	+<modules/exec/Mp3>
 	+<modules/exec/Multitouch>
-	+<modules/exec/MySensors>
 	+<modules/exec/Pcf8574>
 	+<modules/exec/Pwm32>
 	+<modules/exec/TelegramLT>
+	+<modules/display/DwinI>
 	+<modules/display/Lcd2004>
 	+<modules/display/Oled64>
 	+<modules/display/Smi2_m>

src/WsServer.cpp

@@ -117,6 +117,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
             if (headerStr == "/oiranecs|") {
                 writeFileUint8tByFrames("scenario.txt", payload, length, headerLenth, 256);
                 clearConfigure();
+                globalVarsSync();   // в том числе подгружаем сохраненные значения элементов с флешки
                 configure("/config.json");
                 iotScen.loadScenario("/scenario.txt");
                 // создаем событие завершения конфигурирования для возможности

src/modules/API.cpp

@@ -3,6 +3,7 @@
 void* getAPI_Cron(String subtype, String params);
 void* getAPI_Loging(String subtype, String params);
 void* getAPI_LogingDaily(String subtype, String params);
+void* getAPI_IoTMath(String subtype, String params);
 void* getAPI_owmWeather(String subtype, String params);
 void* getAPI_Timer(String subtype, String params);
 void* getAPI_Variable(String subtype, String params);
@@ -16,13 +17,15 @@ void* getAPI_Bmp280(String subtype, String params);
 void* getAPI_Dht1122(String subtype, String params);
 void* getAPI_Ds18b20(String subtype, String params);
 void* getAPI_Impulse(String subtype, String params);
-void* getAPI_Pzem004(String subtype, String params);
+void* getAPI_MQgas(String subtype, String params);
+void* getAPI_Pzem004_v2(String subtype, String params);
 void* getAPI_RTC(String subtype, String params);
 void* getAPI_S8(String subtype, String params);
 void* getAPI_Sht20(String subtype, String params);
 void* getAPI_Sht30(String subtype, String params);
 void* getAPI_Sonar(String subtype, String params);
 void* getAPI_UART(String subtype, String params);
+void* getAPI_AnalogBtn(String subtype, String params);
 void* getAPI_ButtonIn(String subtype, String params);
 void* getAPI_ButtonOut(String subtype, String params);
 void* getAPI_Buzzer(String subtype, String params);
@@ -34,15 +37,16 @@ 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_Oled64(String subtype, String params);
-void* getAPI_TM16XX(String subtype, String params);
 
 void* getAPI(String subtype, String params) {
 void* tmpAPI;
 if ((tmpAPI = getAPI_Cron(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Loging(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_LogingDaily(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_IoTMath(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_owmWeather(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI;
@@ -56,13 +60,15 @@ if ((tmpAPI = getAPI_Bmp280(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Dht1122(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Ds18b20(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Impulse(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_Pzem004(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_MQgas(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_Pzem004_v2(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_RTC(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_S8(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Sht20(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Sht30(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Sonar(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_UART(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_AnalogBtn(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_ButtonIn(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_ButtonOut(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Buzzer(subtype, params)) != nullptr) return tmpAPI;
@@ -74,8 +80,8 @@ 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;
 if ((tmpAPI = getAPI_Oled64(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_TM16XX(subtype, params)) != nullptr) return tmpAPI;
 return nullptr;
 }

src/modules/display/Lcd2004/modinfo.json

@@ -119,43 +119,11 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
             "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
-            "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
-        ],
-        "esp32cam_4mb": [
-            "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
-            "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
-        ],
-        "esp8266_4mb": [
-            "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
-            "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
-        ],
-        "esp8266_1mb": [
-            "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
-            "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
-        ],
-        "esp8266_1mb_ota": [
-            "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
-            "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
-        ],
-        "esp8285_1mb": [
-            "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
-            "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
-        ],
-        "esp8285_1mb_ota": [
-            "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
-            "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
-        ],
-        "esp8266_2mb": [
-            "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
-            "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
-        ],
-        "esp8266_2mb_ota": [
             "https://github.com/robotclass/RobotClass_LiquidCrystal_I2C",
             "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
         ]

src/modules/display/NextionUpload/modinfo.json

@@ -38,12 +38,7 @@
   },
   "defActive": false,
   "usedLibs": {
-    "esp32_4mb": [],
+    "esp32*": [],
-    "esp32_4mb3f": [],
+    "esp82*": []
-    "esp8266_4mb": [],
-    "esp8266_1mb": [],
-    "esp8266_1mb_ota": [],
-    "esp8285_1mb": [],
-    "esp8285_1mb_ota": []
   }
 }

src/modules/display/Oled128/modinfo.json

@@ -73,16 +73,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "gyverlibs/GyverOLED @ 1.4"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "gyverlibs/GyverOLED @ 1.4"
-        ],
-        "esp32_16mb": [
-            "gyverlibs/GyverOLED @ 1.4"
-        ],
-        "esp8266_4mb": [
             "gyverlibs/GyverOLED @ 1.4"
         ]
     }

src/modules/display/Oled64/modinfo.json

@@ -77,19 +77,11 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED",
             "https://github.com/adafruit/Adafruit-GFX-Library"
         ],
-        "esp8266_4mb": [
+        "esp82*": [
-            "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED",
-            "https://github.com/adafruit/Adafruit-GFX-Library"
-        ],
-        "esp8266_1mb": [
-            "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED",
-            "https://github.com/adafruit/Adafruit-GFX-Library"
-        ],
-        "esp8266_1mb_ota": [
             "https://github.com/stblassitude/Adafruit_SSD1306_Wemos_OLED",
             "https://github.com/adafruit/Adafruit-GFX-Library"
         ]

src/modules/display/Smi2_m/modinfo.json

@@ -52,8 +52,6 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": []
-        "esp32_4mb3f": [],
-        "esp32cam_4mb": []
     }
 }

src/modules/display/TM16XX/TM16XX.cpp

@@ -4,19 +4,103 @@
 #include <TM1637.h>
 #include <TM1638.h>
 #include <TM16xxDisplay.h>
+#include <TM16xxbuttons.h>
 
 
+TM16xxButtons* buttons = nullptr; // указатель на объект управления кнопками для TM1638 иначе nullptr
+IoTItem* iotItemObj = nullptr; // указатель на объект конфигурации для доступа из функций calback
+
+void setIotItemValue(int buttonNum, int state) {
+    if (iotItemObj) {
+        String id = iotItemObj->getID() + "_" + String(buttonNum);
+        for (std::list<IoTItem*>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) {
+            if ((*it)->getID() == id) {
+                IoTValue value;
+                value.valD = state;
+                (*it)->setValue(value);
+                //value.valD = 0;  // сбрасываем состояние в нулевое если статус конечный (т.к. библиотека отрабатывает события не по порядку)
+                //if (state == 1 || state == 5 || state == 2) (*it)->setValue(value, false);  
+                break;
+            }
+        }
+    }
+}
+
+// The Release function will be called when a button was released.
+// It can be used for fast actions when no click or double click needs to be detected.
+void fnRelease(byte nButton) {
+    // using isPressed or is LongPressed a shift-key can be implemented
+    if(buttons->isLongPressed(0))
+        Serial.print(F("Button 0 still longpressed. "));
+    else if(buttons->isPressed(0))
+        Serial.print(F("Button 0 still pressed. "));
+
+    Serial.print(F("Button "));
+    Serial.print(nButton);
+    Serial.println(F(" release."));
+
+    setIotItemValue(nButton, 0);
+} // release
+
+
+// This function will be called when a button was pressed 1 time (without a second press).
+void fnClick(byte nButton) {
+    Serial.print(F("Button "));
+    Serial.print(nButton);
+    Serial.println(F(" click."));
+
+    setIotItemValue(nButton, 1);
+} // click
+
+
+// This function will be called when a button was pressed 2 times in a short timeframe.
+void fnDoubleclick(byte nButton) {
+    Serial.print(F("Button "));
+    Serial.print(nButton);
+    Serial.println(F(" doubleclick."));
+
+    setIotItemValue(nButton, 2);
+} // doubleclick
+
+
+// This function will be called once, when a button is pressed for a long time.
+void fnLongPressStart(byte nButton) {
+    Serial.print(F("Button "));
+    Serial.print(nButton);
+    Serial.println(F(" longPress start"));
+
+    setIotItemValue(nButton, 3);
+} // longPressStart
+
+
+// This function will be called often, while a button is pressed for a long time.
+void fnLongPress(byte nButton) {
+    Serial.print(F("Button "));
+    Serial.print(nButton);
+    Serial.println(F(" longPress..."));
+
+    setIotItemValue(nButton, 4);
+} // longPress
+
+
+// This function will be called once, when a button is released after beeing pressed for a long time.
+void fnLongPressStop(byte nButton) {
+    Serial.print(F("Button "));
+    Serial.print(nButton);
+    Serial.println(F(" longPress stop"));
+
+    setIotItemValue(nButton, 5);
+} // longPressStop
+
 
 class TM16XX : public IoTItem {
    private:
     TM16xxDisplay *_display = nullptr;
     TM16xx *_module = nullptr;
-    std::vector<String> _ids2show;
+    String _id2show;
 
    public:
     TM16XX(String parameters) : IoTItem(parameters) {
-        //jsonRead(parameters, "id2show", _id2show);
-
         int DIO, CLK, STB, chip, numDigits, intensity;
         bool onoff;
         String id2show;
@@ -28,58 +112,97 @@ class TM16XX : public IoTItem {
         jsonRead(parameters, "intensity", intensity);
         jsonRead(parameters, "on", onoff);
 
-        jsonRead(parameters, "id2show", id2show);
+        jsonRead(parameters, "id2show", _id2show);
-        if (id2show != "") _ids2show = splitStr(id2show, ",");
 
         if (chip == 1637) {
             _module = new TM1637(DIO, CLK, numDigits);
         } else if (chip == 1638) {
             _module = new TM1638(DIO, CLK, STB, numDigits);
+            buttons = new TM16xxButtons(_module);
+            buttons->attachRelease(fnRelease);
+            buttons->attachClick(fnClick);
+            buttons->attachDoubleClick(fnDoubleclick);
+            buttons->attachLongPressStart(fnLongPressStart);
+            buttons->attachLongPressStop(fnLongPressStop);
+            buttons->attachDuringLongPress(fnLongPress);
         }
         _module->setupDisplay(onoff, intensity);
         _display = new TM16xxDisplay(_module, numDigits);
+        _display->println(getValue());
     }
 
-    void doByInterval() {
+    byte btLeds=0;
-        
+    byte btPosition=0;
+    void loop() {
+        if(buttons) buttons->tick();
     }
 
     void setValue(const IoTValue& Value, bool genEvent = true) {
         if (_display == nullptr) return;
 
         value = Value;
-        _display->println(getValue());
+        //_display->println(getValue());
+        _display->printf("%4s\n", getValue());
         IoTItem::setValue(Value, genEvent);
     }
 
     void onRegEvent(IoTItem* eventItem) {
         if (_display == nullptr) return;
-        if (!eventItem || _ids2show.size() == 0) return; 
+        if (!eventItem || _id2show == "") return; 
+     
+        //_display->println(eventItem->getValue());
+        if (_id2show == eventItem->getID()) {
+            setValue(eventItem->value, false);
+        }
+        // } else {
+        //     _display->println();
+        //     for (int i = 0; i < _ids2show.size(); i++) {
+        //         IoTItem* item = findIoTItem(_ids2show[i]);
+        //         if (item) {
+        //             _display->print(item->getValue());    
+        //         }
+        //     }
+        // }
+    }
 
-        if (strInVector(eventItem->getID(), _ids2show)) {
+    IoTValue execute(String command, std::vector<IoTValue>& param) {
-            if (_ids2show.size() == 1) {
+        if (command == "setLEDs") {
-                _display->println(eventItem->getValue());
+            if (param.size() == 1) {
-            } else {
+                ((TM1638*)_module)->setLEDs(param[0].valD);
-                _display->println();
+            }
-                for (int i = 0; i < _ids2show.size(); i++) {
+        } else if (command == "onLED") {
-                    IoTItem* item = findIoTItem(_ids2show[i]);
+            if (param.size() == 1) {
-                    if (item) {
+                ((TM1638*)_module)->setLED(TM1638_COLOR_RED, param[0].valD - 1);
-                        _display->print(item->getValue());    
+            }
-                    }
+        } else if (command == "offLED") {
-                }
+            if (param.size() == 1) {
+                ((TM1638*)_module)->setLED(TM1638_COLOR_GREEN, param[0].valD - 1);
+            }
+        } else if (command == "setParamLED") {
+            if (param.size() == 2) {
+                _module->setupDisplay(param[0].valD, param[1].valD);
+            }
+        } else if (command == "id2show") {
+            if (param.size()  == 1) {
+                _id2show = param[0].valS;
             }
         }
+
+        return {};
     }
 
     ~TM16XX() {
-        delete _display;
+        if (_display) delete _display;
-        delete _module;
+        if (_module) delete _module;
+        if (buttons) delete buttons;
+        iotItemObj = nullptr;
+        buttons = nullptr;
     };
 };
 
 void *getAPI_TM16XX(String subtype, String param) {
     if (subtype == F("TM16XX")) {
-        return new TM16XX(param);
+        return iotItemObj = new TM16XX(param);
     } else {
         return nullptr;
     }

src/modules/display/TM16XX/example.json

@@ -0,0 +1,243 @@
+{
+    "mark": "iotm",
+    "config": [
+        {
+            "global": 0,
+            "type": "Writing",
+            "subtype": "TM16XX",
+            "id": "tm",
+            "widget": "inputDgt",
+            "page": "screens",
+            "descr": "Экран",
+            "round": 0,
+            "chip": "1638",
+            "numDigits": "8",
+            "DIO": "13",
+            "CLK": "14",
+            "STB": "27",
+            "intensity": "5",
+            "on": "1",
+            "id2show": ""
+        },
+        {
+            "global": 0,
+            "type": "Writing",
+            "subtype": "ButtonOut",
+            "needSave": 0,
+            "id": "led",
+            "widget": "toggle",
+            "page": "screens",
+            "descr": "Освещение",
+            "int": 0,
+            "inv": 0,
+            "pin": 2
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "tm_16",
+            "needSave": 0,
+            "widget": "nil",
+            "page": "Вывод",
+            "descr": "Значение",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "tm_18",
+            "needSave": 0,
+            "widget": "nil",
+            "page": "Вывод",
+            "descr": "Значение",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "tm_20",
+            "needSave": 0,
+            "widget": "nil",
+            "page": "Вывод",
+            "descr": "Значение",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "tm_22",
+            "needSave": 0,
+            "widget": "nil",
+            "page": "Вывод",
+            "descr": "Значение",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "tm_17",
+            "needSave": 0,
+            "widget": "nil",
+            "page": "Вывод",
+            "descr": "Значение",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "tm_19",
+            "needSave": 0,
+            "widget": "nil",
+            "page": "Вывод",
+            "descr": "Значение",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "tm_21",
+            "needSave": 0,
+            "widget": "nil",
+            "page": "Вывод",
+            "descr": "Значение",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "tm_23",
+            "needSave": 0,
+            "widget": "nil",
+            "page": "Вывод",
+            "descr": "Значение",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Writing",
+            "subtype": "Timer",
+            "id": "timer1",
+            "widget": "anydataDef",
+            "page": "Таймеры",
+            "descr": "Таймер1",
+            "int": 1,
+            "countDown": "1000",
+            "ticker": "1",
+            "repeat": 1,
+            "needSave": 0
+        },
+        {
+            "global": 0,
+            "type": "Writing",
+            "subtype": "Timer",
+            "id": "timer2",
+            "widget": "anydataDef",
+            "page": "Таймеры",
+            "descr": "Таймер2",
+            "int": "15",
+            "countDown": "1000",
+            "ticker": 1,
+            "repeat": 1,
+            "needSave": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "page",
+            "needSave": 0,
+            "widget": "anydataDef",
+            "page": "Таймеры",
+            "descr": "Значение",
+            "int": "0",
+            "val": "1",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        }
+    ]
+}
+
+scenario=>if tm_23 == 1 then tm.offLED(8)  # выкл 8 леда при одном клике на кнопку 23
+if tm_23 == 2 then tm.onLED(8)  # вкл 8 леда при двойном клике на кнопку 23
+if tm_23 == 5 then {  # сброс всех индикаторов при долгом нажатии на кнопку 23
+tm = 0
+tm.setLEDs(0)
+}
+
+if tm_16 == 4 then tm = tm - 100  # уменьшаем на 100 и увеличиваем при длительном нажатии
+if tm_18 == 4 then tm = tm + 100
+
+if tm_16 == 1 then tm = tm - 1
+if tm_18 == 1 then tm = tm + 1
+
+if tm_16 == 2 then tm = tm - 1000
+if tm_18 == 2 then tm = tm + 1000
+
+if timer1 >= 0 then tm.setLEDs(timer1)
+
+if tm_20 == 1 then tm = "HELLO!!"
+
+if tm_22 == 1 then tm.setParamLED(0, 7)
+if tm_17 == 1 then tm.setParamLED(1, 7)
+if tm_17 == 2 then tm.setParamLED(1, 0)
+
+if timer1 >= 0 & page == 1 then tm = "ttt1" + timer1
+if timer2 >= 0 & page == 2 then tm = "ttt2" + timer2
+if timer1 >= 0 | timer2 >= 0 then {
+if page == 3 then tm = timer1 + " " + timer2
+}
+if page == 0 then tm.setParamLED(0, 5)
+if page > 0 then tm.setParamLED(1, 5)
+
+if tm_19 == 1 then page = page - 1
+if tm_21 == 1 then page = page + 1

src/modules/display/TM16XX/modinfo.json

@@ -15,7 +15,7 @@
             "numDigits": 4,
             "DIO": "13",
             "CLK": "14",
-            "STB": "12",
+            "STB": "21",
             "intensity": "5",
             "on": "1",
             "id2show": ""
@@ -33,6 +33,7 @@
             "esp8266_4mb": 15
         },
         "moduleDesc": "Позволяет выводить на 7 сегментный экран серии TM16XX (TM1637, TM1638). Может быть расширен до поддержки TM1616, TM1620, TM1628, TM1630, TM1637, TM1638, TM1640, TM1650, TM1652 и TM1668",
+        "retInfo": "Если не установлен ИД для отслеживания значения, то внутренняя переменная будет использоваться как источник для информации",
         "propInfo": {
             "int": "Период времени в секундах обновления информации на экране по конкретному элементу.",
             "chip": "Номер чипа TM1637 или TM1638",
@@ -42,54 +43,28 @@
             "intensity": "Яркость 0-7",
             "on": "Вкл/выкл при старте 1/0",
             "STB": "Номер пина стекового сигнала - не используется на определенных моделях",
-            "id2show": "id элемента конфигурации для отображения. Если пустая строка, то дисплей использует свою переменную. Если указать несколько значений через запятую, то все данные будут последовательно выводиться в строку."
+            "id2show": "id элемента конфигурации для отображения. Если пустая строка, то дисплей использует свою переменную."
         },
         "funcInfo": [
             {
-                "name": "noBacklight",
+                "name": "setLEDs",
-                "descr": "Выключить подсветку",
+                "descr": "Зажигает верхние светодиоды через установку байта, где каждый разряд соответствует диоду. От 0 до 255",
-                "params": []
+                "params": ["Значение байта"]
             },
             {
-                "name": "backlight",
+                "name": "onLED",
-                "descr": "Включить подсветку",
+                "descr": "Включить один диод",
-                "params": []
+                "params": ["Номер диода"]
             },
             {
-                "name": "noDisplay",
+                "name": "offLED",
-                "descr": "Спрятать все данные",
+                "descr": "Выключить один диод",
-                "params": []
+                "params": ["Номер диода"]
             },
             {
-                "name": "display",
+                "name": "setParamLED",
-                "descr": "Показать данные на экране",
+                "descr": "Включить/выключить (1/0) и установить яркость от 0 до 7 дисплея",
-                "params": []
+                "params": ["Вкл/Выкл", "Яркость"]
-            },
-            {
-                "name": "toggle",
-                "descr": "Переключает видимость значений на экране",
-                "params": []
-            },
-            {
-                "name": "x",
-                "descr": "Устанавливает первую координату",
-                "params": [
-                    "Номер строки первого символа"
-                ]
-            },
-            {
-                "name": "y",
-                "descr": "Устанавливает вторую координату",
-                "params": [
-                    "Номер столбца первого символа"
-                ]
-            },
-            {
-                "name": "descr",
-                "descr": "Задает приставку слева от значения",
-                "params": [
-                    "Строка"
-                ]
             },
             {
                 "name": "id2show",
@@ -100,56 +75,16 @@
             }
         ]
     },
-    "defActive": true,
+    "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/maxint-rd/TM16xx",
-            "adafruit/Adafruit GFX Library @ ^1.11.5",
+            "https://github.com/adafruit/Adafruit-GFX-Library",
             "adafruit/Adafruit BusIO @ ^1.13.2"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
             "https://github.com/maxint-rd/TM16xx",
-            "adafruit/Adafruit GFX Library @ ^1.11.5",
+            "https://github.com/adafruit/Adafruit-GFX-Library",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp32cam_4mb": [
-            "https://github.com/maxint-rd/TM16xx",
-            "adafruit/Adafruit GFX Library @ ^1.11.5",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_4mb": [
-            "https://github.com/maxint-rd/TM16xx",
-            "adafruit/Adafruit GFX Library @ ^1.11.5",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_1mb": [
-            "https://github.com/maxint-rd/TM16xx",
-            "adafruit/Adafruit GFX Library @ ^1.11.5",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_1mb_ota": [
-            "https://github.com/maxint-rd/TM16xx",
-            "adafruit/Adafruit GFX Library @ ^1.11.5",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8285_1mb": [
-            "https://github.com/maxint-rd/TM16xx",
-            "adafruit/Adafruit GFX Library @ ^1.11.5",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8285_1mb_ota": [
-            "https://github.com/maxint-rd/TM16xx",
-            "adafruit/Adafruit GFX Library @ ^1.11.5",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_2mb": [
-            "https://github.com/maxint-rd/TM16xx",
-            "adafruit/Adafruit GFX Library @ ^1.11.5",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_2mb_ota": [
-            "https://github.com/maxint-rd/TM16xx",
-            "adafruit/Adafruit GFX Library @ ^1.11.5",
             "adafruit/Adafruit BusIO @ ^1.13.2"
         ]
     }

src/modules/display/Ws2812b/modinfo.json

@@ -97,16 +97,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "adafruit/Adafruit NeoPixel@^1.10.6"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "adafruit/Adafruit NeoPixel@^1.10.6"
-        ],
-        "esp32cam_4mb": [
-            "adafruit/Adafruit NeoPixel@^1.10.6"
-        ],
-        "esp8266_4mb": [
             "adafruit/Adafruit NeoPixel@^1.10.6"
         ]
     }

src/modules/exec/AnalogBtn/AnalogBtn.cpp

@@ -0,0 +1,54 @@
+#include "Global.h"
+#include "classes/IoTItem.h"
+
+extern IoTGpio IoTgpio;
+
+
+class AnalogBtn : public IoTItem {
+   private:
+    int _pin, _aValue, _delta;
+    int _oldVal, _newVal;
+
+   public:
+    AnalogBtn(String parameters) : IoTItem(parameters) {
+        _pin = 0;
+        _aValue = 0;
+        _delta = 50;
+        jsonRead(parameters, "pin", _pin);
+        jsonRead(parameters, "aValue", _aValue);
+        jsonRead(parameters, "delta", _delta);
+        _round = 0;
+        setInterval(-100);
+    }
+
+    void doByInterval() {
+        _newVal = IoTgpio.analogRead(_pin);
+        if (_aValue == -1 && _oldVal != _newVal) {
+            _oldVal = _newVal;
+            SerialPrint("i", "AnalogBtn", (String)_newVal);
+            return;
+        }
+
+        if ((_newVal > _aValue - _delta) && (_newVal < _aValue + _delta)) {
+            if (value.valD == 0) {
+                value.valD = 1;
+                regEvent(value.valD, "AnalogBtn");  
+            }
+        } else {
+            if (value.valD == 1) {
+                value.valD = 0;
+                regEvent(value.valD, "AnalogBtn");  
+            }
+        }
+    }
+
+    ~AnalogBtn() {};
+};
+
+void* getAPI_AnalogBtn(String subtype, String param) {
+    if (subtype == F("AnalogBtn")) {
+        return new AnalogBtn(param);
+    } else {
+        return nullptr;
+    }
+}

src/modules/exec/AnalogBtn/modinfo.json

@@ -0,0 +1,43 @@
+{
+    "menuSection": "executive_devices",
+    "configItem": [
+        {
+            "global": 0,
+            "name": "Аналоговая кнопка",
+            "type": "Reading",
+            "subtype": "AnalogBtn",
+            "id": "abtn",
+            "widget": "toggle",
+            "page": "Кнопки",
+            "descr": "Освещение",
+            "pin": 34,
+            "aValue": -1,
+            "delta": 50
+        }
+    ],
+    "about": {
+        "authorName": "Ilya Belyakov",
+        "authorContact": "https://t.me/Biveraxe",
+        "authorGit": "https://github.com/biveraxe",
+        "exampleURL": "https://iotmanager.org/wiki",
+        "specialThanks": "",
+        "moduleName": "AnalogBtn",
+        "moduleVersion": "1.0",
+        "usedRam": {
+            "esp32_4mb": 15,
+            "esp8266_4mb": 15
+        },
+        "title": "Аналоговая кнопка",
+        "moduleDesc": "Позволяет получить состояние кнопки на аналоговом пине.",
+        "propInfo": {
+            "pin": "Аналоговый GPIO номер, к которому подключена кнопка.",
+            "aValue": "Значение кнопки в диапазоне от 0 до 1023 (8266) или от 0 до 4095 (esp32). Если =-1 то включается режим отладки и в консоль отправляются значения нажимаемой кнопки.",
+            "delta": "Погрешность срабатывания кнопки в диапазоне +-delta."
+        }
+    },
+    "defActive": true,
+    "usedLibs": {
+        "esp32*": [],
+        "esp82*": []
+    }
+}

src/modules/exec/ButtonIn/modinfo.json

@@ -45,18 +45,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32_16mb": [],
-        "esp32s2_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_16mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/exec/ButtonOut/modinfo.json

@@ -49,18 +49,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32_16mb": [],
-        "esp32s2_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_16mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/exec/Buzzer/modinfo.json

@@ -103,15 +103,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/exec/Enconder/modinfo.json

@@ -43,31 +43,10 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "gyverlibs/EncButton @ ^2.0"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "gyverlibs/EncButton @ ^2.0"
-        ],
-        "esp32cam_4mb": [
-            "gyverlibs/EncButton @ ^2.0"
-        ],
-        "esp8266_4mb": [
-            "gyverlibs/EncButton @ ^2.0"
-        ],
-        "esp8266_16mb": [
-            "gyverlibs/EncButton @ ^2.0"
-        ],
-        "esp8266_1mb": [
-            "gyverlibs/EncButton @ ^2.0"
-        ],
-        "esp8266_1mb_ota": [
-            "gyverlibs/EncButton @ ^2.0"
-        ],
-        "esp8285_1mb": [
-            "gyverlibs/EncButton @ ^2.0"
-        ],
-        "esp8285_1mb_ota": [
             "gyverlibs/EncButton @ ^2.0"
         ]
     }

src/modules/exec/Ftp/modinfo.json

@@ -34,12 +34,7 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32_16mb": [],
-        "esp32s2_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_16mb": []
     }
 }

src/modules/exec/HttpGet/modinfo.json

@@ -49,16 +49,7 @@
   },
   "defActive": false,
   "usedLibs": {
-    "esp32_4mb": [],
+    "esp32*": [],
-    "esp32_4mb3f": [],
+    "esp82*": []
-    "esp32cam_4mb": [],
-    "esp32s2_4mb": [],
-    "esp8266_4mb": [],
-    "esp8266_1mb": [],
-    "esp8266_1mb_ota": [],
-    "esp8285_1mb": [],
-    "esp8285_1mb_ota": [],
-    "esp8266_2mb": [],
-    "esp8266_2mb_ota": []
   }
 }

src/modules/exec/IoTServo/IoTServo.cpp

@@ -15,12 +15,19 @@ class IoTServo : public IoTItem {
 
     public:
         IoTServo(String parameters): IoTItem(parameters) {
-            int pin, minPulseWidth, maxPulseWidth, neutralPulseWidth;
+            int pin, minPulseWidth, maxPulseWidth, minAngle, maxAngle;
             jsonRead(parameters, "pin", pin);
             jsonRead(parameters, "minPulseWidth", minPulseWidth);
             jsonRead(parameters, "maxPulseWidth", maxPulseWidth);
-            jsonRead(parameters, "neutralPulseWidth", neutralPulseWidth);
+            jsonRead(parameters, "minAngle", minAngle);
-            servObj.attach(pin, minPulseWidth, maxPulseWidth, neutralPulseWidth);
+            jsonRead(parameters, "maxAngle", maxAngle);
+
+#ifdef ESP32
+            servObj.attach(pin, Servo::CHANNEL_NOT_ATTACHED, minAngle, maxAngle, minPulseWidth, maxPulseWidth);
+#endif 
+#ifdef ESP8266
+            servObj.attach(pin, minPulseWidth, maxPulseWidth, value.valD);
+#endif            
 
             // jsonRead(parameters, "apin", _apin);
             // if (_apin >= 0) IoTgpio.pinMode(_apin, INPUT);

src/modules/exec/IoTServo/modinfo.json

@@ -13,7 +13,8 @@
             "pin": 12,
             "minPulseWidth": 544,
             "maxPulseWidth": 2400,
-            "neutralPulseWidth": 1500,
+            "minAngle": 0,
+            "maxAngle": 180,
             "trackingID": ""
         }
     ],
@@ -34,7 +35,8 @@
             "pin": "Пин, к которому подключен сервопривод",
             "minPulseWidth": "Минимальная длина импульса",
             "maxPulseWidth": "Максимальная длина импульса",
-            "neutralPulseWidth": "Нейтральная длина импульса",
+            "minAngle": "Минимальное значение угла (имеет значение для ESP32)",
+            "maxAngle": "Максимальное значение угла (имеет значение для ESP32)",
             "trackingID": "Идентификатор отслеживания значения другого элемента конфигурации, например, чтение аналога"
         },
         "retInfo": "Содержит текущее значение поворота",
@@ -50,15 +52,9 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/RoboticsBrno/ServoESP32#v1.0.3"
         ],
-        "esp32_4mb3f": [
+        "esp82*": []
-            "https://github.com/RoboticsBrno/ServoESP32#v1.0.3"
-        ],
-        "esp32cam_4mb": [
-            "https://github.com/RoboticsBrno/ServoESP32#v1.0.3"
-        ],
-        "esp8266_4mb": []
     }
 }

src/modules/exec/Mcp23008/modinfo.json

@@ -36,43 +36,11 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0",
             "adafruit/Adafruit BusIO @ ^1.13.2"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp32cam_4mb": [
-            "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_4mb": [
-            "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_1mb": [
-            "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_1mb_ota": [
-            "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8285_1mb": [
-            "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8285_1mb_ota": [
-            "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_2mb": [
-            "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_2mb_ota": [
             "adafruit/Adafruit Mcp23017 Arduino Library@^2.1.0",
             "adafruit/Adafruit BusIO @ ^1.13.2"
         ]

src/modules/exec/Mcp23017/modinfo.json

@@ -36,43 +36,11 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
             "adafruit/Adafruit BusIO @ ^1.13.2"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp32cam_4mb": [
-            "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_4mb": [
-            "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_1mb": [
-            "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_1mb_ota": [
-            "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8285_1mb": [
-            "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8285_1mb_ota": [
-            "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_2mb": [
-            "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_2mb_ota": [
             "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
             "adafruit/Adafruit BusIO @ ^1.13.2"
         ]

src/modules/exec/Mp3/modinfo.json

@@ -89,16 +89,10 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "dfrobot/DFRobotDFPlayerMini @ ^1.0.5"
         ],
-        "esp32_4mb4f": [
+        "esp82*": [
-            "dfrobot/DFRobotDFPlayerMini @ ^1.0.5"
-        ],
-        "esp32cam_4mb": [
-            "dfrobot/DFRobotDFPlayerMini @ ^1.0.5"
-        ],
-        "esp8266_4mb": [
             "dfrobot/DFRobotDFPlayerMini @ ^1.0.5"
         ]
     }

src/modules/exec/Multitouch/modinfo.json

@@ -43,15 +43,7 @@
   },
   "defActive": true,
   "usedLibs": {
-    "esp32_4mb": [],
+    "esp32*": [],
-    "esp32_4mb3f": [],
+    "esp82*": []
-    "esp32cam_4mb": [],
-    "esp8266_4mb": [],
-    "esp8266_1mb": [],
-    "esp8266_1mb_ota": [],
-    "esp8285_1mb": [],
-    "esp8285_1mb_ota": [],
-    "esp8266_2mb": [],
-    "esp8266_2mb_ota": []
   }
 }

src/modules/exec/MySensors/modinfo.json

@@ -49,8 +49,6 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": []
-        "esp32_4mb3f": [],
-        "esp32cam_4mb": []
     }
 }

src/modules/exec/Pcf8574/modinfo.json

@@ -32,34 +32,10 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "adafruit/Adafruit BusIO @ ^1.13.2"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp32cam_4mb": [
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_4mb": [
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_1mb": [
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_1mb_ota": [
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8285_1mb": [
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8285_1mb_ota": [
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_2mb": [
-            "adafruit/Adafruit BusIO @ ^1.13.2"
-        ],
-        "esp8266_2mb_ota": [
             "adafruit/Adafruit BusIO @ ^1.13.2"
         ]
     }

src/modules/exec/Pcf8591/modinfo.json

@@ -41,34 +41,10 @@
     "defActive": false,
     "usedLibs": {
 
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/adafruit/Adafruit_PCF8591"
         ],
-        "esp32_16mb": [
+        "esp82*": [
-            "https://github.com/adafruit/Adafruit_PCF8591"
-        ],
-        "esp8266_4mb": [
-            "https://github.com/adafruit/Adafruit_PCF8591"
-        ],
-        "esp8266_16mb": [
-            "https://github.com/adafruit/Adafruit_PCF8591"
-        ],
-        "esp8266_1mb": [
-            "https://github.com/adafruit/Adafruit_PCF8591"
-        ],
-        "esp8266_1mb_ota": [
-            "https://github.com/adafruit/Adafruit_PCF8591"
-        ],
-        "esp8285_1mb": [
-            "https://github.com/adafruit/Adafruit_PCF8591"
-        ],
-        "esp8285_1mb_ota": [
-            "https://github.com/adafruit/Adafruit_PCF8591"
-        ],
-        "esp8266_2mb": [
-            "https://github.com/adafruit/Adafruit_PCF8591"
-        ],
-        "esp8266_2mb_ota": [
             "https://github.com/adafruit/Adafruit_PCF8591"
         ]
     }

src/modules/exec/Pwm32/modinfo.json

@@ -44,8 +44,6 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": []
-        "esp32_4mb3f": [],
-        "esp32cam_4mb": []
     }
 }

src/modules/exec/Pwm8266/modinfo.json

@@ -40,12 +40,6 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp8266_4mb": [],
+        "esp82*": []
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/exec/SDcard/modinfo.json

@@ -32,13 +32,7 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
-            "espressif/esp32-camera @ ^2.0.0"
-        ],
-        "esp32_4mb3f": [
-            "espressif/esp32-camera @ ^2.0.0"
-        ],
-        "esp32cam_4mb": [
             "espressif/esp32-camera @ ^2.0.0"
         ]
     }

src/modules/exec/SysExt/modinfo.json

@@ -32,9 +32,7 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp8266_4mb": []
     }
 }

src/modules/exec/Telegram/modinfo.json

@@ -55,16 +55,7 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
-            "CTBot @2.1.9"
-        ],
-        "esp32_4mb3f": [
-            "CTBot @2.1.9"
-        ],
-        "esp32cam_4mb": [
-            "CTBot @2.1.9"
-        ],
-        "esp32_16mb": [
             "CTBot @2.1.9"
         ],
         "esp8266_4mb": [

src/modules/exec/TelegramLT/modinfo.json

@@ -51,19 +51,7 @@
   },
   "defActive": true,
   "usedLibs": {
-    "esp32_4mb": [],
+    "esp32*": [],
-    "esp32_4mb3f": [],
+    "esp82*": []
-    "esp32cam_4mb": [],
-    "esp32_16mb": [],
-    "esp32s2_4mb": [],
-    "esp32c3m_4mb":[],
-    "esp8266_4mb": [],
-    "esp8266_16mb": [],
-    "esp8266_1mb": [],
-    "esp8266_1mb_ota": [],
-    "esp8285_1mb": [],
-    "esp8285_1mb_ota": [],
-    "esp8266_2mb": [],
-    "esp8266_2mb_ota": []
   }
 }

src/modules/exec/Telegram_v2/modinfo.json

@@ -124,19 +124,7 @@
     "defActive": false,
 
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
-            "gyverlibs/FastBot"
-        ],
-        "esp32_4mb3f": [
-            "gyverlibs/FastBot"
-        ],
-        "esp32cam_4mb": [
-            "gyverlibs/FastBot"
-        ],
-        "esp32s2_4mb": [
-            "gyverlibs/FastBot"
-        ],
-        "esp32_16mb": [
             "gyverlibs/FastBot"
         ],
         "esp8266_4mb": [

src/modules/exec/Thermostat/modinfo.json

@@ -134,15 +134,7 @@
   },
   "defActive": false,
   "usedLibs": {
-    "esp32_4mb": [],
+    "esp32*": [],
-    "esp32_4mb3f": [],
+    "esp82*": []
-    "esp32cam_4mb": [],
-    "esp8266_4mb": [],
-    "esp8266_1mb": [],
-    "esp8266_1mb_ota": [],
-    "esp8285_1mb": [],
-    "esp8285_1mb_ota": [],
-    "esp8266_2mb": [],
-    "esp8266_2mb_ota": []
   }
 }

src/modules/sensors/A02Distance/modinfo.json

@@ -37,14 +37,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],        
+        "esp82*": []
-        "esp8266_4mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/sensors/Acs712/modinfo.json

@@ -41,16 +41,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32s2_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/sensors/Ads1115/modinfo.json

@@ -41,16 +41,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "adafruit/Adafruit ADS1X15 @ ^2.3.0"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "adafruit/Adafruit ADS1X15 @ ^2.3.0"
-        ],
-        "esp32cam_4mb": [
-            "adafruit/Adafruit ADS1X15 @ ^2.3.0"
-        ],
-        "esp8266_4mb": [
             "adafruit/Adafruit ADS1X15 @ ^2.3.0"
         ]
     }

src/modules/sensors/AhtXX/modinfo.json

@@ -56,28 +56,10 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/enjoyneering/AHTxx.git"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "https://github.com/enjoyneering/AHTxx.git"
-        ],
-        "esp32cam_4mb": [
-            "https://github.com/enjoyneering/AHTxx.git"
-        ],
-        "esp8266_4mb": [
-            "https://github.com/enjoyneering/AHTxx.git"
-        ],
-        "esp8266_1mb": [
-            "https://github.com/enjoyneering/AHTxx.git"
-        ],
-        "esp8266_1mb_ota": [
-            "https://github.com/enjoyneering/AHTxx.git"
-        ],
-        "esp8285_1mb": [
-            "https://github.com/enjoyneering/AHTxx.git"
-        ],
-        "esp8285_1mb_ota": [
             "https://github.com/enjoyneering/AHTxx.git"
         ]
     }

src/modules/sensors/AnalogAdc/modinfo.json

@@ -41,15 +41,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/sensors/BH_1750/modinfo.json

@@ -34,16 +34,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "BH1750"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "BH1750"
-        ],
-        "esp32cam_4mb": [
-            "BH1750"
-        ],
-        "esp8266_4mb": [
             "BH1750"
         ]
     }

src/modules/sensors/Ble/modinfo.json

@@ -64,23 +64,11 @@
   },
   "defActive": false,
   "usedLibs": {
-    "esp32_4mb": [
+    "esp32*": [
       "https://github.com/Mit4el/NimBLE-Arduino.git"
     ],
-    "esp32_16mb": [
+    "esp32s2_4mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
+      "exclude"
-    ],
-    "esp32_4mb3f": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
-    ],
-    "esp32cam_4mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
-    ],
-    "esp32s3_16mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
-    ],
-    "esp32c3m_4mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
     ]
   }
 }

src/modules/sensors/Ble_part1/modinfo.json

@@ -64,23 +64,11 @@
   },
   "defActive": false,
   "usedLibs": {
-    "esp32_4mb": [
+    "esp32*": [
       "https://github.com/Mit4el/NimBLE-Arduino.git"
     ],
-    "esp32_16mb": [
+    "esp32s2_4mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
+      "exclude"
-    ],
-    "esp32_4mb3f": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
-    ],
-    "esp32cam_4mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
-    ],
-    "esp32s3_16mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
-    ],
-    "esp32c3m_4mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
     ]
   }
 }

src/modules/sensors/Ble_part2/modinfo.json

@@ -64,23 +64,11 @@
   },
   "defActive": false,
   "usedLibs": {
-    "esp32_4mb": [
+    "esp32*": [
       "https://github.com/Mit4el/NimBLE-Arduino.git"
     ],
-    "esp32_16mb": [
+    "esp32s2_4mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
+      "exclude"
-    ],
-    "esp32_4mb3f": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
-    ],
-    "esp32cam_4mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
-    ],
-    "esp32s3_16mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
-    ],
-    "esp32c3m_4mb": [
-      "https://github.com/Mit4el/NimBLE-Arduino.git"
     ]
   }
 }

src/modules/sensors/Bme280/modinfo.json

@@ -80,37 +80,10 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "adafruit/Adafruit BME280 Library"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "adafruit/Adafruit BME280 Library"
-        ],
-        "esp32cam_4mb": [
-            "adafruit/Adafruit BME280 Library"
-        ],
-        "esp32c3m_4mb":[
-            "adafruit/Adafruit BME280 Library"
-        ],
-        "esp8266_4mb": [
-            "adafruit/Adafruit BME280 Library"
-        ],
-        "esp8266_1mb": [
-            "adafruit/Adafruit BME280 Library"
-        ],
-        "esp8266_1mb_ota": [
-            "adafruit/Adafruit BME280 Library"
-        ],
-        "esp8285_1mb": [
-            "adafruit/Adafruit BME280 Library"
-        ],
-        "esp8285_1mb_ota": [
-            "adafruit/Adafruit BME280 Library"
-        ],
-        "esp8266_2mb": [
-            "adafruit/Adafruit BME280 Library"
-        ],
-        "esp8266_2mb_ota": [
             "adafruit/Adafruit BME280 Library"
         ]
     }

src/modules/sensors/Bmp280/modinfo.json

@@ -52,34 +52,10 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "adafruit/Adafruit BMP280 Library"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "adafruit/Adafruit BMP280 Library"
-        ],
-        "esp32cam_4mb": [
-            "adafruit/Adafruit BMP280 Library"
-        ],
-        "esp8266_4mb": [
-            "adafruit/Adafruit BMP280 Library"
-        ],
-        "esp8266_1mb": [
-            "adafruit/Adafruit BMP280 Library"
-        ],
-        "esp8266_1mb_ota": [
-            "adafruit/Adafruit BMP280 Library"
-        ],
-        "esp8285_1mb": [
-            "adafruit/Adafruit BMP280 Library"
-        ],
-        "esp8285_1mb_ota": [
-            "adafruit/Adafruit BMP280 Library"
-        ],
-        "esp8266_2mb": [
-            "adafruit/Adafruit BMP280 Library"
-        ],
-        "esp8266_2mb_ota": [
             "adafruit/Adafruit BMP280 Library"
         ]
     }

src/modules/sensors/DS2401/modinfo.json

@@ -35,15 +35,7 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/sensors/Dht1122/modinfo.json

@@ -52,16 +52,10 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "beegee-tokyo/DHT sensor library for ESPx"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "beegee-tokyo/DHT sensor library for ESPx"
-        ],
-        "esp32cam_4mb": [
-            "beegee-tokyo/DHT sensor library for ESPx"
-        ],
-        "esp8266_4mb": [
             "beegee-tokyo/DHT sensor library for ESPx"
         ]
     }

src/modules/sensors/Ds18b20/modinfo.json

@@ -39,34 +39,10 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/milesburton/Arduino-Temperature-Control-Library"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "https://github.com/milesburton/Arduino-Temperature-Control-Library"
-        ],
-        "esp32cam_4mb": [
-            "https://github.com/milesburton/Arduino-Temperature-Control-Library"
-        ],
-        "esp8266_4mb": [
-            "https://github.com/milesburton/Arduino-Temperature-Control-Library"
-        ],
-        "esp8266_1mb": [
-            "https://github.com/milesburton/Arduino-Temperature-Control-Library"
-        ],
-        "esp8266_1mb_ota": [
-            "https://github.com/milesburton/Arduino-Temperature-Control-Library"
-        ],
-        "esp8285_1mb": [
-            "https://github.com/milesburton/Arduino-Temperature-Control-Library"
-        ],
-        "esp8285_1mb_ota": [
-            "https://github.com/milesburton/Arduino-Temperature-Control-Library"
-        ],
-        "esp8266_2mb": [
-            "https://github.com/milesburton/Arduino-Temperature-Control-Library"
-        ],
-        "esp8266_2mb_ota": [
             "https://github.com/milesburton/Arduino-Temperature-Control-Library"
         ]
     }

src/modules/sensors/Ds2423/modinfo.json

@@ -60,19 +60,11 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/jbechter/arduino-onewire-DS2423",
             "paulstoffregen/OneWire @ ^2.3.7"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "https://github.com/jbechter/arduino-onewire-DS2423",
-            "paulstoffregen/OneWire @ ^2.3.7"
-        ],
-        "esp32cam_4mb": [
-            "https://github.com/jbechter/arduino-onewire-DS2423",
-            "paulstoffregen/OneWire @ ^2.3.7"
-        ],
-        "esp8266_4mb": [
             "https://github.com/jbechter/arduino-onewire-DS2423",
             "paulstoffregen/OneWire @ ^2.3.7"
         ]

src/modules/sensors/Emon/modinfo.json

@@ -59,16 +59,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "openenergymonitor/EmonLib@1.1.0"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "openenergymonitor/EmonLib@1.1.0"
-        ],
-        "esp32cam_4mb": [
-            "openenergymonitor/EmonLib@1.1.0"
-        ],
-        "esp8266_4mb": [
             "openenergymonitor/EmonLib@1.1.0"
         ]
     }

src/modules/sensors/ExampleModule/modinfo.json

@@ -75,16 +75,7 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32s2_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/sensors/ExternalMQTT/modinfo.json

@@ -50,16 +50,7 @@
   },
   "defActive": false,
   "usedLibs": {
-    "esp32_4mb": [],
+    "esp32*": [],
-    "esp32_4mb3f": [],
+    "esp82*": []
-    "esp32s2_4mb": [],
-    "esp32cam_4mb": [],
-    "esp8266_4mb": [],
-    "esp8266_1mb": [],
-    "esp8266_1mb_ota": [],
-    "esp8285_1mb": [],
-    "esp8285_1mb_ota": [],
-    "esp8266_2mb": [],
-    "esp8266_2mb_ota": []
   }
 }

src/modules/sensors/FreqMeter/modinfo.json

@@ -84,16 +84,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "kosme/arduinoFFT@^1.5.6"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "kosme/arduinoFFT@^1.5.6"
-        ],
-        "esp32cam_4mb": [
-            "kosme/arduinoFFT@^1.5.6"
-        ],
-        "esp8266_4mb": [
             "kosme/arduinoFFT@^1.5.6"
         ]
     }

src/modules/sensors/GY21/modinfo.json

@@ -49,16 +49,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/JonasGMorsch/GY-21.git"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "https://github.com/JonasGMorsch/GY-21.git"
-        ],
-        "esp32cam_4mb": [
-            "https://github.com/JonasGMorsch/GY-21.git"
-        ],
-        "esp8266_4mb": [
             "https://github.com/JonasGMorsch/GY-21.git"
         ]
     }

src/modules/sensors/Hdc1080/modinfo.json

@@ -52,16 +52,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "ClosedCube HDC1080"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "ClosedCube HDC1080"
-        ],
-        "esp32cam_4mb": [
-            "ClosedCube HDC1080"
-        ],
-        "esp8266_4mb": [
             "ClosedCube HDC1080"
         ]
     }

src/modules/sensors/Hx710/modinfo.json

@@ -46,16 +46,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/kurimawxx00/hx710B_pressure_sensor"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "https://github.com/kurimawxx00/hx710B_pressure_sensor"
-        ],
-        "esp32cam_4mb": [
-            "https://github.com/kurimawxx00/hx710B_pressure_sensor"
-        ],
-        "esp8266_4mb": [
             "https://github.com/kurimawxx00/hx710B_pressure_sensor"
         ]
     }

src/modules/sensors/Hx711/modinfo.json

@@ -61,16 +61,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "GyverHX711@1.2"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "GyverHX711@1.2"
-        ],
-        "esp32cam_4mb": [
-            "GyverHX711@1.2"
-        ],
-        "esp8266_4mb": [
             "GyverHX711@1.2"
         ]
     }

src/modules/sensors/Impulse/modinfo.json

@@ -40,13 +40,7 @@
   },
   "defActive": true,
   "usedLibs": {
-    "esp32_4mb": [],
+    "esp32*": [],
-    "esp32_4mb3f": [],
+    "esp82*": []
-    "esp32cam_4mb": [],
-    "esp8266_4mb": [],
-    "esp8266_1mb": [],
-    "esp8266_1mb_ota": [],
-    "esp8285_1mb": [],
-    "esp8285_1mb_ota": []
   }
 }

src/modules/sensors/Ina219/modinfo.json

@@ -119,22 +119,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/GyverLibs/GyverINA"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "https://github.com/GyverLibs/GyverINA"
-        ],
-        "esp32cam_4mb": [
-            "https://github.com/GyverLibs/GyverINA"
-        ],
-        "esp32s2_4mb": [
-            "https://github.com/GyverLibs/GyverINA"
-        ],
-        "esp8266_4mb": [
-            "https://github.com/GyverLibs/GyverINA"
-        ],
-        "esp8266_16mb": [
             "https://github.com/GyverLibs/GyverINA"
         ]
     }

src/modules/sensors/Ina226/modinfo.json

@@ -119,22 +119,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "https://github.com/GyverLibs/GyverINA"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "https://github.com/GyverLibs/GyverINA"
-        ],
-        "esp32cam_4mb": [
-            "https://github.com/GyverLibs/GyverINA"
-        ],
-        "esp32s2_4mb": [
-            "https://github.com/GyverLibs/GyverINA"
-        ],
-        "esp8266_4mb": [
-            "https://github.com/GyverLibs/GyverINA"
-        ],
-        "esp8266_16mb": [
             "https://github.com/GyverLibs/GyverINA"
         ]
     }

src/modules/sensors/IoTWiegand/modinfo.json

@@ -36,13 +36,7 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
-            "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino"
-        ],
-        "esp32_4mb3f": [
-            "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino"
-        ],
-        "esp32cam_4mb": [
             "https://github.com/jpliew/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino"
         ],
         "esp8266_4mb": [

src/modules/sensors/Max6675/modinfo.json

@@ -38,13 +38,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "adafruit/MAX6675 library"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "adafruit/MAX6675 library"
-        ],
-        "esp8266_4mb": [
             "adafruit/MAX6675 library"
         ]
     }

src/modules/sensors/Mhz19/modinfo.json

@@ -78,10 +78,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp32s2_4mb": [
-        "esp32s2_4mb": [],
+            "plerup/EspSoftwareSerial"
-        "esp32cam_4mb": [],
+        ],
-        "esp8266_4mb": []
+        "esp82*": []
     }
 }

src/modules/sensors/Ntc/modinfo.json

@@ -50,15 +50,7 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/sensors/Pzem004t/modinfo.json

@@ -125,17 +125,9 @@
             "reset": "Поставьте этот параметр равным 1 и pzem будет сброшен к нулю. Смотрите в логе результат: [i] Pzem reset done"
         }
     },
-    "defActive": true,
+    "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/sensors/RCswitch/modinfo.json

@@ -61,34 +61,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "rc-switch @ ^2.6.4"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "rc-switch @ ^2.6.4"
-        ],
-        "esp32cam_4mb": [
-            "rc-switch @ ^2.6.4"
-        ],
-        "esp8266_4mb": [
-            "rc-switch @ ^2.6.4"
-        ],
-        "esp8266_1mb": [
-            "rc-switch @ ^2.6.4"
-        ],
-        "esp8266_1mb_ota": [
-            "rc-switch @ ^2.6.4"
-        ],
-        "esp8285_1mb": [
-            "rc-switch @ ^2.6.4"
-        ],
-        "esp8285_1mb_ota": [
-            "rc-switch @ ^2.6.4"
-        ],
-        "esp8266_2mb": [
-            "rc-switch @ ^2.6.4"
-        ],
-        "esp8266_2mb_ota": [
             "rc-switch @ ^2.6.4"
         ]
     }

src/modules/sensors/RTC/modinfo.json

@@ -80,15 +80,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/sensors/S8/S8.cpp

@@ -6,12 +6,14 @@
 #define R_LEN 7
 #define C_LEN 8
 
-byte cmd_s8[8]        = {0xFE, 0x04, 0x00, 0x03, 0x00, 0x01, 0xD5, 0xC5};
+
-//byte abc_s8[8]        = {0xFE, 0x03, 0x00, 0x1F, 0x00, 0x01, 0xA1, 0xC3};
 
 
 class S8co : public IoTItem {
   private:
+    byte cmd_s8[8]        = {0xFE, 0x04, 0x00, 0x03, 0x00, 0x01, 0xD5, 0xC5};
+    //byte abc_s8[8]        = {0xFE, 0x03, 0x00, 0x1F, 0x00, 0x01, 0xA1, 0xC3};
+
     SoftwareSerial* s8Serial;
 
     unsigned int _s8_co2;
@@ -24,6 +26,11 @@ class S8co : public IoTItem {
     byte _response_s8[7]   = {0, 0, 0, 0, 0, 0, 0};
 
     void s8Request(byte cmd[]) {
+      if (!s8Serial) {
+        SerialPrint("E", "Sensor S8_uart", "Serial not found!");
+        return;
+      }
+
       while(!s8Serial->available()) {
         s8Serial->write(cmd, C_LEN); 
         delay(50); 
@@ -45,7 +52,7 @@ class S8co : public IoTItem {
         _response_s8[i] = s8Serial->read(); 
       }
       
-      s8Serial->end();
+      //s8Serial->end();
     }                     
 
     void co2_measure() {

src/modules/sensors/S8/modinfo.json

@@ -2,6 +2,7 @@
     "menuSection": "sensors",
     "configItem": [
         {
+            "global": 0,
             "name": "(S8) Cенсор качества воздуха",
             "num": 3,
             "type": "Reading",
@@ -35,8 +36,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp8266_4mb": []
     }
 }

src/modules/sensors/Scd40/modinfo.json

@@ -70,19 +70,11 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "Sensirion I2C SCD4x @0.4.0",
             "Sensirion Core @0.6.0"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "Sensirion I2C SCD4x @0.4.0",
-            "Sensirion Core @0.6.0"
-        ],
-        "esp32cam_4mb": [
-            "Sensirion I2C SCD4x @0.4.0",
-            "Sensirion Core @0.6.0"            
-        ],
-        "esp8266_4mb": [
             "Sensirion I2C SCD4x @0.4.0",
             "Sensirion Core @0.6.0"
         ]

src/modules/sensors/Sds011/modinfo.json

@@ -66,16 +66,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "Nova Fitness Sds dust sensors library@1.5.1"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "Nova Fitness Sds dust sensors library@1.5.1"
-        ],
-        "esp32cam_4mb": [
-            "Nova Fitness Sds dust sensors library@1.5.1"
-        ],
-        "esp8266_4mb": [
             "Nova Fitness Sds dust sensors library@1.5.1"
         ]
     }

src/modules/sensors/Sgp30/modinfo.json

@@ -48,34 +48,10 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
-        ],
-        "esp32cam_4mb": [
-            "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
-        ],
-        "esp8266_4mb": [
-            "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
-        ],
-        "esp8266_1mb": [
-            "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
-        ],
-        "esp8266_1mb_ota": [
-            "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
-        ],
-        "esp8285_1mb": [
-            "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
-        ],
-        "esp8285_1mb_ota": [
-            "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
-        ],
-        "esp8266_2mb": [
-            "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
-        ],
-        "esp8266_2mb_ota": [
             "sparkfun/SparkFun SGP30 Arduino Library@^1.0.5"
         ]
     }

src/modules/sensors/Sht20/modinfo.json

@@ -49,31 +49,10 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "robtillaart/SHT2x@^0.1.1"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "robtillaart/SHT2x@^0.1.1"
-        ],
-        "esp8266_4mb": [
-            "robtillaart/SHT2x@^0.1.1"
-        ],
-        "esp8266_1mb": [
-            "robtillaart/SHT2x@^0.1.1"
-        ],
-        "esp8266_1mb_ota": [
-            "robtillaart/SHT2x@^0.1.1"
-        ],
-        "esp8285_1mb": [
-            "robtillaart/SHT2x@^0.1.1"
-        ],
-        "esp8285_1mb_ota": [
-            "robtillaart/SHT2x@^0.1.1"
-        ],
-        "esp8266_2mb": [
-            "robtillaart/SHT2x@^0.1.1"
-        ],
-        "esp8266_2mb_ota": [
             "robtillaart/SHT2x@^0.1.1"
         ]
     }

src/modules/sensors/Sht30/modinfo.json

@@ -49,34 +49,10 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "WEMOS SHT3x@1.0.0"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "WEMOS SHT3x@1.0.0"
-        ],
-        "esp32cam_4mb": [
-            "WEMOS SHT3x@1.0.0"
-        ],
-        "esp8266_4mb": [
-            "WEMOS SHT3x@1.0.0"
-        ],
-        "esp8266_1mb": [
-            "WEMOS SHT3x@1.0.0"
-        ],
-        "esp8266_1mb_ota": [
-            "WEMOS SHT3x@1.0.0"
-        ],
-        "esp8285_1mb": [
-            "WEMOS SHT3x@1.0.0"
-        ],
-        "esp8285_1mb_ota": [
-            "WEMOS SHT3x@1.0.0"
-        ],
-        "esp8266_2mb": [
-            "WEMOS SHT3x@1.0.0"
-        ],
-        "esp8266_2mb_ota": [
             "WEMOS SHT3x@1.0.0"
         ]
     }

src/modules/sensors/Sonar/modinfo.json

@@ -37,15 +37,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/sensors/UART/modinfo.json

@@ -74,34 +74,10 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
             "plerup/EspSoftwareSerial"
         ],
-        "esp32_4mb3f": [
+        "esp82*": [
-            "plerup/EspSoftwareSerial"
-        ],
-        "esp32cam_4mb": [
-            "plerup/EspSoftwareSerial"
-        ],
-        "esp8266_4mb": [
-            "plerup/EspSoftwareSerial"
-        ],
-        "esp8266_1mb": [
-            "plerup/EspSoftwareSerial"
-        ],
-        "esp8266_1mb_ota": [
-            "plerup/EspSoftwareSerial"
-        ],
-        "esp8266_2mb": [
-            "plerup/EspSoftwareSerial"
-        ],
-        "esp8266_2mb_ota": [
-            "plerup/EspSoftwareSerial"
-        ],
-        "esp8285_1mb": [
-            "plerup/EspSoftwareSerial"
-        ],
-        "esp8285_1mb_ota": [
             "plerup/EspSoftwareSerial"
         ]
     }

src/modules/sensors/ld2410/modinfo.json

@@ -85,10 +85,7 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [
+        "esp32*": [
-            "ncmreynolds/ld2410@^0.1.3"
-        ],
-        "esp32_4mb3f": [
             "ncmreynolds/ld2410@^0.1.3"
         ]
     }

src/modules/virtual/Cron/modinfo.json

@@ -49,20 +49,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32_16mb": [],
-        "esp32s2_4mb": [],
-        "esp32s3_16mb": [],
-        "esp32c3m_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_16mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/virtual/GoogleSheet/modinfo.json

@@ -58,12 +58,7 @@
     },
     "defActive": false,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32s2_4mb": [],
-        "esp32s3_16mb": [],
-        "esp32c3m_4mb": [],
-        "esp8266_4mb": []
     }
 }

src/modules/virtual/Loging/modinfo.json

@@ -50,20 +50,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32_16mb": [],
-        "esp32s2_4mb": [],
-        "esp32s3_16mb": [],
-        "esp32c3m_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_16mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/virtual/LogingDaily/modinfo.json

@@ -43,20 +43,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32_16mb": [],
-        "esp32s2_4mb": [],
-        "esp32s3_16mb": [],
-        "esp32c3m_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_16mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/virtual/Math/Math.cpp

@@ -31,6 +31,18 @@ private:
         return mktime(&t);
     }
 
+    bool nowInTimePeriod(String startTime, String endTime) {
+        int h1 = selectToMarker(startTime, ":").toInt();
+        int min1 = selectToMarkerLast(startTime, ":").toInt();
+        int h2 = selectToMarker(endTime, ":").toInt();
+        int min2 = selectToMarkerLast(endTime, ":").toInt();
+
+        int nowMinutes = _time_local.hour * 60 + _time_local.minute;
+
+        return nowMinutes >= h1 * 60 + min1 && nowMinutes <= h2 * 60 + min2;
+    }
+
+
 public:
     IoTMath(String parameters) : IoTItem(parameters) {}
 
@@ -42,7 +54,7 @@ public:
             //SerialPrint("i", F("IoTMath"), F("Mapping value done."));
             return valTmp;
         } else if(command == "convertTime" && param.size() == 5) {
-            time_t unixTime = convertTime(param[0].valD, param[1].valD, param[2].valD, param[3].valD, param[4].valD);
+            uint32_t unixTime = convertTime(param[0].valD, param[1].valD, param[2].valD, param[3].valD, param[4].valD);
 
             if (unixTime == -1) {
                 SerialPrint("E", F("IoTMath"), F("Failed to convert time."));
@@ -51,8 +63,12 @@ public:
 
             IoTValue valTmp;
             valTmp.isDecimal = true;
-            valTmp.valD = unixTime;
+            valTmp.valD = static_cast< float > (unixTime);
-            //SerialPrint("i", F("IoTMath"), F("Time conversion done."));
+            return valTmp;
+        } else if(command == "nowInTimePeriod" && param.size() == 2) {
+            IoTValue valTmp;
+            valTmp.isDecimal = true;
+            valTmp.valD = nowInTimePeriod(param[0].valS, param[1].valS); 
             return valTmp;
         }
 

src/modules/virtual/Math/TimerRelay.json

@@ -0,0 +1,258 @@
+{
+    "mark": "iotm",
+    "config": [
+        {
+            "global": 0,
+            "type": "Writing",
+            "subtype": "ButtonOut",
+            "needSave": "1",
+            "id": "rel1",
+            "widget": "toggle",
+            "page": "Свет 1",
+            "descr": " Реле 1",
+            "int": 0,
+            "inv": "1",
+            "pin": "32"
+        },
+        {
+            "global": 0,
+            "type": "Writing",
+            "subtype": "ButtonOut",
+            "needSave": "1",
+            "id": "rel2",
+            "widget": "toggle",
+            "page": "Свет 2",
+            "descr": " Реле 2",
+            "int": 0,
+            "inv": "1",
+            "pin": "33"
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "RTC",
+            "id": "rtc",
+            "widget": "anydataDef",
+            "page": "Система",
+            "descr": "Время",
+            "chipCode": "3",
+            "timeFormat": "d-m-Y H:i:s",
+            "RST": -1,
+            "CLK": -1,
+            "DAT": -1,
+            "ticker": 0,
+            "int": 5,
+            "btn-setUTime": "0",
+            "btn-setSysTime": "nil"
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "AnalogBtn",
+            "id": "btn1",
+            "widget": "nil",
+            "page": "Свет 1",
+            "descr": "Кнопка 1",
+            "pin": "34",
+            "aValue": 0,
+            "delta": 50
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "AnalogBtn",
+            "id": "btn2",
+            "widget": "nil",
+            "page": "Свет 2",
+            "descr": "Кнопка 2",
+            "pin": "34",
+            "aValue": "1910",
+            "delta": 50
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "IoTMath",
+            "id": "math",
+            "widget": "anydataValue",
+            "page": "Математика",
+            "descr": ""
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "start11",
+            "needSave": "1",
+            "widget": "inputTm",
+            "page": "Свет 1",
+            "descr": " Старт 1",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "stop11",
+            "needSave": "1",
+            "widget": "inputTm",
+            "page": "Свет 1",
+            "descr": " Стоп 1",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "start12",
+            "needSave": "1",
+            "widget": "inputTm",
+            "page": "Свет 1",
+            "descr": "Старт 2",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "stop12",
+            "needSave": "1",
+            "widget": "inputTm",
+            "page": "Свет 1",
+            "descr": "Стоп 2",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "start21",
+            "needSave": "1",
+            "widget": "inputTm",
+            "page": "Свет 2",
+            "descr": " Старт 1",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "stop21",
+            "needSave": "1",
+            "widget": "inputTm",
+            "page": "Свет 2",
+            "descr": " Стоп 1",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "start22",
+            "needSave": "1",
+            "widget": "inputTm",
+            "page": "Свет 2",
+            "descr": "Старт 2",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "Variable",
+            "id": "stop22",
+            "needSave": "1",
+            "widget": "inputTm",
+            "page": "Свет 2",
+            "descr": "Стоп 2",
+            "int": "0",
+            "val": "0.0",
+            "map": "1024,1024,1,100",
+            "plus": 0,
+            "multiply": 1,
+            "round": 0
+        },
+        {
+            "global": 0,
+            "type": "Writing",
+            "subtype": "Cron",
+            "id": "timer",
+            "widget": "anydataRed",
+            "page": "Система",
+            "descr": "Будильник",
+            "int": 1,
+            "val": "0 * * * * *",
+            "formatNextAlarm": "%H:%M:%S",
+            "needSave": 0
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "VButton",
+            "id": "rel1on",
+            "needSave": "1",
+            "widget": "toggle",
+            "page": "Свет 1",
+            "descr": " Работать",
+            "int": "0",
+            "val": "0"
+        },
+        {
+            "global": 0,
+            "type": "Reading",
+            "subtype": "VButton",
+            "id": "rel2on",
+            "needSave": "1",
+            "widget": "toggle",
+            "page": "Свет 2",
+            "descr": " Работать",
+            "int": "0",
+            "val": "0"
+        }
+    ]
+}
+
+scenario=>if btn1>0 then rel1 = 1- rel1
+if btn2>0 then rel2 = 1- rel2
+
+if timer == 0 | start11 | stop11 | start12 | stop12 | start21 | stop21 | start22 | stop22 then {
+if rel1on then 
+if math.nowInTimePeriod(start11, stop11) | math.nowInTimePeriod(start12, stop12) then rel1=1 else rel1=0
+
+if rel2on then 
+if math.nowInTimePeriod(start21, stop21) | math.nowInTimePeriod(start22, stop22) then rel2=1 else rel2=0
+}

src/modules/virtual/Math/modinfo.json

@@ -38,25 +38,24 @@
             },
             {
                 "name": "convertTime",
-                "descr": "Перевести время из формата d-m-Y H:i:s например, 13-08-2023 16:24:00  в юникс-время ",
+                "descr": "Перевести время из формата d-m-Y H:i:s например, 13-08-2023 16:24:00  в юникс-время",
                 "params": [
                     "tm.convertTime(13, 08, 2023, 16, 24); - передаем пять целых чисел. секунды подставятся в ноль"
                 ]
+            },
+            {
+                "name": "nowInTimePeriod",
+                "descr": "Проверяет входит ли текущее время в указанный период. Возвращает 1 если входит, 0 если нет.",
+                "params": [
+                    "Начало периода в формате HH:MM",
+                    "Конец периода в формате HH:MM"
+                ]
             }
         ]
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32s2_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/virtual/Timer/modinfo.json

@@ -73,20 +73,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32_16mb": [],
-        "esp32s2_4mb": [],
-        "esp32s3_16mb": [],
-        "esp32c3m_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_16mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/virtual/VButton/modinfo.json

@@ -35,20 +35,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32_16mb": [],
-        "esp32s2_4mb": [],
-        "esp32s3_16mb": [],
-        "esp32c3m_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_16mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/virtual/Variable/modinfo.json

@@ -95,20 +95,7 @@
     },
     "defActive": true,
     "usedLibs": {
-        "esp32_4mb": [],
+        "esp32*": [],
-        "esp32_4mb3f": [],
+        "esp82*": []
-        "esp32cam_4mb": [],
-        "esp32_16mb": [],
-        "esp32s2_4mb": [],
-        "esp32s3_16mb": [],
-        "esp32c3m_4mb": [],
-        "esp8266_4mb": [],
-        "esp8266_16mb": [],
-        "esp8266_1mb": [],
-        "esp8266_1mb_ota": [],
-        "esp8285_1mb": [],
-        "esp8285_1mb_ota": [],
-        "esp8266_2mb": [],
-        "esp8266_2mb_ota": []
     }
 }

src/modules/virtual/Weather/modinfo.json

@@ -39,20 +39,7 @@
   },
   "defActive": false,
   "usedLibs": {
-    "esp32_4mb": [],
+    "esp32*": [],
-    "esp32_4mb3f": [],
+    "esp82*": []
-    "esp32cam_4mb": [],
-    "esp32_16mb": [],
-    "esp32s2_4mb": [],
-    "esp32s3_16mb": [],
-    "esp32c3m_4mb": [],
-    "esp8266_4mb": [],
-    "esp8266_16mb": [],
-    "esp8266_1mb": [],
-    "esp8266_1mb_ota": [],
-    "esp8285_1mb": [],
-    "esp8285_1mb_ota": [],
-    "esp8266_2mb": [],
-    "esp8266_2mb_ota": []
   }
 }

src/modules/virtual/owmWeather/modinfo.json

@@ -87,19 +87,7 @@
   "defActive": true,
 
   "usedLibs": {
-    "esp32_4mb": [],
+    "esp32*": [],
-    "esp32_4mb3f": [],
+    "esp82*": []
-    "esp32s2_4mb": [],
-    "esp32_16mb": [],
-    "esp32s3_16mb": [],
-    "esp32c3m_4mb": [],
-    "esp8266_4mb": [],
-    "esp8266_16mb": [],    
-    "esp8266_1mb": [],
-    "esp8266_1mb_ota": [],
-    "esp8285_1mb": [],
-    "esp8285_1mb_ota": [],
-    "esp8266_2mb": [],
-    "esp8266_2mb_ota": []
   }
 }