From 72b54eb5bb70c91649a520bc1cb89a075cce8970 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Fri, 12 Aug 2022 22:33:36 +0200 Subject: [PATCH] =?UTF-8?q?=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B9?= =?UTF-8?q?=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/classes/IoTItem.cpp | 5 +++-- src/modules/virtual/Variable/modinfo.json | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/classes/IoTItem.cpp b/src/classes/IoTItem.cpp index ad92c38f..57b4108d 100644 --- a/src/classes/IoTItem.cpp +++ b/src/classes/IoTItem.cpp @@ -18,10 +18,11 @@ IoTItem::IoTItem(String parameters) { String valAsStr; if (jsonRead(parameters, F("val"), valAsStr, false)) // значение переменной или датчика при инициализации если есть в конфигурации - if (value.isDecimal = isDigitDotCommaStr(valAsStr)) + if (value.isDecimal = isDigitDotCommaStr(valAsStr)) { value.valD = valAsStr.toFloat(); - else + } else { value.valS = valAsStr; + } String map; jsonRead(parameters, F("map"), map, false); diff --git a/src/modules/virtual/Variable/modinfo.json b/src/modules/virtual/Variable/modinfo.json index 5f2bb91f..e0666430 100644 --- a/src/modules/virtual/Variable/modinfo.json +++ b/src/modules/virtual/Variable/modinfo.json @@ -10,7 +10,7 @@ "page": "Ввод", "descr": "Введите цифру", "int": "0", - "val": "0", + "val": "0.0", "num": 2 }, { @@ -22,7 +22,7 @@ "page": "Ввод", "descr": "Введите время", "int": "0", - "val": "0", + "val": "02:00", "num": 3 }, { @@ -34,7 +34,7 @@ "page": "Ввод", "descr": "Введите дату", "int": "0", - "val": "0", + "val": "24.05.2022", "num": 4 } ],