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

Merge pull request #9 from biveraxe/ver4dev

Browse Source 
merge_biveraxe
This commit is contained in:
Mit4el
2023-06-17 16:02:39 +03:00
committed by GitHub
parent f8de34fb97 57a5bb6df2
commit af6c975704
21 changed files with 313 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data_svelte/build/bundle.css.gz
View File

Binary file not shown.

BIN
data_svelte/build/bundle.js.gz
View File

Binary file not shown.

6
data_svelte/index.html
View File

@@ -4,12 +4,12 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>IoT Manager 4.4.4</title>
<title>IoT Manager 4.4.6</title>
<link rel="icon" type="image/png" href="/favicon.ico" />
<link rel="stylesheet" href="/build/bundle.css?444" />
<link rel="stylesheet" href="/build/bundle.css?446" />
<script defer src="/build/bundle.js?444"></script>
<script defer src="/build/bundle.js?446"></script>
</head>
<body></body>

186
data_svelte/items.json
View File

@@ -192,19 +192,7 @@
"header": "Сенсоры"
},
{
"name": "13. A02 Дальность",
"type": "Reading",
"subtype": "A02Distance",
"id": "dist",
"widget": "anydataCm",
"page": "Сенсоры",
"descr": "Дальность",
"int": 5,
"round": 1,
"num": 13
},
{
"name": "14. Acs712 Ток",
"name": "13. Acs712 Ток",
"type": "Reading",
"subtype": "Acs712",
"id": "amp",
@@ -219,11 +207,11 @@
"sens": 100,
"adczero": 512,
"btn-setZero": "nil",
"num": 14
"num": 13
},
{
"global": 0,
"name": "15. AHTXX Температура",
"name": "14. AHTXX Температура",
"type": "Reading",
"subtype": "AhtXXt",
"id": "Temp20",
@@ -234,11 +222,11 @@
"addr": "0x38",
"shtType": 1,
"round": 1,
"num": 15
"num": 14
},
{
"global": 0,
"name": "16. AHTXX Влажность",
"name": "15. AHTXX Влажность",
"type": "Reading",
"subtype": "AhtXXh",
"id": "Hum20",
@@ -249,11 +237,11 @@
"addr": "0x38",
"shtType": 1,
"round": 1,
"num": 16
"num": 15
},
{
"global": 0,
"name": "17. Аналоговый сенсор",
"name": "16. Аналоговый сенсор",
"type": "Reading",
"subtype": "AnalogAdc",
"id": "t",
@@ -267,11 +255,11 @@
"pin": 0,
"int": 15,
"avgSteps": 1,
"num": 17
"num": 16
},
{
"global": 0,
"name": "18. BME280 Температура",
"name": "17. BME280 Температура",
"type": "Reading",
"subtype": "Bme280t",
"id": "Tmp3",
@@ -281,11 +269,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 18
"num": 17
},
{
"global": 0,
"name": "19. BME280 Давление",
"name": "18. BME280 Давление",
"type": "Reading",
"subtype": "Bme280p",
"id": "Press3",
@@ -295,11 +283,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 19
"num": 18
},
{
"global": 0,
"name": "20. BME280 Влажность",
"name": "19. BME280 Влажность",
"type": "Reading",
"subtype": "Bme280h",
"id": "Hum3",
@@ -309,11 +297,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 20
"num": 19
},
{
"global": 0,
"name": "21. BME280 Tочка росы",
"name": "20. BME280 Tочка росы",
"type": "Reading",
"subtype": "Bme280dp",
"id": "Dew3",
@@ -323,11 +311,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 21
"num": 20
},
{
"global": 0,
"name": "22. BMP280 Температура",
"name": "21. BMP280 Температура",
"type": "Reading",
"subtype": "Bmp280t",
"id": "tmp3",
@@ -337,11 +325,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 22
"num": 21
},
{
"global": 0,
"name": "23. BMP280 Давление",
"name": "22. BMP280 Давление",
"type": "Reading",
"subtype": "Bmp280p",
"id": "Press3",
@@ -351,11 +339,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 23
"num": 22
},
{
"global": 0,
"name": "24. DHT11 Температура",
"name": "23. DHT11 Температура",
"type": "Reading",
"subtype": "Dht1122t",
"id": "tmp3",
@@ -365,11 +353,11 @@
"int": 15,
"pin": 0,
"senstype": "dht11",
"num": 24
"num": 23
},
{
"global": 0,
"name": "25. DHT11 Влажность",
"name": "24. DHT11 Влажность",
"type": "Reading",
"subtype": "Dht1122h",
"id": "Hum3",
@@ -379,11 +367,11 @@
"int": 15,
"pin": 0,
"senstype": "dht11",
"num": 25
"num": 24
},
{
"global": 0,
"name": "26. DS18B20 Температура",
"name": "25. DS18B20 Температура",
"type": "Reading",
"subtype": "Ds18b20",
"id": "dstmp",
@@ -395,11 +383,11 @@
"index": 0,
"addr": "",
"round": 1,
"num": 26
"num": 25
},
{
"global": 0,
"name": "27. Аналоговый счетчик импульсов",
"name": "26. Аналоговый счетчик импульсов",
"type": "Writing",
"subtype": "Impulse",
"id": "impulse",
@@ -412,11 +400,11 @@
"pinMode": "INPUT",
"debounceDelay": 3,
"multiply": 1,
"num": 27
"num": 26
},
{
"global": 0,
"name": "28. PZEM 004t Напряжение",
"name": "27. PZEM 004t Напряжение",
"type": "Reading",
"subtype": "Pzem004v",
"id": "v",
@@ -426,11 +414,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 28
"num": 27
},
{
"global": 0,
"name": "29. PZEM 004t Сила тока",
"name": "28. PZEM 004t Сила тока",
"type": "Reading",
"subtype": "Pzem004a",
"id": "a",
@@ -440,11 +428,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 29
"num": 28
},
{
"global": 0,
"name": "30. PZEM 004t Мощность",
"name": "29. PZEM 004t Мощность",
"type": "Reading",
"subtype": "Pzem004w",
"id": "w",
@@ -454,11 +442,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 30
"num": 29
},
{
"global": 0,
"name": "31. PZEM 004t Энергия",
"name": "30. PZEM 004t Энергия",
"type": "Reading",
"subtype": "Pzem004wh",
"id": "wh",
@@ -468,11 +456,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 31
"num": 30
},
{
"global": 0,
"name": "32. PZEM 004t Частота",
"name": "31. PZEM 004t Частота",
"type": "Reading",
"subtype": "Pzem004hz",
"id": "hz",
@@ -482,11 +470,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 32
"num": 31
},
{
"global": 0,
"name": "33. PZEM 004t Косинус",
"name": "32. PZEM 004t Косинус",
"type": "Reading",
"subtype": "Pzem004pf",
"id": "pf",
@@ -496,11 +484,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 33
"num": 32
},
{
"global": 0,
"name": "34. PZEM настройка",
"name": "33. PZEM настройка",
"type": "Reading",
"subtype": "Pzem004cmd",
"id": "set",
@@ -512,11 +500,11 @@
"changeaddr": 0,
"setaddr": "0x01",
"reset": 0,
"num": 34
"num": 33
},
{
"global": 0,
"name": "35. Часы реального времени",
"name": "34. Часы реального времени",
"type": "Reading",
"subtype": "RTC",
"id": "rtc",
@@ -532,11 +520,11 @@
"int": 5,
"btn-setUTime": "0",
"btn-setSysTime": "nil",
"num": 35
"num": 34
},
{
"name": "36. (S8) Cенсор качества воздуха",
"num": 36,
"name": "35. (S8) Cенсор качества воздуха",
"num": 35,
"type": "Reading",
"subtype": "S8co",
"id": "s8co",
@@ -550,7 +538,7 @@
},
{
"global": 0,
"name": "37. Sht20 Температура",
"name": "36. Sht20 Температура",
"type": "Reading",
"subtype": "Sht20t",
"id": "tmp2",
@@ -559,11 +547,11 @@
"descr": "Температура",
"int": 15,
"round": 1,
"num": 37
"num": 36
},
{
"global": 0,
"name": "38. Sht20 Влажность",
"name": "37. Sht20 Влажность",
"type": "Reading",
"subtype": "Sht20h",
"id": "Hum2",
@@ -572,11 +560,11 @@
"descr": "Влажность",
"int": 15,
"round": 1,
"num": 38
"num": 37
},
{
"global": 0,
"name": "39. Sht30 Температура",
"name": "38. Sht30 Температура",
"type": "Reading",
"subtype": "Sht30t",
"id": "tmp30",
@@ -585,11 +573,11 @@
"descr": "SHT30 Температура",
"int": 15,
"round": 1,
"num": 39
"num": 38
},
{
"global": 0,
"name": "40. Sht30 Влажность",
"name": "39. Sht30 Влажность",
"type": "Reading",
"subtype": "Sht30h",
"id": "Hum30",
@@ -598,12 +586,12 @@
"descr": "SHT30 Влажность",
"int": 15,
"round": 1,
"num": 40
"num": 39
},
{
"global": 0,
"name": "41. HC-SR04 Ультразвуковой дальномер",
"num": 41,
"name": "40. HC-SR04 Ультразвуковой дальномер",
"num": 40,
"type": "Reading",
"subtype": "Sonar",
"id": "sonar",
@@ -615,7 +603,7 @@
"int": 5
},
{
"name": "42. UART",
"name": "41. UART",
"type": "Reading",
"subtype": "UART",
"page": "",
@@ -627,14 +615,14 @@
"line": 2,
"speed": 9600,
"eventFormat": 0,
"num": 42
"num": 41
},
{
"header": "Исполнительные устройства"
},
{
"global": 0,
"name": "43. Кнопка подключенная к пину",
"name": "42. Кнопка подключенная к пину",
"type": "Writing",
"subtype": "ButtonIn",
"id": "btn",
@@ -649,11 +637,11 @@
"debounceDelay": 50,
"fixState": 0,
"inv": 0,
"num": 43
"num": 42
},
{
"global": 0,
"name": "44. Управление пином",
"name": "43. Управление пином",
"type": "Writing",
"subtype": "ButtonOut",
"needSave": 0,
@@ -664,11 +652,11 @@
"int": 0,
"inv": 0,
"pin": 2,
"num": 44
"num": 43
},
{
"global": 0,
"name": "45. Пассивный звуковой извещатель",
"name": "44. Пассивный звуковой извещатель",
"type": "Writing",
"subtype": "Buzzer",
"id": "buzzer",
@@ -687,11 +675,11 @@
"cycle": 0,
"indication": 1,
"val": 0,
"num": 45
"num": 44
},
{
"global": 0,
"name": "46. Энкодер",
"name": "45. Энкодер",
"type": "Writing",
"subtype": "Encoder",
"id": "enc",
@@ -704,11 +692,11 @@
"step": 1,
"stepOnPress": 5,
"pins": "4,5,2",
"num": 46
"num": 45
},
{
"global": 0,
"name": "47. Сервопривод",
"name": "46. Сервопривод",
"type": "Writing",
"subtype": "IoTServo",
"id": "servo",
@@ -719,11 +707,11 @@
"pin": 12,
"apin": -1,
"amap": "0, 4096, 0, 180",
"num": 47
"num": 46
},
{
"global": 0,
"name": "48. Расширитель портов Mcp23017",
"name": "47. Расширитель портов Mcp23017",
"type": "Reading",
"subtype": "Mcp23017",
"id": "Mcp",
@@ -733,11 +721,11 @@
"int": "0",
"addr": "0x20",
"index": 1,
"num": 48
"num": 47
},
{
"global": 0,
"name": "49. MP3 плеер",
"name": "48. MP3 плеер",
"type": "Reading",
"subtype": "Mp3",
"id": "mp3",
@@ -747,11 +735,11 @@
"int": 1,
"pins": "14,12",
"volume": 20,
"num": 49
"num": 48
},
{
"global": 0,
"name": "50. Сенсорная кнопка",
"name": "49. Сенсорная кнопка",
"type": "Writing",
"subtype": "Multitouch",
"id": "impulse",
@@ -765,11 +753,11 @@
"pinMode": "INPUT",
"debounceDelay": 50,
"PWMDelay": 500,
"num": 50
"num": 49
},
{
"global": 0,
"name": "51. Расширитель портов Pcf8574",
"name": "50. Расширитель портов Pcf8574",
"type": "Reading",
"subtype": "Pcf8574",
"id": "Pcf",
@@ -779,27 +767,29 @@
"int": "0",
"addr": "0x20",
"index": 1,
"num": 51
"num": 50
},
{
"global": 0,
"name": "52. PWM ESP8266",
"name": "51. PWM ESP32",
"type": "Writing",
"subtype": "Pwm8266",
"subtype": "Pwm32",
"id": "pwm",
"widget": "range",
"page": "Кнопки",
"descr": "PWM",
"int": 0,
"pin": 15,
"pin": 2,
"freq": 5000,
"ledChannel": 2,
"PWM_resolution": 10,
"val": 0,
"apin": -1,
"num": 52
"num": 51
},
{
"global": 0,
"name": "53. Телеграм-Лайт",
"name": "52. Телеграм-Лайт",
"type": "Writing",
"subtype": "TelegramLT",
"id": "tg",
@@ -808,14 +798,14 @@
"descr": "",
"token": "",
"chatID": "",
"num": 53
"num": 52
},
{
"header": "Экраны"
},
{
"global": 0,
"name": "54. LCD экран 2004",
"name": "53. LCD экран 2004",
"type": "Reading",
"subtype": "Lcd2004",
"id": "Lcd",
@@ -827,10 +817,10 @@
"size": "20,4",
"coord": "0,0",
"id2show": "id датчика",
"num": 54
"num": 53
},
{
"name": "55. LCD экран 1602",
"name": "54. LCD экран 1602",
"type": "Reading",
"subtype": "Lcd2004",
"id": "Lcd",
@@ -842,6 +832,6 @@
"size": "16,2",
"coord": "0,0",
"id2show": "id датчика",
"num": 55
"num": 54
}
]

4
data_svelte/myProfile.json
View File

@@ -3,7 +3,7 @@
"name": "IoTmanagerVer4",
"apssid": "IoTmanager",
"appass": "",
"routerssid": "rise",
"routerssid": "iot",
"routerpass": "hostel3333",
"timezone": 2,
"ntp": "pool.ntp.org",
@@ -24,7 +24,7 @@
},
"projectProp": {
"platformio": {
"default_envs": "esp8266_4mb",
"default_envs": "esp32_4mb",
"comments_default_envs": "choose from: esp8266_4mb or esp32_4mb or esp8266_1mb or esp8266_1mb_ota or esp8285_1mb or esp8285_1mb_ota"
}
},

3
data_svelte/settings.json
View File

@@ -2,7 +2,7 @@
"name": "IoTmanagerVer4",
"apssid": "IoTmanager",
"appass": "",
"routerssid": "rise",
"routerssid": "iot",
"routerpass": "hostel3333",
"timezone": 2,
"ntp": "pool.ntp.org",
@@ -21,5 +21,6 @@
"pinSDA": 0,
"i2cFreq": 100000,
"wg": "group1",
"udps": 1,
"settings_": ""
}