From f62aa6478d8b329945746310421b54ddf84b40b7 Mon Sep 17 00:00:00 2001 From: Links Date: Tue, 6 Feb 2018 21:36:44 +0100 Subject: [PATCH] more ESP32 stuff --- examples/WebSocketClient/WebSocketClient.ino | 7 ++----- src/WebSockets.h | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/examples/WebSocketClient/WebSocketClient.ino b/examples/WebSocketClient/WebSocketClient.ino index 4dad8e5..fe602aa 100644 --- a/examples/WebSocketClient/WebSocketClient.ino +++ b/examples/WebSocketClient/WebSocketClient.ino @@ -14,22 +14,20 @@ #elif defined(ESP32) #include #include + #include WiFiMulti WiFiMulti; HardwareSerial Serial1(2); #endif #include + #include WebSocketsClient webSocket; #define USE_SERIAL Serial1 -#ifndef ESP8266 -void hexdump(const void *mem, uint32_t len, uint8_t cols = 16); -#endif - void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) { switch(type) { @@ -103,7 +101,6 @@ void loop() { } - #ifndef ESP8266 void hexdump(const void *mem, uint32_t len, uint8_t cols) { const uint8_t* src = (const uint8_t*) mem; diff --git a/src/WebSockets.h b/src/WebSockets.h index a10aab9..c63bb5e 100644 --- a/src/WebSockets.h +++ b/src/WebSockets.h @@ -48,7 +48,7 @@ #define NODEBUG_WEBSOCKETS #endif -#ifdef ESP8266 +#if defined(ESP8266) || defined(ESP32) #define WEBSOCKETS_MAX_DATA_SIZE (15*1024) #define WEBSOCKETS_USE_BIG_MEM #define GET_FREE_HEAP ESP.getFreeHeap() @@ -78,7 +78,7 @@ // max size of the WS Message Header #define WEBSOCKETS_MAX_HEADER_SIZE (14) -#if !defined(WEBSOCKETS_NETWORK_TYPE) +#if !defined(WEBSOCKETS_NETWORK_TYPE) // select Network type based #if defined(ESP8266) || defined(ESP31B) #define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266 @@ -97,7 +97,7 @@ // No SSL/WSS support for client in Async mode // TLS lib need a sync interface! -#if !defined(ESP8266) && !defined(ESP31B) +#if !defined(ESP8266) && !defined(ESP31B) && !defined(ESP32) #error "network type ESP8266 ASYNC only possible on the ESP mcu!" #endif