From 2a27b1d9bf8f4adaa18f439f8f2ace021a78d583 Mon Sep 17 00:00:00 2001 From: biver Date: Thu, 20 Oct 2022 09:28:35 +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=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20?= =?UTF-8?q?=D1=81=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B3=D1=80=D1=83=D0=B7=D0=BA?= =?UTF-8?q?=D0=BE=D0=B9=20setValue=20=D1=83=20=D0=B4=D0=BE=D1=87=D0=B5?= =?UTF-8?q?=D1=80=D0=BD=D0=B8=D1=85=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/exec/ButtonIn/ButtonIn.cpp | 2 +- src/modules/exec/ButtonOut/ButtonOut.cpp | 2 +- src/modules/exec/IoTServo/IoTServo.cpp | 2 +- src/modules/exec/Pwm32/Pwm32.cpp | 2 +- src/modules/exec/Pwm8266/Pwm8266.cpp | 2 +- src/modules/virtual/Loging/Loging.cpp | 2 +- src/modules/virtual/VButton/VButton.cpp | 2 +- src/modules/virtual/Variable/Variable.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/exec/ButtonIn/ButtonIn.cpp b/src/modules/exec/ButtonIn/ButtonIn.cpp index 1a00f59b..6d2fe354 100644 --- a/src/modules/exec/ButtonIn/ButtonIn.cpp +++ b/src/modules/exec/ButtonIn/ButtonIn.cpp @@ -68,7 +68,7 @@ class ButtonIn : public IoTItem { _lastButtonState = _reading; } - void setValue(IoTValue Value) { + void setValue(IoTValue Value, bool generateEvent = true) { value = Value; regEvent((String)(int)value.valD, "ButtonIn"); } diff --git a/src/modules/exec/ButtonOut/ButtonOut.cpp b/src/modules/exec/ButtonOut/ButtonOut.cpp index 6587275f..5509d985 100644 --- a/src/modules/exec/ButtonOut/ButtonOut.cpp +++ b/src/modules/exec/ButtonOut/ButtonOut.cpp @@ -39,7 +39,7 @@ class ButtonOut : public IoTItem { return {}; // команда поддерживает возвращаемое значения. Т.е. по итогу выполнения команды или общения с внешней системой, можно вернуть значение в сценарий для дальнейшей обработки } - void setValue(IoTValue Value) { + void setValue(IoTValue Value, bool generateEvent = true) { value = Value; IoTgpio.digitalWrite(_pin, _inv?!value.valD:value.valD); regEvent((String)(int)value.valD, "ButtonOut"); diff --git a/src/modules/exec/IoTServo/IoTServo.cpp b/src/modules/exec/IoTServo/IoTServo.cpp index 8c7cc357..00c68f23 100644 --- a/src/modules/exec/IoTServo/IoTServo.cpp +++ b/src/modules/exec/IoTServo/IoTServo.cpp @@ -52,7 +52,7 @@ class IoTServo : public IoTItem { return {}; } - void setValue(IoTValue Value) { + void setValue(IoTValue Value, bool generateEvent = true) { value = Value; if (value.isDecimal & (_oldValue != value.valD)) { _oldValue = value.valD; diff --git a/src/modules/exec/Pwm32/Pwm32.cpp b/src/modules/exec/Pwm32/Pwm32.cpp index 6798da3f..f6351c47 100644 --- a/src/modules/exec/Pwm32/Pwm32.cpp +++ b/src/modules/exec/Pwm32/Pwm32.cpp @@ -54,7 +54,7 @@ class Pwm32 : public IoTItem { } } - void setValue(IoTValue Value) { + void setValue(IoTValue Value, bool generateEvent = true) { value = Value; ledcWrite(_ledChannel, value.valD); regEvent(value.valD, "Pwm32"); diff --git a/src/modules/exec/Pwm8266/Pwm8266.cpp b/src/modules/exec/Pwm8266/Pwm8266.cpp index 54307881..e52ab9a9 100644 --- a/src/modules/exec/Pwm8266/Pwm8266.cpp +++ b/src/modules/exec/Pwm8266/Pwm8266.cpp @@ -44,7 +44,7 @@ class Pwm8266 : public IoTItem { } } - void setValue(IoTValue Value) { + void setValue(IoTValue Value, bool generateEvent = true) { value = Value; IoTgpio.analogWrite(_pin, value.valD); regEvent(value.valD, "Pwm8266"); diff --git a/src/modules/virtual/Loging/Loging.cpp b/src/modules/virtual/Loging/Loging.cpp index c0aea13b..11193b85 100644 --- a/src/modules/virtual/Loging/Loging.cpp +++ b/src/modules/virtual/Loging/Loging.cpp @@ -311,7 +311,7 @@ class Date : public IoTItem { setValue(value); } - void setValue(IoTValue Value) { + void setValue(IoTValue Value, bool generateEvent = true) { value = Value; regEvent(value.valS, ""); //отправка данных при изменении даты diff --git a/src/modules/virtual/VButton/VButton.cpp b/src/modules/virtual/VButton/VButton.cpp index 2bd19cb8..ad0bfcd4 100644 --- a/src/modules/virtual/VButton/VButton.cpp +++ b/src/modules/virtual/VButton/VButton.cpp @@ -6,7 +6,7 @@ class VButton : public IoTItem { public: VButton(String parameters): IoTItem(parameters) { } - void setValue(IoTValue Value) { + void setValue(IoTValue Value, bool generateEvent = true) { value = Value; regEvent((String)(int)value.valD, "VButton"); } diff --git a/src/modules/virtual/Variable/Variable.cpp b/src/modules/virtual/Variable/Variable.cpp index c921bb64..0ecd533e 100644 --- a/src/modules/virtual/Variable/Variable.cpp +++ b/src/modules/virtual/Variable/Variable.cpp @@ -9,7 +9,7 @@ class Variable : public IoTItem { } // особенность данного модуля - просто хранение значения для сценария, нет событий - // void setValue(IoTValue Value) { + // void setValue(IoTValue Value, bool generateEvent = true) { // value = Value; // }