Skip to content

Commit 90d1ac4

Browse files
committed
fix seeed build
1 parent 757b356 commit 90d1ac4

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/WebSockets.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,11 @@
240240
#define WEBSOCKETS_NETWORK_SSL_CLASS WiFiClientSecure
241241
#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
242242

243+
#if !defined(ESP_ARDUINO_VERSION) || ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
244+
// The ESP32 Arduino core 2.x.x has a wrong implementation of setTimeout (it takes secondes as argument)
245+
#define NETWORK_SET_TIMEOUT_IN_SECONDS
246+
#endif
247+
243248
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32_ETH)
244249

245250
#include <ETH.h>

src/WebSocketsClient.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -955,12 +955,13 @@ void WebSocketsClient::connectedCb() {
955955
_client.status = WSC_HEADER;
956956

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

965966
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
966967
_client.tcp->setNoDelay(true);

0 commit comments

Comments
 (0)