iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-27 06:32:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed some bugs

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-11-02 04:09:15 +03:00
parent 0bfc876c65
commit 50590bc90e
6 changed files with 92 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/Class/ScenarioClass.h
View File

@@ -72,15 +72,18 @@ class Scenario {
} else if (_conditionSign == "!=") {
flag = _eventValue != _conditionValue;
} else if (_conditionSign == "<") {
flag = _eventValue.toInt() < _conditionValue.toInt();
flag = _eventValue.toFloat() < _conditionValue.toFloat();
} else if (_conditionSign == ">") {
flag = _eventValue.toInt() > _conditionValue.toInt();
flag = _eventValue.toFloat() > _conditionValue.toFloat();
} else if (_conditionSign == ">=") {
flag = _eventValue.toInt() >= _conditionValue.toInt();
flag = _eventValue.toFloat() >= _conditionValue.toFloat();
} else if (_conditionSign == "<=") {
flag = _eventValue.toInt() <= _conditionValue.toInt();
flag = _eventValue.toFloat() <= _conditionValue.toFloat();
}
Serial.println("event Value: " + _eventValue);
Serial.println("cond Value: " + _conditionValue);
if (flag) Serial.println("I Scenario event: " + _condition);
return flag;
@@ -97,7 +100,7 @@ class Scenario {
this->calculate2();
if (this->isConditionSatisfied()) { //если вошедшее событие выполняет условие сценария
_scenBlok = deleteBeforeDelimiter(_scenBlok, "\n");
//Serial.println(" [>] Making: " + _scenBlok);
Serial.println(" [>] Making: " + _scenBlok);
spaceCmdExecute(_scenBlok);
}
}

2
include/Consts.h
View File

@@ -31,7 +31,7 @@
//#define MDNS_ENABLED
//#define WEBSOCKET_ENABLED
//#define LAYOUT_IN_RAM
#define UDP_ENABLED
//#define UDP_ENABLED
//#define SSDP_ENABLED
//=========Sensors enable/disable=================================================================================================================================

9
include/items/ButtonOutClass.h
View File

@@ -5,8 +5,8 @@
#include "Global.h"
class ButtonOutClass : public LineParsing {
public:
ButtonOutClass() : LineParsing(){};
public:
ButtonOutClass() : LineParsing() {};
void init() {
if (_pin != "") {
@@ -28,12 +28,13 @@ class ButtonOutClass : public LineParsing {
if (inv == "") {
digitalWrite(pinInt, state.toInt());
} else {
}
else {
digitalWrite(pinInt, !state.toInt());
}
eventGen(key, "");
jsonWriteInt(configLiveJson, key, state.toInt());
publishStatus(key, state);
publishStatus(key, state);
}
};

6
include/items/SensorDallasClass.h
View File

@@ -5,8 +5,8 @@
#include "items/SensorConvertingClass.h"
class SensorDallasClass : public SensorConvertingClass {
public:
SensorDallasClass() : SensorConvertingClass(){};
public:
SensorDallasClass() : SensorConvertingClass() {};
void SensorDallasInit() {
oneWire = new OneWire((uint8_t)_pin.toInt());
@@ -36,7 +36,7 @@ class SensorDallasClass : public SensorConvertingClass {
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
publishStatus(key, String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
}
}