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

Корректируем новую схему с новыми устройствами esp01

Browse Source
This commit is contained in:
biver
2022-10-12 15:48:05 +03:00
parent 3af9b457de
commit 0e44ba1a3e
20 changed files with 380 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

474
data_svelte/items.json
View File

@@ -7,34 +7,7 @@
"header": "Виртуальные элементы" "header": "Виртуальные элементы"
}, },
{ {
"name": "1. График", "name": "1. Таймер",
"type": "Writing",
"subtype": "Loging",
"id": "log",
"widget": "chart2",
"page": "Графики",
"descr": "Температура",
"num": 1,
"int": 5,
"logid": "t",
"points": 300
},
{
"name": "2. График дневного расхода",
"type": "Writing",
"subtype": "LogingDaily",
"id": "log",
"widget": "chart3",
"page": "Графики",
"descr": "Температура",
"num": 2,
"int": 1,
"logid": "t",
"points": 365,
"test": 0
},
{
"name": "3. Таймер",
"type": "Writing", "type": "Writing",
"subtype": "Timer", "subtype": "Timer",
"id": "timer", "id": "timer",
@@ -46,10 +19,10 @@
"ticker": 1, "ticker": 1,
"repeat": 1, "repeat": 1,
"needSave": 0, "needSave": 0,
"num": 3 "num": 1
}, },
{ {
"name": "4. Окно ввода числа (переменная)", "name": "2. Окно ввода числа (переменная)",
"type": "Reading", "type": "Reading",
"subtype": "Variable", "subtype": "Variable",
"id": "value", "id": "value",
@@ -58,10 +31,10 @@
"descr": "Введите число", "descr": "Введите число",
"int": "0", "int": "0",
"val": "0.0", "val": "0.0",
"num": 4 "num": 2
}, },
{ {
"name": "5. Окно ввода времени", "name": "3. Окно ввода времени",
"type": "Reading", "type": "Reading",
"subtype": "Variable", "subtype": "Variable",
"id": "time", "id": "time",
@@ -70,10 +43,10 @@
"descr": "Введите время", "descr": "Введите время",
"int": "0", "int": "0",
"val": "02:00", "val": "02:00",
"num": 5 "num": 3
}, },
{ {
"name": "6. Окно ввода даты", "name": "4. Окно ввода даты",
"type": "Reading", "type": "Reading",
"subtype": "Variable", "subtype": "Variable",
"id": "time", "id": "time",
@@ -82,10 +55,10 @@
"descr": "Введите дату", "descr": "Введите дату",
"int": "0", "int": "0",
"val": "24.05.2022", "val": "24.05.2022",
"num": 6 "num": 4
}, },
{ {
"name": "7. Окно ввода текста", "name": "5. Окно ввода текста",
"type": "Reading", "type": "Reading",
"subtype": "Variable", "subtype": "Variable",
"id": "txt", "id": "txt",
@@ -94,10 +67,10 @@
"descr": "Введите текст", "descr": "Введите текст",
"int": "0", "int": "0",
"val": "текст", "val": "текст",
"num": 7 "num": 5
}, },
{ {
"name": "8. Виртуальная кнопка", "name": "6. Виртуальная кнопка",
"type": "Reading", "type": "Reading",
"subtype": "VButton", "subtype": "VButton",
"id": "vbtn", "id": "vbtn",
@@ -106,162 +79,13 @@
"descr": "Кнопка", "descr": "Кнопка",
"int": "0", "int": "0",
"val": "0", "val": "0",
"num": 8 "num": 6
}, },
{ {
"header": "Сенсоры" "header": "Сенсоры"
}, },
{ {
"name": "9. Acs712 Ток", "name": "7. DS18B20 Температура",
"type": "Reading",
"subtype": "Acs712",
"id": "amp",
"widget": "anydataAmp",
"page": "Сенсоры",
"descr": "Ток",
"round": 3,
"pin": 39,
"int": 5,
"num": 9
},
{
"name": "10. AHTXX Температура",
"type": "Reading",
"subtype": "AhtXXt",
"id": "Temp20",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "AHTXX Температура",
"int": 15,
"addr": "0x38",
"shtType": 1,
"round": 1,
"num": 10
},
{
"name": "11. AHTXX Влажность",
"type": "Reading",
"subtype": "AhtXXh",
"id": "Hum20",
"widget": "anydataHum",
"page": "Сенсоры",
"descr": "AHTXX Влажность",
"int": 15,
"addr": "0x38",
"shtType": 1,
"round": 1,
"num": 11
},
{
"name": "12. Аналоговый сенсор",
"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": 12
},
{
"name": "13. BME280 Температура",
"type": "Reading",
"subtype": "Bme280t",
"id": "tmp3",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "Температура",
"int": 15,
"addr": "0x77",
"round": 1,
"num": 13
},
{
"name": "14. BME280 Давление",
"type": "Reading",
"subtype": "Bme280p",
"id": "Press3",
"widget": "anydataMm",
"page": "Сенсоры",
"descr": "Давление",
"int": 15,
"addr": "0x77",
"round": 1,
"num": 14
},
{
"name": "15. BME280 Влажность",
"type": "Reading",
"subtype": "Bme280h",
"id": "Hum3",
"widget": "anydataHum",
"page": "Сенсоры",
"descr": "Влажность",
"int": 15,
"addr": "0x77",
"round": 1,
"num": 15
},
{
"name": "16. BMP280 Температура",
"type": "Reading",
"subtype": "Bmp280t",
"id": "tmp3",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "280 Температура",
"int": 15,
"addr": "0x77",
"round": 1,
"num": 16
},
{
"name": "17. BMP280 Давление",
"type": "Reading",
"subtype": "Bmp280p",
"id": "Press3",
"widget": "anydataMm",
"page": "Сенсоры",
"descr": "280 Давление",
"int": 15,
"addr": "0x77",
"round": 1,
"num": 17
},
{
"name": "18. DHT11 Температура",
"type": "Reading",
"subtype": "Dht1122t",
"id": "tmp3",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "Температура",
"int": 15,
"pin": 0,
"senstype": "dht11",
"num": 18
},
{
"name": "19. DHT11 Влажность",
"type": "Reading",
"subtype": "Dht1122h",
"id": "Hum3",
"widget": "anydataHum",
"page": "Сенсоры",
"descr": "Влажность",
"int": 15,
"pin": 0,
"senstype": "dht11",
"num": 19
},
{
"name": "20. DS18B20 Температура",
"type": "Reading", "type": "Reading",
"subtype": "Ds18b20", "subtype": "Ds18b20",
"id": "dstmp", "id": "dstmp",
@@ -273,153 +97,11 @@
"index": 0, "index": 0,
"addr": "", "addr": "",
"round": 1, "round": 1,
"num": 20 "num": 7
}, },
{ {
"name": "21. GY21 Температура", "name": "8. Сканер кнопок 433 MHz",
"type": "Reading", "num": 8,
"subtype": "GY21t",
"id": "tmp4",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "Температура",
"round": 1,
"int": 15,
"num": 21
},
{
"name": "22. GY21 Влажность",
"type": "Reading",
"subtype": "GY21h",
"id": "Hum4",
"widget": "anydataHum",
"page": "Сенсоры",
"descr": "Влажность",
"round": 1,
"int": 15,
"num": 22
},
{
"name": "23. HDC1080 Температура",
"type": "Reading",
"subtype": "Hdc1080t",
"id": "Temp1080",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "1080 Температура",
"int": 15,
"addr": "0x40",
"round": 1,
"num": 23
},
{
"name": "24. HDC1080 Влажность",
"type": "Reading",
"subtype": "Hdc1080h",
"id": "Hum1080",
"widget": "anydataHum",
"page": "Сенсоры",
"descr": "1080 Влажность",
"int": 15,
"addr": "0x40",
"round": 1,
"num": 24
},
{
"name": "25. MAX6675 Температура",
"type": "Reading",
"subtype": "Max6675t",
"id": "maxtmp",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "MAX Температура",
"int": 15,
"DO": 12,
"CS": 13,
"CLK": 14,
"num": 25
},
{
"name": "26. PZEM 004t Напряжение",
"type": "Reading",
"subtype": "Pzem004v",
"id": "v",
"widget": "anydataVlt",
"page": "PZEM",
"descr": "Напряжение",
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 26
},
{
"name": "27. PZEM 004t Сила тока",
"type": "Reading",
"subtype": "Pzem004a",
"id": "a",
"widget": "anydataAmp",
"page": "PZEM",
"descr": "Сила тока",
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 27
},
{
"name": "28. PZEM 004t Мощность",
"type": "Reading",
"subtype": "Pzem004w",
"id": "w",
"widget": "anydataWt",
"page": "PZEM",
"descr": "Мощность",
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 28
},
{
"name": "29. PZEM 004t Энергия",
"type": "Reading",
"subtype": "Pzem004wh",
"id": "wh",
"widget": "anydataWth",
"page": "PZEM",
"descr": "Энергия",
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 29
},
{
"name": "30. PZEM 004t Частота",
"type": "Reading",
"subtype": "Pzem004hz",
"id": "hz",
"widget": "anydataHtz",
"page": "PZEM",
"descr": "Частота",
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 30
},
{
"name": "31. PZEM 004t Косинус",
"type": "Reading",
"subtype": "Pzem004pf",
"id": "pf",
"widget": "anydata",
"page": "PZEM",
"descr": "Косинус F",
"int": 15,
"addr": "0xF8",
"round": 1,
"num": 31
},
{
"name": "32. Сканер кнопок 433 MHz",
"num": 32,
"type": "Reading", "type": "Reading",
"subtype": "RCswitch", "subtype": "RCswitch",
"id": "rsw", "id": "rsw",
@@ -428,56 +110,8 @@
"pinTx": 12 "pinTx": 12
}, },
{ {
"name": "33. Sht20 Температура", "name": "9. HC-SR04 Ультразвуковой дальномер",
"type": "Reading", "num": 9,
"subtype": "Sht20t",
"id": "tmp2",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "Температура",
"int": 15,
"round": 1,
"num": 33
},
{
"name": "34. Sht20 Влажность",
"type": "Reading",
"subtype": "Sht20h",
"id": "Hum2",
"widget": "anydataHum",
"page": "Сенсоры",
"descr": "Влажность",
"int": 15,
"round": 1,
"num": 34
},
{
"name": "35. Sht30 Температура",
"type": "Reading",
"subtype": "Sht30t",
"id": "tmp30",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "SHT30 Температура",
"int": 15,
"round": 1,
"num": 35
},
{
"name": "36. Sht30 Влажность",
"type": "Reading",
"subtype": "Sht30h",
"id": "Hum30",
"widget": "anydataHum",
"page": "Сенсоры",
"descr": "SHT30 Влажность",
"int": 15,
"round": 1,
"num": 36
},
{
"name": "37. HC-SR04 Ультразвуковой дальномер",
"num": 37,
"type": "Reading", "type": "Reading",
"subtype": "Sonar", "subtype": "Sonar",
"id": "sonar", "id": "sonar",
@@ -488,24 +122,11 @@
"pinEcho": 4, "pinEcho": 4,
"int": 5 "int": 5
}, },
{
"name": "38. UART",
"type": "Reading",
"subtype": "UART",
"page": "",
"descr": "",
"widget": "nil",
"id": "u",
"tx": 12,
"rx": 13,
"speed": 9600,
"num": 38
},
{ {
"header": "Исполнительные устройства" "header": "Исполнительные устройства"
}, },
{ {
"name": "39. Кнопка подключенная к пину", "name": "10. Кнопка подключенная к пину",
"type": "Writing", "type": "Writing",
"subtype": "ButtonIn", "subtype": "ButtonIn",
"id": "btn", "id": "btn",
@@ -518,10 +139,10 @@
"pinMode": "INPUT", "pinMode": "INPUT",
"debounceDelay": 50, "debounceDelay": 50,
"fixState": 0, "fixState": 0,
"num": 39 "num": 10
}, },
{ {
"name": "40. Управление пином", "name": "11. Управление пином",
"type": "Writing", "type": "Writing",
"subtype": "ButtonOut", "subtype": "ButtonOut",
"id": "btn", "id": "btn",
@@ -531,24 +152,10 @@
"int": 0, "int": 0,
"inv": 0, "inv": 0,
"pin": 2, "pin": 2,
"num": 40 "num": 11
}, },
{ {
"name": "41. Сервопривод", "name": "12. Расширитель портов Mcp23017",
"type": "Writing",
"subtype": "IoTServo",
"id": "servo",
"widget": "range",
"page": "servo",
"descr": "угол",
"int": 1,
"pin": 12,
"apin": -1,
"amap": "0, 4096, 0, 180",
"num": 41
},
{
"name": "42. Расширитель портов Mcp23017",
"type": "Reading", "type": "Reading",
"subtype": "Mcp23017", "subtype": "Mcp23017",
"id": "Mcp", "id": "Mcp",
@@ -558,23 +165,10 @@
"int": "0", "int": "0",
"addr": "0x20", "addr": "0x20",
"index": 1, "index": 1,
"num": 42 "num": 12
}, },
{ {
"name": "43. MP3 плеер", "name": "13. Расширитель портов Pcf8574",
"type": "Reading",
"subtype": "Mp3",
"id": "mp3",
"widget": "",
"page": "",
"descr": "",
"int": 1,
"pins": "14,12",
"volume": 20,
"num": 43
},
{
"name": "44. Расширитель портов Pcf8574",
"type": "Reading", "type": "Reading",
"subtype": "Pcf8574", "subtype": "Pcf8574",
"id": "Pcf", "id": "Pcf",
@@ -584,10 +178,10 @@
"int": "0", "int": "0",
"addr": "0x20", "addr": "0x20",
"index": 1, "index": 1,
"num": 44 "num": 13
}, },
{ {
"name": "45. PWM ESP8266", "name": "14. PWM ESP8266",
"type": "Writing", "type": "Writing",
"subtype": "Pwm8266", "subtype": "Pwm8266",
"id": "pwm", "id": "pwm",
@@ -599,10 +193,10 @@
"freq": 5000, "freq": 5000,
"val": 0, "val": 0,
"apin": -1, "apin": -1,
"num": 45 "num": 14
}, },
{ {
"name": "46. Телеграм-Лайт", "name": "15. Телеграм-Лайт",
"type": "Writing", "type": "Writing",
"subtype": "TelegramLT", "subtype": "TelegramLT",
"id": "tg", "id": "tg",
@@ -611,13 +205,13 @@
"descr": "", "descr": "",
"token": "", "token": "",
"chatID": "", "chatID": "",
"num": 46 "num": 15
}, },
{ {
"header": "Экраны" "header": "Экраны"
}, },
{ {
"name": "47. LCD экран 2004", "name": "16. LCD экран 2004",
"type": "Reading", "type": "Reading",
"subtype": "Lcd2004", "subtype": "Lcd2004",
"id": "Lcd", "id": "Lcd",
@@ -629,10 +223,10 @@
"size": "20,4", "size": "20,4",
"coord": "0,0", "coord": "0,0",
"id2show": "id датчика", "id2show": "id датчика",
"num": 47 "num": 16
}, },
{ {
"name": "48. LCD экран 1602", "name": "17. LCD экран 1602",
"type": "Reading", "type": "Reading",
"subtype": "Lcd2004", "subtype": "Lcd2004",
"id": "Lcd", "id": "Lcd",
@@ -644,6 +238,6 @@
"size": "16,2", "size": "16,2",
"coord": "0,0", "coord": "0,0",
"id2show": "id датчика", "id2show": "id датчика",
"num": 48 "num": 17
} }
] ]

