feedc0de/arduinoWebSockets
1
0
Fork 0
forked from Links2004/arduinoWebSockets
Code Pull Requests Activity

Merge remote-tracking branch 'remotes/me-no-dev/async' into async

Browse Source
This commit is contained in:
Markus Sattler
2016-01-30 11:59:33 +01:00
parent 629f524ea4 512e3f6c09
commit 632ee13230
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/WebSockets.h
View File

@ -53,9 +53,9 @@
#define WEBSOCKETS_MAX_HEADER_SIZE (14) #define WEBSOCKETS_MAX_HEADER_SIZE (14)
// select Network type based // select Network type based
#ifdef ESP8266 #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
#else #else
#define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100 #define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100
#endif #endif
@ -66,11 +66,15 @@
// No SSL/WSS support for client in Async mode // No SSL/WSS support for client in Async mode
// TLS lib need a sync interface! // TLS lib need a sync interface!
#ifndef ESP8266 #if !defined(ESP8266) && !defined(ESP31B)
#error "network type ESP8266 ASYNC only possible on the ESP mcu!" #error "network type ESP8266 ASYNC only possible on the ESP mcu!"
#endif #endif
#ifdef ESP8266
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#else
#include <ESP31BWiFi.h>
#endif
#include <ESPAsyncTCP.h> #include <ESPAsyncTCP.h>
#include <ESPAsyncTCPbuffer.h> #include <ESPAsyncTCPbuffer.h>
#define WEBSOCKETS_NETWORK_CLASS AsyncTCPbuffer #define WEBSOCKETS_NETWORK_CLASS AsyncTCPbuffer
@ -78,11 +82,15 @@
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) #elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
#ifndef ESP8266 #if !defined(ESP8266) && !defined(ESP31B)
#error "network type ESP8266 only possible on the ESP mcu!" #error "network type ESP8266 only possible on the ESP mcu!"
#endif #endif
#ifdef ESP8266
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#else
#include <ESP31BWiFi.h>
#endif
#define WEBSOCKETS_NETWORK_CLASS WiFiClient #define WEBSOCKETS_NETWORK_CLASS WiFiClient
#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer #define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer