From e3f3ae76649301d0098de235658712a20eb09e17 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Wed, 26 Aug 2020 01:47:16 +0300 Subject: [PATCH] add iputs for time and value --- data/items/input-digit.txt | 1 + data/items/input-time.txt | 1 + data/set.device.json | 7 ++++--- src/Cmd.cpp | 5 +++-- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 data/items/input-digit.txt create mode 100644 data/items/input-time.txt diff --git a/data/items/input-digit.txt b/data/items/input-digit.txt new file mode 100644 index 00000000..932b28d5 --- /dev/null +++ b/data/items/input-digit.txt @@ -0,0 +1 @@ +input-digit;id;inputDigit;Ввод;Введите.цифру;order;st[60] \ No newline at end of file diff --git a/data/items/input-time.txt b/data/items/input-time.txt new file mode 100644 index 00000000..ad394ae6 --- /dev/null +++ b/data/items/input-time.txt @@ -0,0 +1 @@ +input-time;id;inputTime;Ввод;Введите.время;order;st[10-00-00] \ No newline at end of file diff --git a/data/set.device.json b/data/set.device.json index 6dc2932b..e906a530 100644 --- a/data/set.device.json +++ b/data/set.device.json @@ -56,9 +56,10 @@ "title": { "#": "Выберите элемент из списка", "/set?addItem=button-out": "1.Кнопка управляющая пином", - "/set?addItem=button-out-i": "2.Кнопка управляющая пином с инверсией", - "/set?addItem=pwm-out": "3.Широтно импульсная подуляция", - "/set?addItem=button-in": "4.Физическая кнопка" + "/set?addItem=pwm-out": "2.Широтно импульсная подуляция", + "/set?addItem=button-in": "3.Физическая кнопка", + "/set?addItem=input-digit": "4.Окно ввода цифровых значений", + "/set?addItem=input-time": "5.Окно ввода времени" } }, { diff --git a/src/Cmd.cpp b/src/Cmd.cpp index 1a436d9f..11b35bec 100644 --- a/src/Cmd.cpp +++ b/src/Cmd.cpp @@ -232,8 +232,9 @@ void handle_time_init() { nullptr, true); } -//===================================================================================================================================== -//=========================================Добавление текстового виджета============================================================ +//===============================================Модуль вывода текста============================================ +//output-text;id;anydata;Вывод;Сигнализация;order;st[Обнаружено.движение] +//=============================================================================================================== void text() { String number = sCmd.next(); String widget_name = sCmd.next();