37
data_svelte_lite/index.html
View File

@@ -1,3 +1,4 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@@ -5,12 +6,36 @@
<meta name="viewport" content="width=device-width,initial-scale=1" /> <meta name="viewport" content="width=device-width,initial-scale=1" />
<title>IoT Manager 4.4.1</title> <title>IoT Manager 4.4.1</title>
<link rel="icon" type="image/png" href="/favicon.ico" />
<link rel="icon" type="image/png" href="https://iotmanager.org/favicon.ico" /> <link rel="stylesheet" href="https://iotmanager.org/esp01ota/build/bundle.css?440" />
<link rel="stylesheet" href="https://iotmanager.org/build/bundle.css?441" />
<script defer src="https://iotmanager.org/build/bundle.js?441"></script>
</head> </head>
<body></body> <body>
<script>
let script = document.createElement('script');
script.src = "https://iotmanager.org/esp01ota/build/bundle.js?440";
script.onload = execute;
document.head.append(script);
script.onerror = error;
function error() {
console.log("ошибка при загрузке ресурса");
}
function execute() {
console.log("скрипт загружен");
document.getElementById("my-form").style.display="none";
}
</script>
<div style="display: flex; align-items: center; justify-content: center;" >
<form method="GET" action="http://192.168.4.1/set" id="my-form">
<br><br><h1>Настройка WiFi</h1><br>
<div>
<input name="routerssid" type="text" placeholder="WIFI">
</div><br>
<div>
<input name="routerpass" placeholder="Password">
</div><br><br>
<input type="submit" value="сохранить">
</form>
</div>
</body>
</html> </html>

