From ce383fe7fe71d236cdbc95a657ba956622829033 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Thu, 17 Dec 2020 22:48:20 +0100 Subject: [PATCH] global change 1 mb working version --- data/dev_conf.txt | 0 data/edit.htm.gz | Bin 5455 -> 0 bytes data/items/items.txt | 8 +- data/presets/presets.c.txt | 46 -------- data/presets/presets.s.txt | 84 ------------- data/set.device.json | 8 +- data/set.utilities.json | 10 ++ doc/calculator.xlsx | Bin 0 -> 9890 bytes doc/old files/items/analog-adc.txt | 1 + doc/old files/items/bme280-hum.txt | 1 + doc/old files/items/bme280-press.txt | 1 + doc/old files/items/bme280-temp.txt | 1 + doc/old files/items/bmp280-press.txt | 1 + doc/old files/items/bmp280-temp.txt | 1 + doc/old files/items/button-in.txt | 1 + doc/old files/items/button-out.inv.txt | 1 + doc/old files/items/button-out.npin.txt | 1 + doc/old files/items/button-out.pin.txt | 1 + doc/old files/items/count-down.txt | 1 + doc/old files/items/dallas-temp.txt | 1 + doc/old files/items/dht11-hum.txt | 1 + doc/old files/items/dht11-temp.txt | 1 + doc/old files/items/dht22-hum.txt | 1 + doc/old files/items/dht22-temp.txt | 1 + doc/old files/items/impuls-out.txt | 1 + doc/old files/items/input-digit.txt | 1 + doc/old files/items/input-time.txt | 1 + doc/old files/items/logging.txt | 1 + doc/old files/items/modbus.txt | 1 + doc/old files/items/output-text.txt | 1 + doc/old files/items/pwm-out.txt | 1 + doc/old files/items/uart-button.txt | 1 + doc/old files/items/uart-widget.txt | 1 + doc/old files/items/ultrasonic-cm.txt | 1 + doc/old files/items/uptime.txt | 1 + doc/old files/presets/1.c.txt | 5 + doc/old files/presets/1.s.txt | 8 ++ doc/old files/presets/2.c.txt | 12 ++ doc/old files/presets/2.s.txt | 18 +++ doc/old files/presets/3.c.txt | 5 + doc/old files/presets/3.s.txt | 8 ++ doc/old files/presets/4.c.txt | 4 + doc/old files/presets/4.s.txt | 8 ++ doc/old files/presets/5.c.txt | 7 ++ doc/old files/presets/5.s.txt | 16 +++ doc/old files/presets/6.c.txt | 3 + doc/old files/presets/6.s.txt | 6 + doc/old files/presets/7.c.txt | 4 + doc/old files/presets/7.s.txt | 10 ++ doc/old files/presets/8.c.txt | 4 + doc/old files/presets/8.s.txt | 7 ++ doc/old files/presets/9.c.txt | 2 + doc/old files/presets/9.s.txt | 3 + include/Consts.h | 4 +- platformio.ini | 2 +- src/BufferExecute.cpp | 16 ++- src/MqttClient.cpp | 13 +- src/SoftUART.cpp | 7 +- src/Telegram.cpp | 3 +- src/Web.cpp | 151 ++++++++++-------------- src/items/vButtonOut.cpp | 11 -- 61 files changed, 265 insertions(+), 255 deletions(-) delete mode 100644 data/dev_conf.txt delete mode 100644 data/edit.htm.gz delete mode 100644 data/presets/presets.c.txt delete mode 100644 data/presets/presets.s.txt create mode 100644 doc/calculator.xlsx create mode 100644 doc/old files/items/analog-adc.txt create mode 100644 doc/old files/items/bme280-hum.txt create mode 100644 doc/old files/items/bme280-press.txt create mode 100644 doc/old files/items/bme280-temp.txt create mode 100644 doc/old files/items/bmp280-press.txt create mode 100644 doc/old files/items/bmp280-temp.txt create mode 100644 doc/old files/items/button-in.txt create mode 100644 doc/old files/items/button-out.inv.txt create mode 100644 doc/old files/items/button-out.npin.txt create mode 100644 doc/old files/items/button-out.pin.txt create mode 100644 doc/old files/items/count-down.txt create mode 100644 doc/old files/items/dallas-temp.txt create mode 100644 doc/old files/items/dht11-hum.txt create mode 100644 doc/old files/items/dht11-temp.txt create mode 100644 doc/old files/items/dht22-hum.txt create mode 100644 doc/old files/items/dht22-temp.txt create mode 100644 doc/old files/items/impuls-out.txt create mode 100644 doc/old files/items/input-digit.txt create mode 100644 doc/old files/items/input-time.txt create mode 100644 doc/old files/items/logging.txt create mode 100644 doc/old files/items/modbus.txt create mode 100644 doc/old files/items/output-text.txt create mode 100644 doc/old files/items/pwm-out.txt create mode 100644 doc/old files/items/uart-button.txt create mode 100644 doc/old files/items/uart-widget.txt create mode 100644 doc/old files/items/ultrasonic-cm.txt create mode 100644 doc/old files/items/uptime.txt create mode 100644 doc/old files/presets/1.c.txt create mode 100644 doc/old files/presets/1.s.txt create mode 100644 doc/old files/presets/2.c.txt create mode 100644 doc/old files/presets/2.s.txt create mode 100644 doc/old files/presets/3.c.txt create mode 100644 doc/old files/presets/3.s.txt create mode 100644 doc/old files/presets/4.c.txt create mode 100644 doc/old files/presets/4.s.txt create mode 100644 doc/old files/presets/5.c.txt create mode 100644 doc/old files/presets/5.s.txt create mode 100644 doc/old files/presets/6.c.txt create mode 100644 doc/old files/presets/6.s.txt create mode 100644 doc/old files/presets/7.c.txt create mode 100644 doc/old files/presets/7.s.txt create mode 100644 doc/old files/presets/8.c.txt create mode 100644 doc/old files/presets/8.s.txt create mode 100644 doc/old files/presets/9.c.txt create mode 100644 doc/old files/presets/9.s.txt diff --git a/data/dev_conf.txt b/data/dev_conf.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/data/edit.htm.gz b/data/edit.htm.gz deleted file mode 100644 index 5786121f98a84b5695314c9ad8e5537f57650ba4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5455 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 z 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 tUp1 -btn1 0 -telegram нагрев#выключен 1 -end -t1 < tLow1 -btn1 1 -telegram нагрев#включен 1 -end* -t2 > threshold+-2 -heater2 0 -end -t2 < threshold+-2 -heater2 1 -end -timenow = time21 -threshold threshold1 -end -timenow = time22 -threshold threshold2 -end -timenow = time23 -threshold threshold3 -end -timenow = time24 -threshold threshold4 -end* -h3 > hUp3 -hUp3 0 -telegram полив#выключен 1 -end -h3 < hLow3 -hUp3 1 -telegram полив#включен 1 -end* -timenow = time41 -btn41 1 -btn42 0 -end -timenow = time42 -btn41 0 -btn42 1 -end* -btn51 = 1 -btn52 1 -btn53 1 -btn54 1 -pwm51 200 -pwm52 800 -txt5 включено -end -btn51 = 0 -btn52 0 -btn53 0 -btn54 0 -pwm51 800 -pwm52 200 -txt5 выключено -end* -button = 1 -count input -end -count = 0 -button 0 -end* -sensor = 1 -text обнаружено -time %date% -telegram text обнаружено#движение 1 -end -reset = 1 -text не#обнаружено -time %date% -reset 0 -end* -sensor = 1 -light 1 -count period -end -count = 0 -light 0 -end* -switch = 1 -light change -end* \ No newline at end of file diff --git a/data/set.device.json b/data/set.device.json index bd7affaa..cf6a6369 100644 --- a/data/set.device.json +++ b/data/set.device.json @@ -92,11 +92,9 @@ "/set?addItem=20-ps": "20.Датчик давления bmp280", "/set?addItem=21-ips": "21.Создать импульсы через заданный промежуток времени (управление шд)", "/set?addItem=22-cnt": "22.Таймер обратного отчета", - "/set?addItem=23-mb": "23.Прочитать регистр modbus устройства", - "/set?addItem=24-btn": "24.UART кнопка (шлет свое состояние в UART)", - "/set?addItem=25-txt": "25.UART виджет (позволяет вывести полученные данные в любой виджет)", - "/set?addItem=26-log": "26.Логгирование и вывод в график любой величины", - "/set?addItem=27-ut": "27.Отобразить время работы устройства" + "/set?addItem=23-txt": "23.Виджет для отображения информации полученной из uart, get-запроса, или по udp", + "/set?addItem=24-log": "24.Логгирование и вывод в график любой величины", + "/set?addItem=25-ut": "25.Отобразить время работы устройства" } }, { diff --git a/data/set.utilities.json b/data/set.utilities.json index dee60f7c..16f10037 100644 --- a/data/set.utilities.json +++ b/data/set.utilities.json @@ -52,6 +52,16 @@ { "type": "hr" }, + { + "type": "checkbox", + "name": "uartEvents", + "title": "Включить отправку всех событий в UART", + "action": "/set?uartEvents=[[uartEvents]]", + "state": "{{uartEvents}}" + }, + { + "type": "hr" + }, { "type": "h4", "title": "Скорость", diff --git a/doc/calculator.xlsx b/doc/calculator.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..6fd98cf2035fc8bfc8a7921684392c3e8e604571 GIT binary patch literal 9890 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 literal 0 HcmV?d00001 diff --git a/doc/old files/items/analog-adc.txt b/doc/old files/items/analog-adc.txt new file mode 100644 index 00000000..8bc0e914 --- /dev/null +++ b/doc/old files/items/analog-adc.txt @@ -0,0 +1 @@ +0;analog-adc;id;fillgauge;Сенсоры;Аналоговый;order;gol;map[0,1024,0,100];c[1] \ No newline at end of file diff --git a/doc/old files/items/bme280-hum.txt b/doc/old files/items/bme280-hum.txt new file mode 100644 index 00000000..c8afd255 --- /dev/null +++ b/doc/old files/items/bme280-hum.txt @@ -0,0 +1 @@ +0;bme280-hum;id;anydataHum;Сенсоры;Влажность;order;addr[0x76];c[1] \ No newline at end of file diff --git a/doc/old files/items/bme280-press.txt b/doc/old files/items/bme280-press.txt new file mode 100644 index 00000000..f79973e2 --- /dev/null +++ b/doc/old files/items/bme280-press.txt @@ -0,0 +1 @@ +0;bme280-press;id;anydataPress;Сенсоры;Давление;order;addr[0x76];c[1] \ No newline at end of file diff --git a/doc/old files/items/bme280-temp.txt b/doc/old files/items/bme280-temp.txt new file mode 100644 index 00000000..6e5e9003 --- /dev/null +++ b/doc/old files/items/bme280-temp.txt @@ -0,0 +1 @@ +0;bme280-temp;id;anydataTemp;Сенсоры;Температура;order;addr[0x76];c[1] \ No newline at end of file diff --git a/doc/old files/items/bmp280-press.txt b/doc/old files/items/bmp280-press.txt new file mode 100644 index 00000000..44b9e8c9 --- /dev/null +++ b/doc/old files/items/bmp280-press.txt @@ -0,0 +1 @@ +0;bmp280-press;id;anydataPress;Сенсоры;Давление;order;addr[0x76];c[1] \ No newline at end of file diff --git a/doc/old files/items/bmp280-temp.txt b/doc/old files/items/bmp280-temp.txt new file mode 100644 index 00000000..c3cb42eb --- /dev/null +++ b/doc/old files/items/bmp280-temp.txt @@ -0,0 +1 @@ +0;bmp280-temp;id;anydataTemp;Сенсоры;Температура;order;addr[0x76];c[1] \ No newline at end of file diff --git a/doc/old files/items/button-in.txt b/doc/old files/items/button-in.txt new file mode 100644 index 00000000..79d79ec9 --- /dev/null +++ b/doc/old files/items/button-in.txt @@ -0,0 +1 @@ +0;button-in;id;toggle;Кнопки;Освещение;order;pin;db[20] \ No newline at end of file diff --git a/doc/old files/items/button-out.inv.txt b/doc/old files/items/button-out.inv.txt new file mode 100644 index 00000000..5499a108 --- /dev/null +++ b/doc/old files/items/button-out.inv.txt @@ -0,0 +1 @@ +0;button-out;id;toggle;Кнопки;Освещение;order;pin;inv[1] \ No newline at end of file diff --git a/doc/old files/items/button-out.npin.txt b/doc/old files/items/button-out.npin.txt new file mode 100644 index 00000000..ecffd881 --- /dev/null +++ b/doc/old files/items/button-out.npin.txt @@ -0,0 +1 @@ +0;button-out;id;toggle;Кнопки;Освещение;order \ No newline at end of file diff --git a/doc/old files/items/button-out.pin.txt b/doc/old files/items/button-out.pin.txt new file mode 100644 index 00000000..b0645025 --- /dev/null +++ b/doc/old files/items/button-out.pin.txt @@ -0,0 +1 @@ +0;button-out;id;toggle;Кнопки;Освещение;order;pin \ No newline at end of file diff --git a/doc/old files/items/count-down.txt b/doc/old files/items/count-down.txt new file mode 100644 index 00000000..3300573c --- /dev/null +++ b/doc/old files/items/count-down.txt @@ -0,0 +1 @@ +0;count-down;id;anydata;Таймер;Обратный#отчет;order \ No newline at end of file diff --git a/doc/old files/items/dallas-temp.txt b/doc/old files/items/dallas-temp.txt new file mode 100644 index 00000000..0da8bdca --- /dev/null +++ b/doc/old files/items/dallas-temp.txt @@ -0,0 +1 @@ +0;dallas-temp;id;anydataTemp;Сенсоры;Температура;order;sal;index[0];int[10] \ No newline at end of file diff --git a/doc/old files/items/dht11-hum.txt b/doc/old files/items/dht11-hum.txt new file mode 100644 index 00000000..b7d9a820 --- /dev/null +++ b/doc/old files/items/dht11-hum.txt @@ -0,0 +1 @@ +0;dht-hum;id;anydataHum;Сенсоры;Влажность;order;thd;type[dht11];c[1] \ No newline at end of file diff --git a/doc/old files/items/dht11-temp.txt b/doc/old files/items/dht11-temp.txt new file mode 100644 index 00000000..39c5e949 --- /dev/null +++ b/doc/old files/items/dht11-temp.txt @@ -0,0 +1 @@ +0;dht-temp;id;anydataTemp;Сенсоры;Температура;order;thd;type[dht11];c[1] \ No newline at end of file diff --git a/doc/old files/items/dht22-hum.txt b/doc/old files/items/dht22-hum.txt new file mode 100644 index 00000000..ab69cf97 --- /dev/null +++ b/doc/old files/items/dht22-hum.txt @@ -0,0 +1 @@ +0;dht-hum;id;anydataHum;Сенсоры;Влажность;order;thd;type[dht22];c[1] \ No newline at end of file diff --git a/doc/old files/items/dht22-temp.txt b/doc/old files/items/dht22-temp.txt new file mode 100644 index 00000000..d14a434d --- /dev/null +++ b/doc/old files/items/dht22-temp.txt @@ -0,0 +1 @@ +0;dht-temp;id;anydataTemp;Сенсоры;Температура;order;thd;type[dht22];c[1] \ No newline at end of file diff --git a/doc/old files/items/impuls-out.txt b/doc/old files/items/impuls-out.txt new file mode 100644 index 00000000..99994ae5 --- /dev/null +++ b/doc/old files/items/impuls-out.txt @@ -0,0 +1 @@ +0;impuls-out;id;na;na;na;order;pin \ No newline at end of file diff --git a/doc/old files/items/input-digit.txt b/doc/old files/items/input-digit.txt new file mode 100644 index 00000000..7df7260e --- /dev/null +++ b/doc/old files/items/input-digit.txt @@ -0,0 +1 @@ +0;inoutput;id;inputDigit;Ввод;Введите#цифру;order \ No newline at end of file diff --git a/doc/old files/items/input-time.txt b/doc/old files/items/input-time.txt new file mode 100644 index 00000000..3fc078b0 --- /dev/null +++ b/doc/old files/items/input-time.txt @@ -0,0 +1 @@ +0;inoutput;id;inputTime;Ввод;Введите#время;order \ No newline at end of file diff --git a/doc/old files/items/logging.txt b/doc/old files/items/logging.txt new file mode 100644 index 00000000..8253774f --- /dev/null +++ b/doc/old files/items/logging.txt @@ -0,0 +1 @@ +0;logging;id;chart;Графики;История;order;val[any];int[60];cnt[100] \ No newline at end of file diff --git a/doc/old files/items/modbus.txt b/doc/old files/items/modbus.txt new file mode 100644 index 00000000..a782395a --- /dev/null +++ b/doc/old files/items/modbus.txt @@ -0,0 +1 @@ +0;modbus;id;anydata;Modbus;Регистр;order;addr[1];reg[0];c[1] \ No newline at end of file diff --git a/doc/old files/items/output-text.txt b/doc/old files/items/output-text.txt new file mode 100644 index 00000000..65d45284 --- /dev/null +++ b/doc/old files/items/output-text.txt @@ -0,0 +1 @@ +0;inoutput;id;anydata;Вывод;Сигнализация;order \ No newline at end of file diff --git a/doc/old files/items/pwm-out.txt b/doc/old files/items/pwm-out.txt new file mode 100644 index 00000000..2acbb459 --- /dev/null +++ b/doc/old files/items/pwm-out.txt @@ -0,0 +1 @@ +0;pwm-out;id;range;Ползунки;Яркость;order;pin \ No newline at end of file diff --git a/doc/old files/items/uart-button.txt b/doc/old files/items/uart-button.txt new file mode 100644 index 00000000..ee2a6b22 --- /dev/null +++ b/doc/old files/items/uart-button.txt @@ -0,0 +1 @@ +0;button-out;id;toggle;Кнопки;Освещение;order;type[UART] \ No newline at end of file diff --git a/doc/old files/items/uart-widget.txt b/doc/old files/items/uart-widget.txt new file mode 100644 index 00000000..469ab016 --- /dev/null +++ b/doc/old files/items/uart-widget.txt @@ -0,0 +1 @@ +0;inoutput;id;anydata;Вывод;Вывод#uart;order \ No newline at end of file diff --git a/doc/old files/items/ultrasonic-cm.txt b/doc/old files/items/ultrasonic-cm.txt new file mode 100644 index 00000000..c5d518c3 --- /dev/null +++ b/doc/old files/items/ultrasonic-cm.txt @@ -0,0 +1 @@ +0;ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;cin;map[0,500,0,100];c[1];int[10] \ No newline at end of file diff --git a/doc/old files/items/uptime.txt b/doc/old files/items/uptime.txt new file mode 100644 index 00000000..972241b4 --- /dev/null +++ b/doc/old files/items/uptime.txt @@ -0,0 +1 @@ +0;uptime;id;anydataTime;Системные;%name%#uptime;order \ No newline at end of file diff --git a/doc/old files/presets/1.c.txt b/doc/old files/presets/1.c.txt new file mode 100644 index 00000000..abcd06dc --- /dev/null +++ b/doc/old files/presets/1.c.txt @@ -0,0 +1,5 @@ +0;dallas-temp;temp;anydataTemp;Термостат;Температура;1;pin[2];index[0];int[10] +0;logging;log;chart;Термостат;История;2;val[temp];int[60];cnt[100] +0;inoutput;inputU;inputDigit;Термостат;Верхний#порог;3 +0;inoutput;inputL;inputDigit;Термостат;Нижний#порог;4 +0;button-out;button;toggle;Термостат;Нагрев;5;pin[12] \ No newline at end of file diff --git a/doc/old files/presets/1.s.txt b/doc/old files/presets/1.s.txt new file mode 100644 index 00000000..dc4c8c07 --- /dev/null +++ b/doc/old files/presets/1.s.txt @@ -0,0 +1,8 @@ +temp > inputU +button 0 +telegram нагрев#выключен 1 +end +temp < inputL +button 1 +telegram нагрев#включен 1 +end \ No newline at end of file diff --git a/doc/old files/presets/2.c.txt b/doc/old files/presets/2.c.txt new file mode 100644 index 00000000..d91fa5c7 --- /dev/null +++ b/doc/old files/presets/2.c.txt @@ -0,0 +1,12 @@ +0;dallas-temp;temp;anydataTemp;Термостат;Температура;1;pin[2];index[0];int[60] +0;logging;log;chart;Термостат;История;2;val[temp];int[10];cnt[100] +0;inoutput;threshold;inputDigitTemp;Термостат;Заданная#температура;3 +0;button-out;heater;toggle;Термостат;Нагреватель;7;pin[12] +0;inoutput;time1;inputTimeClock;Расписание;Утренний#период;8 +0;inoutput;threshold1;inputDigitTemp;Расписание;Температура;9 +0;inoutput;time2;inputTimeClock;Расписание;Дневной#период;10 +0;inoutput;threshold2;inputDigitTemp;Расписание;Температура;11 +0;inoutput;time3;inputTimeClock;Расписание;Вечерний#период;12 +0;inoutput;threshold3;inputDigitTemp;Расписание;Температура;13 +0;inoutput;time4;inputTimeClock;Расписание;Ночной#период;14 +0;inoutput;threshold4;inputDigitTemp;Расписание;Температура;15 \ No newline at end of file diff --git a/doc/old files/presets/2.s.txt b/doc/old files/presets/2.s.txt new file mode 100644 index 00000000..5a6f36f1 --- /dev/null +++ b/doc/old files/presets/2.s.txt @@ -0,0 +1,18 @@ +temp > threshold+-2 +heater 0 +end +temp < threshold+-2 +heater 1 +end +timenow = time1 +threshold threshold1 +end +timenow = time2 +threshold threshold2 +end +timenow = time3 +threshold threshold3 +end +timenow = time4 +threshold threshold4 +end \ No newline at end of file diff --git a/doc/old files/presets/3.c.txt b/doc/old files/presets/3.c.txt new file mode 100644 index 00000000..fb2c602b --- /dev/null +++ b/doc/old files/presets/3.c.txt @@ -0,0 +1,5 @@ +0;dht-hum;hum;anydataHum;Теплица;Влажность;1;pin[2];type[dht11];c[1] +0;logging;log;chart;Теплица;История;2;val[hum];int[60];cnt[100] +0;inoutput;inputU;inputDigit;Теплица;Верхний#порог;3 +0;inoutput;inputL;inputDigit;Теплица;Нижний#порог;4 +0;button-out;button;toggle;Теплица;Полив;5;pin[12] \ No newline at end of file diff --git a/doc/old files/presets/3.s.txt b/doc/old files/presets/3.s.txt new file mode 100644 index 00000000..f69cdc54 --- /dev/null +++ b/doc/old files/presets/3.s.txt @@ -0,0 +1,8 @@ +hum > inputU +button 0 +telegram полив#выключен 1 +end +hum < inputL +button 1 +telegram полив#включен 1 +end \ No newline at end of file diff --git a/doc/old files/presets/4.c.txt b/doc/old files/presets/4.c.txt new file mode 100644 index 00000000..3f1ccaa1 --- /dev/null +++ b/doc/old files/presets/4.c.txt @@ -0,0 +1,4 @@ +0;button-out;button1;toggle;Реле;Освещение;1;pin[12] +0;button-out;button2;toggle;Реле;Освещение;2;pin[13] +0;inoutput;T1;inputTime;Реле;Введите#время#включения;3 +0;inoutput;T2;inputTime;Реле;Введите#время#выключения;4 \ No newline at end of file diff --git a/doc/old files/presets/4.s.txt b/doc/old files/presets/4.s.txt new file mode 100644 index 00000000..844d1c5b --- /dev/null +++ b/doc/old files/presets/4.s.txt @@ -0,0 +1,8 @@ +timenow = T1 +button1 1 +button2 0 +end +timenow = T2 +button1 0 +button2 1 +end \ No newline at end of file diff --git a/doc/old files/presets/5.c.txt b/doc/old files/presets/5.c.txt new file mode 100644 index 00000000..359a7a52 --- /dev/null +++ b/doc/old files/presets/5.c.txt @@ -0,0 +1,7 @@ +0;button-out;button-out-1;toggle;Кнопки;Выключить#все;1 +0;button-out;button-out-2;toggle;Кнопки;Гостинная;2;pin[12] +0;button-out;button-out-3;toggle;Кнопки;Спальня;3;pin[13] +0;button-out;button-out-4;toggle;Кнопки;Прихожая;4;pin[14] +0;pwm-out;pwm-out-5;range;Кнопки;Яркость;5;pin[15] +0;pwm-out;pwm-out-6;range;Кнопки;Яркость;6;pin[16] +0;inoutput;output-text-7;anydata;Кнопки;Статус;7 \ No newline at end of file diff --git a/doc/old files/presets/5.s.txt b/doc/old files/presets/5.s.txt new file mode 100644 index 00000000..0424728a --- /dev/null +++ b/doc/old files/presets/5.s.txt @@ -0,0 +1,16 @@ +button-out-1 = 1 +button-out-2 1 +button-out-3 1 +button-out-4 1 +pwm-out-5 200 +pwm-out-6 800 +output-text-7 включено +end +button-out-1 = 0 +button-out-2 0 +button-out-3 0 +button-out-4 0 +pwm-out-5 800 +pwm-out-6 200 +output-text-7 выключено +end \ No newline at end of file diff --git a/doc/old files/presets/6.c.txt b/doc/old files/presets/6.c.txt new file mode 100644 index 00000000..c7fd096a --- /dev/null +++ b/doc/old files/presets/6.c.txt @@ -0,0 +1,3 @@ +0;button-out;button;toggle;Таймер;Освещение;1;pin[12] +0;count-down;count;anydata;Таймер;Обратный#отчет;2 +0;inoutput;input;inputDigit;Таймер;Введите#цифру;3 \ No newline at end of file diff --git a/doc/old files/presets/6.s.txt b/doc/old files/presets/6.s.txt new file mode 100644 index 00000000..06b70a4a --- /dev/null +++ b/doc/old files/presets/6.s.txt @@ -0,0 +1,6 @@ +button = 1 +count input +end +count = 0 +button 0 +end \ No newline at end of file diff --git a/doc/old files/presets/7.c.txt b/doc/old files/presets/7.c.txt new file mode 100644 index 00000000..984c6b8d --- /dev/null +++ b/doc/old files/presets/7.c.txt @@ -0,0 +1,4 @@ +0;inoutput;text;anydataAlarm;Сигнализация;Движение:;1 +0;inoutput;time;anydataTime;Сигнализация;Время:;2 +0;button-in;sensor;na;na;na;3;pin[0];db[20] +0;button-out;reset;toggle;Сигнализация;Сбросить;4 \ No newline at end of file diff --git a/doc/old files/presets/7.s.txt b/doc/old files/presets/7.s.txt new file mode 100644 index 00000000..32d28e78 --- /dev/null +++ b/doc/old files/presets/7.s.txt @@ -0,0 +1,10 @@ +sensor = 1 +text обнаружено +time %date% +telegram text обнаружено#движение 1 +end +reset = 1 +text не#обнаружено +time %date% +reset 0 +end \ No newline at end of file diff --git a/doc/old files/presets/8.c.txt b/doc/old files/presets/8.c.txt new file mode 100644 index 00000000..d18bdd0b --- /dev/null +++ b/doc/old files/presets/8.c.txt @@ -0,0 +1,4 @@ +0;button-in;sensor;na;na;na;1;pin[0];db[20] +0;button-out;light;toggle;Освещение;Освещение;2;pin[13] +0;count-down;count;anydata;Освещение;Обратный#отчет;3 +0;inoutput;period;inputDigit;Освещение;Период#включения;4 \ No newline at end of file diff --git a/doc/old files/presets/8.s.txt b/doc/old files/presets/8.s.txt new file mode 100644 index 00000000..10d55654 --- /dev/null +++ b/doc/old files/presets/8.s.txt @@ -0,0 +1,7 @@ +sensor = 1 +light 1 +count period +end +count = 0 +light 0 +end \ No newline at end of file diff --git a/doc/old files/presets/9.c.txt b/doc/old files/presets/9.c.txt new file mode 100644 index 00000000..502f3ae4 --- /dev/null +++ b/doc/old files/presets/9.c.txt @@ -0,0 +1,2 @@ +0;button-out;light;toggle;Кнопки;Освещение;1;pin[13] +0;button-in;switch;na;na;na;2;pin[0];db[20] \ No newline at end of file diff --git a/doc/old files/presets/9.s.txt b/doc/old files/presets/9.s.txt new file mode 100644 index 00000000..6f6d7dcc --- /dev/null +++ b/doc/old files/presets/9.s.txt @@ -0,0 +1,3 @@ +switch = 1 +light change +end \ No newline at end of file diff --git a/include/Consts.h b/include/Consts.h index dd97d73a..6b4e6764 100644 --- a/include/Consts.h +++ b/include/Consts.h @@ -1,8 +1,8 @@ #pragma once //===========Firmware============================================================================================================================================= -#define FIRMWARE_VERSION 272 -//#define FLASH_SIZE_1MB true +#define FIRMWARE_VERSION 273 +#define FLASH_SIZE_1MB true //================================================================================================================================================================== #define NUM_BUTTONS 6 #define LED_PIN 2 diff --git a/platformio.ini b/platformio.ini index f5848391..bd0eef56 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,6 +1,6 @@ [platformio] -default_envs = esp8266 +default_envs = esp8266_01_1m ;============================================================================================================================================= [common_env_data] lib_deps_external = diff --git a/src/BufferExecute.cpp b/src/BufferExecute.cpp index b28778bb..e0752de6 100644 --- a/src/BufferExecute.cpp +++ b/src/BufferExecute.cpp @@ -1,5 +1,6 @@ #include "BufferExecute.h" #include "Global.h" +#include "SoftUART.h" // #include "items/vSensorDallas.h" #include "items/vSensorUltrasonic.h" @@ -11,9 +12,18 @@ #include "items/vCountDown.h" void loopCmdAdd(const String& cmdStr) { - orderBuf += cmdStr; - if (!cmdStr.endsWith(",")) { - orderBuf += ","; + if (cmdStr.endsWith(",")) { + orderBuf += cmdStr; +#ifdef uartEnable + if (jsonReadBool(configSetupJson, "uart")) { + if (jsonReadBool(configSetupJson, "uartEvents")) { + if (myUART) { + myUART->print(cmdStr); + SerialPrint("I", "<=UART", cmdStr); + } + } + } +#endif } } diff --git a/src/MqttClient.cpp b/src/MqttClient.cpp index 951d16c4..fa334f78 100644 --- a/src/MqttClient.cpp +++ b/src/MqttClient.cpp @@ -1,5 +1,5 @@ #include "MqttClient.h" - +#include "BufferExecute.h" #include #include "items/vLogging.h" #include "Class/NotAsync.h" @@ -132,10 +132,13 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) { String key = selectFromMarkerToMarker(topicStr, "/", 3); - orderBuf += key; - orderBuf += " "; - orderBuf += payloadStr; - orderBuf += ","; + String order; + order += key; + order += " "; + order += payloadStr; + order += ","; + + loopCmdAdd(order); SerialPrint("I", "=>MQTT", "Msg from iotmanager app: " + key + " " + payloadStr); } diff --git a/src/SoftUART.cpp b/src/SoftUART.cpp index 00673fce..c40a3f08 100644 --- a/src/SoftUART.cpp +++ b/src/SoftUART.cpp @@ -2,6 +2,7 @@ #ifdef uartEnable #include "SoftUART.h" #include "Global.h" +#include "BufferExecute.h" #ifdef ESP8266 SoftwareSerial* myUART = nullptr; @@ -10,7 +11,7 @@ HardwareSerial* myUART = nullptr; #endif void uartInit() { - if (!jsonReadBool(configSetupJson, "uartEnable")) { + if (!jsonReadBool(configSetupJson, "uart")) { return; } if (!myUART) { @@ -27,7 +28,7 @@ void uartInit() { void uartHandle() { if (myUART) { - if (!jsonReadBool(configSetupJson, "uartEnable")) { + if (!jsonReadBool(configSetupJson, "uart")) { return; } static String incStr; @@ -49,7 +50,7 @@ void parse(String& incStr) { incStr.replace("\n", ""); if (incStr.indexOf("set") != -1) { incStr = deleteBeforeDelimiter(incStr, " "); - orderBuf += incStr; + loopCmdAdd(incStr); SerialPrint("I", "=>UART", incStr); } } diff --git a/src/Telegram.cpp b/src/Telegram.cpp index ee8fabb9..6663b20c 100644 --- a/src/Telegram.cpp +++ b/src/Telegram.cpp @@ -1,6 +1,7 @@ #include "Consts.h" #ifdef telegramEnable #include "Telegram.h" +#include "BufferExecute.h" CTBot* myBot{ nullptr }; void telegramInit() { @@ -49,7 +50,7 @@ void telegramMsgParse(String msg) { if (msg.indexOf("set") != -1) { msg = deleteBeforeDelimiter(msg, "_"); msg.replace("_", " "); - orderBuf += String(msg) + ","; + loopCmdAdd(String(msg) + ","); myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), "order done"); SerialPrint("<-", "Telegram", "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + String(msg)); } diff --git a/src/Web.cpp b/src/Web.cpp index 31a93c3d..6027fcc5 100644 --- a/src/Web.cpp +++ b/src/Web.cpp @@ -19,65 +19,55 @@ bool parseRequestForPreset(AsyncWebServerRequest* request, uint8_t& preset) { void web_init() { server.on("/set", HTTP_GET, [](AsyncWebServerRequest* request) { //==============================set.device.json==================================================================================================== - if (request->hasArg("addItem")) { + if (request->hasArg(F("addItem"))) { addItem2(request->getParam("addItem")->value()); request->redirect("/?set.device"); } - if (request->hasArg("addPreset")) { - addPreset2(request->getParam("addPreset")->value().toInt()); - jsonWriteStr(configSetupJson, "warning1", F("

