Merge pull request #355 from Links2004/ESP32_serial

ESP32 fixes
This commit is contained in:
Markus
2018-08-07 18:31:43 +02:00
committed by GitHub
3 changed files with 18 additions and 6 deletions

View File

@ -17,8 +17,6 @@
WiFiMulti WiFiMulti; WiFiMulti WiFiMulti;
WebSocketsClient webSocket; WebSocketsClient webSocket;
HardwareSerial Serial1(2);
#define USE_SERIAL Serial1 #define USE_SERIAL Serial1
void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) { void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) {
@ -59,6 +57,12 @@ void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
// send data to server // send data to server
// webSocket.sendBIN(payload, length); // webSocket.sendBIN(payload, length);
break; break;
case WStype_ERROR:
case WStype_FRAGMENT_TEXT_START:
case WStype_FRAGMENT_BIN_START:
case WStype_FRAGMENT:
case WStype_FRAGMENT_FIN:
break;
} }
} }

View File

@ -19,8 +19,6 @@
WiFiMulti WiFiMulti; WiFiMulti WiFiMulti;
WebSocketsClient webSocket; WebSocketsClient webSocket;
HardwareSerial Serial1(2);
#define USE_SERIAL Serial1 #define USE_SERIAL Serial1
void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) { void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) {
@ -64,6 +62,12 @@ void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
// send data to server // send data to server
// webSocket.sendBIN(payload, length); // webSocket.sendBIN(payload, length);
break; break;
case WStype_ERROR:
case WStype_FRAGMENT_TEXT_START:
case WStype_FRAGMENT_BIN_START:
case WStype_FRAGMENT:
case WStype_FRAGMENT_FIN:
break;
} }
} }

View File

@ -16,8 +16,6 @@
WiFiMulti WiFiMulti; WiFiMulti WiFiMulti;
WebSocketsServer webSocket = WebSocketsServer(81); WebSocketsServer webSocket = WebSocketsServer(81);
HardwareSerial Serial1(2);
#define USE_SERIAL Serial1 #define USE_SERIAL Serial1
void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) { void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) {
@ -64,6 +62,12 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length
// send message to client // send message to client
// webSocket.sendBIN(num, payload, length); // webSocket.sendBIN(num, payload, length);
break; break;
case WStype_ERROR:
case WStype_FRAGMENT_TEXT_START:
case WStype_FRAGMENT_BIN_START:
case WStype_FRAGMENT:
case WStype_FRAGMENT_FIN:
break;
} }
} }