219
data_svelte_lite/items.json
View File

@@ -6,12 +6,102 @@
{ {
"header": "Виртуальные элементы" "header": "Виртуальные элементы"
}, },
{
"name": "1. Таймер",
"type": "Writing",
"subtype": "Timer",
"id": "timer",
"widget": "anydataDef",
"page": "Таймеры",
"descr": "Таймер",
"int": 1,
"countDown": 15,
"ticker": 1,
"repeat": 1,
"needSave": 0,
"num": 1
},
{
"name": "2. Окно ввода числа (переменная)",
"type": "Reading",
"subtype": "Variable",
"id": "value",
"widget": "inputDgt",
"page": "Ввод",
"descr": "Введите число",
"int": "0",
"val": "0.0",
"num": 2
},
{
"name": "3. Окно ввода времени",
"type": "Reading",
"subtype": "Variable",
"id": "time",
"widget": "inputTm",
"page": "Ввод",
"descr": "Введите время",
"int": "0",
"val": "02:00",
"num": 3
},
{
"name": "4. Окно ввода даты",
"type": "Reading",
"subtype": "Variable",
"id": "time",
"widget": "inputDate",
"page": "Ввод",
"descr": "Введите дату",
"int": "0",
"val": "24.05.2022",
"num": 4
},
{
"name": "5. Окно ввода текста",
"type": "Reading",
"subtype": "Variable",
"id": "txt",
"widget": "inputTxt",
"page": "Ввод",
"descr": "Введите текст",
"int": "0",
"val": "текст",
"num": 5
},
{
"name": "6. Виртуальная кнопка",
"type": "Reading",
"subtype": "VButton",
"id": "vbtn",
"widget": "toggle",
"page": "Кнопки",
"descr": "Кнопка",
"int": "0",
"val": "0",
"num": 6
},
{ {
"header": "Сенсоры" "header": "Сенсоры"
}, },
{ {
"name": "1. Сканер кнопок 433 MHz", "name": "7. DS18B20 Температура",
"num": 1, "type": "Reading",
"subtype": "Ds18b20",
"id": "dstmp",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "DS Температура",
"int": 15,
"pin": 2,
"index": 0,
"addr": "",
"round": 1,
"num": 7
},
{
"name": "8. Сканер кнопок 433 MHz",
"num": 8,
"type": "Reading", "type": "Reading",
"subtype": "RCswitch", "subtype": "RCswitch",
"id": "rsw", "id": "rsw",
@@ -19,10 +109,135 @@
"pinRx": 12, "pinRx": 12,
"pinTx": 12 "pinTx": 12
}, },
{
"name": "9. HC-SR04 Ультразвуковой дальномер",
"num": 9,
"type": "Reading",
"subtype": "Sonar",
"id": "sonar",
"widget": "anydataTmp",
"page": "Сенсоры",
"descr": "Расстояние (см)",
"pinTrig": 5,
"pinEcho": 4,
"int": 5
},
{ {
"header": "Исполнительные устройства" "header": "Исполнительные устройства"
}, },
{
"name": "10. Кнопка подключенная к пину",
"type": "Writing",
"subtype": "ButtonIn",
"id": "btn",
"widget": "toggle",
"page": "Кнопки",
"descr": "Освещение",
"int": 0,
"pin": 16,
"execLevel": "1",
"pinMode": "INPUT",
"debounceDelay": 50,
"fixState": 0,
"num": 10
},
{
"name": "11. Управление пином",
"type": "Writing",
"subtype": "ButtonOut",
"id": "btn",
"widget": "toggle",
"page": "Кнопки",
"descr": "Освещение",
"int": 0,
"inv": 0,
"pin": 2,
"num": 11
},
{
"name": "12. Расширитель портов Mcp23017",
"type": "Reading",
"subtype": "Mcp23017",
"id": "Mcp",
"widget": "",
"page": "",
"descr": "",
"int": "0",
"addr": "0x20",
"index": 1,
"num": 12
},
{
"name": "13. Расширитель портов Pcf8574",
"type": "Reading",
"subtype": "Pcf8574",
"id": "Pcf",
"widget": "",
"page": "",
"descr": "",
"int": "0",
"addr": "0x20",
"index": 1,
"num": 13
},
{
"name": "14. PWM ESP8266",
"type": "Writing",
"subtype": "Pwm8266",
"id": "pwm",
"widget": "range",
"page": "Кнопки",
"descr": "PWM",
"int": 0,
"pin": 15,
"freq": 5000,
"val": 0,
"apin": -1,
"num": 14
},
{
"name": "15. Телеграм-Лайт",
"type": "Writing",
"subtype": "TelegramLT",
"id": "tg",
"widget": "",
"page": "",
"descr": "",
"token": "",
"chatID": "",
"num": 15
},
{ {
"header": "Экраны" "header": "Экраны"
},
{
"name": "16. LCD экран 2004",
"type": "Reading",
"subtype": "Lcd2004",
"id": "Lcd",
"widget": "",
"page": "",
"descr": "T",
"int": 15,
"addr": "0x27",
"size": "20,4",
"coord": "0,0",
"id2show": "id датчика",
"num": 16
},
{
"name": "17. LCD экран 1602",
"type": "Reading",
"subtype": "Lcd2004",
"id": "Lcd",
"widget": "",
"page": "",
"descr": "T",
"int": 15,
"addr": "0x27",
"size": "16,2",
"coord": "0,0",
"id2show": "id датчика",
"num": 17
} }
] ]

