Merge branch 'ver4dev' into ver4dev

include/classes/IoTDiscovery.h

@@ -0,0 +1,36 @@
+#pragma once
+#include <Arduino.h>
+#include "Global.h"
+#include "classes/IoTItem.h"
+
+class IoTDiscovery : public IoTItem
+{
+public:
+    IoTDiscovery(const String &parameters);
+    ~IoTDiscovery();
+
+//    inline bool isDiscoveryHomed() { return HOMEd; }
+
+//    inline bool isDiscoveryHA() { return HA; }
+
+    String HOMEdTopic = "";
+    String HATopic = "";
+    //String ChipId = "";
+
+    virtual void mqttSubscribeDiscovery();
+
+    virtual void publishStatusHOMEd(const String &topic, const String &data);
+
+
+
+protected:
+    boolean publishRetain(const String &topic, const String &data);
+    virtual void getlayoutHA();
+    virtual void deleteFromHOMEd();
+    virtual void getlayoutHOMEd();
+
+    //bool HOMEd = false;
+    //bool HA = false;
+    //String HOMEdTopic;
+
+};

include/classes/IoTItem.h

@@ -4,6 +4,7 @@
 //#include "classes/IoTBench.h"
 
 class IoTBench;
+class IoTDiscovery;
 
 struct IoTValue {
     float valD = 0;
@@ -58,8 +59,10 @@ class IoTItem {
     //virtual IoTItem* getCAMDriver();
     virtual IoTItem* getTlgrmDriver();
     //virtual IoTBench* getBenchmark();
-    virtual IoTBench*getBenchmarkTask();
-    virtual IoTBench*getBenchmarkLoad();
+    virtual IoTBench* getBenchmarkTask();
+    virtual IoTBench* getBenchmarkLoad();
+    virtual IoTDiscovery* getHADiscovery();
+    virtual IoTDiscovery* getHOMEdDiscovery();
     virtual unsigned long getRtcUnixTime();
 
         // делаем доступным модулям отправку сообщений в телеграм