me-no-dev/ESPAsyncWebServer
1
0
Fork 1
mirror of https://github.com/me-no-dev/ESPAsyncWebServer.git synced 2025-07-31 19:24:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes in ESP32/ESP8266 code diffs

Browse Source
This commit is contained in:
Emil Muratov
2024-07-02 22:23:41 +09:00
committed by Mathieu Carbou
parent e4d9cf2d3f
commit c004ca8cd3
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/AsyncWebSocket.cpp
View File

@@ -613,7 +613,7 @@ size_t AsyncWebSocketClient::printf(const char* format, ...) {
return len; return len;
} }
#ifndef ESP32 #ifdef ESP8266
size_t AsyncWebSocketClient::printf_P(PGM_P formatP, ...) { size_t AsyncWebSocketClient::printf_P(PGM_P formatP, ...) {
va_list arg; va_list arg;
va_start(arg, formatP); va_start(arg, formatP);
@@ -680,7 +680,7 @@ void AsyncWebSocketClient::text(const String& message) {
text(message.c_str(), message.length()); text(message.c_str(), message.length());
} }
#ifndef ESP32 #ifdef ESP8266
void AsyncWebSocketClient::text(const __FlashStringHelper* data) { void AsyncWebSocketClient::text(const __FlashStringHelper* data) {
PGM_P p = reinterpret_cast<PGM_P>(data); PGM_P p = reinterpret_cast<PGM_P>(data);
@@ -699,7 +699,7 @@ void AsyncWebSocketClient::text(const __FlashStringHelper* data) {
free(message); free(message);
} }
} }
#endif // ESP32 #endif // ESP8266
void AsyncWebSocketClient::binary(AsyncWebSocketMessageBuffer* buffer) { void AsyncWebSocketClient::binary(AsyncWebSocketMessageBuffer* buffer) {
if (buffer) { if (buffer) {
@@ -728,7 +728,7 @@ void AsyncWebSocketClient::binary(const String& message) {
binary(message.c_str(), message.length()); binary(message.c_str(), message.length());
} }
#ifndef ESP32 #ifdef ESP8266
void AsyncWebSocketClient::binary(const __FlashStringHelper* data, size_t len) { void AsyncWebSocketClient::binary(const __FlashStringHelper* data, size_t len) {
PGM_P p = reinterpret_cast<PGM_P>(data); PGM_P p = reinterpret_cast<PGM_P>(data);
char* message = (char*)malloc(len); char* message = (char*)malloc(len);
@@ -739,6 +739,7 @@ void AsyncWebSocketClient::binary(const __FlashStringHelper* data, size_t len) {
} }
} }
#endif #endif
IPAddress AsyncWebSocketClient::remoteIP() const { IPAddress AsyncWebSocketClient::remoteIP() const {
if (!_client) if (!_client)
return IPAddress((uint32_t)0U); return IPAddress((uint32_t)0U);
@@ -839,7 +840,7 @@ void AsyncWebSocket::text(uint32_t id, const String& message) {
text(id, message.c_str(), message.length()); text(id, message.c_str(), message.length());
} }
#ifndef ESP8266 #ifdef ESP8266
void AsyncWebSocket::text(uint32_t id, const __FlashStringHelper* data) { void AsyncWebSocket::text(uint32_t id, const __FlashStringHelper* data) {
PGM_P p = reinterpret_cast<PGM_P>(data); PGM_P p = reinterpret_cast<PGM_P>(data);
@@ -883,7 +884,7 @@ void AsyncWebSocket::textAll(const char* message) {
void AsyncWebSocket::textAll(const String& message) { void AsyncWebSocket::textAll(const String& message) {
textAll(message.c_str(), message.length()); textAll(message.c_str(), message.length());
} }
#ifndef ESP32 #ifdef ESP8266
void AsyncWebSocket::textAll(const __FlashStringHelper* data) { void AsyncWebSocket::textAll(const __FlashStringHelper* data) {
PGM_P p = reinterpret_cast<PGM_P>(data); PGM_P p = reinterpret_cast<PGM_P>(data);
@@ -902,7 +903,7 @@ void AsyncWebSocket::textAll(const __FlashStringHelper* data) {
free(message); free(message);
} }
} }
#endif // ESP32 #endif // ESP8266
void AsyncWebSocket::textAll(AsyncWebSocketMessageBuffer* buffer) { void AsyncWebSocket::textAll(AsyncWebSocketMessageBuffer* buffer) {
if (buffer) { if (buffer) {
textAll(std::move(buffer->_buffer)); textAll(std::move(buffer->_buffer));
@@ -929,7 +930,8 @@ void AsyncWebSocket::binary(uint32_t id, const char* message) {
void AsyncWebSocket::binary(uint32_t id, const String& message) { void AsyncWebSocket::binary(uint32_t id, const String& message) {
binary(id, message.c_str(), message.length()); binary(id, message.c_str(), message.length());
} }
#ifndef ESP32
#ifdef ESP8266
void AsyncWebSocket::binary(uint32_t id, const __FlashStringHelper* data, size_t len) { void AsyncWebSocket::binary(uint32_t id, const __FlashStringHelper* data, size_t len) {
PGM_P p = reinterpret_cast<PGM_P>(data); PGM_P p = reinterpret_cast<PGM_P>(data);
char* message = (char*)malloc(len); char* message = (char*)malloc(len);
@@ -939,7 +941,8 @@ void AsyncWebSocket::binary(uint32_t id, const __FlashStringHelper* data, size_t
free(message); free(message);
} }
} }
#endif // ESP32 #endif // ESP8266
void AsyncWebSocket::binary(uint32_t id, AsyncWebSocketMessageBuffer* buffer) { void AsyncWebSocket::binary(uint32_t id, AsyncWebSocketMessageBuffer* buffer) {
if (buffer) { if (buffer) {
binary(id, std::move(buffer->_buffer)); binary(id, std::move(buffer->_buffer));
@@ -963,7 +966,8 @@ void AsyncWebSocket::binaryAll(const char* message) {
void AsyncWebSocket::binaryAll(const String& message) { void AsyncWebSocket::binaryAll(const String& message) {
binaryAll(message.c_str(), message.length()); binaryAll(message.c_str(), message.length());
} }
#ifndef ESP32
#ifdef ESP8266
void AsyncWebSocket::binaryAll(const __FlashStringHelper* data, size_t len) { void AsyncWebSocket::binaryAll(const __FlashStringHelper* data, size_t len) {
PGM_P p = reinterpret_cast<PGM_P>(data); PGM_P p = reinterpret_cast<PGM_P>(data);
char* message = (char*)malloc(len); char* message = (char*)malloc(len);
@@ -973,7 +977,8 @@ void AsyncWebSocket::binaryAll(const __FlashStringHelper* data, size_t len) {
free(message); free(message);
} }
} }
#endif // ESP32 #endif // ESP8266
void AsyncWebSocket::binaryAll(AsyncWebSocketMessageBuffer* buffer) { void AsyncWebSocket::binaryAll(AsyncWebSocketMessageBuffer* buffer) {
if (buffer) { if (buffer) {
binaryAll(std::move(buffer->_buffer)); binaryAll(std::move(buffer->_buffer));
@@ -1019,7 +1024,7 @@ size_t AsyncWebSocket::printfAll(const char* format, ...) {
return len; return len;
} }
#ifndef ESP32 #ifdef ESP8266
size_t AsyncWebSocket::printf_P(uint32_t id, PGM_P formatP, ...) { size_t AsyncWebSocket::printf_P(uint32_t id, PGM_P formatP, ...) {
AsyncWebSocketClient* c = client(id); AsyncWebSocketClient* c = client(id);
if (c != NULL) { if (c != NULL) {

4
src/AsyncWebSocket.h
View File

@@ -336,9 +336,9 @@ class AsyncWebSocket : public AsyncWebHandler {
void binaryAll(const char* message, size_t len); void binaryAll(const char* message, size_t len);
void binaryAll(const char* message); void binaryAll(const char* message);
void binaryAll(const String& message); void binaryAll(const String& message);
#ifndef ESP32 #ifdef ESP8266
void binaryAll(const __FlashStringHelper* message, size_t len); void binaryAll(const __FlashStringHelper* message, size_t len);
#endif // ESP32 #endif // ESP8266
void binaryAll(AsyncWebSocketMessageBuffer* buffer); void binaryAll(AsyncWebSocketMessageBuffer* buffer);
void binaryAll(AsyncWebSocketSharedBuffer buffer); void binaryAll(AsyncWebSocketSharedBuffer buffer);