From cf041494c4aab41568870632f3be465e4d6bf031 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Sat, 22 Oct 2022 23:10:09 +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=B4=D0=BE=D0=BF=20=D0=B8=D0=BD=D1=84=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=BE=D1=82=D0=BC=D0=B5=D0=BD=D1=8B=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BB=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B4=D1=80=D1=83=D0=B3=D1=83=D1=8E=20=D0=95?=
 =?UTF-8?q?=D0=A1=D0=9F=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=B1=D0=BE=D0=B5=20?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/classes/IoTItem.h             |  4 ++--
 src/classes/IoTItem.cpp               | 10 +++++-----
 src/modules/virtual/Loging/Loging.cpp |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/classes/IoTItem.h b/include/classes/IoTItem.h
index 4979e796..00d4a68c 100644
--- a/include/classes/IoTItem.h
+++ b/include/classes/IoTItem.h
@@ -16,8 +16,8 @@ class IoTItem {
     virtual void doByInterval();
     virtual IoTValue execute(String command, std::vector<IoTValue>& param);
 
-    virtual void regEvent(String value, String consoleInfo);
-    virtual void regEvent(float value, String consoleInfo);
+    virtual void regEvent(String value, String consoleInfo, bool error = false);
+    virtual void regEvent(float value, String consoleInfo, bool error = false);
 
     String getSubtype();
 
diff --git a/src/classes/IoTItem.cpp b/src/classes/IoTItem.cpp
index 074d7526..37a59850 100644
--- a/src/classes/IoTItem.cpp
+++ b/src/classes/IoTItem.cpp
@@ -79,7 +79,7 @@ void IoTItem::setValue(IoTValue Value, bool generateEvent) {
 }
 
 //когда событие случилось
-void IoTItem::regEvent(String value, String consoleInfo = "") {
+void IoTItem::regEvent(String value, String consoleInfo, bool error) {
     if (_needSave) {
         jsonWriteStr_(valuesFlashJson, _id, value);
         needSaveValues = true;
@@ -95,8 +95,8 @@ void IoTItem::regEvent(String value, String consoleInfo = "") {
     // if (_global) {
     //     SerialPrint("i", F("=>ALLMQTT"), "Broadcast event: ");
     // }
-    //отправка события другим устройствам в сети==============================
-    if (jsonReadBool(settingsFlashJson, "mqttin") && _global) {
+    //отправка события другим устройствам в сети если не было ошибки==============================
+    if (jsonReadBool(settingsFlashJson, "mqttin") && _global && !error) {
        String json = "{}";
        jsonWriteStr_(json, "id", _id);
        jsonWriteStr_(json, "val", value);
@@ -120,14 +120,14 @@ String IoTItem::getRoundValue() {
     }
 }
 
-void IoTItem::regEvent(float regvalue, String consoleInfo = "") {
+void IoTItem::regEvent(float regvalue, String consoleInfo, bool error) {
     value.valD = regvalue;
 
     if (_multiply) value.valD = value.valD * _multiply;
     if (_plus) value.valD = value.valD + _plus;
     if (_map1 != _map2) value.valD = map(value.valD, _map1, _map2, _map3, _map4);
     
-    regEvent(getRoundValue(), consoleInfo);
+    regEvent(getRoundValue(), consoleInfo, error);
 }
 
 void IoTItem::doByInterval() {}
diff --git a/src/modules/virtual/Loging/Loging.cpp b/src/modules/virtual/Loging/Loging.cpp
index d9ccb976..d9f5fdde 100644
--- a/src/modules/virtual/Loging/Loging.cpp
+++ b/src/modules/virtual/Loging/Loging.cpp
@@ -263,7 +263,7 @@ class Loging : public IoTItem {
         }
     }
 
-    void regEvent(String value, String consoleInfo = "") {
+    void regEvent(String value, String consoleInfo, bool error = false) {
         String userDate = getItemValue(id + "-date");
         String currentDate = getTodayDateDotFormated();
         //отправляем в график данные только когда выбран сегодняшний день