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

Merge pull request #183 from biveraxe/ver4dev

Browse Source 
Исправляем ошибку применения модификаторов к значению
This commit is contained in:
Ilya Belyakov
2022-09-02 18:23:09 +03:00
committed by GitHub
parent 258d7b764b 0c23cd78dd
commit 25843260c7
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/classes/IoTItem.cpp
View File

@@ -33,7 +33,7 @@ IoTItem::IoTItem(String parameters) {
_map2 = selectFromMarkerToMarker(map, ",", 1).toInt(); _map2 = selectFromMarkerToMarker(map, ",", 1).toInt();
_map3 = selectFromMarkerToMarker(map, ",", 2).toInt(); _map3 = selectFromMarkerToMarker(map, ",", 2).toInt();
_map4 = selectFromMarkerToMarker(map, ",", 3).toInt(); _map4 = selectFromMarkerToMarker(map, ",", 3).toInt();
} } else _map1 = _map2 = _map3 = _map4 = 0;
} }
//луп выполняющий переодическое дерганье //луп выполняющий переодическое дерганье
@@ -50,15 +50,22 @@ void IoTItem::loop() {
//получить //получить
String IoTItem::getValue() { String IoTItem::getValue() {
if (value.isDecimal) if (value.isDecimal) {
if (_multiply) value.valD = value.valD * _multiply;
if (_plus) value.valD = value.valD + _plus;
if (_round >= 0 && _round <= 6) {
int sot = _round ? pow(10, (int)_round) : 1;
value.valD = round(value.valD * sot) / sot;
}
if (_map1 != _map2) value.valD = map(value.valD, _map1, _map2, _map3, _map4);
if (_round >= 0 && _round <= 6) { if (_round >= 0 && _round <= 6) {
char buf[15]; char buf[15];
sprintf(buf, ("%1." + (String)_round + "f").c_str(), value.valD); sprintf(buf, ("%1." + (String)_round + "f").c_str(), value.valD);
return (String)buf; return (String)buf;
} else } else
return (String)value.valD; return (String)value.valD;
else } else return value.valS;
return value.valS;
} }
//установить //установить
@@ -106,16 +113,7 @@ void IoTItem::regEvent(String value, String consoleInfo = "") {
} }
void IoTItem::regEvent(float regvalue, String consoleInfo = "") { void IoTItem::regEvent(float regvalue, String consoleInfo = "") {
if (_multiply) regvalue = regvalue * _multiply;
if (_plus) regvalue = regvalue + _plus;
if (_round >= 0 && _round <= 6) {
int sot = _round ? pow(10, (int)_round) : 1;
regvalue = round(regvalue * sot) / sot;
}
if (_map1 != _map2) regvalue = map(regvalue, _map1, _map2, _map3, _map4);
value.valD = regvalue; value.valD = regvalue;
regEvent(getValue(), consoleInfo); regEvent(getValue(), consoleInfo);
} }