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

Commit 0e8180c

Browse files
authored
v2.15.0 to use Ethernet_Generic library
### Release v2.15.0 1. Use new [Ethernet_Generic library](https://github.com/khoih-prog/Ethernet_Generic) as default for W5x00. 2. Sync with `arduinoWebSockets v2.3.6` 3. Add examples and rewrite all the examples to support new features 4. Update `Packages' Patches`
1 parent 73f5a8d commit 0e8180c

16 files changed

+125
-139
lines changed

CONTRIBUTING.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ If you don't find anything, please [open a new issue](https://github.com/khoih-p
1515
Please ensure to specify the following:
1616

1717
* Arduino IDE version (e.g. 1.8.19) or Platform.io version
18-
* Board Core Version (e.g. Arduino SAMDUE core v1.6.12, ESP8266 core v3.0.2, ArduinoCore-mbed v3.0.0, etc.)
18+
* Board Core Version (e.g. Arduino SAMDUE core v1.6.12, ESP8266 core v3.0.2, ArduinoCore-mbed v3.0.1, etc.)
1919
* Contextual information (e.g. what you were trying to achieve)
2020
* Simplest possible steps to reproduce
2121
* Anything that might be relevant in your opinion, such as:
@@ -28,9 +28,9 @@ Please ensure to specify the following:
2828
```
2929
Arduino IDE version: 1.8.19
3030
RASPBERRY_PI_PICO board
31-
ArduinoCore-mbed v3.0.0
31+
ArduinoCore-mbed v3.0.1
3232
OS: Ubuntu 20.04 LTS
33-
Linux xy-Inspiron-3593 5.13.0-37-generic #42~20.04.1-Ubuntu SMP Tue Mar 15 15:44:28 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
33+
Linux xy-Inspiron-3593 5.13.0-39-generic #44~20.04.1-Ubuntu SMP Thu Mar 24 16:43:35 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
3434
3535
Context:
3636
I encountered an endless loop while trying to connect to Local WiFi.
@@ -52,3 +52,4 @@ There are usually some outstanding feature requests in the [existing issues list
5252

5353
Pull Requests with changes and fixes are also welcome!
5454

55+

README.md

Lines changed: 50 additions & 51 deletions
Large diffs are not rendered by default.

changelog.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
## Table of Contents
1313

1414
* [Changelog](#changelog)
15+
* [Release v2.15.0](#release-v2150)
1516
* [Release v2.14.2](#release-v2142)
1617
* [Release v2.14.1](#release-v2141)
1718
* [Release v2.14.0](#release-v2140)
@@ -56,6 +57,14 @@
5657

5758
## Changelog
5859

60+
### Release v2.15.0
61+
62+
1. Use new [Ethernet_Generic library](https://github.com/khoih-prog/Ethernet_Generic) as default for W5x00.
63+
2. Sync with `arduinoWebSockets v2.3.6`
64+
3. Add examples and rewrite all the examples to support new features
65+
4. Update `Packages' Patches`
66+
67+
5968
### Release v2.14.2
6069

6170
1. Fix Async bug for ESP8266 when using NETWORK_ESP8266_ASYNC

