From a69e048da96f9c172995775ea48b95467830d040 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Tue, 22 Feb 2022 22:48:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D0=B0=D0=BD=D0=B4=D0=B0=D1=80?=
 =?UTF-8?q?=D1=82=D0=B8=D0=B7=D0=B8=D1=80=D1=83=D0=B5=D0=BC=20=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=82=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B5=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=B8=D1=81=D0=B2=D0=B0=D0=B8=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=B7=20=D1=81=D1=86=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/classes/IoTItem.h   | 1 +
 src/classes/IoTItem.cpp     | 6 ++++++
 src/classes/IoTScenario.cpp | 5 ++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/classes/IoTItem.h b/include/classes/IoTItem.h
index 7d012b7d..e15c48e5 100644
--- a/include/classes/IoTItem.h
+++ b/include/classes/IoTItem.h
@@ -29,6 +29,7 @@ class IoTItem {
     IoTValue value;  // хранение основного значения, котрое обновляется из сценария, execute(), loop() или doByInterval()
 
     virtual IoTGpio* getGpioDriver();
+    virtual void setValue(IoTValue Value);
 
    protected:
     String _subtype;
diff --git a/src/classes/IoTItem.cpp b/src/classes/IoTItem.cpp
index 850cbae5..f3d9ac12 100644
--- a/src/classes/IoTItem.cpp
+++ b/src/classes/IoTItem.cpp
@@ -90,4 +90,10 @@ IoTItem* myIoTItem;
 
 IoTGpio* IoTItem::getGpioDriver() {
     return nullptr;
+}
+
+void IoTItem::setValue(IoTValue Value) {
+    value = Value;
+    if (value.isDecimal) regEvent(value.valD, "");
+    else regEvent(value.valS, "");
 }
\ No newline at end of file
diff --git a/src/classes/IoTScenario.cpp b/src/classes/IoTScenario.cpp
index 255d26ad..22b5b73d 100644
--- a/src/classes/IoTScenario.cpp
+++ b/src/classes/IoTScenario.cpp
@@ -64,7 +64,10 @@ public:
   VariableExprAST(const String &name, IoTItem* item) : Name(name), Item(item) {}
 
   int setValue(IoTValue *val) {
-    Item->value = *val;  // устанавливаем значение в связанном Item модуля напрямую
+    if (Item) {
+      //Item->value = *val;  // устанавливаем значение в связанном Item модуля напрямую
+      Item->setValue(*val);
+    }
     return 1;
   }