8000 fix wrong printf parameter · Aeronaut/arduinoWebSockets@aebdc46 · GitHub
[go: up one dir, main page]
Skip to content

Commit aebdc46

Browse files
Links2004Links2004
committed
fix wrong printf parameter
improve Serial Usage
1 parent cf3ca5f commit aebdc46

File tree

2 files changed

+28
-24
lines changed

2 files changed

+28
-24
lines changed

‎examples/WebSocketClient/WebSocketClient.ino

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,28 @@ ESP8266WiFiMulti WiFiMulti;
1818
WebSocketsClient webSocket;
1919

2020

21+
#define USE_SERIAL Serial1
22+
2123
void webSocketEvent(WStype_t type, uint8_t * payload, size_t lenght) {
2224

2325

2426
switch(type) {
2527
case WStype_DISCONNECTED:
26-
Serial1.printf("[WSc] Disconnected!\n");
28+
USE_SERIAL.printf("[WSc] Disconnected!\n");
2729
break;
2830
case WStype_CONNECTED:
2931
{
30-
Serial1.printf("[WSc] Connected to url: %s\n", payload);
32+
USE_SERIAL.printf("[WSc] Connected to url: %s\n", payload);
3133
}
3234
break;
3335
case WStype_TEXT:
34-
Serial1.printf("[WSc] get text: %s\n", lenght);
36+
USE_SERIAL.printf("[WSc] get text: %s\n", payload);
3537

3638
// send data to back to Server
3739
webSocket.sendTXT(payload, lenght);
3840
break;
3941
case WStype_BIN:
40-
Serial1.printf("[WSc] get binary lenght: %u\n", lenght);
42+
USE_SERIAL.printf("[WSc] get binary lenght: %u\n", lenght);
4143
hexdump(payload, lenght);
4244

4345
// echo data back to Server
@@ -49,19 +51,19 @@ void webSocketEvent(WStype_t type, uint8_t * payload, size_t lenght) {
4951

5052

5153
void setup() {
52-
Serial.begin(921600);
53-
Serial1.begin(921600);
54+
// USE_SERIAL.begin(921600);
55+
USE_SERIAL.begin(115200);
5456

5557
//Serial.setDebugOutput(true);
56-
Serial1.setDebugOutput(true);
58+
USE_SERIAL.setDebugOutput(true);
5759

58-
Serial1.println();
59-
Serial1.println();
60-
Serial1.println();
60+
USE_SERIAL.println();
61+
USE_SERIAL.println();
62+
USE_SERIAL.println();
6163

6264
for(uint8_t t = 4; t > 0; t--) {
63-
Serial1.printf("[SETUP] BOOT WAIT %d...\n", t);
64-
Serial1.flush();
65+
USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
66+
USE_SERIAL.flush();
6567
delay(1000);
6668
}
6769

‎examples/WebSocketServer/WebSocketServer.ino

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,22 @@ ESP8266WiFiMulti WiFiMulti;
1616

1717
WebSocketsServer webSocket = WebSocketsServer(81);
1818

19+
#define USE_SERIAL Serial1
20+
1921
void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght) {
2022

2123
switch(type) {
2224
case WStype_DISCONNECTED:
23-
Serial1.printf("[%u] Disconnected!\n", num);
25+
USE_SERIAL.printf("[%u] Disconnected!\n", num);
2426
break;
2527
case WStype_CONNECTED:
2628
{
2729
IPAddress ip = webSocket.remoteIP(num);
28-
Serial1.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
30+
USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
2931
}
3032
break;
3133
case WStype_TEXT:
32-
Serial1.printf("[%u] get Text: %s\n", num, payload);
34+
USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
3335

3436
// echo data back to browser
3537
webSocket.sendTXT(num, payload, lenght);
@@ -38,7 +40,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
3840
webSocket.broadcastTXT(payload, lenght);
3941
break;
4042
case WStype_BIN:
41-
Serial1.printf("[%u] get binary lenght: %u\n", num, lenght);
43+
USE_SERIAL.printf("[%u] get binary lenght: %u\n", num, lenght);
4244
hexdump(payload, lenght);
4345

4446
// echo data back to browser
@@ -49,19 +51,19 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
4951
}
5052

5153
void setup() {
52-
Serial.begin(921600);
53-
Serial1.begin(921600);
54+
// USE_SERIAL.begin(921600);
55+
USE_SERIAL.begin(115200);
5456

5557
//Serial.setDebugOutput(true);
56-
Serial1.setDebugOutput(true);
58+
USE_SERIAL.setDebugOutput(true);
5759

58-
Serial1.println();
59-
Serial1.println();
60-
Serial1.println();
60+
USE_SERIAL.println();
61+
USE_SERIAL.println();
62+
USE_SERIAL.println();
6163

6264
for(uint8_t t = 4; t > 0; t--) {
63-
Serial1.printf("[SETUP] BOOT WAIT %d...\n", t);
64-
Serial1.flush();
65+
USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
66+
USE_SERIAL.flush();
6567
delay(1000);
6668
}
6769

0 commit comments

Comments
 (0)
0