iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Корректируем алгоритм работы с наследными setValue в модулях

Browse Source
This commit is contained in:
biver
2022-10-22 07:59:26 +03:00
parent 2078ecd17b
commit 55c0cfd718
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/display/Ws2812b/Ws2181b.cpp
View File

@@ -178,7 +178,7 @@ public:
int b = map(value.valD, 1,1024,1,255); int b = map(value.valD, 1,1024,1,255);
_strip->setBrightness(b); _strip->setBrightness(b);
_strip->show(); _strip->show();
regEvent(value.valD, "Ws2812b"); if (generateEvent) regEvent(value.valD, "Ws2812b");
} }
~Ws2812b(){}; ~Ws2812b(){};

2
src/modules/exec/ButtonIn/ButtonIn.cpp
View File

@@ -70,7 +70,7 @@ class ButtonIn : public IoTItem {
void setValue(IoTValue Value, bool generateEvent = true) { void setValue(IoTValue Value, bool generateEvent = true) {
value = Value; value = Value;
regEvent((String)(int)value.valD, "ButtonIn"); if (generateEvent) regEvent((String)(int)value.valD, "ButtonIn");
} }
String getValue() { String getValue() {

2
src/modules/exec/ButtonOut/ButtonOut.cpp
View File

@@ -40,7 +40,7 @@ class ButtonOut : public IoTItem {
void setValue(IoTValue Value, bool generateEvent = true) { void setValue(IoTValue Value, bool generateEvent = true) {
value = Value; value = Value;
IoTgpio.digitalWrite(_pin, _inv?!value.valD:value.valD); IoTgpio.digitalWrite(_pin, _inv?!value.valD:value.valD);
regEvent((String)(int)value.valD, "ButtonOut"); if (generateEvent) regEvent((String)(int)value.valD, "ButtonOut");
} }
String getValue() { String getValue() {

2
src/modules/exec/IoTServo/IoTServo.cpp
View File

@@ -57,7 +57,7 @@ class IoTServo : public IoTItem {
if (value.isDecimal & (_oldValue != value.valD)) { if (value.isDecimal & (_oldValue != value.valD)) {
_oldValue = value.valD; _oldValue = value.valD;
servObj.write(_oldValue); servObj.write(_oldValue);
regEvent(value.valD, "IoTServo"); if (generateEvent) regEvent(value.valD, "IoTServo");
} }
} }

2
src/modules/exec/Pwm32/Pwm32.cpp
View File

@@ -57,7 +57,7 @@ class Pwm32 : public IoTItem {
void setValue(IoTValue Value, bool generateEvent = true) { void setValue(IoTValue Value, bool generateEvent = true) {
value = Value; value = Value;
ledcWrite(_ledChannel, value.valD); ledcWrite(_ledChannel, value.valD);
regEvent(value.valD, "Pwm32"); if (generateEvent) regEvent(value.valD, "Pwm32");
} }
//======================================================================================================= //=======================================================================================================

2
src/modules/exec/Pwm8266/Pwm8266.cpp
View File

@@ -47,7 +47,7 @@ class Pwm8266 : public IoTItem {
void setValue(IoTValue Value, bool generateEvent = true) { void setValue(IoTValue Value, bool generateEvent = true) {
value = Value; value = Value;
IoTgpio.analogWrite(_pin, value.valD); IoTgpio.analogWrite(_pin, value.valD);
regEvent(value.valD, "Pwm8266"); if (generateEvent) regEvent(value.valD, "Pwm8266");
} }
//======================================================================================================= //=======================================================================================================

2
src/modules/virtual/Loging/Loging.cpp
View File

@@ -313,7 +313,7 @@ class Date : public IoTItem {
void setValue(IoTValue Value, bool generateEvent = true) { void setValue(IoTValue Value, bool generateEvent = true) {
value = Value; value = Value;
regEvent(value.valS, ""); if (generateEvent) regEvent(value.valS, "");
//отправка данных при изменении даты //отправка данных при изменении даты
for (std::list<IoTItem *>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) { for (std::list<IoTItem *>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) {
if ((*it)->getSubtype() == "Loging") { if ((*it)->getSubtype() == "Loging") {

2
src/modules/virtual/VButton/VButton.cpp
View File

@@ -8,7 +8,7 @@ class VButton : public IoTItem {
void setValue(IoTValue Value, bool generateEvent = true) { void setValue(IoTValue Value, bool generateEvent = true) {
value = Value; value = Value;
regEvent((String)(int)value.valD, "VButton"); if (generateEvent) regEvent((String)(int)value.valD, "VButton");
} }
String getValue() { String getValue() {