iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-29 15:42:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159 from biveraxe/ver4dev

Browse Source 
Ver4dev
This commit is contained in:
Ilya Belyakov
2022-08-11 17:54:12 +03:00
committed by GitHub
parent 610cc8f862 6e4d8777d4
commit c78b45159d
2 changed files with 138 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
data_svelte/items.json
View File

@@ -22,10 +22,10 @@
"num": 1 "num": 1
}, },
{ {
"name": "2. Переменная", "name": "2. Кнопка",
"type": "Reading", "type": "Reading",
"subtype": "Variable", "subtype": "Variable",
"id": "var", "id": "vbtn",
"widget": "", "widget": "",
"page": "", "page": "",
"descr": "", "descr": "",
@@ -33,11 +33,47 @@
"val": "0", "val": "0",
"num": 2 "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": "Сенсоры" "header": "Сенсоры"
}, },
{ {
"name": "3. Cенсор температуры AHT20", "name": "6. Cенсор температуры AHT20",
"type": "Reading", "type": "Reading",
"subtype": "Aht20t", "subtype": "Aht20t",
"id": "Temp20", "id": "Temp20",
@@ -47,10 +83,10 @@
"int": 15, "int": 15,
"addr": "0x38", "addr": "0x38",
"round": 1, "round": 1,
"num": 3 "num": 6
}, },
{ {
"name": "4. Cенсор влажности AHT20", "name": "7. Cенсор влажности AHT20",
"type": "Reading", "type": "Reading",
"subtype": "Aht20h", "subtype": "Aht20h",
"id": "Hum20", "id": "Hum20",
@@ -60,10 +96,10 @@
"int": 15, "int": 15,
"addr": "0x38", "addr": "0x38",
"round": 1, "round": 1,
"num": 4 "num": 7
}, },
{ {
"name": "5. Аналоговый сенсор", "name": "8. Аналоговый сенсор",
"type": "Reading", "type": "Reading",
"subtype": "AnalogAdc", "subtype": "AnalogAdc",
"id": "t", "id": "t",
@@ -77,10 +113,10 @@
"pin": 0, "pin": 0,
"int": 15, "int": 15,
"avgSteps": 1, "avgSteps": 1,
"num": 5 "num": 8
}, },
{ {
"name": "6. Cенсор температуры Bme280", "name": "9. Cенсор температуры Bme280",
"type": "Reading", "type": "Reading",
"subtype": "Bme280t", "subtype": "Bme280t",
"id": "tmp3", "id": "tmp3",
@@ -90,10 +126,10 @@
"int": 15, "int": 15,
"addr": "0x77", "addr": "0x77",
"round": 1, "round": 1,
"num": 6 "num": 9
}, },
{ {
"name": "7. Cенсор давления Bme280", "name": "10. Cенсор давления Bme280",
"type": "Reading", "type": "Reading",
"subtype": "Bme280p", "subtype": "Bme280p",
"id": "Press3", "id": "Press3",
@@ -103,10 +139,10 @@
"int": 15, "int": 15,
"addr": "0x77", "addr": "0x77",
"round": 1, "round": 1,
"num": 7 "num": 10
}, },
{ {
"name": "8. Cенсор влажности Bme280", "name": "11. Cенсор влажности Bme280",
"type": "Reading", "type": "Reading",
"subtype": "Bme280h", "subtype": "Bme280h",
"id": "Hum3", "id": "Hum3",
@@ -116,10 +152,10 @@
"int": 15, "int": 15,
"addr": "0x77", "addr": "0x77",
"round": 1, "round": 1,
"num": 8 "num": 11
}, },
{ {
"name": "9. Cенсор температуры Bmp280", "name": "12. Cенсор температуры Bmp280",
"type": "Reading", "type": "Reading",
"subtype": "Bmp280t", "subtype": "Bmp280t",
"id": "tmp3", "id": "tmp3",
@@ -129,10 +165,10 @@
"int": 15, "int": 15,
"addr": "0x77", "addr": "0x77",
"round": 1, "round": 1,
"num": 9 "num": 12
}, },
{ {
"name": "10. Cенсор давления Bmp280", "name": "13. Cенсор давления Bmp280",
"type": "Reading", "type": "Reading",
"subtype": "Bmp280p", "subtype": "Bmp280p",
"id": "Press3", "id": "Press3",
@@ -142,10 +178,10 @@
"int": 15, "int": 15,
"addr": "0x77", "addr": "0x77",
"round": 1, "round": 1,
"num": 10 "num": 13
}, },
{ {
"name": "11. Cенсор температуры dht11", "name": "14. Cенсор температуры dht11",
"type": "Reading", "type": "Reading",
"subtype": "Dht1122t", "subtype": "Dht1122t",
"id": "tmp3", "id": "tmp3",
@@ -155,10 +191,10 @@
"int": 15, "int": 15,
"pin": 0, "pin": 0,
"senstype": "dht11", "senstype": "dht11",
"num": 11 "num": 14
}, },
{ {
"name": "12. Cенсор влажности dht11", "name": "15. Cенсор влажности dht11",
"type": "Reading", "type": "Reading",
"subtype": "Dht1122h", "subtype": "Dht1122h",
"id": "Hum3", "id": "Hum3",
@@ -168,10 +204,10 @@
"int": 15, "int": 15,
"pin": 0, "pin": 0,
"senstype": "dht11", "senstype": "dht11",
"num": 12 "num": 15
}, },
{ {
"name": "13. Cенсор температуры ds18b20", "name": "16. Cенсор температуры ds18b20",
"type": "Reading", "type": "Reading",
"subtype": "Ds18b20", "subtype": "Ds18b20",
"id": "dstmp", "id": "dstmp",
@@ -183,10 +219,10 @@
"index": 0, "index": 0,
"addr": "", "addr": "",
"round": 1, "round": 1,
"num": 13 "num": 16
}, },
{ {
"name": "14. Cенсор температуры GY21", "name": "17. Cенсор температуры GY21",
"type": "Reading", "type": "Reading",
"subtype": "GY21t", "subtype": "GY21t",
"id": "tmp4", "id": "tmp4",
@@ -195,10 +231,10 @@
"descr": "Температура", "descr": "Температура",
"round": 1, "round": 1,
"int": 15, "int": 15,
"num": 14 "num": 17
}, },
{ {
"name": "15. Cенсор влажности GY21", "name": "18. Cенсор влажности GY21",
"type": "Reading", "type": "Reading",
"subtype": "GY21h", "subtype": "GY21h",
"id": "Hum4", "id": "Hum4",
@@ -207,10 +243,10 @@
"descr": "Влажность", "descr": "Влажность",
"round": 1, "round": 1,
"int": 15, "int": 15,
"num": 15 "num": 18
}, },
{ {
"name": "16. Cенсор температуры HDC1080", "name": "19. Cенсор температуры HDC1080",
"type": "Reading", "type": "Reading",
"subtype": "Hdc1080t", "subtype": "Hdc1080t",
"id": "Temp1080", "id": "Temp1080",
@@ -220,10 +256,10 @@
"int": 15, "int": 15,
"addr": "0x40", "addr": "0x40",
"round": 1, "round": 1,
"num": 16 "num": 19
}, },
{ {
"name": "17. Cенсор влажности HDC1080", "name": "20. Cенсор влажности HDC1080",
"type": "Reading", "type": "Reading",
"subtype": "Hdc1080h", "subtype": "Hdc1080h",
"id": "Hum1080", "id": "Hum1080",
@@ -233,10 +269,10 @@
"int": 15, "int": 15,
"addr": "0x40", "addr": "0x40",
"round": 1, "round": 1,
"num": 17 "num": 20
}, },
{ {
"name": "18. Cенсор температуры MAX6675", "name": "21. Cенсор температуры MAX6675",
"type": "Reading", "type": "Reading",
"subtype": "Max6675t", "subtype": "Max6675t",
"id": "maxtmp", "id": "maxtmp",
@@ -247,11 +283,11 @@
"DO": 12, "DO": 12,
"CS": 13, "CS": 13,
"CLK": 14, "CLK": 14,
"num": 18 "num": 21
}, },
{ {
"name": "19. Сканер кнопок 433 MHz", "name": "22. Сканер кнопок 433 MHz",
"num": 19, "num": 22,
"type": "Reading", "type": "Reading",
"subtype": "RCswitch", "subtype": "RCswitch",
"id": "rsw", "id": "rsw",
@@ -260,7 +296,7 @@
"pinTx": 12 "pinTx": 12
}, },
{ {
"name": "20. Cенсор температуры Sht20", "name": "23. Cенсор температуры Sht20",
"type": "Reading", "type": "Reading",
"subtype": "Sht20t", "subtype": "Sht20t",
"id": "tmp2", "id": "tmp2",
@@ -269,10 +305,10 @@
"descr": "Температура", "descr": "Температура",
"int": 15, "int": 15,
"round": 1, "round": 1,
"num": 20 "num": 23
}, },
{ {
"name": "21. Cенсор влажности Sht20", "name": "24. Cенсор влажности Sht20",
"type": "Reading", "type": "Reading",
"subtype": "Sht20h", "subtype": "Sht20h",
"id": "Hum2", "id": "Hum2",
@@ -281,10 +317,10 @@
"descr": "Влажность", "descr": "Влажность",
"int": 15, "int": 15,
"round": 1, "round": 1,
"num": 21 "num": 24
}, },
{ {
"name": "22. Cенсор температуры Sht30", "name": "25. Cенсор температуры Sht30",
"type": "Reading", "type": "Reading",
"subtype": "Sht30t", "subtype": "Sht30t",
"id": "tmp30", "id": "tmp30",
@@ -293,10 +329,10 @@
"descr": "SHT30 Температура", "descr": "SHT30 Температура",
"int": 15, "int": 15,
"round": 1, "round": 1,
"num": 22 "num": 25
}, },
{ {
"name": "23. Cенсор влажности Sht30", "name": "26. Cенсор влажности Sht30",
"type": "Reading", "type": "Reading",
"subtype": "Sht30h", "subtype": "Sht30h",
"id": "Hum30", "id": "Hum30",
@@ -305,11 +341,11 @@
"descr": "SHT30 Влажность", "descr": "SHT30 Влажность",
"int": 15, "int": 15,
"round": 1, "round": 1,
"num": 23 "num": 26
}, },
{ {
"name": "24. Сонар HC-SR04", "name": "27. Сонар HC-SR04",
"num": 24, "num": 27,
"type": "Reading", "type": "Reading",
"subtype": "Sonar", "subtype": "Sonar",
"id": "sonar", "id": "sonar",
@@ -324,7 +360,7 @@
"header": "Исполнительные устройства" "header": "Исполнительные устройства"
}, },
{ {
"name": "25. Кнопка (подключенная физически)", "name": "28. Кнопка (подключенная физически)",
"type": "Writing", "type": "Writing",
"subtype": "ButtonIn", "subtype": "ButtonIn",
"id": "btn", "id": "btn",
@@ -337,10 +373,10 @@
"pinMode": "INPUT", "pinMode": "INPUT",
"debounceDelay": 50, "debounceDelay": 50,
"fixState": 1, "fixState": 1,
"num": 25 "num": 28
}, },
{ {
"name": "26. Кнопка управляющая пином (Реле с кнопкой)", "name": "29. Кнопка управляющая пином (Реле с кнопкой)",
"type": "Writing", "type": "Writing",
"subtype": "ButtonOut", "subtype": "ButtonOut",
"id": "btn", "id": "btn",
@@ -350,10 +386,10 @@
"int": 0, "int": 0,
"inv": 0, "inv": 0,
"pin": 2, "pin": 2,
"num": 26 "num": 29
}, },
{ {
"name": "27. Поддержка DS1302(1), DS1307(2), DS3231(3), RX8025(4)", "name": "30. Поддержка DS1302(1), DS1307(2), DS3231(3), RX8025(4)",
"type": "Reading", "type": "Reading",
"subtype": "IarduinoRTC", "subtype": "IarduinoRTC",
"id": "RTC", "id": "RTC",
@@ -367,10 +403,10 @@
"dat": 4, "dat": 4,
"defFormat": "d-m-Y", "defFormat": "d-m-Y",
"ticker": 0, "ticker": 0,
"num": 27 "num": 30
}, },
{ {
"name": "28. Сервопривод", "name": "31. Сервопривод",
"type": "Writing", "type": "Writing",
"subtype": "IoTServo", "subtype": "IoTServo",
"id": "servo", "id": "servo",
@@ -381,10 +417,10 @@
"pin": 12, "pin": 12,
"apin": -1, "apin": -1,
"amap": "0, 4096, 0, 180", "amap": "0, 4096, 0, 180",
"num": 28 "num": 31
}, },
{ {
"name": "29. Расширитель портов Mcp23017", "name": "32. Расширитель портов Mcp23017",
"type": "Reading", "type": "Reading",
"subtype": "Mcp23017", "subtype": "Mcp23017",
"id": "Mcp", "id": "Mcp",
@@ -394,10 +430,10 @@
"int": "0", "int": "0",
"addr": "0x20", "addr": "0x20",
"index": 1, "index": 1,
"num": 29 "num": 32
}, },
{ {
"name": "30. MP3 плеер", "name": "33. MP3 плеер",
"type": "Reading", "type": "Reading",
"subtype": "Mp3", "subtype": "Mp3",
"id": "mp3", "id": "mp3",
@@ -407,10 +443,10 @@
"int": 1, "int": 1,
"pins": "14,12", "pins": "14,12",
"volume": 20, "volume": 20,
"num": 30 "num": 33
}, },
{ {
"name": "31. PWM ESP8266", "name": "34. PWM ESP8266",
"type": "Writing", "type": "Writing",
"subtype": "Pwm8266", "subtype": "Pwm8266",
"id": "pwm", "id": "pwm",
@@ -422,10 +458,10 @@
"freq": 5000, "freq": 5000,
"val": 0, "val": 0,
"apin": -1, "apin": -1,
"num": 31 "num": 34
}, },
{ {
"name": "32. Доп. функции системы", "name": "35. Доп. функции системы",
"type": "Reading", "type": "Reading",
"subtype": "SysExt", "subtype": "SysExt",
"id": "SysExt", "id": "SysExt",
@@ -433,13 +469,13 @@
"page": "", "page": "",
"descr": "", "descr": "",
"int": 15, "int": 15,
"num": 32 "num": 35
}, },
{ {
"header": "Экраны" "header": "Экраны"
}, },
{ {
"name": "33. LCD экран 2004", "name": "36. LCD экран 2004",
"type": "Reading", "type": "Reading",
"subtype": "Lcd2004", "subtype": "Lcd2004",
"id": "Lcd", "id": "Lcd",
@@ -451,10 +487,10 @@
"size": "20,4", "size": "20,4",
"coord": "0,0", "coord": "0,0",
"id2show": "id датчика", "id2show": "id датчика",
"num": 33 "num": 36
}, },
{ {
"name": "34. LCD экран 1602", "name": "37. LCD экран 1602",
"type": "Reading", "type": "Reading",
"subtype": "Lcd2004", "subtype": "Lcd2004",
"id": "Lcd", "id": "Lcd",
@@ -466,6 +502,6 @@
"size": "16,2", "size": "16,2",
"coord": "0,0", "coord": "0,0",
"id2show": "id датчика", "id2show": "id датчика",
"num": 34 "num": 37
} }
] ]

36
src/modules/1.virtual/Variable/modinfo.json
View File

@@ -2,6 +2,42 @@
"menuSection": "Виртуальные элементы", "menuSection": "Виртуальные элементы",
"configItem": [{ "configItem": [{
"name": "Кнопка",
"type": "Reading",
"subtype": "Variable",
"id": "vbtn",
"widget": "",
"page": "",
"descr": "",
"int": "0",
"val": "0"
},
{
"name": "Окно ввода цифры",
"type": "Reading",
"subtype": "Variable",
"id": "dedit",
"widget": "",
"page": "",
"descr": "",
"int": "0",
"val": "0"
},
{
"name": "Окно ввода времени",
"type": "Reading",
"subtype": "Variable",
"id": "tedit",
"widget": "",
"page": "",
"descr": "",
"int": "0",
"val": "0"
},
{
"name": "Переменная", "name": "Переменная",
"type": "Reading", "type": "Reading",
"subtype": "Variable", "subtype": "Variable",