Skip to content
This repository was archived by the owner on Jan 29, 2023. It is now read-only.

Commit 5187833

Browse files
khoih-progkhoih-prog
authored
v1.13.1 to use new WiFi101_Generic library
### Release v1.13.1 1. Using new [`WiFi101_Generic library`](https://github.com/khoih-prog/WiFi101_Generic) for sending larger data 2. Add astyle using `allman` style. Restyle the library 3. Update `Packages' Patches`
1 parent 4ad5abd commit 5187833

File tree

16 files changed

+307
-237
lines changed

16 files changed

+307
-237
lines changed

‎examples/ESP32/ESP32-Client_SINRIC/ESP32-Client_SINRIC.ino‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
88
99
The library provides simple and easy interface for websockets (Client and Server).
10-
10+
1111
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
1212
Licensed under MIT license
1313
*****************************************************************************************************************************/
@@ -86,7 +86,7 @@ void turnOff(String deviceId)
8686
void onEventsCallback(WebsocketsEvent event, String data)
8787
{
8888
(void) data;
89-
89+
9090
if (event == WebsocketsEvent::ConnectionOpened)
9191
{
9292
if (!isConnected)
@@ -120,7 +120,7 @@ void onEventsCallback(WebsocketsEvent event, String data)
120120
void onMessagesCallback(WebsocketsMessage message)
121121
{
122122
String SINRIC_message = message.data();
123-
123+
124124
Serial.print("Got Message: ");
125125
Serial.println(SINRIC_message /*message.data()*/);
126126

@@ -136,23 +136,26 @@ void onMessagesCallback(WebsocketsMessage message)
136136
DynamicJsonDocument json(1024);
137137
//auto deserializeError = deserializeJson(json, (char*)message.data());
138138
auto deserializeError = deserializeJson(json, SINRIC_message);
139-
139+
140140
if ( deserializeError )
141141
{
142142
Serial.println("JSON parseObject() failed");
143143
return;
144144
}
145+
145146
//serializeJson(json, Serial);
146147
#else
147148
DynamicJsonBuffer jsonBuffer;
148149
// Parse JSON string
149150
JsonObject& json = jsonBuffer.parseObject(SINRIC_message);
151+
150152
// Test if parsing succeeds.
151153
if (!json.success())
152154
{
153155
Serial.println("JSON parseObject() failed");
154156
return;
155157
}
158+
156159
#endif
157160

158161
String deviceId = json ["deviceId"];
@@ -162,6 +165,7 @@ void onMessagesCallback(WebsocketsMessage message)
162165
{
163166
// Switch or Light
164167
String value = json ["value"];
168+
165169
if (value == "ON")
166170
{
167171
turnOn(deviceId);
@@ -177,11 +181,13 @@ void setup()
177181
{
178182
pinMode(LED_PIN, OUTPUT);
179183
digitalWrite(LED_PIN, LOW);
180-
184+
181185
Serial.begin(115200);
186+
182187
while (!Serial && millis() < 5000);
183188

184-
Serial.print("\nStart ESP32-Client_SINRIC on "); Serial.println(ARDUINO_BOARD);
189+
Serial.print("\nStart ESP32-Client_SINRIC on ");
190+
Serial.println(ARDUINO_BOARD);
185191
Serial.println(WEBSOCKETS2_GENERIC_VERSION);
186192

187193
// Connect to wifi

‎examples/ESP32/ESP32-Client_SINRIC/defines.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
88
99
The library provides simple and easy interface for websockets (Client and Server).
10-
10+
1111
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
1212
Licensed under MIT license
1313
*****************************************************************************************************************************/
@@ -16,16 +16,16 @@
1616
#define defines_h
1717

1818
#if !( defined(ESP8266) || defined(ESP32) )
19-
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
19+
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
2020
#elif ( ARDUINO_ESP32S2_DEV || ARDUINO_FEATHERS2 || ARDUINO_ESP32S2_THING_PLUS || ARDUINO_MICROS2 || \
2121
ARDUINO_METRO_ESP32S2 || ARDUINO_MAGTAG29_ESP32S2 || ARDUINO_FUNHOUSE_ESP32S2 || \
2222
ARDUINO_ADAFRUIT_FEATHER_ESP32S2_NOPSRAM )
23-
#define BOARD_TYPE "ESP32-S2"
23+
#define BOARD_TYPE "ESP32-S2"
2424
#elif ( ARDUINO_ESP32C3_DEV )
25-
#warning Using ESP32-C3 boards
26-
#define BOARD_TYPE "ESP32-C3"
25+
#warning Using ESP32-C3 boards
26+
#define BOARD_TYPE "ESP32-C3"
2727
#else
28-
#define BOARD_TYPE "ESP32"
28+
#define BOARD_TYPE "ESP32"
2929
#endif
3030

3131
#ifndef BOARD_NAME
@@ -49,9 +49,9 @@ const char* websockets_server_host = SINRIC_WEBSERVER; //Enter server address
4949
const uint16_t websockets_server_port = SINRIC_WEBSERVER_PORT; // Enter server port
5050

5151
#ifdef LED_BUILTIN
52-
#define LED_PIN LED_BUILTIN
52+
#define LED_PIN LED_BUILTIN
5353
#else
54-
#define LED_PIN 2
55-
#endif
54+
#define LED_PIN 2
55+
#endif
5656

5757
#endif //defines_h

‎examples/ESP32/Esp32-AdvancedWebServer/Esp32-AdvancedWebServer.ino‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,20 @@ void drawGraph()
107107
void setup()
108108
{
109109
Serial.begin(115200);
110+
110111
while (!Serial && millis() < 5000);
111112

112-
Serial.print("\nStart ESP32-AdvancedWebServer on "); Serial.println(ARDUINO_BOARD);
113+
Serial.print("\nStart ESP32-AdvancedWebServer on ");
114+
Serial.println(ARDUINO_BOARD);
113115
Serial.println(WEBSOCKETS2_GENERIC_VERSION);
114116

115117
Serial.print("Attempting to connect to SSID: ");
116118
Serial.println(ssid);
117119

118120
WiFi.mode(WIFI_STA);
119-
120-
WiFi.config(serverIP, static_GW, static_SN);
121-
121+
122+
WiFi.config(serverIP, static_GW, static_SN);
123+
122124
WiFi.begin(ssid, password);
123125

124126
// Wait some time to connect to wifi
@@ -139,7 +141,7 @@ void setup()
139141
return;
140142
}
141143

142-
if (MDNS.begin("esp32"))
144+
if (MDNS.begin("esp32"))
143145
{
144146
Serial.println("MDNS responder started");
145147
}

‎examples/ESP32/Esp32-AdvancedWebServer/defines.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
#define defines_h
1616

1717
#if !( defined(ESP8266) || defined(ESP32) )
18-
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
18+
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
1919
#elif ( ARDUINO_ESP32S2_DEV || ARDUINO_FEATHERS2 || ARDUINO_ESP32S2_THING_PLUS || ARDUINO_MICROS2 || \
2020
ARDUINO_METRO_ESP32S2 || ARDUINO_MAGTAG29_ESP32S2 || ARDUINO_FUNHOUSE_ESP32S2 || \
2121
ARDUINO_ADAFRUIT_FEATHER_ESP32S2_NOPSRAM )
22-
#define BOARD_TYPE "ESP32-S2"
22+
#define BOARD_TYPE "ESP32-S2"
2323
#elif ( ARDUINO_ESP32C3_DEV )
24-
#warning Using ESP32-C3 boards
25-
#define BOARD_TYPE "ESP32-C3"
24+
#warning Using ESP32-C3 boards
25+
#define BOARD_TYPE "ESP32-C3"
2626
#else
27-
#define BOARD_TYPE "ESP32"
27+
#define BOARD_TYPE "ESP32"
2828
#endif
2929

3030
#ifndef BOARD_NAME

‎examples/ESP32/Esp32-Client/Esp32-Client.ino‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
88
99
The library provides simple and easy interface for websockets (Client and Server).
10-
10+
1111
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
1212
Licensed under MIT license
1313
*****************************************************************************************************************************/
@@ -38,23 +38,23 @@ using namespace websockets2_generic;
3838

3939
WebsocketsClient client;
4040

41-
void onEventsCallback(WebsocketsEvent event, String data)
41+
void onEventsCallback(WebsocketsEvent event, String data)
4242
{
4343
(void) data;
44-
45-
if (event == WebsocketsEvent::ConnectionOpened)
44+
45+
if (event == WebsocketsEvent::ConnectionOpened)
4646
{
4747
Serial.println("Connnection Opened");
48-
}
49-
else if (event == WebsocketsEvent::ConnectionClosed)
48+
}
49+
else if (event == WebsocketsEvent::ConnectionClosed)
5050
{
5151
Serial.println("Connnection Closed");
52-
}
53-
else if (event == WebsocketsEvent::GotPing)
52+
}
53+
else if (event == WebsocketsEvent::GotPing)
5454
{
5555
Serial.println("Got a Ping!");
56-
}
57-
else if (event == WebsocketsEvent::GotPong)
56+
}
57+
else if (event == WebsocketsEvent::GotPong)
5858
{
5959
Serial.println("Got a Pong!");
6060
}
@@ -63,23 +63,25 @@ void onEventsCallback(WebsocketsEvent event, String data)
6363
void setup()
6464
{
6565
Serial.begin(115200);
66+
6667
while (!Serial && millis() < 5000);
6768

68-
Serial.print("\nStart ESP32-Client on "); Serial.println(ARDUINO_BOARD);
69+
Serial.print("\nStart ESP32-Client on ");
70+
Serial.println(ARDUINO_BOARD);
6971
Serial.println(WEBSOCKETS2_GENERIC_VERSION);
7072

7173
// Connect to wifi
7274
WiFi.begin(ssid, password);
7375

7476
// Wait some time to connect to wifi
75-
for (int i = 0; i < 10 && WiFi.status() != WL_CONNECTED; i++)
77+
for (int i = 0; i < 10 && WiFi.status() != WL_CONNECTED; i++)
7678
{
7779
Serial.print(".");
7880
delay(1000);
7981
}
8082

8183
// Check if connected to wifi
82-
if (WiFi.status() != WL_CONNECTED)
84+
if (WiFi.status() != WL_CONNECTED)
8385
{
8486
Serial.println("No Wifi!");
8587
return;
@@ -89,34 +91,34 @@ void setup()
8991
Serial.println(websockets_server_host);
9092

9193
// run callback when messages are received
92-
client.onMessage([&](WebsocketsMessage message)
94+
client.onMessage([&](WebsocketsMessage message)
9395
{
9496
Serial.print("Got Message: ");
9597
Serial.println(message.data());
9698
});
9799

98100
// run callback when events are occuring
99101
client.onEvent(onEventsCallback);
100-
102+
101103
// try to connect to Websockets server
102104
bool connected = client.connect(websockets_server_host, websockets_server_port, "/");
103-
104-
if (connected)
105+
106+
if (connected)
105107
{
106108
Serial.println("Connected!");
107109
String WS_msg = String("Hello to Server from ") + BOARD_NAME;
108110
client.send(WS_msg);
109-
}
110-
else
111+
}
112+
else
111113
{
112114
Serial.println("Not Connected!");
113115
}
114116
}
115117

116-
void loop()
118+
void loop()
117119
{
118120
// let the websockets client check for incoming messages
119-
if (client.available())
121+
if (client.available())
120122
{
121123
client.poll();
122124
}

‎examples/ESP32/Esp32-Client/defines.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/****************************************************************************************************************************
22
defines.h for ESP32-Client.ino
33
For ESP32.
4-
4+
55
Based on and modified from Gil Maimon's ArduinoWebsockets library https://github.com/gilmaimon/ArduinoWebsockets
66
to support STM32F/L/H/G/WB/MP1, nRF52 and SAMD21/SAMD51 boards besides ESP8266 and ESP32
77
88
99
The library provides simple and easy interface for websockets (Client and Server).
10-
10+
1111
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
1212
Licensed under MIT license
1313
*****************************************************************************************************************************/
@@ -16,16 +16,16 @@
1616
#define defines_h
1717

1818
#if !( defined(ESP8266) || defined(ESP32) )
19-
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
19+
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
2020
#elif ( ARDUINO_ESP32S2_DEV || ARDUINO_FEATHERS2 || ARDUINO_ESP32S2_THING_PLUS || ARDUINO_MICROS2 || \
2121
ARDUINO_METRO_ESP32S2 || ARDUINO_MAGTAG29_ESP32S2 || ARDUINO_FUNHOUSE_ESP32S2 || \
2222
ARDUINO_ADAFRUIT_FEATHER_ESP32S2_NOPSRAM )
23-
#define BOARD_TYPE "ESP32-S2"
23+
#define BOARD_TYPE "ESP32-S2"
2424
#elif ( ARDUINO_ESP32C3_DEV )
25-
#warning Using ESP32-C3 boards
26-
#define BOARD_TYPE "ESP32-C3"
25+
#warning Using ESP32-C3 boards
26+
#define BOARD_TYPE "ESP32-C3"
2727
#else
28-
#define BOARD_TYPE "ESP32"
28+
#define BOARD_TYPE "ESP32"
2929
#endif
3030

3131
#ifndef BOARD_NAME

0 commit comments

Comments
 (0)