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

авто ip

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-01-30 21:47:16 +01:00
parent b9d8443724
commit 0eab9ec7d8
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data_svelte/build/bundle.js
View File

File diff suppressed because one or more lines are too long

6
include/StandWebServer.h
View File

@@ -21,7 +21,7 @@ extern void hexdump(const void* mem, uint32_t len, uint8_t cols);
#endif #endif
#endif #endif
void sendFileToWs3(const String& filename, uint8_t num);
void sendFileToWs4(const String& filename, uint8_t num);
void sendFileToWs5(const char* filename, uint8_t num, size_t frameSize); void sendFileToWs5(const char* filename, uint8_t num, size_t frameSize);
void sendMark(const char* filename, const char* mark, uint8_t num); // void sendMark(const char* filename, const char* mark, uint8_t num);
// void sendFileToWs3(const String& filename, uint8_t num);
// void sendFileToWs4(const String& filename, uint8_t num);

26
src/StandWebServer.cpp
View File

@@ -221,8 +221,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
} }
if (headerStr == "/config") { if (headerStr == "/config") {
sendFileToWs5("/widgets.json", num, 128); sendFileToWs5("/widgets.json", num, 1024);
sendFileToWs5("/config.json", num, 128); sendFileToWs5("/config.json", num, 1024);
} }
if (headerStr == "/gifnoc") { if (headerStr == "/gifnoc") {
@@ -304,17 +304,17 @@ void sendFileToWs5(const char* filename, uint8_t num, size_t frameSize) {
standWebSocket.sendTXT(num, "/end" + String(filename)); standWebSocket.sendTXT(num, "/end" + String(filename));
} }
void sendMark(const char* filename, const char* mark, uint8_t num) { // void sendMark(const char* filename, const char* mark, uint8_t num) {
char outChar[strlen(filename) + strlen(mark) + 1]; // char outChar[strlen(filename) + strlen(mark) + 1];
strcpy(outChar, mark); // strcpy(outChar, mark);
strcat(outChar, filename); // strcat(outChar, filename);
size_t size = strlen(outChar); // size_t size = strlen(outChar);
uint8_t outUint[size]; // uint8_t outUint[size];
for (size_t i = 0; i < size; i++) { // for (size_t i = 0; i < size; i++) {
outUint[i] = uint8_t(outChar[i]); // outUint[i] = uint8_t(outChar[i]);
} // }
standWebSocket.sendBIN(num, outUint, sizeof(outUint)); // standWebSocket.sendBIN(num, outUint, sizeof(outUint));
} // }
//посылка данных из файла в string //посылка данных из файла в string
// void sendFileToWs3(const String& filename, uint8_t num) { // void sendFileToWs3(const String& filename, uint8_t num) {