Merge pull request #160 from biveraxe/ver4dev

Убираем нумерацию папок модулей

data_svelte/items.json

@@ -4,363 +4,43 @@
         "num": 0
     },
     {
-        "header": "Виртуальные элементы"
+        "header": "Экраны"
     },
     {
-        "name": "1. Таймер",
-        "type": "Writing",
-        "subtype": "Timer",
-        "id": "timer",
+        "name": "1. LCD экран 2004",
+        "type": "Reading",
+        "subtype": "Lcd2004",
+        "id": "Lcd",
         "widget": "",
         "page": "",
-        "descr": "",
-        "int": 1,
-        "countDown": 15,
-        "ticker": 0,
-        "repeat": 0,
-        "needSave": 0,
+        "descr": "T",
+        "int": 15,
+        "addr": "0x27",
+        "size": "20,4",
+        "coord": "0,0",
+        "id2show": "id датчика",
         "num": 1
     },
     {
-        "name": "2. Кнопка",
+        "name": "2. LCD экран 1602",
         "type": "Reading",
-        "subtype": "Variable",
-        "id": "vbtn",
+        "subtype": "Lcd2004",
+        "id": "Lcd",
         "widget": "",
         "page": "",
-        "descr": "",
-        "int": "0",
-        "val": "0",
+        "descr": "T",
+        "int": 15,
+        "addr": "0x27",
+        "size": "16,2",
+        "coord": "0,0",
+        "id2show": "id датчика",
         "num": 2
     },
