diff --git a/data_svelte/settings.json b/data_svelte/settings.json index f2b7d36c..bfeb5544 100644 --- a/data_svelte/settings.json +++ b/data_svelte/settings.json @@ -1,5 +1,4 @@ { - "settings_": "", "name": "IoTmanagerVer4", "apssid": "IoTmanager", "appass": "", diff --git a/src/DeviceList.cpp b/src/DeviceList.cpp index c9998917..1b817d98 100644 --- a/src/DeviceList.cpp +++ b/src/DeviceList.cpp @@ -2,7 +2,7 @@ const String getThisDevice() { String thisDevice = "{}"; - jsonWriteStr_(thisDevice, F("devicelist_"), ""); //метка для парсинга + // jsonWriteStr_(thisDevice, F("devicelist_"), ""); //метка для парсинга jsonWriteStr_(thisDevice, F("ip"), jsonReadStr(settingsFlashJson, F("ip"))); jsonWriteStr_(thisDevice, F("id"), jsonReadStr(settingsFlashJson, F("id"))); jsonWriteStr_(thisDevice, F("name"), jsonReadStr(settingsFlashJson, F("name"))); diff --git a/src/EspFileSystem.cpp b/src/EspFileSystem.cpp index 91dd4bf1..817aa8bf 100644 --- a/src/EspFileSystem.cpp +++ b/src/EspFileSystem.cpp @@ -19,8 +19,8 @@ void globalVarsSync() { jsonWriteStr_(settingsFlashJson, "root", mqttRootDevice); jsonWriteStr_(settingsFlashJson, "id", chipId); - jsonWriteStr_(errorsHeapJson, "errors_", ""); //метка для парсинга - jsonWriteStr_(ssidListHeapJson, "ssids_", ""); //метка для парсинга + // jsonWriteStr_(errorsHeapJson, "errors_", ""); //метка для парсинга + // jsonWriteStr_(ssidListHeapJson, "ssids_", ""); //метка для парсинга } String getParamsJson() { diff --git a/src/WsServer.cpp b/src/WsServer.cpp index 9014f600..fb7bd9a8 100644 --- a/src/WsServer.cpp +++ b/src/WsServer.cpp @@ -56,19 +56,19 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length) //отвечаем данными на запрос страницы if (headerStr == "/|") { - sendFileToWs("/layout.json", num, 1024); + sendFileToWsByFrames("/layout.json", "layout", "", num, WEB_SOCKETS_FRAME_SIZE); } //отвечаем на запрос параметров if (headerStr == "/params|") { String params = "{}"; - jsonWriteStr(params, "params_", ""); //метка для парсинга + // jsonWriteStr(params, "params_", ""); //метка для парсинга for (std::list::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) { if ((*it)->getSubtype() != "Loging") { if ((*it)->iAmLocal) jsonWriteStr(params, (*it)->getID(), (*it)->getValue()); } } - standWebSocket.sendTXT(num, params); + sendStringToWs("params", params, num); } //отвечаем на запрос графиков