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

общение через веб сокет

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-01-22 00:15:49 +01:00
parent 6318fb4af0
commit 9f05eccb26
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/StandWebServer.cpp
View File

@@ -13,6 +13,10 @@ void standWebServerInit() {
HTTP.send(200, "application/json", settingsFlashJson); HTTP.send(200, "application/json", settingsFlashJson);
}); });
HTTP.on("/config.json", HTTP_GET, []() {
HTTP.send(200, "application/json", readFile(F("config.json"), 5096));
});
HTTP.on("/restart", HTTP_GET, []() { HTTP.on("/restart", HTTP_GET, []() {
// ESP.restart(); // ESP.restart();
HTTP.send(200, "text/plain", "ok"); HTTP.send(200, "text/plain", "ok");
@@ -215,10 +219,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
if (payloadStr.startsWith("/config")) { if (payloadStr.startsWith("/config")) {
//если прилетел url страницы /config то отправим widgets.json и config.json //если прилетел url страницы /config то отправим widgets.json и config.json
#ifdef QUEUE_FROM_STR sendFileToWs4("/widgets.json", num);
// sendFileToWs2("/widgets.json", num);
sendFileToWs4("/config.json", num); sendFileToWs4("/config.json", num);
#endif
} }
if (payloadStr.startsWith("/gifnoc.json")) { //если прилетел измененный пакет с меткой /gifnoc (config наоборот) то перепишем файл, пока переписываем целеком if (payloadStr.startsWith("/gifnoc.json")) { //если прилетел измененный пакет с меткой /gifnoc (config наоборот) то перепишем файл, пока переписываем целеком
@@ -314,31 +316,30 @@ void sendFileToWs2(const String& filename, uint8_t num) {
} }
void sendFileToWs3(const String& filename, uint8_t num) { void sendFileToWs3(const String& filename, uint8_t num) {
standWebSocket.sendTXT(num, "/st" + filename);
size_t ws_buffer = 512;
String path = filepath(filename); String path = filepath(filename);
auto file = FileFS.open(path, "r"); auto file = FileFS.open(path, "r");
if (!file) { if (!file) {
SerialPrint(F("E"), F("FS"), F("reed file error")); SerialPrint(F("E"), F("FS"), F("reed file error"));
} }
size_t fileSize = file.size(); size_t fileSize = file.size();
SerialPrint(F("i"), F("WS"), "Send file '" + filename + "', file size: " + String(fileSize)); SerialPrint(F("i"), F("WS"), "Send file '" + filename + "', file size: " + String(fileSize));
String ret; String ret;
ret.reserve(file.size() - file.position()); char temp[ws_buffer + 1];
char temp[256 + 1];
int countRead = file.readBytes(temp, sizeof(temp) - 1); int countRead = file.readBytes(temp, sizeof(temp) - 1);
while (countRead > 0) { while (countRead > 0) {
temp[countRead] = 0; temp[countRead] = 0;
ret += temp; ret = temp;
standWebSocket.sendTXT(num, ret);
countRead = file.readBytes(temp, sizeof(temp) - 1); countRead = file.readBytes(temp, sizeof(temp) - 1);
} }
standWebSocket.sendTXT(num, "/end" + filename);
standWebSocket.sendTXT(num, ret);
} }
void sendFileToWs4(const String& filename, uint8_t num) { void sendFileToWs4(const String& filename, uint8_t num) {
size_t ws_buffer = 1024; standWebSocket.sendTXT(num, "/st" + filename);
size_t ws_buffer = 512;
String path = filepath(filename); String path = filepath(filename);
auto file = FileFS.open(path, "r"); auto file = FileFS.open(path, "r");
if (!file) { if (!file) {
@@ -353,4 +354,5 @@ void sendFileToWs4(const String& filename, uint8_t num) {
standWebSocket.sendTXT(num, temp, countRead); standWebSocket.sendTXT(num, temp, countRead);
countRead = file.readBytes(temp, sizeof(temp) - 1); countRead = file.readBytes(temp, sizeof(temp) - 1);
} }
standWebSocket.sendTXT(num, "/end" + filename);
} }