Merge pull request #235 from biveraxe/ver4dev

Добавляем модификаторы для числового ввода и правим баг в кнопке
This commit is contained in:
2022-11-10 16:02:30 +03:00
committed by GitHub
2 changed files with 8 additions and 8 deletions

View File

@@ -15,7 +15,7 @@ class ButtonOut : public IoTItem {
_round = 0; _round = 0;
IoTgpio.pinMode(_pin, OUTPUT); IoTgpio.pinMode(_pin, OUTPUT);
IoTgpio.digitalWrite(_pin, value.valD?HIGH:LOW); IoTgpio.digitalWrite(_pin, _inv?!value.valD:value.valD);
} }
void doByInterval() { void doByInterval() {

View File

@@ -13,7 +13,10 @@
"descr": "Введите число", "descr": "Введите число",
"int": "0", "int": "0",
"val": "0.0", "val": "0.0",
"num": 2 "map": "1024,1024,1,100",
"plus": 0,
"multiply": 1,
"round": 0
}, },
{ {
"global": 0, "global": 0,
@@ -26,8 +29,7 @@
"page": "Ввод", "page": "Ввод",
"descr": "Введите время", "descr": "Введите время",
"int": "0", "int": "0",
"val": "02:00", "val": "02:00"
"num": 3
}, },
{ {
"global": 0, "global": 0,
@@ -40,8 +42,7 @@
"page": "Ввод", "page": "Ввод",
"descr": "Введите дату", "descr": "Введите дату",
"int": "0", "int": "0",
"val": "24.05.2022", "val": "24.05.2022"
"num": 4
}, },
{ {
"global": 0, "global": 0,
@@ -54,8 +55,7 @@
"page": "Ввод", "page": "Ввод",
"descr": "Введите текст", "descr": "Введите текст",
"int": "0", "int": "0",
"val": "текст", "val": "текст"
"num": 5
} }
], ],
"about": { "about": {