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

наделяем библиотеку сокетов возможностью посылать фреймы

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-10-07 18:53:10 +02:00
parent dfa060895e
commit b44e7c3ae0
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Const.h
View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
//Версия прошивки //Версия прошивки
#define FIRMWARE_VERSION 430 #define FIRMWARE_VERSION 431
#ifdef esp8266_4mb #ifdef esp8266_4mb
#define FIRMWARE_NAME "esp8266_4mb" #define FIRMWARE_NAME "esp8266_4mb"

4
lib/WebSockets/src/WebSocketsServer.cpp
View File

@@ -225,13 +225,13 @@ bool WebSocketsServerCore::broadcastTXT(String & payload) {
* @param headerToPayload bool (see sendFrame for more details) * @param headerToPayload bool (see sendFrame for more details)
* @return true if ok * @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) { if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) {
return false; return false;
} }
WSclient_t * client = &_clients[num]; WSclient_t * client = &_clients[num];
if(clientIsConnected(client)) { if(clientIsConnected(client)) {
return sendFrame(client, WSop_binary, payload, length, true, headerToPayload); return sendFrame(client, WSop_binary, payload, length, fin, headerToPayload);
} }
return false; return false;
} }

5
lib/WebSockets/src/WebSocketsServer.h
View File

@@ -65,7 +65,7 @@ class WebSocketsServerCore : protected WebSockets {
bool broadcastTXT(const char * payload, size_t length = 0); bool broadcastTXT(const char * payload, size_t length = 0);
bool broadcastTXT(String & payload); 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 sendBIN(uint8_t num, const uint8_t * payload, size_t length);
bool broadcastBIN(uint8_t * payload, size_t length, bool headerToPayload = false); 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 void loop(void); // handle incoming client and client data
#else #else
// Async interface not need a loop call // Async interface not need a loop call
void loop(void) __attribute__((deprecated)) {} void loop(void) __attribute__((deprecated)) {
}
#endif #endif
protected: protected:

1
platformio.ini
View File

@@ -29,7 +29,6 @@ framework = arduino
board = esp32dev board = esp32dev
platform = espressif32 @5.1.1 platform = espressif32 @5.1.1
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
upload_speed = 115200
monitor_speed = 115200 monitor_speed = 115200
debug_tool = esp-prog debug_tool = esp-prog
board_build.filesystem = littlefs board_build.filesystem = littlefs

2
src/WsServer.cpp
View File

@@ -222,7 +222,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
} }
if (headerStr == "/test|") { if (headerStr == "/test|") {
//sendBlobToWsStrHeader("/layout.json", "header", num, 1024); sendBlobToWsStrHeader("/layout.json", "layout|0000|", num, 1024);
} }
} break; } break;