Skip to content

Commit 321b289

Browse files
skaarj1989skaarj1989
committed
1 parent 31cf0e2 commit 321b289

File tree

4 files changed

+54
-53
lines changed

4 files changed

+54
-53
lines changed

‎examples/chat-client/chat-client.ino‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#define NETWORK_CONTROLLER ETHERNET_CONTROLLER_W5X00
33

44
#if NETWORK_CONTROLLER == NETWORK_CONTROLLER_WIFI
5-
const char kSSID[]{"SKYNET"};
6-
const char kPassword[]{"***"};
5+
const char kSSID[]{ "SKYNET" };
6+
const char kPassword[]{ "***" };
77
#else
8-
byte mac[]{0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
9-
const IPAddress ip{192, 168, 46, 180};
8+
byte mac[]{ 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
9+
const IPAddress ip{ 192, 168, 46, 180 };
1010
#endif
1111

1212
#include "ExampleBoilerplate.hpp"
@@ -17,7 +17,6 @@ using namespace net;
1717
constexpr auto kBufferSize = 64;
1818
char message[kBufferSize]{};
1919

20-
using MyWebSocket = WebSocket<NetClient>;
2120
using MyWebSocketClient = WebSocketClient<NetClient>;
2221

2322
MyWebSocketClient client;
@@ -29,19 +28,19 @@ void setup() {
2928

3029
setupNetwork();
3130

32-
client.onOpen([](MyWebSocket &ws) {
31+
client.onOpen([](IWebSocket &ws) {
3332
_SERIAL.println(F("Type a message in the following format: <text>"));
3433
_SERIAL.println(F("----------------------------------------------"));
3534
});
3635

37-
client.onMessage([](MyWebSocket &ws, const WebSocketDataType,
36+
client.onMessage([](IWebSocket &ws, const WebSocketDataType,
3837
const char *message, uint16_t) {
3938
_SERIAL.println(message);
4039
});
4140
client.onClose(
42-
[](MyWebSocket &, const WebSocketCloseCode, const char *, uint16_t) {
43-
_SERIAL.println(F("Disconnected"));
44-
});
41+
[](IWebSocket &, const WebSocketCloseCode, const char *, uint16_t) {
42+
_SERIAL.println(F("Disconnected"));
43+
});
4544

4645
if (!client.open("192.168.46.4", 3000)) {
4746
_SERIAL.println(F("Connection failed!"));
@@ -50,11 +49,11 @@ void setup() {
5049
}
5150
}
5251

53-
uint32_t previousTime{0};
52+
uint32_t previousTime{ 0 };
5453

5554
void loop() {
5655
static auto recvInProgress = false;
57-
static byte idx{0};
56+
static byte idx{ 0 };
5857

5958
static auto newData = false;
6059
while (_SERIAL.available() > 0 && newData == false) {

‎examples/simple-client/simple-client.ino‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
#define NETWORK_CONTROLLER ETHERNET_CONTROLLER_W5X00
33

44
#if NETWORK_CONTROLLER == NETWORK_CONTROLLER_WIFI
5-
const char kSSID[]{"SKYNET"};
6-
const char kPassword[]{"***"};
5+
const char kSSID[]{ "SKYNET" };
6+
const char kPassword[]{ "***" };
77
#else
8-
byte mac[]{0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
9-
const IPAddress ip{192, 168, 46, 180};
8+
byte mac[]{ 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
9+
const IPAddress ip{ 192, 168, 46, 180 };
1010
#endif
1111

1212
#include "ExampleBoilerplate.hpp"
1313

1414
#include <WebSocketClient.hpp>
1515
using namespace net;
1616

17-
using MyWebSocket = WebSocket<NetClient>;
1817
using MyWebSocketClient = WebSocketClient<NetClient>;
1918

2019
MyWebSocketClient client;
@@ -26,37 +25,37 @@ void setup() {
2625

2726
setupNetwork();
2827

29-
client.onOpen([](MyWebSocket &ws) {
28+
client.onOpen([](IWebSocket &ws) {
3029
_SERIAL.println(F("Connected"));
3130
const auto protocol = ws.getProtocol();
3231
if (protocol) {
3332
_SERIAL.print(F("Client protocol: "));
3433
_SERIAL.println(protocol);
3534
}
3635

37-
const char message[]{"Hello from Arduino client!"};
36+
const char message[]{ "Hello from Arduino client!" };
3837
ws.send(WebSocketDataType::TEXT, message, strlen(message));
3938
});
4039

41-
client.onMessage([](MyWebSocket &ws, const WebSocketDataType dataType,
40+
client.onMessage([](IWebSocket &ws, const WebSocketDataType dataType,
4241
const char *message, uint16_t length) {
4342
switch (dataType) {
44-
case WebSocketDataType::TEXT:
45-
_SERIAL.print(F("Received: "));
46-
_SERIAL.println(message);
47-
break;
48-
case WebSocketDataType::BINARY:
49-
_SERIAL.println(F("Received binary data"));
50-
break;
43+
case WebSocketDataType::TEXT:
44+
_SERIAL.print(F("Received: "));
45+
_SERIAL.println(message);
46+
break;
47+
case WebSocketDataType::BINARY:
48+
_SERIAL.println(F("Received binary data"));
49+
break;
5150
}
5251

53-
ws.send(dataType, message, length); // Echo back to server
52+
ws.send(dataType, message, length); // Echo back to server
5453
});
5554

5655
client.onClose(
57-
[](MyWebSocket &, const WebSocketCloseCode, const char *, uint16_t) {
58-
_SERIAL.println(F("Disconnected\n"));
59-
});
56+
[](IWebSocket &, const WebSocketCloseCode, const char *, uint16_t) {
57+
_SERIAL.println(F("Disconnected\n"));
58+
});
6059

6160
if (!client.open("192.168.46.4", 3000, "/")) {
6261
_SERIAL.println(F("Connection failed!"));
@@ -65,4 +64,6 @@ void setup() {
6564
}
6665
}
6766

68-
void loop() { client.listen(); }
67+
void loop() {
68+
client.listen();
69+
}

‎examples/simple-server/simple-server.ino‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,22 @@
22
#define NETWORK_CONTROLLER ETHERNET_CONTROLLER_W5X00
33

44
#if NETWORK_CONTROLLER == NETWORK_CONTROLLER_WIFI
5-
const char kSSID[]{"SKYNET"};
6-
const char kPassword[]{"***"};
5+
const char kSSID[]{ "SKYNET" };
6+
const char kPassword[]{ "***" };
77
#else
8-
byte mac[]{0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
9-
const IPAddress ip{192, 168, 46, 180};
8+
byte mac[]{ 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
9+
const IPAddress ip{ 192, 168, 46, 180 };
1010
#endif
1111

1212
#include "ExampleBoilerplate.hpp"
1313

1414
#include <WebSocketServer.hpp>
1515
using namespace net;
1616

17-
using MyWebSocket = WebSocket<NetClient>;
1817
using MyWebSocketServer = WebSocketServer<NetServer, NetClient, 4>;
1918

2019
constexpr auto kPort = 3000;
21-
MyWebSocketServer wss{kPort};
20+
MyWebSocketServer wss{ kPort };
2221

2322
void setup() {
2423
_SERIAL.begin(115200);
@@ -30,41 +29,43 @@ void setup() {
3029
_SERIAL.print(F("Server running on port: "));
3130
_SERIAL.println(kPort);
3231

33-
wss.onConnection([](MyWebSocket &ws) {
32+
wss.onConnection([](IWebSocket &ws) {
3433
const auto protocol = ws.getProtocol();
3534
if (protocol) {
3635
_SERIAL.print(F("Client protocol: "));
3736
_SERIAL.println(protocol);
3837
}
3938

40-
ws.onMessage([](MyWebSocket &ws, const WebSocketDataType dataType,
39+
ws.onMessage([](IWebSocket &ws, const WebSocketDataType dataType,
4140
const char *message, uint16_t length) {
4241
switch (dataType) {
43-
case net::WebSocketDataType::TEXT:
44-
_SERIAL.print(F("Received: "));
45-
_SERIAL.println(message);
46-
break;
47-
case net::WebSocketDataType::BINARY:
48-
_SERIAL.println(F("Received binary data"));
49-
break;
42+
case net::WebSocketDataType::TEXT:
43+
_SERIAL.print(F("Received: "));
44+
_SERIAL.println(message);
45+
break;
46+
case net::WebSocketDataType::BINARY:
47+
_SERIAL.println(F("Received binary data"));
48+
break;
5049
}
5150

5251
ws.send(dataType, message, length);
5352
});
5453

5554
ws.onClose(
56-
[](MyWebSocket &, const WebSocketCloseCode, const char *, uint16_t) {
57-
_SERIAL.println(F("Disconnected"));
58-
});
55+
[](IWebSocket &, const WebSocketCloseCode, const char *, uint16_t) {
56+
_SERIAL.println(F("Disconnected"));
57+
});
5958

6059
_SERIAL.print(F("New client: "));
6160
_SERIAL.println(ws.getRemoteIP());
6261

63-
const char message[]{"Hello from Arduino server!"};
62+
const char message[]{ "Hello from Arduino server!" };
6463
ws.send(WebSocketDataType::TEXT, message, strlen(message));
6564
});
6665

6766
wss.begin();
6867
}
6968

70-
void loop() { wss.listen(); }
69+
void loop() {
70+
wss.listen();
71+
}

‎src/WebSocketClient.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace net {
99
/** @class WebSocketClient */
1010
template <class NetClient> class WebSocketClient : public WebSocket<NetClient> {
1111
public:
12-
using onOpenCallback = void (*)(WebSocket<NetClient> &);
12+
using onOpenCallback = void (*)(IWebSocket &);
1313
using onErrorCallback = void (*)(WebSocketError);
1414

1515
public:

0 commit comments

Comments
 (0)