-    {
-        "name": "3. Окно ввода цифры",
-        "type": "Reading",
-        "subtype": "Variable",
-        "id": "dedit",
-        "widget": "",
-        "page": "",
-        "descr": "",
-        "int": "0",
-        "val": "0",
-        "num": 3
-    },
-    {
-        "name": "4. Окно ввода времени",
-        "type": "Reading",
-        "subtype": "Variable",
-        "id": "tedit",
-        "widget": "",
-        "page": "",
-        "descr": "",
-        "int": "0",
-        "val": "0",
-        "num": 4
-    },
-    {
-        "name": "5. Переменная",
-        "type": "Reading",
-        "subtype": "Variable",
-        "id": "var",
-        "widget": "",
-        "page": "",
-        "descr": "",
-        "int": "0",
-        "val": "0",
-        "num": 5
-    },
-    {
-        "header": "Сенсоры"
-    },
-    {
-        "name": "6. Cенсор температуры AHT20",
-        "type": "Reading",
-        "subtype": "Aht20t",
-        "id": "Temp20",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "AHT20 Температура",
-        "int": 15,
-        "addr": "0x38",
-        "round": 1,
-        "num": 6
-    },
-    {
-        "name": "7. Cенсор влажности AHT20",
-        "type": "Reading",
-        "subtype": "Aht20h",
-        "id": "Hum20",
-        "widget": "anydataHum",
-        "page": "Сенсоры",
-        "descr": "AHT20 Влажность",
-        "int": 15,
-        "addr": "0x38",
-        "round": 1,
-        "num": 7
-    },
-    {
-        "name": "8. Аналоговый сенсор",
-        "type": "Reading",
-        "subtype": "AnalogAdc",
-        "id": "t",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "Температура",
-        "map": "1,1024,1,100",
-        "plus": 0,
-        "multiply": 1,
-        "round": 1,
-        "pin": 0,
-        "int": 15,
-        "avgSteps": 1,
-        "num": 8
-    },
-    {
-        "name": "9. Cенсор температуры Bme280",
-        "type": "Reading",
-        "subtype": "Bme280t",
-        "id": "tmp3",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "Температура",
-        "int": 15,
-        "addr": "0x77",
-        "round": 1,
-        "num": 9
-    },
-    {
-        "name": "10. Cенсор давления Bme280",
-        "type": "Reading",
-        "subtype": "Bme280p",
-        "id": "Press3",
-        "widget": "anydataMm",
-        "page": "Сенсоры",
-        "descr": "Давление",
-        "int": 15,
-        "addr": "0x77",
-        "round": 1,
-        "num": 10
-    },
-    {
-        "name": "11. Cенсор влажности Bme280",
-        "type": "Reading",
-        "subtype": "Bme280h",
-        "id": "Hum3",
-        "widget": "anydataHum",
-        "page": "Сенсоры",
-        "descr": "Влажность",
-        "int": 15,
-        "addr": "0x77",
-        "round": 1,
-        "num": 11
-    },
-    {
-        "name": "12. Cенсор температуры Bmp280",
-        "type": "Reading",
-        "subtype": "Bmp280t",
-        "id": "tmp3",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "280 Температура",
-        "int": 15,
-        "addr": "0x77",
-        "round": 1,
-        "num": 12
-    },
-    {
-        "name": "13. Cенсор давления Bmp280",
-        "type": "Reading",
-        "subtype": "Bmp280p",
-        "id": "Press3",
-        "widget": "anydataMm",
-        "page": "Сенсоры",
-        "descr": "280 Давление",
-        "int": 15,
-        "addr": "0x77",
-        "round": 1,
-        "num": 13
-    },
-    {
-        "name": "14. Cенсор температуры dht11",
-        "type": "Reading",
-        "subtype": "Dht1122t",
-        "id": "tmp3",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "Температура",
-        "int": 15,
-        "pin": 0,
-        "senstype": "dht11",
-        "num": 14
-    },
-    {
-        "name": "15. Cенсор влажности dht11",
-        "type": "Reading",
-        "subtype": "Dht1122h",
-        "id": "Hum3",
-        "widget": "anydataHum",
-        "page": "Сенсоры",
-        "descr": "Влажность",
-        "int": 15,
-        "pin": 0,
-        "senstype": "dht11",
-        "num": 15
-    },
-    {
-        "name": "16. Cенсор температуры ds18b20",
-        "type": "Reading",
-        "subtype": "Ds18b20",
-        "id": "dstmp",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "DS Температура",
-        "int": 15,
-        "pin": 2,
-        "index": 0,
-        "addr": "",
-        "round": 1,
-        "num": 16
-    },
-    {
-        "name": "17. Cенсор температуры GY21",
-        "type": "Reading",
-        "subtype": "GY21t",
-        "id": "tmp4",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "Температура",
-        "round": 1,
-        "int": 15,
-        "num": 17
-    },
-    {
-        "name": "18. Cенсор влажности GY21",
-        "type": "Reading",
-        "subtype": "GY21h",
-        "id": "Hum4",
-        "widget": "anydataHum",
-        "page": "Сенсоры",
-        "descr": "Влажность",
-        "round": 1,
-        "int": 15,
-        "num": 18
-    },
-    {
-        "name": "19. Cенсор температуры HDC1080",
-        "type": "Reading",
-        "subtype": "Hdc1080t",
-        "id": "Temp1080",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "1080 Температура",
-        "int": 15,
-        "addr": "0x40",
-        "round": 1,
-        "num": 19
-    },
-    {
-        "name": "20. Cенсор влажности HDC1080",
-        "type": "Reading",
-        "subtype": "Hdc1080h",
-        "id": "Hum1080",
-        "widget": "anydataHum",
-        "page": "Сенсоры",
-        "descr": "1080 Влажность",
-        "int": 15,
-        "addr": "0x40",
-        "round": 1,
-        "num": 20
-    },
-    {
-        "name": "21. Cенсор температуры MAX6675",
-        "type": "Reading",
-        "subtype": "Max6675t",
-        "id": "maxtmp",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "MAX Температура",
-        "int": 15,
-        "DO": 12,
-        "CS": 13,
-        "CLK": 14,
-        "num": 21
-    },
-    {
-        "name": "22. Сканер кнопок 433 MHz",
-        "num": 22,
-        "type": "Reading",
-        "subtype": "RCswitch",
-        "id": "rsw",
-        "int": 500,
-        "pinRx": 12,
-        "pinTx": 12
-    },
-    {
-        "name": "23. Cенсор температуры Sht20",
-        "type": "Reading",
-        "subtype": "Sht20t",
-        "id": "tmp2",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "Температура",
-        "int": 15,
-        "round": 1,
-        "num": 23
-    },
-    {
-        "name": "24. Cенсор влажности Sht20",
-        "type": "Reading",
-        "subtype": "Sht20h",
-        "id": "Hum2",
-        "widget": "anydataHum",
-        "page": "Сенсоры",
-        "descr": "Влажность",
-        "int": 15,
-        "round": 1,
-        "num": 24
-    },
-    {
-        "name": "25. Cенсор температуры Sht30",
-        "type": "Reading",
-        "subtype": "Sht30t",
-        "id": "tmp30",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "SHT30 Температура",
-        "int": 15,
-        "round": 1,
-        "num": 25
-    },
-    {
-        "name": "26. Cенсор влажности Sht30",
-        "type": "Reading",
-        "subtype": "Sht30h",
-        "id": "Hum30",
-        "widget": "anydataHum",
-        "page": "Сенсоры",
-        "descr": "SHT30 Влажность",
-        "int": 15,
-        "round": 1,
-        "num": 26
-    },
-    {
-        "name": "27. Сонар HC-SR04",
-        "num": 27,
-        "type": "Reading",
-        "subtype": "Sonar",
-        "id": "sonar",
-        "widget": "anydataTmp",
-        "page": "Сенсоры",
-        "descr": "Расстояние (см)",
-        "pinTrig": 5,
-        "pinEcho": 4,
-        "int": 5
-    },
     {
         "header": "Исполнительные устройства"
     },
     {
-        "name": "28. Кнопка подключенная к пину",
+        "name": "3. Кнопка подключенная к пину",
         "type": "Writing",
         "subtype": "ButtonIn",
         "id": "btn",
@@ -373,10 +53,10 @@
         "pinMode": "INPUT",
         "debounceDelay": 50,
         "fixState": 1,
-        "num": 28
+        "num": 3
     },
     {
-        "name": "29. Кнопка управляющая пином (Реле)",
+        "name": "4. Кнопка управляющая пином (Реле)",
         "type": "Writing",
         "subtype": "ButtonOut",
         "id": "btn",
@@ -386,10 +66,10 @@
         "int": 0,
         "inv": 0,
         "pin": 2,
-        "num": 29
+        "num": 4
     },
     {
-        "name": "30. Поддержка DS1302(1), DS1307(2), DS3231(3), RX8025(4)",
+        "name": "5. Поддержка DS1302(1), DS1307(2), DS3231(3), RX8025(4)",
         "type": "Reading",
         "subtype": "IarduinoRTC",
         "id": "RTC",
@@ -403,10 +83,10 @@
         "dat": 4,
         "defFormat": "d-m-Y",
         "ticker": 0,
-        "num": 30
+        "num": 5
     },
     {
-        "name": "31. Сервопривод",
+        "name": "6. Сервопривод",
         "type": "Writing",
         "subtype": "IoTServo",
         "id": "servo",
@@ -417,10 +97,10 @@
         "pin": 12,
         "apin": -1,
         "amap": "0, 4096, 0, 180",
-        "num": 31
+        "num": 6
     },
     {
-        "name": "32. Расширитель портов Mcp23017",
+        "name": "7. Расширитель портов Mcp23017",
         "type": "Reading",
         "subtype": "Mcp23017",
         "id": "Mcp",
@@ -430,10 +110,10 @@
         "int": "0",
         "addr": "0x20",
         "index": 1,
-        "num": 32
+        "num": 7
     },
     {
-        "name": "33. MP3 плеер",
+        "name": "8. MP3 плеер",
         "type": "Reading",
         "subtype": "Mp3",
         "id": "mp3",
@@ -443,10 +123,10 @@
         "int": 1,
         "pins": "14,12",
         "volume": 20,
-        "num": 33
+        "num": 8
     },
     {
-        "name": "34. PWM ESP8266",
+        "name": "9. PWM ESP8266",
         "type": "Writing",
         "subtype": "Pwm8266",
         "id": "pwm",
@@ -458,10 +138,10 @@
         "freq": 5000,
         "val": 0,
         "apin": -1,
-        "num": 34
+        "num": 9
     },
     {
-        "name": "35. Доп. функции системы",
+        "name": "10. Доп. функции системы",
         "type": "Reading",
         "subtype": "SysExt",
         "id": "SysExt",
@@ -469,39 +149,359 @@
         "page": "",
         "descr": "",
         "int": 15,
+        "num": 10
+    },
+    {
+        "header": "Сенсоры"
+    },
+    {
+        "name": "11. Cенсор температуры AHT20",
+        "type": "Reading",
+        "subtype": "Aht20t",
+        "id": "Temp20",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "AHT20 Температура",
+        "int": 15,
+        "addr": "0x38",
+        "round": 1,
+        "num": 11
+    },
+    {
+        "name": "12. Cенсор влажности AHT20",
+        "type": "Reading",
+        "subtype": "Aht20h",
+        "id": "Hum20",
+        "widget": "anydataHum",
+        "page": "Сенсоры",
+        "descr": "AHT20 Влажность",
+        "int": 15,
+        "addr": "0x38",
+        "round": 1,
+        "num": 12
+    },
+    {
+        "name": "13. Аналоговый сенсор",
+        "type": "Reading",
+        "subtype": "AnalogAdc",
+        "id": "t",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "Температура",
+        "map": "1,1024,1,100",
+        "plus": 0,
+        "multiply": 1,
+        "round": 1,
+        "pin": 0,
+        "int": 15,
+        "avgSteps": 1,
+        "num": 13
+    },
+    {
+        "name": "14. Cенсор температуры Bme280",
+        "type": "Reading",
+        "subtype": "Bme280t",
+        "id": "tmp3",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "Температура",
+        "int": 15,
+        "addr": "0x77",
+        "round": 1,
+        "num": 14
+    },
+    {
+        "name": "15. Cенсор давления Bme280",
+        "type": "Reading",
+        "subtype": "Bme280p",
+        "id": "Press3",
+        "widget": "anydataMm",
+        "page": "Сенсоры",
+        "descr": "Давление",
+        "int": 15,
+        "addr": "0x77",
+        "round": 1,
+        "num": 15
+    },
+    {
+        "name": "16. Cенсор влажности Bme280",
+        "type": "Reading",
+        "subtype": "Bme280h",
+        "id": "Hum3",
+        "widget": "anydataHum",
+        "page": "Сенсоры",
+        "descr": "Влажность",
+        "int": 15,
+        "addr": "0x77",
+        "round": 1,
+        "num": 16
+    },
+    {
+        "name": "17. Cенсор температуры Bmp280",
+        "type": "Reading",
+        "subtype": "Bmp280t",
+        "id": "tmp3",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "280 Температура",
+        "int": 15,
+        "addr": "0x77",
+        "round": 1,
+        "num": 17
+    },
+    {
+        "name": "18. Cенсор давления Bmp280",
+        "type": "Reading",
+        "subtype": "Bmp280p",
+        "id": "Press3",
+        "widget": "anydataMm",
+        "page": "Сенсоры",
+        "descr": "280 Давление",
+        "int": 15,
+        "addr": "0x77",
+        "round": 1,
+        "num": 18
+    },
+    {
+        "name": "19. Cенсор температуры dht11",
+        "type": "Reading",
+        "subtype": "Dht1122t",
+        "id": "tmp3",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "Температура",
+        "int": 15,
+        "pin": 0,
+        "senstype": "dht11",
+        "num": 19
+    },
+    {
+        "name": "20. Cенсор влажности dht11",
+        "type": "Reading",
+        "subtype": "Dht1122h",
+        "id": "Hum3",
+        "widget": "anydataHum",
+        "page": "Сенсоры",
+        "descr": "Влажность",
+        "int": 15,
+        "pin": 0,
+        "senstype": "dht11",
+        "num": 20
+    },
+    {
+        "name": "21. Cенсор температуры ds18b20",
+        "type": "Reading",
+        "subtype": "Ds18b20",
+        "id": "dstmp",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "DS Температура",
+        "int": 15,
+        "pin": 2,
+        "index": 0,
+        "addr": "",
+        "round": 1,
+        "num": 21
+    },
+    {
+        "name": "22. Cенсор температуры GY21",
+        "type": "Reading",
+        "subtype": "GY21t",
+        "id": "tmp4",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "Температура",
+        "round": 1,
+        "int": 15,
+        "num": 22
+    },
+    {
+        "name": "23. Cенсор влажности GY21",
+        "type": "Reading",
+        "subtype": "GY21h",
+        "id": "Hum4",
+        "widget": "anydataHum",
+        "page": "Сенсоры",
+        "descr": "Влажность",
+        "round": 1,
+        "int": 15,
+        "num": 23
+    },
+    {
+        "name": "24. Cенсор температуры HDC1080",
+        "type": "Reading",
+        "subtype": "Hdc1080t",
+        "id": "Temp1080",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "1080 Температура",
+        "int": 15,
+        "addr": "0x40",
+        "round": 1,
+        "num": 24
+    },
+    {
+        "name": "25. Cенсор влажности HDC1080",
+        "type": "Reading",
+        "subtype": "Hdc1080h",
+        "id": "Hum1080",
+        "widget": "anydataHum",
+        "page": "Сенсоры",
+        "descr": "1080 Влажность",
+        "int": 15,
+        "addr": "0x40",
+        "round": 1,
+        "num": 25
+    },
+    {
+        "name": "26. Cенсор температуры MAX6675",
+        "type": "Reading",
+        "subtype": "Max6675t",
+        "id": "maxtmp",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "MAX Температура",
+        "int": 15,
+        "DO": 12,
+        "CS": 13,
+        "CLK": 14,
+        "num": 26
+    },
+    {
+        "name": "27. Сканер кнопок 433 MHz",
+        "num": 27,
+        "type": "Reading",
+        "subtype": "RCswitch",
+        "id": "rsw",
+        "int": 500,
+        "pinRx": 12,
+        "pinTx": 12
+    },
+    {
+        "name": "28. Cенсор температуры Sht20",
+        "type": "Reading",
+        "subtype": "Sht20t",
+        "id": "tmp2",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "Температура",
+        "int": 15,
+        "round": 1,
+        "num": 28
+    },
+    {
+        "name": "29. Cенсор влажности Sht20",
+        "type": "Reading",
+        "subtype": "Sht20h",
+        "id": "Hum2",
+        "widget": "anydataHum",
+        "page": "Сенсоры",
+        "descr": "Влажность",
+        "int": 15,
+        "round": 1,
+        "num": 29
+    },
+    {
+        "name": "30. Cенсор температуры Sht30",
+        "type": "Reading",
+        "subtype": "Sht30t",
+        "id": "tmp30",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "SHT30 Температура",
+        "int": 15,
+        "round": 1,
+        "num": 30
+    },
+    {
+        "name": "31. Cенсор влажности Sht30",
+        "type": "Reading",
+        "subtype": "Sht30h",
+        "id": "Hum30",
+        "widget": "anydataHum",
+        "page": "Сенсоры",
+        "descr": "SHT30 Влажность",
+        "int": 15,
+        "round": 1,
+        "num": 31
+    },
+    {
+        "name": "32. Сонар HC-SR04",
+        "num": 32,
+        "type": "Reading",
+        "subtype": "Sonar",
+        "id": "sonar",
+        "widget": "anydataTmp",
+        "page": "Сенсоры",
+        "descr": "Расстояние (см)",
+        "pinTrig": 5,
+        "pinEcho": 4,
+        "int": 5
+    },
+    {
+        "header": "Виртуальные элементы"
+    },
+    {
+        "name": "33. Таймер",
+        "type": "Writing",
+        "subtype": "Timer",
+        "id": "timer",
+        "widget": "",
+        "page": "",
+        "descr": "",
+        "int": 1,
+        "countDown": 15,
+        "ticker": 0,
+        "repeat": 0,
+        "needSave": 0,
+        "num": 33
+    },
+    {
+        "name": "34. Кнопка",
+        "type": "Reading",
+        "subtype": "Variable",
+        "id": "vbtn",
+        "widget": "",
+        "page": "",
+        "descr": "",
+        "int": "0",
+        "val": "0",
+        "num": 34
+    },
+    {
+        "name": "35. Окно ввода цифры",
+        "type": "Reading",
+        "subtype": "Variable",
+        "id": "dedit",
+        "widget": "",
+        "page": "",
+        "descr": "",
+        "int": "0",
+        "val": "0",
         "num": 35
     },
     {
-        "header": "Экраны"
-    },
-    {
-        "name": "36. LCD экран 2004",
+        "name": "36. Окно ввода времени",
         "type": "Reading",
-        "subtype": "Lcd2004",
-        "id": "Lcd",
+        "subtype": "Variable",
+        "id": "tedit",
         "widget": "",
         "page": "",
-        "descr": "T",
-        "int": 15,
-        "addr": "0x27",
-        "size": "20,4",
-        "coord": "0,0",
-        "id2show": "id датчика",
+        "descr": "",
+        "int": "0",
+        "val": "0",
         "num": 36
     },
     {
-        "name": "37. LCD экран 1602",
+        "name": "37. Переменная",
         "type": "Reading",
-        "subtype": "Lcd2004",
-        "id": "Lcd",
+        "subtype": "Variable",
+        "id": "var",
         "widget": "",
         "page": "",
-        "descr": "T",
-        "int": 15,
-        "addr": "0x27",
-        "size": "16,2",
-        "coord": "0,0",
-        "id2show": "id датчика",
+        "descr": "",
+        "int": "0",
+        "val": "0",
         "num": 37
     }
 ]

