From 0a8f43c7d287757279e751feb4a45f20c4bec01f Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Fri, 12 Aug 2022 08:04:36 +0300
Subject: [PATCH] =?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=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=83=20?=
 =?UTF-8?q?=D0=B2=D1=81=D0=B5=D1=85=20=D0=B2=D0=B8=D0=B4=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/exec/ButtonIn/ButtonIn.cpp   | 5 +++++
 src/modules/exec/ButtonOut/ButtonOut.cpp | 3 +--
 src/modules/virtual/VButton/VButton.cpp  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/modules/exec/ButtonIn/ButtonIn.cpp b/src/modules/exec/ButtonIn/ButtonIn.cpp
index ce7eed7f..8184bf43 100644
--- a/src/modules/exec/ButtonIn/ButtonIn.cpp
+++ b/src/modules/exec/ButtonIn/ButtonIn.cpp
@@ -65,6 +65,11 @@ class ButtonIn : public IoTItem {
         _lastButtonState = _reading;
     }
 
+    void setValue(IoTValue Value) {
+        value = Value;
+        regEvent((String)(int)value.valD, "ButtonIn");
+    }
+
     ~ButtonIn() {};
 };
 
diff --git a/src/modules/exec/ButtonOut/ButtonOut.cpp b/src/modules/exec/ButtonOut/ButtonOut.cpp
index 3f7ee697..994792b4 100644
--- a/src/modules/exec/ButtonOut/ButtonOut.cpp
+++ b/src/modules/exec/ButtonOut/ButtonOut.cpp
@@ -42,8 +42,7 @@ class ButtonOut : public IoTItem {
     void setValue(IoTValue Value) {
         value = Value;
         IoTgpio.digitalWrite(_pin, _inv?!value.valD:value.valD);
-        if (value.isDecimal) regEvent(value.valD, "ButtonOut");
-        else regEvent(value.valS, "ButtonOut");
+        regEvent((String)(int)value.valD, "ButtonOut");
     }
     //=======================================================================================================
 
diff --git a/src/modules/virtual/VButton/VButton.cpp b/src/modules/virtual/VButton/VButton.cpp
index 6bfcb5ea..caa09997 100644
--- a/src/modules/virtual/VButton/VButton.cpp
+++ b/src/modules/virtual/VButton/VButton.cpp
@@ -8,7 +8,7 @@ class VButton : public IoTItem {
 
     void setValue(IoTValue Value) {
         value = Value;
-        regEvent((String)(int)value.valD, "");
+        regEvent((String)(int)value.valD, "VButton");
     }
 
     void doByInterval() { }