From b44e7c3ae061ad00085d3636b51268d327d3ce00 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Fri, 7 Oct 2022 18:53:10 +0200
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B0=D0=B4=D0=B5=D0=BB=D1=8F=D0=B5?=
 =?UTF-8?q?=D0=BC=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=83=20=D1=81=D0=BE=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C?=
 =?UTF-8?q?=D1=8E=20=D0=BF=D0=BE=D1=81=D1=8B=D0=BB=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D1=84=D1=80=D0=B5=D0=B9=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/Const.h                         | 2 +-
 lib/WebSockets/src/WebSocketsServer.cpp | 4 ++--
 lib/WebSockets/src/WebSocketsServer.h   | 5 +++--
 platformio.ini                          | 1 -
 src/WsServer.cpp                        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

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;