список устройств

include/DeviceList.h

@@ -0,0 +1,4 @@
+#pragma once
+#include "Global.h"
+
+extern void addThisDeviceToList();

include/Main.h

@@ -9,3 +9,4 @@
 #include "ESPConfiguration.h"
 #include "MqttClient.h"
 #include "WsServer.h"
+#include "DeviceList.h"

src/DeviceList.cpp

@@ -0,0 +1,11 @@
+#include "DeviceList.h"
+
+void addThisDeviceToList() {
+    jsonWriteStr_(devListJson, "devicelist", "devicelist");
+    jsonWriteStr_(devListJson, "ip", jsonReadStr(settingsFlashJson, "ip"));
+    jsonWriteStr_(devListJson, "id", jsonReadStr(settingsFlashJson, "id"));
+    jsonWriteStr_(devListJson, "name", jsonReadStr(settingsFlashJson, "name"));
+    jsonWriteBool_(devListJson, "status", true);
+    devListJson = "[" + devListJson + "]";
+    Serial.println(devListJson);
+}

src/EspFileSystem.cpp

@@ -16,6 +16,7 @@ void globalVarsSync() {
     mqttPrefix = jsonReadStr(settingsFlashJson, F("mqttPrefix"));
     mqttRootDevice = mqttPrefix + "/" + chipId;
     jsonWriteStr_(settingsFlashJson, "root", mqttRootDevice);
+    jsonWriteStr_(settingsFlashJson, "id", chipId);
     saveSettingsFlashJson();
     jsonWriteStr_(ssidListJson, "ssid", "");
 }

src/Global.cpp

@@ -41,7 +41,7 @@ String eventBuf = "";
 // wifi
 String ssidListJson = "{}";
 
-String devListJson = "{}";
+String devListJson;
 
 // Mqtt
 String mqttServer = "";

src/Main.cpp

@@ -21,6 +21,9 @@ void setup() {
     //подключаемся к роутеру
     routerConnect();
 
+    //синхронизация списка устройств
+    addThisDeviceToList();
+
     //запустим один раз асинхронное сканирование сетей wifi для веба
     RouterFind(jsonReadStr(settingsFlashJson, F("routerssid")));
 
@@ -49,6 +52,7 @@ void setup() {
     ts.add(
         MYTEST, 1000 * 30, [&](void*) {
             SerialPrint(F("i"), F("HEAP"), prettyBytes(ESP.getFreeHeap()));
+            standWebSocket.broadcastTXT(devListJson);
         },
         nullptr, true);
 }

src/WsServer.cpp

@@ -62,8 +62,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
             }
             // list ===================================================================
             if (headerStr == "/list") {
-                standWebSocket.sendTXT(num, devListJson);
+                // standWebSocket.sendTXT(num, devListJson);
-                sendFileToWs("/settings.json", num, 1024);
+                // sendFileToWs("/settings.json", num, 1024);
             }
 
         } break;