mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-29 15:42:20 +03:00
обновленный веб
This commit is contained in:
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -5,7 +5,14 @@ void addThisDeviceToList() {
|
|||||||
jsonWriteStr_(devListJson, "ip", jsonReadStr(settingsFlashJson, "ip"));
|
jsonWriteStr_(devListJson, "ip", jsonReadStr(settingsFlashJson, "ip"));
|
||||||
jsonWriteStr_(devListJson, "id", jsonReadStr(settingsFlashJson, "id"));
|
jsonWriteStr_(devListJson, "id", jsonReadStr(settingsFlashJson, "id"));
|
||||||
jsonWriteStr_(devListJson, "name", jsonReadStr(settingsFlashJson, "name"));
|
jsonWriteStr_(devListJson, "name", jsonReadStr(settingsFlashJson, "name"));
|
||||||
jsonWriteBool_(devListJson, "status", true);
|
|
||||||
|
devListJson = devListJson + ",";
|
||||||
|
String test;
|
||||||
|
jsonWriteStr_(test, "ip", "192.168.88.88");
|
||||||
|
jsonWriteStr_(test, "id", "123456789");
|
||||||
|
jsonWriteStr_(test, "name", "test");
|
||||||
|
devListJson = devListJson + test;
|
||||||
|
|
||||||
devListJson = "[" + devListJson + "]";
|
devListJson = "[" + devListJson + "]";
|
||||||
Serial.println(devListJson);
|
Serial.println(devListJson);
|
||||||
}
|
}
|
||||||
@@ -48,7 +48,7 @@ void setup() {
|
|||||||
|
|
||||||
configure("/config.json");
|
configure("/config.json");
|
||||||
|
|
||||||
//создали задачу которая будет выполняться каждые 30 секунд
|
//задачи редкого выполнения
|
||||||
ts.add(
|
ts.add(
|
||||||
MYTEST, 1000 * 30, [&](void*) {
|
MYTEST, 1000 * 30, [&](void*) {
|
||||||
SerialPrint(F("i"), F("HEAP"), prettyBytes(ESP.getFreeHeap()));
|
SerialPrint(F("i"), F("HEAP"), prettyBytes(ESP.getFreeHeap()));
|
||||||
|
|||||||
@@ -62,8 +62,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
|
|||||||
}
|
}
|
||||||
// list ===================================================================
|
// list ===================================================================
|
||||||
if (headerStr == "/list") {
|
if (headerStr == "/list") {
|
||||||
// standWebSocket.sendTXT(num, devListJson);
|
standWebSocket.sendTXT(num, devListJson);
|
||||||
// sendFileToWs("/settings.json", num, 1024);
|
sendFileToWs("/settings.json", num, 1024);
|
||||||
}
|
}
|
||||||
|
|
||||||
} break;
|
} break;
|
||||||
|
|||||||
Reference in New Issue
Block a user