iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 20:09:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

продолжение переписи проекта!

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-10-09 20:17:02 +02:00
parent fe30d7c27d
commit db69c96ea0
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data_svelte/settings.json
View File

@@ -1,5 +1,4 @@
{ {
"settings_": "",
"name": "IoTmanagerVer4", "name": "IoTmanagerVer4",
"apssid": "IoTmanager", "apssid": "IoTmanager",
"appass": "", "appass": "",

2
src/DeviceList.cpp
View File

@@ -2,7 +2,7 @@
const String getThisDevice() { const String getThisDevice() {
String thisDevice = "{}"; String thisDevice = "{}";
jsonWriteStr_(thisDevice, F("devicelist_"), ""); //метка для парсинга // jsonWriteStr_(thisDevice, F("devicelist_"), ""); //метка для парсинга
jsonWriteStr_(thisDevice, F("ip"), jsonReadStr(settingsFlashJson, F("ip"))); jsonWriteStr_(thisDevice, F("ip"), jsonReadStr(settingsFlashJson, F("ip")));
jsonWriteStr_(thisDevice, F("id"), jsonReadStr(settingsFlashJson, F("id"))); jsonWriteStr_(thisDevice, F("id"), jsonReadStr(settingsFlashJson, F("id")));
jsonWriteStr_(thisDevice, F("name"), jsonReadStr(settingsFlashJson, F("name"))); jsonWriteStr_(thisDevice, F("name"), jsonReadStr(settingsFlashJson, F("name")));

4
src/EspFileSystem.cpp
View File

@@ -19,8 +19,8 @@ void globalVarsSync() {
jsonWriteStr_(settingsFlashJson, "root", mqttRootDevice); jsonWriteStr_(settingsFlashJson, "root", mqttRootDevice);
jsonWriteStr_(settingsFlashJson, "id", chipId); jsonWriteStr_(settingsFlashJson, "id", chipId);
jsonWriteStr_(errorsHeapJson, "errors_", ""); //метка для парсинга // jsonWriteStr_(errorsHeapJson, "errors_", ""); //метка для парсинга
jsonWriteStr_(ssidListHeapJson, "ssids_", ""); //метка для парсинга // jsonWriteStr_(ssidListHeapJson, "ssids_", ""); //метка для парсинга
} }
String getParamsJson() { String getParamsJson() {

6
src/WsServer.cpp
View File

@@ -56,19 +56,19 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
//отвечаем данными на запрос страницы //отвечаем данными на запрос страницы
if (headerStr == "/|") { if (headerStr == "/|") {
sendFileToWs("/layout.json", num, 1024); sendFileToWsByFrames("/layout.json", "layout", "", num, WEB_SOCKETS_FRAME_SIZE);
} }
//отвечаем на запрос параметров //отвечаем на запрос параметров
if (headerStr == "/params|") { if (headerStr == "/params|") {
String params = "{}"; String params = "{}";
jsonWriteStr(params, "params_", ""); //метка для парсинга // jsonWriteStr(params, "params_", ""); //метка для парсинга
for (std::list<IoTItem*>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) { for (std::list<IoTItem*>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) {
if ((*it)->getSubtype() != "Loging") { if ((*it)->getSubtype() != "Loging") {
if ((*it)->iAmLocal) jsonWriteStr(params, (*it)->getID(), (*it)->getValue()); if ((*it)->iAmLocal) jsonWriteStr(params, (*it)->getID(), (*it)->getValue());
} }
} }
standWebSocket.sendTXT(num, params); sendStringToWs("params", params, num);
} }
//отвечаем на запрос графиков //отвечаем на запрос графиков