myProfile.json

@@ -26,143 +26,143 @@
         }
     },
     "modules": {
-        "Виртуальные элементы": [
+        "Экраны": [
             {
-                "path": "src\\modules\\1.virtual\\Timer",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\1.virtual\\Variable",
-                "active": true
-            }
-        ],
-        "Сенсоры": [
-            {
-                "path": "src\\modules\\2.sensors\\Ads1115",
-                "active": false
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Aht20",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\AnalogAdc",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Bme280",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Bmp280",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Dht1122",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Ds18b20",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Emon",
-                "active": false
-            },
-            {
-                "path": "src\\modules\\2.sensors\\GY21",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Hdc1080",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\IoTWiegand",
-                "active": false
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Max6675",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Mhz19",
-                "active": false
-            },
-            {
-                "path": "src\\modules\\2.sensors\\RCswitch",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Sds011",
-                "active": false
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Sht20",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Sht30",
-                "active": true
-            },
-            {
-                "path": "src\\modules\\2.sensors\\Sonar",
+                "path": "src\\modules\\display\\Lcd2004",
                 "active": true
             }
         ],
         "Исполнительные устройства": [
             {
-                "path": "src\\modules\\3.exec\\ButtonIn",
+                "path": "src\\modules\\exec\\ButtonIn",
                 "active": true
             },
             {
-                "path": "src\\modules\\3.exec\\ButtonOut",
+                "path": "src\\modules\\exec\\ButtonOut",
                 "active": true
             },
             {
-                "path": "src\\modules\\3.exec\\EspCam",
+                "path": "src\\modules\\exec\\EspCam",
                 "active": false
             },
             {
-                "path": "src\\modules\\3.exec\\IarduinoRTC",
+                "path": "src\\modules\\exec\\IarduinoRTC",
                 "active": true
             },
             {
-                "path": "src\\modules\\3.exec\\IoTServo",
+                "path": "src\\modules\\exec\\IoTServo",
                 "active": true
             },
             {
-                "path": "src\\modules\\3.exec\\Mcp23017",
+                "path": "src\\modules\\exec\\Mcp23017",
                 "active": true
             },
             {
-                "path": "src\\modules\\3.exec\\Mp3",
+                "path": "src\\modules\\exec\\Mp3",
                 "active": true
             },
             {
-                "path": "src\\modules\\3.exec\\Pwm32",
+                "path": "src\\modules\\exec\\Pwm32",
                 "active": true
             },
             {
-                "path": "src\\modules\\3.exec\\Pwm8266",
+                "path": "src\\modules\\exec\\Pwm8266",
                 "active": true
             },
             {
-                "path": "src\\modules\\3.exec\\SDcard",
+                "path": "src\\modules\\exec\\SDcard",
                 "active": false
             },
             {
-                "path": "src\\modules\\3.exec\\SysExt",
+                "path": "src\\modules\\exec\\SysExt",
                 "active": true
             },
             {
-                "path": "src\\modules\\3.exec\\Telegram",
+                "path": "src\\modules\\exec\\Telegram",
                 "active": false
             }
         ],
-        "Экраны": [
+        "Сенсоры": [
             {
-                "path": "src\\modules\\4.display\\Lcd2004",
+                "path": "src\\modules\\sensors\\Ads1115",
+                "active": false
+            },
+            {
+                "path": "src\\modules\\sensors\\Aht20",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\AnalogAdc",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\Bme280",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\Bmp280",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\Dht1122",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\Ds18b20",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\Emon",
+                "active": false
+            },
+            {
+                "path": "src\\modules\\sensors\\GY21",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\Hdc1080",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\IoTWiegand",
+                "active": false
+            },
+            {
+                "path": "src\\modules\\sensors\\Max6675",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\Mhz19",
+                "active": false
+            },
+            {
+                "path": "src\\modules\\sensors\\RCswitch",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\Sds011",
+                "active": false
+            },
+            {
+                "path": "src\\modules\\sensors\\Sht20",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\Sht30",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\sensors\\Sonar",
+                "active": true
+            }
+        ],
+        "Виртуальные элементы": [
+            {
+                "path": "src\\modules\\virtual\\Timer",
+                "active": true
+            },
+            {
+                "path": "src\\modules\\virtual\\Variable",
                 "active": true
             }
         ]

platformio.ini

@@ -50,6 +50,10 @@ lib_deps_external =
 
 [env:esp8266_4mb_fromitems]
 lib_deps = 
+	marcoschwartz/LiquidCrystal_I2C@^1.1.4
+	adafruit/Adafruit MCP23017 Arduino Library@^2.0.2
+	adafruit/Adafruit BusIO @ ^1.13.0
+	dfrobot/DFRobotDFPlayerMini @ ^1.0.5
 	Adafruit AHTX0
 	adafruit/Adafruit BME280 Library
 	adafruit/Adafruit BMP280 Library
@@ -61,35 +65,31 @@ lib_deps =
 	rc-switch @ ^2.6.4
 	robtillaart/SHT2x@^0.1.1
 	WEMOS SHT3x@1.0.0
-	adafruit/Adafruit MCP23017 Arduino Library@^2.0.2
-	adafruit/Adafruit BusIO @ ^1.13.0
-	dfrobot/DFRobotDFPlayerMini @ ^1.0.5
-	marcoschwartz/LiquidCrystal_I2C@^1.1.4
 build_src_filter = 
-	+<modules\1.virtual\Timer>
-	+<modules\1.virtual\Variable>
-	+<modules\2.sensors\Aht20>
-	+<modules\2.sensors\AnalogAdc>
-	+<modules\2.sensors\Bme280>
-	+<modules\2.sensors\Bmp280>
-	+<modules\2.sensors\Dht1122>
-	+<modules\2.sensors\Ds18b20>
-	+<modules\2.sensors\GY21>
-	+<modules\2.sensors\Hdc1080>
-	+<modules\2.sensors\Max6675>
-	+<modules\2.sensors\RCswitch>
-	+<modules\2.sensors\Sht20>
-	+<modules\2.sensors\Sht30>
-	+<modules\2.sensors\Sonar>
-	+<modules\3.exec\ButtonIn>
-	+<modules\3.exec\ButtonOut>
-	+<modules\3.exec\IarduinoRTC>
-	+<modules\3.exec\IoTServo>
-	+<modules\3.exec\Mcp23017>
-	+<modules\3.exec\Mp3>
-	+<modules\3.exec\Pwm8266>
-	+<modules\3.exec\SysExt>
-	+<modules\4.display\Lcd2004>
+	+<modules\display\Lcd2004>
+	+<modules\exec\ButtonIn>
+	+<modules\exec\ButtonOut>
+	+<modules\exec\IarduinoRTC>
+	+<modules\exec\IoTServo>
+	+<modules\exec\Mcp23017>
+	+<modules\exec\Mp3>
+	+<modules\exec\Pwm8266>
+	+<modules\exec\SysExt>
+	+<modules\sensors\Aht20>
+	+<modules\sensors\AnalogAdc>
+	+<modules\sensors\Bme280>
+	+<modules\sensors\Bmp280>
+	+<modules\sensors\Dht1122>
+	+<modules\sensors\Ds18b20>
+	+<modules\sensors\GY21>
+	+<modules\sensors\Hdc1080>
+	+<modules\sensors\Max6675>
+	+<modules\sensors\RCswitch>
+	+<modules\sensors\Sht20>
+	+<modules\sensors\Sht30>
+	+<modules\sensors\Sonar>
+	+<modules\virtual\Timer>
+	+<modules\virtual\Variable>
 
 [env:esp32_4mb_fromitems]
 lib_deps = 

src/modules/API.cpp

@@ -1,7 +1,14 @@
 #include "ESPConfiguration.h"
 
-void* getAPI_Timer(String subtype, String params);
-void* getAPI_Variable(String subtype, String params);
+void* getAPI_Lcd2004(String subtype, String params);
+void* getAPI_ButtonIn(String subtype, String params);
+void* getAPI_ButtonOut(String subtype, String params);
+void* getAPI_IarduinoRTC(String subtype, String params);
+void* getAPI_IoTServo(String subtype, String params);
+void* getAPI_Mcp23017(String subtype, String params);
+void* getAPI_Mp3(String subtype, String params);
+void* getAPI_Pwm8266(String subtype, String params);
+void* getAPI_SysExt(String subtype, String params);
 void* getAPI_Aht20(String subtype, String params);
 void* getAPI_AnalogAdc(String subtype, String params);
 void* getAPI_Bme280(String subtype, String params);
@@ -15,20 +22,20 @@ void* getAPI_RCswitch(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_ButtonIn(String subtype, String params);
-void* getAPI_ButtonOut(String subtype, String params);
-void* getAPI_IarduinoRTC(String subtype, String params);
-void* getAPI_IoTServo(String subtype, String params);
-void* getAPI_Mcp23017(String subtype, String params);
-void* getAPI_Mp3(String subtype, String params);
-void* getAPI_Pwm8266(String subtype, String params);
-void* getAPI_SysExt(String subtype, String params);
-void* getAPI_Lcd2004(String subtype, String params);
+void* getAPI_Timer(String subtype, String params);
+void* getAPI_Variable(String subtype, String params);
 
 void* getAPI(String subtype, String params) {
 void* tmpAPI;
-if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_Lcd2004(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_IarduinoRTC(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_IoTServo(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_Mcp23017(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_Mp3(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_Pwm8266(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_SysExt(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Aht20(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_AnalogAdc(subtype, params)) != nullptr) return tmpAPI;
 if ((tmpAPI = getAPI_Bme280(subtype, params)) != nullptr) return tmpAPI;
@@ -42,14 +49,7 @@ if ((tmpAPI = getAPI_RCswitch(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_ButtonIn(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_ButtonOut(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_IarduinoRTC(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_IoTServo(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_Mcp23017(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_Mp3(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_Pwm8266(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_SysExt(subtype, params)) != nullptr) return tmpAPI;
-if ((tmpAPI = getAPI_Lcd2004(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI;
+if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI;
 return nullptr;
 }