Links2004/arduinoWebSockets
1
0
Fork 1
mirror of https://github.com/Links2004/arduinoWebSockets.git synced 2025-07-20 10:42:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
Links
2023-05-01 14:36:26 +02:00
parent 4115a87c16
commit a4f13a1410
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/WebSockets.h
View File

@ -50,7 +50,7 @@
DEBUG_ESP_PORT.flush(); \ DEBUG_ESP_PORT.flush(); \
} }
#else #else
//#define DEBUG_WEBSOCKETS(...) os_printf( __VA_ARGS__ ) // #define DEBUG_WEBSOCKETS(...) os_printf( __VA_ARGS__ )
#endif #endif
#endif #endif
@ -67,7 +67,7 @@
#define WEBSOCKETS_USE_BIG_MEM #define WEBSOCKETS_USE_BIG_MEM
#define GET_FREE_HEAP ESP.getFreeHeap() #define GET_FREE_HEAP ESP.getFreeHeap()
// moves all Header strings to Flash (~300 Byte) // moves all Header strings to Flash (~300 Byte)
//#define WEBSOCKETS_SAVE_RAM // #define WEBSOCKETS_SAVE_RAM
#if defined(ESP8266) #if defined(ESP8266)
#define WEBSOCKETS_YIELD() delay(0) #define WEBSOCKETS_YIELD() delay(0)
@ -122,12 +122,12 @@
// select Network type based // select Network type based
#if defined(ESP8266) || defined(ESP31B) #if defined(ESP8266) || defined(ESP31B)
#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266 #define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266
//#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266_ASYNC // #define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266_ASYNC
//#define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100 // #define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100
#elif defined(ESP32) #elif defined(ESP32)
#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP32 #define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP32
//#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP32_ETH // #define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP32_ETH
#elif defined(ARDUINO_ARCH_RP2040) #elif defined(ARDUINO_ARCH_RP2040)
#define WEBSOCKETS_NETWORK_TYPE NETWORK_RP2040 #define WEBSOCKETS_NETWORK_TYPE NETWORK_RP2040

7
src/WebSockets4WebServer.h
View File

@ -28,14 +28,13 @@
#include <WebSocketsServer.h> #include <WebSocketsServer.h>
#include <ESP8266WebServer.h> #include <ESP8266WebServer.h>
#if((WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)) && WEBSERVER_HAS_HOOK
#if ((WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)) && WEBSERVER_HAS_HOOK
class WebSockets4WebServer : public WebSocketsServerCore { class WebSockets4WebServer : public WebSocketsServerCore {
#if defined(ESP8266) #if defined(ESP8266)
using WebServerClass = ESP8266WebServer; using WebServerClass = ESP8266WebServer;
#else #else
using WebServerClass = WebServer; using WebServerClass = WebServer;
#endif #endif
public: public:

8
src/WebSocketsClient.cpp
View File

@ -226,7 +226,7 @@ void WebSocketsClient::loop(void) {
_client.ssl->setCACert(_CA_cert); _client.ssl->setCACert(_CA_cert);
#elif defined(ESP8266) && defined(SSL_AXTLS) #elif defined(ESP8266) && defined(SSL_AXTLS)
_client.ssl->setCACert((const uint8_t *)_CA_cert, strlen(_CA_cert) + 1); _client.ssl->setCACert((const uint8_t *)_CA_cert, strlen(_CA_cert) + 1);
#elif (defined(ESP8266) || defined(ARDUINO_ARCH_RP2040)) && defined(SSL_BARESSL) #elif(defined(ESP8266) || defined(ARDUINO_ARCH_RP2040)) && defined(SSL_BARESSL)
_client.ssl->setTrustAnchors(_CA_cert); _client.ssl->setTrustAnchors(_CA_cert);
#else #else
#error setCACert not implemented #error setCACert not implemented
@ -428,9 +428,9 @@ bool WebSocketsClient::isConnected(void) {
return (_client.status == WSC_CONNECTED); return (_client.status == WSC_CONNECTED);
} }
//################################################################################# // #################################################################################
//################################################################################# // #################################################################################
//################################################################################# // #################################################################################
/** /**
* *

6
src/WebSocketsServer.cpp
View File

@ -414,9 +414,9 @@ IPAddress WebSocketsServerCore::remoteIP(uint8_t num) {
} }
#endif #endif
//################################################################################# // #################################################################################
//################################################################################# // #################################################################################
//################################################################################# // #################################################################################
/** /**
* handle new client connection * handle new client connection