Merge branch 'ver4dev' of https://github.com/biveraxe/IoTManager into ver4dev

data_svelte/index.html

@@ -4,7 +4,7 @@
 	<meta charset='utf-8'>
 	<meta name='viewport' content='width=device-width,initial-scale=1'>
 
-	<title>IoT Manager 4.1.1</title>
+	<title>IoT Manager 4.1.2</title>
 
 	<link rel='icon' type='image/png' href='/favicon.ico'>
 	<link rel='stylesheet' href='/build/bundle.css'>

data_svelte/settings.json

@@ -16,5 +16,5 @@
     "mqttPass": "hostel3333",
     "serverip": "http://206.189.49.244:8081",
     "log": 0,
-    "mqttin": 1
+    "mqttin": 0
 }

src/EspFileSystem.cpp

@@ -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;
 }

src/classes/IoTItem.cpp

@@ -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 + "'");
 }
 
@@ -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;