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

новый веб 4.1.2

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-03-02 00:43:43 +01:00
parent c3529d1a10
commit 9d956113b5
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/EspFileSystem.cpp
View File

@@ -25,7 +25,7 @@ void globalVarsSync() {
String getParamsJson() {
String json;
serializeJson(*getLocalItemsAsJSON(), json);
serializeJson(*getLocalItemsAsJSON(), json); // Ilya, data: "1.00" (analog sensor, round set to 1, should be "1.0")
jsonWriteStr_(json, "params", "");
return json;
}

10
src/classes/IoTItem.cpp
View File

@@ -71,7 +71,7 @@ void IoTItem::regEvent(String value, String consoleInfo = "") {
SerialPrint("i", F("<=MQTT"), "Broadcast event: " + json);
}
//========================================================================
publishStatusWs(_id, value);
publishStatusWs(_id, value); // Ilya, data: "1" (analog sensor, round set to 1, should be "1.0")
SerialPrint("i", "Sensor " + consoleInfo, "'" + _id + "' data: " + value + "'");
}
@@ -80,7 +80,7 @@ void IoTItem::regEvent(float regvalue, String consoleInfo = "") {
if (_plus) regvalue = regvalue + _multiply;
if (_round >= 0 && _round < 6) {
int sot = _round ? pow(10, (int)_round) : 1;
regvalue = round(regvalue*sot)/sot;
regvalue = round(regvalue * sot) / sot;
}
if (_map1 != _map2) regvalue = map(regvalue, _map1, _map2, _map3, _map4);
@@ -134,8 +134,10 @@ IoTItem* findIoTItem(String name) { // поиск элемента модуля
String getItemValue(String name) { // поиск плюс получение значения
IoTItem* tmp = findIoTItem(name);
if (tmp) return tmp->getValue();
else return "";
if (tmp)
return tmp->getValue();
else
return "";
}
StaticJsonDocument<JSON_BUFFER_SIZE> docForExport;