From 621a4d2f015e4e402383c4ce00d4131d2e0f7582 Mon Sep 17 00:00:00 2001
From: Mit4el <Mit4bmw@gmail.com>
Date: Fri, 6 Oct 2023 00:24:06 +0300
Subject: [PATCH] bugfix Thermostat, ExternalMqtt; add widget liter

---
 data_svelte/widgets.json                          |  7 +++++++
 data_svelte_lite/widgets.json                     |  7 +++++++
 include/MqttClient.h                              |  2 +-
 src/modules/exec/Thermostat/Thermostat.cpp        | 10 +++++-----
 src/modules/sensors/ExternalMQTT/ExternalMQTT.cpp | 10 ++++++----
 src/modules/sensors/ExternalMQTT/modinfo.json     |  4 ++--
 6 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/data_svelte/widgets.json b/data_svelte/widgets.json
index 8a758af7..76a4712c 100644
--- a/data_svelte/widgets.json
+++ b/data_svelte/widgets.json
@@ -301,6 +301,13 @@
         "after": "cm",
         "icon": "speedometer"
     },
+    {
+        "name": "anydataLiter",
+        "label": "Литры",
+        "widget": "anydata",
+        "after": "ltr",
+        "icon": "speedometer"
+    },    
     {
         "name": "nil",
         "label": "Без виджета"
diff --git a/data_svelte_lite/widgets.json b/data_svelte_lite/widgets.json
index 8a758af7..76a4712c 100644
--- a/data_svelte_lite/widgets.json
+++ b/data_svelte_lite/widgets.json
@@ -301,6 +301,13 @@
         "after": "cm",
         "icon": "speedometer"
     },
+    {
+        "name": "anydataLiter",
+        "label": "Литры",
+        "widget": "anydata",
+        "after": "ltr",
+        "icon": "speedometer"
+    },    
     {
         "name": "nil",
         "label": "Без виджета"
diff --git a/include/MqttClient.h b/include/MqttClient.h
index 35827e4e..f7614f94 100644
--- a/include/MqttClient.h
+++ b/include/MqttClient.h
@@ -22,7 +22,7 @@ boolean publishChartMqtt(const String& topic, const String& data);
 boolean publishJsonMqtt(const String& topic, const String& json);
 boolean publishStatusMqtt(const String& topic, const String& data);
 boolean publishEvent(const String& topic, const String& data);
-void mqttSubscribeExternal(String topic, bool usePrefix);
+void mqttSubscribeExternal(String topic, bool usePrefix = false);
 
 bool publishChartFileToMqtt(String path, String id, int maxCount);
 
diff --git a/src/modules/exec/Thermostat/Thermostat.cpp b/src/modules/exec/Thermostat/Thermostat.cpp
index 68999c20..3e342931 100644
--- a/src/modules/exec/Thermostat/Thermostat.cpp
+++ b/src/modules/exec/Thermostat/Thermostat.cpp
@@ -239,9 +239,9 @@ protected:
         }
         if (sp && pv)
         {
-            value.valD = pid(sp, pv, pv_last, ierr, _int);
-            value.valS = (String)(int)pid(sp, pv, pv_last, ierr, _int);
-            regEvent(value.valS, "ThermostatPID", false, true);
+//            value.valD = pid(sp, pv, pv_last, ierr, _int);
+//            value.valS = (String)(int)value.valD;
+            regEvent(pid(sp, pv, pv_last, ierr, _int), "ThermostatPID", false, true);
                 }
         pv_last = pv;
     }
@@ -332,8 +332,8 @@ private:
 public:
     ThermostatETK(String parameters) : IoTItem(parameters)
     {
-        jsonRead(parameters, "set_id", _set_id);
-        jsonRead(parameters, "term_id", _term_id);
+//        jsonRead(parameters, "set_id", _set_id);
+//        jsonRead(parameters, "term_id", _term_id);
         jsonRead(parameters, "iv_k", _iv_k);
         jsonRead(parameters, "outside_id", _outside_id);
     }
diff --git a/src/modules/sensors/ExternalMQTT/ExternalMQTT.cpp b/src/modules/sensors/ExternalMQTT/ExternalMQTT.cpp
index a37add87..abe1ac60 100644
--- a/src/modules/sensors/ExternalMQTT/ExternalMQTT.cpp
+++ b/src/modules/sensors/ExternalMQTT/ExternalMQTT.cpp
@@ -15,7 +15,7 @@ private:
     bool dataFromNode = false;
     String _topic = "";
     bool _isJson;
-    bool _addPrefix;
+//    bool _addPrefix;
     bool _debug;
     bool sendOk = false;
 
@@ -28,12 +28,12 @@ public:
         jsonRead(parameters, F("offline"), offline);
         _topic = jsonReadStr(parameters, "topic");
         jsonRead(parameters, "isJson", _isJson);
-        jsonRead(parameters, "addPrefix", _addPrefix);
+//        jsonRead(parameters, "addPrefix", _addPrefix);
         jsonRead(parameters, "debug", _debug);
         dataFromNode = false;
         if (mqttIsConnect())
             sendOk = true;
-        mqttSubscribeExternal(_topic, _addPrefix);
+        mqttSubscribeExternal(_topic);
     }
     char *TimeToString(unsigned long t)
     {
@@ -113,7 +113,7 @@ public:
         if (mqttIsConnect() && !sendOk)
         {
             sendOk = true;
-            mqttSubscribeExternal(_topic, _addPrefix);
+            mqttSubscribeExternal(_topic);
         }
     }
     void onMqttWsAppConnectEvent()
@@ -144,6 +144,8 @@ public:
                 if (_minutesPassed >= offline)
                 {
                     jsonWriteStr(json, F("info"), F("offline"));
+                    regEvent(NAN, "ExternalMQTT");
+                    SerialPrint("E", "ExternalMQTT", "V error", _id);
                 }
             }
         }
diff --git a/src/modules/sensors/ExternalMQTT/modinfo.json b/src/modules/sensors/ExternalMQTT/modinfo.json
index 70825798..9737126a 100644
--- a/src/modules/sensors/ExternalMQTT/modinfo.json
+++ b/src/modules/sensors/ExternalMQTT/modinfo.json
@@ -12,7 +12,6 @@
       "descr": "",
       "sensor": "",
       "topic": "",
-      "addPrefix": 0,
       "isJson": 1,
       "round": "",
       "orange": 60,
@@ -24,7 +23,7 @@
   ],
   "about": {
     "authorName": "AVAKS",
-    "authorContact": "https://t.me/@avaks_dev",
+    "authorContact": "https://t.me/@avaks",
     "authorGit": "https://github.com/avaksru",
     "specialThanks": "",
     "moduleName": "ExternalMQTT",
@@ -53,6 +52,7 @@
   "usedLibs": {
     "esp32_4mb": [],
     "esp32s2_4mb": [],
+    "esp32cam_4mb": [],
     "esp8266_4mb": [],
     "esp8266_1mb": [],
     "esp8266_1mb_ota": [],