14
include/Const.h
View File

@@ -3,6 +3,14 @@
//Версия прошивки //Версия прошивки
#define FIRMWARE_VERSION 431 #define FIRMWARE_VERSION 431
#ifdef esp8266_1mb_ota
#define FIRMWARE_NAME "esp8266_1mb_ota"
#endif
#ifdef esp8266_1mb
#define FIRMWARE_NAME "esp8266_1mb"
#endif
#ifdef esp8266_4mb #ifdef esp8266_4mb
#define FIRMWARE_NAME "esp8266_4mb" #define FIRMWARE_NAME "esp8266_4mb"
#endif #endif
@@ -30,13 +38,7 @@
#define TELEMETRY_UPDATE_INTERVAL_MIN 60 #define TELEMETRY_UPDATE_INTERVAL_MIN 60
#ifdef esp8266_4mb
#define USE_LITTLEFS true #define USE_LITTLEFS true
#endif
#ifdef esp32_4mb
#define USE_LITTLEFS true
#endif
#define START_DATETIME 1661990400 // 01.09.2022 00:00:00 константа для сокращения unix time #define START_DATETIME 1661990400 // 01.09.2022 00:00:00 константа для сокращения unix time

2
myProfile.json
View File

@@ -24,7 +24,7 @@
}, },
"projectProp": { "projectProp": {
"platformio": { "platformio": {
"default_envs": "esp8266_4mb" "default_envs": "esp8266_1mb_ota"
} }
}, },
"modules": { "modules": {

42
platformio.ini
View File

@@ -3,7 +3,7 @@ lib_deps =
${common_env_data.lib_deps_external} ${common_env_data.lib_deps_external}
${env:esp8266_1mb_ota_fromitems.lib_deps} ${env:esp8266_1mb_ota_fromitems.lib_deps}
ESPAsyncUDP ESPAsyncUDP
build_flags = -Desp8266_4mb="esp8266_4mb" build_flags = -Desp8266_1mb_ota="esp8266_1mb_ota"
framework = arduino framework = arduino
board = nodemcuv2 board = nodemcuv2
board_build.ldscript = eagle.flash.1m64.ld board_build.ldscript = eagle.flash.1m64.ld
@@ -24,7 +24,7 @@ lib_deps =
${common_env_data.lib_deps_external} ${common_env_data.lib_deps_external}
${env:esp8266_1mb_fromitems.lib_deps} ${env:esp8266_1mb_fromitems.lib_deps}
ESPAsyncUDP ESPAsyncUDP
build_flags = -Desp8266_4mb="esp8266_4mb" build_flags = -Desp8266_1mb="esp8266_1mb"
framework = arduino framework = arduino
board = nodemcuv2 board = nodemcuv2
board_build.ldscript = eagle.flash.1m256.ld board_build.ldscript = eagle.flash.1m256.ld
@@ -83,8 +83,8 @@ build_src_filter =
${env:esp32_4mb_fromitems.build_src_filter} ${env:esp32_4mb_fromitems.build_src_filter}
[platformio] [platformio]
default_envs = esp8266_4mb default_envs = esp8266_1mb_ota
data_dir = data_svelte data_dir = data_svelte_lite
[common_env_data] [common_env_data]
upload_port = COM4 upload_port = COM4
@@ -94,15 +94,49 @@ lib_deps_external =
[env:esp8266_1mb_ota_fromitems] [env:esp8266_1mb_ota_fromitems]
lib_deps = lib_deps =
milesburton/DallasTemperature@^3.9.1
rc-switch @ ^2.6.4 rc-switch @ ^2.6.4
adafruit/Adafruit MCP23017 Arduino Library@^2.1.0
adafruit/Adafruit BusIO @ ^1.13.2
adafruit/Adafruit BusIO @ ^1.13.2
marcoschwartz/LiquidCrystal_I2C@^1.1.4
build_src_filter = build_src_filter =
+<modules/virtual/Timer>
+<modules/virtual/Variable>
+<modules/virtual/VButton>
+<modules/sensors/Ds18b20>
+<modules/sensors/RCswitch> +<modules/sensors/RCswitch>
+<modules/sensors/Sonar>
+<modules/exec/ButtonIn>
+<modules/exec/ButtonOut>
+<modules/exec/Mcp23017>
+<modules/exec/Pcf8574>
+<modules/exec/Pwm8266>
+<modules/exec/TelegramLT>
+<modules/display/Lcd2004>
[env:esp8266_1mb_fromitems] [env:esp8266_1mb_fromitems]
lib_deps = lib_deps =
milesburton/DallasTemperature@^3.9.1
rc-switch @ ^2.6.4 rc-switch @ ^2.6.4
adafruit/Adafruit MCP23017 Arduino Library@^2.1.0
adafruit/Adafruit BusIO @ ^1.13.2
adafruit/Adafruit BusIO @ ^1.13.2
marcoschwartz/LiquidCrystal_I2C@^1.1.4
build_src_filter = build_src_filter =
+<modules/virtual/Timer>
+<modules/virtual/Variable>
+<modules/virtual/VButton>
+<modules/sensors/Ds18b20>
+<modules/sensors/RCswitch> +<modules/sensors/RCswitch>
+<modules/sensors/Sonar>
+<modules/exec/ButtonIn>
+<modules/exec/ButtonOut>
+<modules/exec/Mcp23017>
+<modules/exec/Pcf8574>
+<modules/exec/Pwm8266>
+<modules/exec/TelegramLT>
+<modules/display/Lcd2004>
[env:esp8266_4mb_fromitems] [env:esp8266_4mb_fromitems]
lib_deps = lib_deps =

2
src/UpgradeFirm.cpp
View File

@@ -72,7 +72,7 @@ bool upgradeBuild() {
handleUpdateStatus(true, PATH_ERROR); handleUpdateStatus(true, PATH_ERROR);
return ret; return ret;
} }
#ifdef esp8266_4mb #if defined (esp8266_4mb) || defined (esp8266_1mb) || defined (esp8266_1mb_ota)
ESPhttpUpdate.rebootOnUpdate(false); ESPhttpUpdate.rebootOnUpdate(false);
t_httpUpdate_return retBuild = ESPhttpUpdate.update(wifiClient, getBinPath("firmware.bin")); t_httpUpdate_return retBuild = ESPhttpUpdate.update(wifiClient, getBinPath("firmware.bin"));
#endif #endif

34
src/modules/API.cpp
View File

@@ -1,31 +1,14 @@
#include "ESPConfiguration.h" #include "ESPConfiguration.h"
void* getAPI_Loging(String subtype, String params);
void* getAPI_LogingDaily(String subtype, String params);
void* getAPI_Timer(String subtype, String params); void* getAPI_Timer(String subtype, String params);
void* getAPI_Variable(String subtype, String params); void* getAPI_Variable(String subtype, String params);
void* getAPI_VButton(String subtype, String params); void* getAPI_VButton(String subtype, String params);
void* getAPI_Acs712(String subtype, String params);
void* getAPI_AhtXX(String subtype, String params);
void* getAPI_AnalogAdc(String subtype, String params);
void* getAPI_Bme280(String subtype, String params);
void* getAPI_Bmp280(String subtype, String params);
void* getAPI_Dht1122(String subtype, String params);
void* getAPI_Ds18b20(String subtype, String params); void* getAPI_Ds18b20(String subtype, String params);
void* getAPI_GY21(String subtype, String params);
void* getAPI_Hdc1080(String subtype, String params);
void* getAPI_Max6675(String subtype, String params);
void* getAPI_Pzem004(String subtype, String params);
void* getAPI_RCswitch(String subtype, String params); 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_Sonar(String subtype, String params);
void* getAPI_UART(String subtype, String params);
void* getAPI_ButtonIn(String subtype, String params); void* getAPI_ButtonIn(String subtype, String params);
void* getAPI_ButtonOut(String subtype, String params); void* getAPI_ButtonOut(String subtype, String params);
void* getAPI_IoTServo(String subtype, String params);
void* getAPI_Mcp23017(String subtype, String params); void* getAPI_Mcp23017(String subtype, String params);
void* getAPI_Mp3(String subtype, String params);
void* getAPI_Pcf8574(String subtype, String params); void* getAPI_Pcf8574(String subtype, String params);
void* getAPI_Pwm8266(String subtype, String params); void* getAPI_Pwm8266(String subtype, String params);
void* getAPI_TelegramLT(String subtype, String params); void* getAPI_TelegramLT(String subtype, String params);
@@ -33,32 +16,15 @@ void* getAPI_Lcd2004(String subtype, String params);
void* getAPI(String subtype, String params) { void* getAPI(String subtype, String params) {
void* tmpAPI; void* tmpAPI;
if ((tmpAPI = getAPI_Loging(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_LogingDaily(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Timer(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_Variable(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_VButton(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_VButton(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Acs712(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_AhtXX(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_AnalogAdc(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Bme280(subtype, params)) != nullptr) return tmpAPI;
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_Ds18b20(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_GY21(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Hdc1080(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Max6675(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Pzem004(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_RCswitch(subtype, params)) != nullptr) return tmpAPI; 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_Sonar(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_UART(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_ButtonIn(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_ButtonOut(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_Mcp23017(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Mp3(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_Pcf8574(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_Pwm8266(subtype, params)) != nullptr) return tmpAPI;
if ((tmpAPI = getAPI_TelegramLT(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_TelegramLT(subtype, params)) != nullptr) return tmpAPI;

6
src/modules/display/Lcd2004/modinfo.json
View File

@@ -108,6 +108,12 @@
], ],
"esp8266_4mb": [ "esp8266_4mb": [
"marcoschwartz/LiquidCrystal_I2C@^1.1.4" "marcoschwartz/LiquidCrystal_I2C@^1.1.4"
],
"esp8266_1mb": [
"marcoschwartz/LiquidCrystal_I2C@^1.1.4"
],
"esp8266_1mb_ota": [
"marcoschwartz/LiquidCrystal_I2C@^1.1.4"
] ]
} }
} }

4
src/modules/exec/ButtonIn/modinfo.json
View File

@@ -42,6 +42,8 @@
"defActive": true, "defActive": true,
"usedLibs": { "usedLibs": {
"esp32_4mb": [], "esp32_4mb": [],
"esp8266_4mb": [] "esp8266_4mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": []
} }
} }

4
src/modules/exec/ButtonOut/modinfo.json
View File

@@ -43,6 +43,8 @@
"defActive": true, "defActive": true,
"usedLibs": { "usedLibs": {
"esp32_4mb": [], "esp32_4mb": [],
"esp8266_4mb": [] "esp8266_4mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": []
} }
} }

8
src/modules/exec/Mcp23017/modinfo.json
View File

@@ -45,6 +45,14 @@
"esp8266_4mb": [ "esp8266_4mb": [
"adafruit/Adafruit MCP23017 Arduino Library@^2.1.0", "adafruit/Adafruit MCP23017 Arduino Library@^2.1.0",
"adafruit/Adafruit BusIO @ ^1.13.2" "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"
] ]
} }
} }

6
src/modules/exec/Pcf8574/modinfo.json
View File

@@ -37,6 +37,12 @@
], ],
"esp8266_4mb": [ "esp8266_4mb": [
"adafruit/Adafruit BusIO @ ^1.13.2" "adafruit/Adafruit BusIO @ ^1.13.2"
],
"esp8266_1mb": [
"adafruit/Adafruit BusIO @ ^1.13.2"
],
"esp8266_1mb_ota": [
"adafruit/Adafruit BusIO @ ^1.13.2"
] ]
} }
} }

4
src/modules/exec/Pwm8266/modinfo.json
View File

@@ -41,6 +41,8 @@
"defActive": true, "defActive": true,
"usedLibs": { "usedLibs": {
"esp8266_4mb": [] "esp8266_4mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": []
} }
} }

