mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-27 06:32:19 +03:00
Корректируем алгоритм работы с наследными setValue в модулях
This commit is contained in:
@@ -178,7 +178,7 @@ public:
|
||||
int b = map(value.valD, 1,1024,1,255);
|
||||
_strip->setBrightness(b);
|
||||
_strip->show();
|
||||
regEvent(value.valD, "Ws2812b");
|
||||
if (generateEvent) regEvent(value.valD, "Ws2812b");
|
||||
}
|
||||
|
||||
~Ws2812b(){};
|
||||
|
||||
@@ -70,7 +70,7 @@ class ButtonIn : public IoTItem {
|
||||
|
||||
void setValue(IoTValue Value, bool generateEvent = true) {
|
||||
value = Value;
|
||||
regEvent((String)(int)value.valD, "ButtonIn");
|
||||
if (generateEvent) regEvent((String)(int)value.valD, "ButtonIn");
|
||||
}
|
||||
|
||||
String getValue() {
|
||||
|
||||
@@ -40,7 +40,7 @@ class ButtonOut : public IoTItem {
|
||||
void setValue(IoTValue Value, bool generateEvent = true) {
|
||||
value = Value;
|
||||
IoTgpio.digitalWrite(_pin, _inv?!value.valD:value.valD);
|
||||
regEvent((String)(int)value.valD, "ButtonOut");
|
||||
if (generateEvent) regEvent((String)(int)value.valD, "ButtonOut");
|
||||
}
|
||||
|
||||
String getValue() {
|
||||
|
||||
@@ -57,7 +57,7 @@ class IoTServo : public IoTItem {
|
||||
if (value.isDecimal & (_oldValue != value.valD)) {
|
||||
_oldValue = value.valD;
|
||||
servObj.write(_oldValue);
|
||||
regEvent(value.valD, "IoTServo");
|
||||
if (generateEvent) regEvent(value.valD, "IoTServo");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ class Pwm32 : public IoTItem {
|
||||
void setValue(IoTValue Value, bool generateEvent = true) {
|
||||
value = Value;
|
||||
ledcWrite(_ledChannel, value.valD);
|
||||
regEvent(value.valD, "Pwm32");
|
||||
if (generateEvent) regEvent(value.valD, "Pwm32");
|
||||
}
|
||||
//=======================================================================================================
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ class Pwm8266 : public IoTItem {
|
||||
void setValue(IoTValue Value, bool generateEvent = true) {
|
||||
value = Value;
|
||||
IoTgpio.analogWrite(_pin, value.valD);
|
||||
regEvent(value.valD, "Pwm8266");
|
||||
if (generateEvent) regEvent(value.valD, "Pwm8266");
|
||||
}
|
||||
//=======================================================================================================
|
||||
|
||||
|
||||
@@ -313,7 +313,7 @@ class Date : public IoTItem {
|
||||
|
||||
void setValue(IoTValue Value, bool generateEvent = true) {
|
||||
value = Value;
|
||||
regEvent(value.valS, "");
|
||||
if (generateEvent) regEvent(value.valS, "");
|
||||
//отправка данных при изменении даты
|
||||
for (std::list<IoTItem *>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) {
|
||||
if ((*it)->getSubtype() == "Loging") {
|
||||
|
||||
@@ -8,7 +8,7 @@ class VButton : public IoTItem {
|
||||
|
||||
void setValue(IoTValue Value, bool generateEvent = true) {
|
||||
value = Value;
|
||||
regEvent((String)(int)value.valD, "VButton");
|
||||
if (generateEvent) regEvent((String)(int)value.valD, "VButton");
|
||||
}
|
||||
|
||||
String getValue() {
|
||||
|
||||
Reference in New Issue
Block a user