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

Merge pull request #343 from IoTManagerProject/ver4dev

Browse Source 
453
This commit is contained in:
Dmitry Borisenko
2023-10-10 16:18:26 +02:00
committed by GitHub
parent 324df4169c 8f457c6aa1
commit e79263b9a5
15 changed files with 130 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PrepareProject.py
View File

@@ -209,7 +209,13 @@ with open("platformio.ini", 'w') as configFile:
# сохраняем часть применяемого профиля в папку data_svelte для загрузки на контроллер и дальнейшего переиспользования
print(f"Saving profile {profile} in /data_svelte/flashProfile.json")
shortProfJson = profJson
shortProfJson = json.loads('{}')
shortProfJson['projectProp'] = {
'platformio': {
'default_envs': deviceName
}
}
shortProfJson['modules'] = profJson['modules']
with open("data_svelte/flashProfile.json", "w", encoding='utf-8') as write_file:
json.dump(shortProfJson, write_file, ensure_ascii=False, indent=4, sort_keys=False)

2
compilerProfile.json
View File

@@ -122,7 +122,7 @@
},
{
"path": "src/modules/virtual/owmWeather",
"active": true
"active": false
},
{
"path": "src/modules/virtual/Timer",

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

Binary file not shown.

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

Binary file not shown.

6
data_full/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.5.2</title>
<title>IoT Manager 4.5.3</title>
<link rel="icon" type="image/png" href="/favicon.ico" />
<link rel="stylesheet" href="/build/bundle.css?4520" />
<link rel="stylesheet" href="/build/bundle.css?4530" />
<script defer src="/build/bundle.js?4520"></script>
<script defer src="/build/bundle.js?4530"></script>
</head>
<body></body>

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.

104
data_svelte/flashProfile.json
View File

@@ -1,105 +1,7 @@
{
"iotmSettings": {
"name": "IoTmanagerVer4",
"apssid": "IoTmanager",
"appass": "",
"routerssid": "iot",
"routerpass": "hostel3333",
"timezone": 2,
"ntp": "pool.ntp.org",
"weblogin": "admin",
"webpass": "admin",
"mqttServer": "",
"mqttPort": 8021,
"mqttPrefix": "/risenew",
"mqttUser": "rise",
"mqttPass": "3hostel3",
"serverip": "http://iotmanager.org",
"log": 0,
"mqttin": 0,
"pinSCL": 0,
"pinSDA": 0,
"i2cFreq": 100000,
"wg": "group1"
},
"projectProp": {
"platformio": {
"default_envs": "esp8266_4mb",
"comments_default_envs": "choose from: esp8266_4mb or esp32_4mb or esp32cam_4mb or esp32s2_4mb or esp8266_1mb or esp8266_1mb_ota or esp8285_1mb or esp8285_1mb_ota",
"envs": [
{
"name": "esp8266_4mb",
"firmware": "0x00000",
"littlefs": "0x300000"
},
{
"name": "esp8266_16mb",
"firmware": "0x00000",
"littlefs": "0x200000"
},
{
"name": "esp32_4mb",
"boot_app0": "0xe000",
"bootloader_qio_80m": "0x1000",
"firmware": "0x10000",
"partitions": "0x8000",
"littlefs": "0x290000"
},
{
"name": "esp32cam_4mb",
"boot_app0": "0xe000",
"bootloader_qio_80m": "0x1000",
"firmware": "0x10000",
"partitions": "0x8000",
"littlefs": "0x290000"
},
{
"name": "esp32_16mb",
"boot_app0": "0xe000",
"bootloader_qio_80m": "0x1000",
"firmware": "0x10000",
"partitions": "0x8000",
"littlefs": "0x910000"
},
{
"name": "esp8266_1mb",
"firmware": "0x00000000",
"littlefs": "0x000bb000"
},
{
"name": "esp8266_1mb_ota",
"firmware": "0x00000000",
"littlefs": "0x000eb000"
},
{
"name": "esp8266_2mb",
"firmware": "0x00000000",
"littlefs": "0x00100000"
},
{
"name": "esp8266_2mb_ota",
"firmware": "0x00000000",
"littlefs": "0x001c0000"
},
{
"name": "esp8285_1mb",
"firmware": "0x00000000",
"littlefs": "0x000bb000"
},
{
"name": "esp8285_1mb_ota",
"firmware": "0x00000000",
"littlefs": "0x000eb000"
},
{
"name": "esp32s2_4mb",
"boot_app0": "0xe000",
"bootloader_qio_80m": "0x1000",
"firmware": "0x10000",
"partitions": "0x8000",
"littlefs": "0x290000"
}
]
"default_envs": "esp8266_4mb"
}
},
"modules": {
@@ -122,7 +24,7 @@
},
{
"path": "src/modules/virtual/owmWeather",
"active": true
"active": false
},
{
"path": "src/modules/virtual/Timer",
@@ -330,7 +232,7 @@
},
{
"path": "src/modules/exec/HttpGet",
"active": true
"active": false
},
{
"path": "src/modules/exec/IoTServo",

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.5.2</title>
<title>IoT Manager 4.5.3</title>
<link rel="icon" type="image/png" href="/favicon.ico" />
<link rel="stylesheet" href="/build/bundle.css?4520" />
<link rel="stylesheet" href="/build/bundle.css?4530" />
<script defer src="/build/bundle.js?4520"></script>
<script defer src="/build/bundle.js?4530"></script>
</head>
<body></body>

247
data_svelte/items.json
View File

@@ -68,29 +68,7 @@
},
{
"global": 0,
"name": "5. Погода OWM",
"type": "Reading",
"subtype": "owmWeather",
"id": "owm",
"needSave": 0,
"widget": "nil",
"page": "Погода",
"descr": "Температура на улице",
"int": 30,
"API_key": "",
"сity": "Moscow",
"lon": "37.54",
"lat": "57.74",
"lang": "ru",
"param": "",
"round": 1,
"val": "...",
"debug": 0,
"num": 5
},
{
"global": 0,
"name": "6. Таймер",
"name": "5. Таймер",
"type": "Writing",
"subtype": "Timer",
"id": "timer",
@@ -102,11 +80,11 @@
"ticker": 1,
"repeat": 1,
"needSave": 0,
"num": 6
"num": 5
},
{
"global": 0,
"name": "7. Окно ввода числа (переменная)",
"name": "6. Окно ввода числа (переменная)",
"type": "Reading",
"subtype": "Variable",
"id": "value",
@@ -120,11 +98,11 @@
"plus": 0,
"multiply": 1,
"round": 0,
"num": 7
"num": 6
},
{
"global": 0,
"name": "8. Окно ввода времени",
"name": "7. Окно ввода времени",
"type": "Reading",
"subtype": "Variable",
"id": "time",
@@ -134,11 +112,11 @@
"descr": "Введите время",
"int": "0",
"val": "02:00",
"num": 8
"num": 7
},
{
"global": 0,
"name": "9. Окно ввода даты",
"name": "8. Окно ввода даты",
"type": "Reading",
"subtype": "Variable",
"id": "time",
@@ -148,11 +126,11 @@
"descr": "Введите дату",
"int": "0",
"val": "24.05.2022",
"num": 9
"num": 8
},
{
"global": 0,
"name": "10. Окно ввода текста",
"name": "9. Окно ввода текста",
"type": "Reading",
"subtype": "Variable",
"id": "txt",
@@ -162,11 +140,11 @@
"descr": "Введите текст",
"int": "0",
"val": "текст",
"num": 10
"num": 9
},
{
"global": 0,
"name": "11. Вывод значения",
"name": "10. Вывод значения",
"type": "Reading",
"subtype": "Variable",
"id": "vout",
@@ -180,11 +158,11 @@
"plus": 0,
"multiply": 1,
"round": 0,
"num": 11
"num": 10
},
{
"global": 0,
"name": "12. Цветной текст",
"name": "11. Цветной текст",
"type": "Reading",
"subtype": "VariableColor",
"id": "color",
@@ -194,11 +172,11 @@
"descr": "Цветной текст",
"val": "...",
"round": 0,
"num": 12
"num": 11
},
{
"global": 0,
"name": "13. Виртуальная кнопка",
"name": "12. Виртуальная кнопка",
"type": "Reading",
"subtype": "VButton",
"id": "vbtn",
@@ -208,13 +186,13 @@
"descr": "Кнопка",
"int": "0",
"val": "0",
"num": 13
"num": 12
},
{
"header": "sensors"
},
{
"name": "14. A02 Дальность",
"name": "13. A02 Дальность",
"type": "Reading",
"subtype": "A02Distance",
"id": "dist",
@@ -223,10 +201,10 @@
"descr": "Дальность",
"int": 5,
"round": 1,
"num": 14
"num": 13
},
{
"name": "15. Acs712 Ток",
"name": "14. Acs712 Ток",
"type": "Reading",
"subtype": "Acs712",
"id": "amp",
@@ -241,11 +219,11 @@
"sens": 100,
"adczero": 512,
"btn-setZero": "nil",
"num": 15
"num": 14
},
{
"global": 0,
"name": "16. AHTXX Температура",
"name": "15. AHTXX Температура",
"type": "Reading",
"subtype": "AhtXXt",
"id": "Temp20",
@@ -256,11 +234,11 @@
"addr": "0x38",
"shtType": 1,
"round": 1,
"num": 16
"num": 15
},
{
"global": 0,
"name": "17. AHTXX Влажность",
"name": "16. AHTXX Влажность",
"type": "Reading",
"subtype": "AhtXXh",
"id": "Hum20",
@@ -271,11 +249,11 @@
"addr": "0x38",
"shtType": 1,
"round": 1,
"num": 17
"num": 16
},
{
"global": 0,
"name": "18. Аналоговый сенсор",
"name": "17. Аналоговый сенсор",
"type": "Reading",
"subtype": "AnalogAdc",
"id": "t",
@@ -289,11 +267,11 @@
"pin": 0,
"int": 15,
"avgSteps": 1,
"num": 18
"num": 17
},
{
"global": 0,
"name": "19. BME280 Температура",
"name": "18. BME280 Температура",
"type": "Reading",
"subtype": "Bme280t",
"id": "Tmp3",
@@ -303,11 +281,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 19
"num": 18
},
{
"global": 0,
"name": "20. BME280 Давление",
"name": "19. BME280 Давление",
"type": "Reading",
"subtype": "Bme280p",
"id": "Press3",
@@ -317,11 +295,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 20
"num": 19
},
{
"global": 0,
"name": "21. BME280 Влажность",
"name": "20. BME280 Влажность",
"type": "Reading",
"subtype": "Bme280h",
"id": "Hum3",
@@ -331,11 +309,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 21
"num": 20
},
{
"global": 0,
"name": "22. BME280 Tочка росы",
"name": "21. BME280 Tочка росы",
"type": "Reading",
"subtype": "Bme280dp",
"id": "Dew3",
@@ -345,11 +323,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 22
"num": 21
},
{
"global": 0,
"name": "23. BMP280 Температура",
"name": "22. BMP280 Температура",
"type": "Reading",
"subtype": "Bmp280t",
"id": "tmp3",
@@ -359,11 +337,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 23
"num": 22
},
{
"global": 0,
"name": "24. BMP280 Давление",
"name": "23. BMP280 Давление",
"type": "Reading",
"subtype": "Bmp280p",
"id": "Press3",
@@ -373,11 +351,11 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 24
"num": 23
},
{
"global": 0,
"name": "25. DHT11 Температура",
"name": "24. DHT11 Температура",
"type": "Reading",
"subtype": "Dht1122t",
"id": "tmp3",
@@ -387,11 +365,11 @@
"int": 15,
"pin": 0,
"senstype": "dht11",
"num": 25
"num": 24
},
{
"global": 0,
"name": "26. DHT11 Влажность",
"name": "25. DHT11 Влажность",
"type": "Reading",
"subtype": "Dht1122h",
"id": "Hum3",
@@ -401,11 +379,11 @@
"int": 15,
"pin": 0,
"senstype": "dht11",
"num": 26
"num": 25
},
{
"global": 0,
"name": "27. DS18B20 Температура",
"name": "26. DS18B20 Температура",
"type": "Reading",
"subtype": "Ds18b20",
"id": "dstmp",
@@ -417,11 +395,11 @@
"index": 0,
"addr": "",
"round": 1,
"num": 27
"num": 26
},
{
"global": 0,
"name": "28. Аналоговый счетчик импульсов",
"name": "27. Аналоговый счетчик импульсов",
"type": "Writing",
"subtype": "Impulse",
"id": "impulse",
@@ -434,11 +412,11 @@
"pinMode": "INPUT",
"debounceDelay": 3,
"multiply": 1,
"num": 28
"num": 27
},
{
"global": 0,
"name": "29. PZEM 004t Напряжение",
"name": "28. PZEM 004t Напряжение",
"type": "Reading",
"subtype": "Pzem004v",
"id": "v",
@@ -448,11 +426,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 29
"num": 28
},
{
"global": 0,
"name": "30. PZEM 004t Сила тока",
"name": "29. PZEM 004t Сила тока",
"type": "Reading",
"subtype": "Pzem004a",
"id": "a",
@@ -462,11 +440,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 30
"num": 29
},
{
"global": 0,
"name": "31. PZEM 004t Мощность",
"name": "30. PZEM 004t Мощность",
"type": "Reading",
"subtype": "Pzem004w",
"id": "w",
@@ -476,11 +454,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 31
"num": 30
},
{
"global": 0,
"name": "32. PZEM 004t Энергия",
"name": "31. PZEM 004t Энергия",
"type": "Reading",
"subtype": "Pzem004wh",
"id": "wh",
@@ -490,11 +468,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 32
"num": 31
},
{
"global": 0,
"name": "33. PZEM 004t Частота",
"name": "32. PZEM 004t Частота",
"type": "Reading",
"subtype": "Pzem004hz",
"id": "hz",
@@ -504,11 +482,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 33
"num": 32
},
{
"global": 0,
"name": "34. PZEM 004t Косинус",
"name": "33. PZEM 004t Косинус",
"type": "Reading",
"subtype": "Pzem004pf",
"id": "pf",
@@ -518,11 +496,11 @@
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 34
"num": 33
},
{
"global": 0,
"name": "35. PZEM настройка",
"name": "34. PZEM настройка",
"type": "Reading",
"subtype": "Pzem004cmd",
"id": "set",
@@ -534,11 +512,11 @@
"changeaddr": 0,
"setaddr": "0x01",
"reset": 0,
"num": 35
"num": 34
},
{
"global": 0,
"name": "36. Часы реального времени",
"name": "35. Часы реального времени",
"type": "Reading",
"subtype": "RTC",
"id": "rtc",
@@ -554,11 +532,11 @@
"int": 5,
"btn-setUTime": "0",
"btn-setSysTime": "nil",
"num": 36
"num": 35
},
{
"name": "37. (S8) Cенсор качества воздуха",
"num": 37,
"name": "36. (S8) Cенсор качества воздуха",
"num": 36,
"type": "Reading",
"subtype": "S8co",
"id": "s8co",
@@ -572,7 +550,7 @@
},
{
"global": 0,
"name": "38. Sht20 Температура",
"name": "37. Sht20 Температура",
"type": "Reading",
"subtype": "Sht20t",
"id": "tmp2",
@@ -581,11 +559,11 @@
"descr": "Температура",
"int": 15,
"round": 1,
"num": 38
"num": 37
},
{
"global": 0,
"name": "39. Sht20 Влажность",
"name": "38. Sht20 Влажность",
"type": "Reading",
"subtype": "Sht20h",
"id": "Hum2",
@@ -594,11 +572,11 @@
"descr": "Влажность",
"int": 15,
"round": 1,
"num": 39
"num": 38
},
{
"global": 0,
"name": "40. Sht30 Температура",
"name": "39. Sht30 Температура",
"type": "Reading",
"subtype": "Sht30t",
"id": "tmp30",
@@ -607,11 +585,11 @@
"descr": "SHT30 Температура",
"int": 15,
"round": 1,
"num": 40
"num": 39
},
{
"global": 0,
"name": "41. Sht30 Влажность",
"name": "40. Sht30 Влажность",
"type": "Reading",
"subtype": "Sht30h",
"id": "Hum30",
@@ -620,12 +598,12 @@
"descr": "SHT30 Влажность",
"int": 15,
"round": 1,
"num": 41
"num": 40
},
{
"global": 0,
"name": "42. HC-SR04 Ультразвуковой дальномер",
"num": 42,
"name": "41. HC-SR04 Ультразвуковой дальномер",
"num": 41,
"type": "Reading",
"subtype": "Sonar",
"id": "sonar",
@@ -637,7 +615,7 @@
"int": 5
},
{
"name": "43. UART",
"name": "42. UART",
"type": "Reading",
"subtype": "UART",
"page": "",
@@ -649,14 +627,14 @@
"line": 2,
"speed": 9600,
"eventFormat": 0,
"num": 43
"num": 42
},
{
"header": "executive_devices"
},
{
"global": 0,
"name": "44. Кнопка подключенная к пину",
"name": "43. Кнопка подключенная к пину",
"type": "Writing",
"subtype": "ButtonIn",
"id": "btn",
@@ -671,11 +649,11 @@
"debounceDelay": 50,
"fixState": 0,
"inv": 0,
"num": 44
"num": 43
},
{
"global": 0,
"name": "45. Управление пином",
"name": "44. Управление пином",
"type": "Writing",
"subtype": "ButtonOut",
"needSave": 0,
@@ -686,11 +664,11 @@
"int": 0,
"inv": 0,
"pin": 2,
"num": 45
"num": 44
},
{
"global": 0,
"name": "46. Пассивный звуковой извещатель",
"name": "45. Пассивный звуковой извещатель",
"type": "Writing",
"subtype": "Buzzer",
"id": "buzzer",
@@ -709,11 +687,11 @@
"cycle": 0,
"indication": 1,
"val": 0,
"num": 46
"num": 45
},
{
"global": 0,
"name": "47. Энкодер",
"name": "46. Энкодер",
"type": "Writing",
"subtype": "Encoder",
"id": "enc",
@@ -726,24 +704,11 @@
"step": 1,
"stepOnPress": 5,
"pins": "4,5,2",
"num": 47
"num": 46
},
{
"global": 0,
"name": "48. HttpGet",
"type": "Writing",
"subtype": "HttpGet",
"id": "http",
"widget": "",
"page": "",
"descr": "",
"token": "",
"chatID": "",
"num": 48
},
{
"global": 0,
"name": "49. Сервопривод",
"name": "47. Сервопривод",
"type": "Writing",
"subtype": "IoTServo",
"id": "servo",
@@ -754,11 +719,11 @@
"pin": 12,
"apin": -1,
"amap": "0, 4096, 0, 180",
"num": 49
"num": 47
},
{
"global": 0,
"name": "50. Расширитель портов Mcp23017",
"name": "48. Расширитель портов Mcp23017",
"type": "Reading",
"subtype": "Mcp23017",
"id": "Mcp",
@@ -768,11 +733,11 @@
"int": "0",
"addr": "0x20",
"index": 1,
"num": 50
"num": 48
},
{
"global": 0,
"name": "51. MP3 плеер",
"name": "49. MP3 плеер",
"type": "Reading",
"subtype": "Mp3",
"id": "mp3",
@@ -782,11 +747,11 @@
"int": 1,
"pins": "14,12",
"volume": 20,
"num": 51
"num": 49
},
{
"global": 0,
"name": "52. Сенсорная кнопка",
"name": "50. Сенсорная кнопка",
"type": "Writing",
"subtype": "Multitouch",
"id": "impulse",
@@ -800,11 +765,11 @@
"pinMode": "INPUT",
"debounceDelay": 50,
"PWMDelay": 500,
"num": 52
"num": 50
},
{
"global": 0,
"name": "53. Расширитель портов Pcf8574",
"name": "51. Расширитель портов Pcf8574",
"type": "Reading",
"subtype": "Pcf8574",
"id": "Pcf",
@@ -814,11 +779,11 @@
"int": "0",
"addr": "0x20",
"index": 1,
"num": 53
"num": 51
},
{
"global": 0,
"name": "54. PWM ESP8266",
"name": "52. PWM ESP8266",
"type": "Writing",
"subtype": "Pwm8266",
"id": "pwm",
@@ -830,11 +795,11 @@
"freq": 5000,
"val": 0,
"apin": -1,
"num": 54
"num": 52
},
{
"global": 0,
"name": "55. Телеграм-Лайт",
"name": "53. Телеграм-Лайт",
"type": "Writing",
"subtype": "TelegramLT",
"id": "tg",
@@ -843,14 +808,14 @@
"descr": "",
"token": "",
"chatID": "",
"num": 55
"num": 53
},
{
"header": "screens"
},
{
"global": 0,
"name": "56. LCD экран 2004",
"name": "54. LCD экран 2004",
"type": "Reading",
"subtype": "Lcd2004",
"id": "Lcd",
@@ -863,10 +828,10 @@
"id2show": "",
"prefix": "",
"postfix": "",
"num": 56
"num": 54
},
{
"name": "57. LCD экран 1602",
"name": "55. LCD экран 1602",
"type": "Reading",
"subtype": "Lcd2004",
"id": "Lcd",
@@ -879,11 +844,11 @@
"id2show": "",
"prefix": "",
"postfix": "",
"num": 57
"num": 55
},
{
"global": 0,
"name": "58. OLED экран 64 8266",
"name": "56. OLED экран 64 8266",
"type": "Reading",
"subtype": "Oled64",
"id": "Oled",
@@ -896,11 +861,11 @@
"id2show": "",
"prefix": "",
"postfix": "",
"num": 58
"num": 56
},
{
"global": 0,
"name": "59. 7 сегментный дисплей TM16XX",
"name": "57. 7 сегментный дисплей TM16XX",
"type": "Writing",
"subtype": "TM16XX",
"id": "tm",
@@ -916,6 +881,6 @@
"intensity": "5",
"on": "1",
"id2show": "",
"num": 59
"num": 57
}
]

2
include/Const.h
View File

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

4
myProfile.json
View File

@@ -122,7 +122,7 @@
},
{
"path": "src/modules/virtual/owmWeather",
"active": true
"active": false
},
{
"path": "src/modules/virtual/Timer",
@@ -330,7 +330,7 @@
},
{
"path": "src/modules/exec/HttpGet",
"active": true
"active": false
},
{
"path": "src/modules/exec/IoTServo",

2
platformio.ini
View File

@@ -489,7 +489,6 @@ build_src_filter =
+<modules/virtual/Cron>
+<modules/virtual/Loging>
+<modules/virtual/LogingDaily>
+<modules/virtual/owmWeather>
+<modules/virtual/Timer>
+<modules/virtual/Variable>
+<modules/virtual/VariableColor>
@@ -514,7 +513,6 @@ build_src_filter =
+<modules/exec/ButtonOut>
+<modules/exec/Buzzer>
+<modules/exec/Enconder>
+<modules/exec/HttpGet>
+<modules/exec/IoTServo>
+<modules/exec/Mcp23017>
+<modules/exec/Mp3>

4
src/modules/API.cpp
View File

@@ -3,7 +3,6 @@
void* getAPI_Cron(String subtype, String params);
void* getAPI_Loging(String subtype, String params);
void* getAPI_LogingDaily(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);
void* getAPI_VariableColor(String subtype, String params);
@@ -28,7 +27,6 @@ void* getAPI_ButtonIn(String subtype, String params);
void* getAPI_ButtonOut(String subtype, String params);
void* getAPI_Buzzer(String subtype, String params);
void* getAPI_Encoder(String subtype, String params);
void* getAPI_HttpGet(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);
@@ -45,7 +43,6 @@ 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_owmWeather(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_VariableColor(subtype, params)) != nullptr) return tmpAPI;
@@ -70,7 +67,6 @@ 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;
if ((tmpAPI = getAPI_Encoder(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_HttpGet(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;

12
src/modules/virtual/owmWeather/modinfo.json
View File

@@ -1,6 +1,5 @@
{
"menuSection": "virtual_elments",
"configItem": [
{
"global": 0,
@@ -24,7 +23,6 @@
"debug": 0
}
],
"about": {
"authorName": "Serghei Crasnicov, v2.0 Mikhail Bubnov",
"authorContact": "https://t.me/Serghei63",
@@ -60,18 +58,16 @@
"lon": "Долгота, при использовании координат, будет автоматически выбран ближайший город",
"lat": "Широта, при использовании координат, будет автоматически выбран ближайший город",
"lang": "Язык используемый в ответах OpenWetaherMap",
"debug":"1 - выводить дополнительный лог в сериал"
"debug": "1 - выводить дополнительный лог в сериал"
}
},
"defActive": true,
"defActive": false,
"usedLibs": {
"esp32_4mb": [],
"esp32s2_4mb": [],
"esp32_16mb": [],
"esp8266_4mb": [],
"esp8266_16mb": [],
"esp8266_16mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": [],
"esp8285_1mb": [],
@@ -79,4 +75,4 @@
"esp8266_2mb": [],
"esp8266_2mb_ota": []
}
}
}