From 497c402597ce015409dc19d2201b59c299d8527b Mon Sep 17 00:00:00 2001 From: biver Date: Thu, 10 Nov 2022 17:37:59 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=BC=D0=BE=D0=B4=D0=B8=D1=84=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D1=87=D0=B8?= =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=B2=D0=B2=D0=BE?= =?UTF-8?q?=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/virtual/Variable/modinfo.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/virtual/Variable/modinfo.json b/src/modules/virtual/Variable/modinfo.json index 5bbc918a..85f957b4 100644 --- a/src/modules/virtual/Variable/modinfo.json +++ b/src/modules/virtual/Variable/modinfo.json @@ -13,7 +13,10 @@ "descr": "Введите число", "int": "0", "val": "0.0", - "num": 2 + "map": "1024,1024,1,100", + "plus": 0, + "multiply": 1, + "round": 0 }, { "global": 0, @@ -26,8 +29,7 @@ "page": "Ввод", "descr": "Введите время", "int": "0", - "val": "02:00", - "num": 3 + "val": "02:00" }, { "global": 0, @@ -40,8 +42,7 @@ "page": "Ввод", "descr": "Введите дату", "int": "0", - "val": "24.05.2022", - "num": 4 + "val": "24.05.2022" }, { "global": 0, @@ -54,8 +55,7 @@ "page": "Ввод", "descr": "Введите текст", "int": "0", - "val": "текст", - "num": 5 + "val": "текст" } ], "about": { From 8b4d5eddbca5e068eca6b56a6a96996dab424a40 Mon Sep 17 00:00:00 2001 From: biver Date: Thu, 10 Nov 2022 18:01:05 +0500 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=81=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8F=20ButtonOut=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=B8=D0=BD=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/exec/ButtonOut/ButtonOut.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/exec/ButtonOut/ButtonOut.cpp b/src/modules/exec/ButtonOut/ButtonOut.cpp index 46743487..e5f86172 100644 --- a/src/modules/exec/ButtonOut/ButtonOut.cpp +++ b/src/modules/exec/ButtonOut/ButtonOut.cpp @@ -15,7 +15,7 @@ class ButtonOut : public IoTItem { _round = 0; IoTgpio.pinMode(_pin, OUTPUT); - IoTgpio.digitalWrite(_pin, value.valD?HIGH:LOW); + IoTgpio.digitalWrite(_pin, _inv?!value.valD:value.valD); } void doByInterval() {