library.json

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "WebSockets_Generic",
3-
"version": "2.14.2",
4-
"description": "RFC6455-based WebSockets Server and Client for Arduino boards, such as nRF52, Portenta_H7, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, Teensy, SAM DUE, RP2040-based boards, besides ESP8266/ESP32 ESP32 (ESP32, ESP32_S2, ESP32_S3 and ESP32_C3) and WT32_ETH01. Ethernet shields W5100, W5200, W5500, ENC28J60, Teensy 4.1 NativeEthernet/QNEthernet or Portenta_H7 WiFi/Ethernet. Now supporting websocket only mode for Socket.IO",
3+
"version": "2.15.0",
4+
"description": "RFC6455-based WebSockets Server and Client for Arduino boards, such as nRF52, Portenta_H7, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, Teensy, SAM DUE, RP2040-based boards, besides ESP8266/ESP32 ESP32 (ESP32, ESP32_S2, ESP32_S3 and ESP32_C3) and WT32_ETH01. Ethernet shields W5100, W5200, W5500, ENC28J60, Teensy 4.1 NativeEthernet/QNEthernet or Portenta_H7 WiFi/Ethernet. Now supporting websocket only mode for Socket.IO. Ethernet_Generic library is used as default for W5x00",
55
"keywords": "wifi, WiFiNINA, websocket, websockets-server, websockets-client, Teensy, SAM DUE, SAMD, STM32, nRF52, QNEthernet, rp2040, Portenta-H7, ESP32, ESP8266, W5x00, Ethernet, Ethernet2, Ethernet3, EthernetLarge, EthernetENC, UIPEthernet, NativeEthernet, ENC28J60, rpi-pico, http, web, server, client, Mega",
66
"authors": [
77
{
@@ -66,6 +66,11 @@
6666
"version": ">=2.0.0",
6767
"platforms": ["*"]
6868
},
69+
{
70+
"owner": "khoih-prog",
71+
"name": "Ethernet_Generic",
72+
"version": "^2.0.0"
73+
},
6974
{
7075
"owner": "khoih-prog",
7176
"name": "WebServer_WT32_ETH01",
@@ -114,30 +119,6 @@
114119
"version": ">=1.3.2",
115120
"platforms": ["*"]
116121
},
117-
{
118-
"owner": "adafruit",
119-
"name": "Ethernet2",
120-
"version": ">=1.0.4",
121-
"platforms": ["*"]
122-
},
123-
{
124-
"owner": "sstaub",
125-
"name": "Ethernet3",
126-
"version": ">=1.5.5",
127-
"platforms": ["*"]
128-
},
129-
{
130-
"owner": "arduino-libraries",
131-
"name": "Ethernet",
132-
"version": ">=2.0.0",
133-
"platforms": ["*"]
134-
},
135-
{
136-
"owner": "openslab-osu",
137-
"name": "EthernetLarge",
138-
"version": ">=2.0.0",
139-
"platforms": ["*"]
140-
},
141122
{
142123
"name": "WiFi101",
143124
"version": "https://github.com/khoih-prog/WiFi101"

library.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name=WebSockets_Generic
2-
version=2.14.2
2+
version=2.15.0
33
author=Markus Sattler, Khoi Hoang <khoih.prog@gmail.com>
44
maintainer=Khoi Hoang <khoih.prog@gmail.com>
5-
sentence=RFC6455-based WebSockets Server and Client for Arduino boards, such as nRF52, Portenta_H7, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, Teensy, SAM DUE, RP2040-based boards, besides ESP8266/ESP32 (ESP32, ESP32_S2, ESP32_S3 and ESP32_C3) and WT32_ETH01. Ethernet shields W5100, W5200, W5500, ENC28J60, Teensy 4.1 NativeEthernet/QNEthernet or Portenta_H7 WiFi/Ethernet. Now supporting websocket only mode for Socket.IO
5+
sentence=RFC6455-based WebSockets Server and Client for Arduino boards, such as nRF52, Portenta_H7, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, Teensy, SAM DUE, RP2040-based boards, besides ESP8266/ESP32 (ESP32, ESP32_S2, ESP32_S3 and ESP32_C3) and WT32_ETH01. Ethernet shields W5100, W5200, W5500, ENC28J60, Teensy 4.1 NativeEthernet/QNEthernet or Portenta_H7 WiFi/Ethernet. Now supporting websocket only mode for Socket.IO. Ethernet_Generic library is used as default for W5x00
66
paragraph=Use v2.2.2+ for ESP, nRF52, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, Teensy, SAM DUE, RP2040-based boards, WT32_ETH01, Portenta_H7, etc.
77
category=Communication
88
url=https://github.com/khoih-prog/WebSockets_Generic
99
architectures=*
10-
depends=WiFiNINA_Generic, WiFiWebServer, EthernetWebServer, WebServer_WT32_ETH01, EthernetWebServer_STM32, DoubleResetDetector_Generic, SinricPro_Generic, FlashStorage_SAMD
10+
depends=WiFiNINA_Generic, WiFiWebServer, EthernetWebServer, Ethernet_Generic, WebServer_WT32_ETH01, EthernetWebServer_STM32, DoubleResetDetector_Generic, SinricPro_Generic, FlashStorage_SAMD
1111
includes=WebSocketsClient_Generic.h, WebSocketsServer_Generic.h,SocketIOclient_Generic

platformio/platformio.ini

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,16 @@ lib_compat_mode = strict
4141
lib_deps =
4242
; PlatformIO 4.x
4343
; WiFiNINA_Generic@~1.8.14-3
44-
; WiFiWebServer@~1.6.1
45-
; EthernetWebServer@~2.0.0
44+
; WiFiWebServer@~1.7.0
45+
; EthernetWebServer@~2.1.1
4646
; WebServer_WT32_ETH01@~1.4.1
47-
; EthernetWebServer_STM32@>=1.3.3
48-
; Ethernet@~2.0.0
49-
; EthernetLarge@~2.0.0
50-
; Ethernet2@~1.0.4
51-
; Ethernet3@~1.5.5
47+
; EthernetWebServer_STM32@>=1.4.0
48+
; Ethernet_Generic>=2.0.0
5249
; EthernetENC@~2.0.2
5350
; UIPEthernet@~2.0.8
5451
; STM32duino LwIP@>=2.1.2
5552
; STM32duino STM32Ethernet@>=1.2.0
56-
; DoubleResetDetector_Generic@>=1.8.0
53+
; DoubleResetDetector_Generic@>=1.8.1
5754
; SinricPro_Generic@>=2.8.4
5855
; FlashStorage_SAMD@>=1.3.2
5956
; FlashStorage_STM32@~1.2.0
@@ -62,19 +59,16 @@ lib_deps =
6259
; ESPAsyncTCP@>=1.2.2
6360
; PlatformIO 5.x
6461
khoih-prog/WiFiNINA_Generic@~1.8.14-3
65-
khoih-prog/WiFiWebServer@~1.6.1
66-
khoih-prog/EthernetWebServer@~2.0.0
62+
khoih-prog/WiFiWebServer@~1.7.0
63+
khoih-prog/EthernetWebServer@~2.1.1
64+
khoih-prog/Ethernet_Generic@~2.0.0
6765
khoih-prog/WebServer_WT32_ETH01@~1.4.1
68-
khoih-prog/EthernetWebServer_STM32@>=1.3.3
69-
PaulStoffregen/Ethernet@~2.0.0
70-
PaulStoffregen/EthernetLarge@~2.0.0
71-
adafruit/Ethernet2@~1.0.4
72-
sstaub/Ethernet3@~1.5.5
66+
khoih-prog/EthernetWebServer_STM32@>=1.4.0
7367
jandrassy/EthernetENC@~2.0.2
7468
UIPEthernet/UIPEthernet@~2.0.8
7569
stm32duino/STM32duino LwIP@>=2.1.2
7670
stm32duino/STM32duino STM32Ethernet@>=1.2.0
77-
khoih-prog/DoubleResetDetector_Generic@>=1.8.0
71+
khoih-prog/DoubleResetDetector_Generic@>=1.8.1
7872
khoih-prog/SinricPro_Generic@>=2.8.4
7973
khoih-prog/FlashStorage_SAMD@~1.3.2
8074
khoih-prog/FlashStorage_STM32@~1.2.0

src/SocketIOclient_Generic-Impl.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
License along with this library; if not, write to the Free Software
2929
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3030
31-
Version: 2.14.2
31+
Version: 2.15.0
3232
3333
Version Modified By Date Comments
3434
------- ----------- ---------- -----------
@@ -42,6 +42,7 @@
4242
2.14.0 K Hoang 17/02/2022 Suppress unnecessary warnings. Optimize code by passing by reference instead of value
4343
2.14.1 K Hoang 18/02/2022 Fix setInsecure() bug for WIO_Terminal. Update Packages_Patches for Seeeduino
4444
2.14.2 K Hoang 27/03/2022 Fix Async bug for ESP8266 when using NETWORK_ESP8266_ASYNC
45+
2.15.0 K Hoang 06/04/2022 Use Ethernet_Generic library as default. Sync with arduinoWebSockets v2.3.6
4546
*****************************************************************************************************************************/
4647

4748
#pragma once

src/SocketIOclient_Generic.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
License along with this library; if not, write to the Free Software
2929
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3030
31-
Version: 2.14.2
31+
Version: 2.15.0
3232
3333
Version Modified By Date Comments
3434
------- ----------- ---------- -----------
@@ -42,6 +42,7 @@
4242
2.14.0 K Hoang 17/02/2022 Suppress unnecessary warnings. Optimize code by passing by reference instead of value
4343
2.14.1 K Hoang 18/02/2022 Fix setInsecure() bug for WIO_Terminal. Update Packages_Patches for Seeeduino
4444
2.14.2 K Hoang 27/03/2022 Fix Async bug for ESP8266 when using NETWORK_ESP8266_ASYNC
45+
2.15.0 K Hoang 06/04/2022 Use Ethernet_Generic library as default. Sync with arduinoWebSockets v2.3.6
4546
*****************************************************************************************************************************/
4647

4748
#pragma once
@@ -54,6 +55,7 @@
5455
#endif
5556

5657
#include "WebSockets_Generic.h"
58+
#include "WebSocketsClient_Generic.h"
5759

5860
#define EIO_HEARTBEAT_INTERVAL 20000
5961

@@ -140,7 +142,7 @@ class SocketIOclient : protected WebSocketsClient
140142
bool send(socketIOmessageType_t type, char * payload, size_t length = 0, bool headerToPayload = false);
141143
bool send(socketIOmessageType_t type, const char * payload, size_t length = 0);
142144
bool send(socketIOmessageType_t type, const String& payload);
143-
145+
144146
void loop();
145147

146148
void configureEIOping(bool disableHeartbeat = false);
@@ -150,7 +152,7 @@ class SocketIOclient : protected WebSocketsClient
150152
{
151153
_reconnectInterval = time;
152154
}
153-
155+
154156
void setExtraHeaders(const char * extraHeaders = nullptr)
155157
{
156158
WebSocketsClient::setExtraHeaders(extraHeaders);

src/WebSockets4WebServer_Generic.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
License along with this library; if not, write to the Free Software
2929
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3030
31-
Version: 2.14.2
31+
Version: 2.15.0
3232
3333
Version Modified By Date Comments
3434
------- ----------- ---------- -----------
@@ -42,6 +42,7 @@
4242
2.14.0 K Hoang 17/02/2022 Suppress unnecessary warnings. Optimize code by passing by reference instead of value
4343
2.14.1 K Hoang 18/02/2022 Fix setInsecure() bug for WIO_Terminal. Update Packages_Patches for Seeeduino
4444
2.14.2 K Hoang 27/03/2022 Fix Async bug for ESP8266 when using NETWORK_ESP8266_ASYNC
45+
2.15.0 K Hoang 06/04/2022 Use Ethernet_Generic library as default. Sync with arduinoWebSockets v2.3.6
4546
*****************************************************************************************************************************/
4647

4748
#pragma once

src/WebSocketsClient_Generic-Impl.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
License along with this library; if not, write to the Free Software
2929
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3030
31-
Version: 2.14.2
31+
Version: 2.15.0
3232
3333
Version Modified By Date Comments
3434
------- ----------- ---------- -----------
@@ -42,6 +42,7 @@
4242
2.14.0 K Hoang 17/02/2022 Suppress unnecessary warnings. Optimize code by passing by reference instead of value
4343
2.14.1 K Hoang 18/02/2022 Fix setInsecure() bug for WIO_Terminal. Update Packages_Patches for Seeeduino
4444
2.14.2 K Hoang 27/03/2022 Fix Async bug for ESP8266 when using NETWORK_ESP8266_ASYNC
45+
2.15.0 K Hoang 06/04/2022 Use Ethernet_Generic library as default. Sync with arduinoWebSockets v2.3.6
4546
*****************************************************************************************************************************/
4647

4748
#pragma once

0 commit comments

Comments
 (0)