Требуется перезагрузка

")); - request->redirect("/?set.device"); + if (request->hasArg(F("addPreset"))) { + addPreset2(request->getParam(F("addPreset"))->value().toInt()); + if (FLASH_SIZE_1MB) { + jsonWriteStr(configSetupJson, F("warning1"), F("

Присеты не доступны, модуль на 1mb

")); + } + else { + jsonWriteStr(configSetupJson, F("warning1"), F("

Требуется перезагрузка

")); + } + request->redirect(F("/?set.device")); } - if (request->hasArg("delChoosingItems")) { - jsonWriteStr(configSetupJson, "warning1", F("

Требуется перезагрузка

")); + if (request->hasArg(F("delChoosingItems"))) { + jsonWriteStr(configSetupJson, F("warning1"), F("

Требуется перезагрузка

")); myNotAsyncActions->make(do_delChoosingItems); request->send(200); } - if (request->hasArg("delAllItems")) { + if (request->hasArg(F("delAllItems"))) { delAllItems(); cleanLogAndData(); - jsonWriteStr(configSetupJson, "warning1", F("

Требуется перезагрузка

")); - request->redirect("/?set.device"); + jsonWriteStr(configSetupJson, F("warning1"), F("

Требуется перезагрузка

")); + request->redirect(F("/?set.device")); } - if (request->hasArg("saveItems")) { + if (request->hasArg(F("saveItems"))) { myNotAsyncActions->make(do_deviceInit); request->send(200); } - if (request->hasArg("scen")) { - bool value = request->getParam("scen")->value().toInt(); - jsonWriteBool(configSetupJson, "scen", value); + if (request->hasArg(F("scen"))) { + bool value = request->getParam(F("scen"))->value().toInt(); + jsonWriteBool(configSetupJson, F("scen"), value); saveConfig(); loadScenario(); request->send(200); } - if (request->hasArg("sceninit")) { + if (request->hasArg(F("sceninit"))) { loadScenario(); request->send(200); } - //if (request->hasArg("snaUdp")) { - // bool value = request->getParam("snaUdp")->value().toInt(); - // jsonWriteBool(configSetupJson, "snaUdp", value); - // saveConfig(); - // #ifdef UDP_ENABLED - // asyncUdpInit(); - // #endif - // request->send(200); - //} - - //if (request->hasArg("scenUdp")) { - // myNotAsyncActions->make(do_sendScenUDP); - // request->send(200); - //} - - if (request->hasArg("MqttIn")) { - bool value = request->getParam("MqttIn")->value().toInt(); + if (request->hasArg(F("MqttIn"))) { + bool value = request->getParam(F("MqttIn"))->value().toInt(); jsonWriteBool(configSetupJson, "MqttIn", value); saveConfig(); mqtt.subscribe((mqttPrefix + "/+/+/event").c_str()); @@ -85,111 +75,103 @@ void web_init() { request->send(200); } - if (request->hasArg("MqttOut")) { - bool value = request->getParam("MqttOut")->value().toInt(); - jsonWriteBool(configSetupJson, "MqttOut", value); + if (request->hasArg(F("MqttOut"))) { + bool value = request->getParam(F("MqttOut"))->value().toInt(); + jsonWriteBool(configSetupJson, F("MqttOut"), value); saveConfig(); request->send(200); } - if (request->hasArg("scenMqtt")) { + if (request->hasArg(F("scenMqtt"))) { myNotAsyncActions->make(do_sendScenMQTT); request->send(200); } - if (request->hasArg("cleanlog")) { + if (request->hasArg(F("cleanlog"))) { cleanLogAndData(); request->send(200); } //==============================wifi settings============================================= - if (request->hasArg("devname")) { - jsonWriteStr(configSetupJson, "name", request->getParam("devname")->value()); + if (request->hasArg(F("devname"))) { + jsonWriteStr(configSetupJson, F("name"), request->getParam(F("devname"))->value()); saveConfig(); request->send(200); } - if (request->hasArg("routerssid")) { - jsonWriteStr(configSetupJson, "routerssid", request->getParam("routerssid")->value()); + if (request->hasArg(F("routerssid"))) { + jsonWriteStr(configSetupJson, F("routerssid"), request->getParam(F("routerssid"))->value()); saveConfig(); request->send(200); } - if (request->hasArg("routerpass")) { - jsonWriteStr(configSetupJson, "routerpass", request->getParam("routerpass")->value()); + if (request->hasArg(F("routerpass"))) { + jsonWriteStr(configSetupJson, F("routerpass"), request->getParam(F("routerpass"))->value()); saveConfig(); request->send(200); } - if (request->hasArg("apssid")) { - jsonWriteStr(configSetupJson, "apssid", request->getParam("apssid")->value()); + if (request->hasArg(F("apssid"))) { + jsonWriteStr(configSetupJson, F("apssid"), request->getParam(F("apssid"))->value()); saveConfig(); request->send(200, "text/text", "OK"); } - if (request->hasArg("appass")) { - jsonWriteStr(configSetupJson, "appass", request->getParam("appass")->value()); + if (request->hasArg(F("appass"))) { + jsonWriteStr(configSetupJson, F("appass"), request->getParam(F("appass"))->value()); saveConfig(); request->send(200); } - if (request->hasArg("weblogin")) { - jsonWriteStr(configSetupJson, "weblogin", request->getParam("weblogin")->value()); + if (request->hasArg(F("weblogin"))) { + jsonWriteStr(configSetupJson, F("weblogin"), request->getParam(F("weblogin"))->value()); saveConfig(); request->send(200); } - if (request->hasArg("webpass")) { - jsonWriteStr(configSetupJson, "webpass", request->getParam("webpass")->value()); + if (request->hasArg(F("webpass"))) { + jsonWriteStr(configSetupJson, F("webpass"), request->getParam(F("webpass"))->value()); saveConfig(); request->send(200); } - if (request->hasArg("timezone")) { - String timezoneStr = request->getParam("timezone")->value(); - jsonWriteStr(configSetupJson, "timezone", timezoneStr); + if (request->hasArg(F("timezone"))) { + String timezoneStr = request->getParam(F("timezone"))->value(); + jsonWriteStr(configSetupJson, F("timezone"), timezoneStr); saveConfig(); timeNow->setTimezone(timezoneStr.toInt()); request->send(200); } - if (request->hasArg("ntp")) { - String ntpStr = request->getParam("ntp")->value(); - jsonWriteStr(configSetupJson, "ntp", ntpStr); + if (request->hasArg(F("ntp"))) { + String ntpStr = request->getParam(F("ntp"))->value(); + jsonWriteStr(configSetupJson, F("ntp"), ntpStr); saveConfig(); timeNow->setNtpPool(ntpStr); request->send(200); } - if (request->hasArg("blink")) { - bool value = request->getParam("blink")->value().toInt(); - jsonWriteBool(configSetupJson, "blink", value); + if (request->hasArg(F("blink"))) { + bool value = request->getParam(F("blink"))->value().toInt(); + jsonWriteBool(configSetupJson, F("blink"), value); saveConfig(); request->send(200); } - if (request->hasArg("reqReset")) { + if (request->hasArg(F("reqReset"))) { String tmp = "{}"; jsonWriteStr(tmp, "title", F("Вы действительно хотите перезагрузить устройство?Идет перезагрузка устройства')\">Перезагрузить")); jsonWriteStr(tmp, "class", "pop-up"); request->send(200, "text/html", tmp); } - if (request->hasArg("reset")) { + if (request->hasArg(F("reset"))) { ESP.restart(); request->send(200); } - if (request->hasArg("test")) { - if (request->getParam("test")->value() == "ok") { - Serial.println("test pass"); - } - request->send(200); - } - //==============================mqtt settings============================================= - if (request->hasArg("mqttServer")) { jsonWriteStr(configSetupJson, "mqttServer", request->getParam("mqttServer")->value()); saveConfig(); @@ -237,7 +219,7 @@ void web_init() { request->send(200, "text/html", payload); } - //==============================push settings============================================= + //==============================telegram settings============================================= if (request->hasArg("telegramApi")) { jsonWriteStr(configSetupJson, "telegramApi", request->getParam("telegramApi")->value()); saveConfig(); @@ -266,15 +248,21 @@ void web_init() { myNotAsyncActions->make(do_BUSSCAN); request->redirect("/?set.utilities"); } - if (request->hasArg("uartEnable")) { - bool value = request->getParam("uartEnable")->value().toInt(); - jsonWriteBool(configSetupJson, "uartEnable", value); + if (request->hasArg("uart")) { + bool value = request->getParam("uart")->value().toInt(); + jsonWriteBool(configSetupJson, "uart", value); saveConfig(); #ifdef uartEnable uartInit(); #endif request->send(200); } + if (request->hasArg("uartEvents")) { + bool value = request->getParam("uartEvents")->value().toInt(); + jsonWriteBool(configSetupJson, "uartEvents", value); + saveConfig(); + request->send(200); + } if (request->hasArg("uartS")) { jsonWriteStr(configSetupJson, "uartS", request->getParam("uartS")->value()); saveConfig(); @@ -309,22 +297,7 @@ void web_init() { } }); - //==============================list of items===================================================== - //server.on("/del", HTTP_GET, [](AsyncWebServerRequest* request) { - // if (request->hasArg("file")) { - // itemsFile = request->getParam("file")->value(); - // } - // if (request->hasArg("line")) { - // itemsLine = request->getParam("line")->value(); - // } - // delElementFlag = true; - // deviceInit(); - // request->redirect("/?setn.device"); - //}); - /* - * Check - */ server.on("/check", HTTP_GET, [](AsyncWebServerRequest* request) { myNotAsyncActions->make(do_GETLASTVERSION); SerialPrint("I", "Update", "firmware version: " + String(lastVersion)); diff --git a/src/items/vButtonOut.cpp b/src/items/vButtonOut.cpp index 3ef137b0..fb422e34 100644 --- a/src/items/vButtonOut.cpp +++ b/src/items/vButtonOut.cpp @@ -20,17 +20,6 @@ ButtonOut::ButtonOut(String pin, boolean inv, String key, String type) { ButtonOut::~ButtonOut() {} void ButtonOut::execute(String state) { - if (_type == "UART") { - if (jsonReadBool(configSetupJson, "uartEnable")) { -#ifdef uartEnable - if (myUART) { - String msg = _key + " " + state; - myUART->print(msg); - SerialPrint("I", "<=UART", msg); - } -#endif - } - } if (state != "" && _pin != "") { if (state == "change") { state = String(!digitalRead(_pin.toInt()));