Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/WebSockets.h
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,11 @@
#define WEBSOCKETS_NETWORK_SSL_CLASS WiFiClientSecure
#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer

#if !defined(ESP_ARDUINO_VERSION) || ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
// The ESP32 Arduino core 2.x.x has a wrong implementation of setTimeout (it takes secondes as argument)
#define NETWORK_SET_TIMEOUT_IN_SECONDS
#endif

#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32_ETH)

#include <ETH.h>
Expand Down
9 changes: 5 additions & 4 deletions src/WebSocketsClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -955,12 +955,13 @@ void WebSocketsClient::connectedCb() {
_client.status = WSC_HEADER;

// set Timeout for readBytesUntil and readStringUntil
#if defined(ESP_ARDUINO_VERSION) && WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32 && ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
// The ESP32 Arduino core 2.x.x has a wrong implementation of setTimeout (it takes secondes as argument)
_client.tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT/1000);
#elif (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
#if defined(NETWORK_SET_TIMEOUT_IN_SECONDS)
_client.tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT / 1000);
#else
_client.tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT);
#endif
#endif

#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
_client.tcp->setNoDelay(true);
Expand Down
Loading