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

Добавляем в базовый класс поддержку математических модификаторов для всех регистрируемых событий float типа

Browse Source
This commit is contained in:
biver
2022-02-01 23:04:06 +03:00
parent 6373f36eb5
commit 3898234c6d
2 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/classes/IoTSensor.h
View File

@@ -10,6 +10,7 @@ class IoTSensor {
void loop(); void loop();
virtual void doByInterval(); virtual void doByInterval();
void regEvent(String value, String consoleInfo); void regEvent(String value, String consoleInfo);
void regEvent(float value, String consoleInfo);
String getSubtype(); String getSubtype();
String getID(); String getID();
@@ -22,4 +23,12 @@ class IoTSensor {
String _subtype; String _subtype;
String _id; String _id;
unsigned long _interval; unsigned long _interval;
float _multiply; // умножаем на значение
float _plus; // увеличиваем на значение
int _map1;
int _map2;
int _map3;
int _map4;
int _round; // 1, 10, 100, 1000, 10000
}; };

39
src/classes/IoTSensor.cpp
View File

@@ -5,9 +5,22 @@
IoTSensor::IoTSensor(String parameters) { IoTSensor::IoTSensor(String parameters) {
_interval = jsonReadInt(parameters, "int") * 1000; jsonRead(parameters, "int", _interval);
_subtype = jsonReadStr(parameters, "subtype"); _interval = _interval * 1000;
_id = jsonReadStr(parameters, "id"); jsonRead(parameters, "subtype", _subtype);
jsonRead(parameters, "id", _id);
jsonRead(parameters, "multiply", _multiply);
jsonRead(parameters, "plus", _plus);
jsonRead(parameters, "round", _round);
String map;
jsonRead(parameters, "map", map);
if (map != "") {
_map1 = selectFromMarkerToMarker(map, ",", 0).toInt();
_map2 = selectFromMarkerToMarker(map, ",", 1).toInt();
_map3 = selectFromMarkerToMarker(map, ",", 2).toInt();
_map4 = selectFromMarkerToMarker(map, ",", 3).toInt();
}
} }
IoTSensor::~IoTSensor() {} IoTSensor::~IoTSensor() {}
@@ -29,10 +42,22 @@ void IoTSensor::loop() {
} }
void IoTSensor::regEvent(String value, String consoleInfo = "") { void IoTSensor::regEvent(String value, String consoleInfo = "") {
eventGen2(_id, String(value)); eventGen2(_id, value);
jsonWriteStr(paramsFlashJson, _id, String(value)); jsonWriteStr(paramsFlashJson, _id, value);
publishStatus(_id, String(value)); publishStatus(_id, value);
SerialPrint("I", "Sensor " + consoleInfo, "'" + _id + "' data: " + String(value) + "'"); SerialPrint("I", "Sensor " + consoleInfo, "'" + _id + "' data: " + value + "'");
}
void IoTSensor::regEvent(float value, String consoleInfo = "") {
if (_multiply) value = value * _multiply;
if (_plus) value = value + _multiply;
if (_round != 0) {
if (value > 0) value = (int)(value * _round + 0.5) / _round;
if (value < 0) value = (int)(value * _round - 0.5) / _round;
}
if (_map1 != _map2) value = map(value, _map1, _map2, _map3, _map4);
regEvent((String)value, consoleInfo);
} }
void IoTSensor::doByInterval() {} void IoTSensor::doByInterval() {}