4
src/modules/exec/TelegramLT/modinfo.json
View File

@@ -51,6 +51,8 @@
"usedLibs": { "usedLibs": {
"esp32_4mb": [], "esp32_4mb": [],
"esp8266_4mb": [] "esp8266_4mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": []
} }
} }

6
src/modules/sensors/Ds18b20/modinfo.json
View File

@@ -43,6 +43,12 @@
], ],
"esp8266_4mb": [ "esp8266_4mb": [
"milesburton/DallasTemperature@^3.9.1" "milesburton/DallasTemperature@^3.9.1"
],
"esp8266_1mb": [
"milesburton/DallasTemperature@^3.9.1"
],
"esp8266_1mb_ota": [
"milesburton/DallasTemperature@^3.9.1"
] ]
} }
} }

4
src/modules/sensors/Sonar/modinfo.json
View File

@@ -37,6 +37,8 @@
"defActive": true, "defActive": true,
"usedLibs": { "usedLibs": {
"esp32_4mb": [], "esp32_4mb": [],
"esp8266_4mb": [] "esp8266_4mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": []
} }
} }

4
src/modules/virtual/Timer/modinfo.json
View File

@@ -69,6 +69,8 @@
"defActive": true, "defActive": true,
"usedLibs": { "usedLibs": {
"esp32_4mb": [], "esp32_4mb": [],
"esp8266_4mb": [] "esp8266_4mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": []
} }
} }

4
src/modules/virtual/VButton/modinfo.json
View File

@@ -34,6 +34,8 @@
"defActive": true, "defActive": true,
"usedLibs": { "usedLibs": {
"esp32_4mb": [], "esp32_4mb": [],
"esp8266_4mb": [] "esp8266_4mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": []
} }
} }

4
src/modules/virtual/Variable/modinfo.json
View File

@@ -71,6 +71,8 @@
"defActive": true, "defActive": true,
"usedLibs": { "usedLibs": {
"esp32_4mb": [], "esp32_4mb": [],
"esp8266_4mb": [] "esp8266_4mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": []
} }
} }