From 3434f8bd828091a4dcbae016c41c93fc5ead7e9c Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Mon, 25 Apr 2022 10:48:44 +0300
Subject: [PATCH] =?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=B2=20=D1=8F=D0=B4=D1=80=D0=BE=20setValue(Str?=
 =?UTF-8?q?ing=20valStr);=20=D0=B4=D0=BB=D1=8F=20=D1=83=D0=BD=D0=B8=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D1=81=D0=B2=D0=B0=D0=B8=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D1=83=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/classes/IoTItem.h |  1 +
 src/EventsAndOrders.cpp   |  7 +------
 src/classes/IoTItem.cpp   | 10 ++++++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/include/classes/IoTItem.h b/include/classes/IoTItem.h
index d21ebdf5..83302287 100644
--- a/include/classes/IoTItem.h
+++ b/include/classes/IoTItem.h
@@ -37,6 +37,7 @@ class IoTItem {
     virtual IoTGpio* getGpioDriver();
     virtual iarduino_RTC_BASE* getRtcDriver();
     virtual void setValue(IoTValue Value);
+    virtual void setValue(String valStr);
 
    protected:
     String _subtype;
diff --git a/src/EventsAndOrders.cpp b/src/EventsAndOrders.cpp
index 5f699b38..61436c4d 100644
--- a/src/EventsAndOrders.cpp
+++ b/src/EventsAndOrders.cpp
@@ -29,12 +29,7 @@ void handleOrder() {
         IoTItem* item = findIoTItem(selectToMarker(order, " "));
         if (item) {
             String valStr = selectToMarkerLast(order, " ");
-            IoTValue value;
-            if (value.isDecimal = isDigitDotCommaStr(valStr))
-                value.valD = valStr.toFloat();
-            else
-                value.valS = valStr;
-            item->setValue(value);
+            item->setValue(valStr);
         }
 
         orderBuf = deleteBeforeDelimiter(orderBuf, ",");
diff --git a/src/classes/IoTItem.cpp b/src/classes/IoTItem.cpp
index bd39f08e..c986ecfa 100644
--- a/src/classes/IoTItem.cpp
+++ b/src/classes/IoTItem.cpp
@@ -113,6 +113,16 @@ void IoTItem::setValue(IoTValue Value) {
         regEvent(value.valS, "");
 }
 
+void IoTItem::setValue(String valStr) {
+    if (value.isDecimal = isDigitDotCommaStr(valStr)) {
+        value.valD = valStr.toFloat();
+        regEvent(value.valD, "");
+    } else {
+        value.valS = valStr;
+        regEvent(value.valS, "");
+    }
+}
+
 externalVariable::externalVariable(String parameters) : IoTItem(parameters) {
     prevMillis = millis();  // запоминаем текущее значение таймера для выполения doByInterval после int сек
     iAmLocal = false;       // указываем, что это сущность прилетела из сети