diff --git a/include/Const.h b/include/Const.h index bb82f3e8..d93e4c43 100644 --- a/include/Const.h +++ b/include/Const.h @@ -1,7 +1,7 @@ #pragma once //Версия прошивки -#define FIRMWARE_VERSION 430 +#define FIRMWARE_VERSION 431 #ifdef esp8266_4mb #define FIRMWARE_NAME "esp8266_4mb" diff --git a/lib/WebSockets/src/WebSocketsServer.cpp b/lib/WebSockets/src/WebSocketsServer.cpp index ea765633..e8b7f223 100644 --- a/lib/WebSockets/src/WebSocketsServer.cpp +++ b/lib/WebSockets/src/WebSocketsServer.cpp @@ -225,13 +225,13 @@ bool WebSocketsServerCore::broadcastTXT(String & payload) { * @param headerToPayload bool (see sendFrame for more details) * @return true if ok */ -bool WebSocketsServerCore::sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload) { +bool WebSocketsServerCore::sendBIN(uint8_t num, uint8_t * payload, size_t length, bool fin, bool headerToPayload) { if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) { return false; } WSclient_t * client = &_clients[num]; if(clientIsConnected(client)) { - return sendFrame(client, WSop_binary, payload, length, true, headerToPayload); + return sendFrame(client, WSop_binary, payload, length, fin, headerToPayload); } return false; } diff --git a/lib/WebSockets/src/WebSocketsServer.h b/lib/WebSockets/src/WebSocketsServer.h index 28ef17c6..88b3b417 100644 --- a/lib/WebSockets/src/WebSocketsServer.h +++ b/lib/WebSockets/src/WebSocketsServer.h @@ -65,7 +65,7 @@ class WebSocketsServerCore : protected WebSockets { bool broadcastTXT(const char * payload, size_t length = 0); bool broadcastTXT(String & payload); - bool sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload = false); + bool sendBIN(uint8_t num, uint8_t * payload, size_t length, bool fin = true, bool headerToPayload = false); bool sendBIN(uint8_t num, const uint8_t * payload, size_t length); bool broadcastBIN(uint8_t * payload, size_t length, bool headerToPayload = false); @@ -228,7 +228,8 @@ class WebSocketsServer : public WebSocketsServerCore { void loop(void); // handle incoming client and client data #else // Async interface not need a loop call - void loop(void) __attribute__((deprecated)) {} + void loop(void) __attribute__((deprecated)) { + } #endif protected: diff --git a/platformio.ini b/platformio.ini index 4590a0cc..2a704efe 100644 --- a/platformio.ini +++ b/platformio.ini @@ -29,7 +29,6 @@ framework = arduino board = esp32dev platform = espressif32 @5.1.1 monitor_filters = esp32_exception_decoder -upload_speed = 115200 monitor_speed = 115200 debug_tool = esp-prog board_build.filesystem = littlefs diff --git a/src/WsServer.cpp b/src/WsServer.cpp index 5a4ad354..70be5600 100644 --- a/src/WsServer.cpp +++ b/src/WsServer.cpp @@ -222,7 +222,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length) } if (headerStr == "/test|") { - //sendBlobToWsStrHeader("/layout.json", "header", num, 1024); + sendBlobToWsStrHeader("/layout.json", "layout|0000|", num, 1024); } } break;