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

Commit

Permalink
v1.10.2 to fix bug if using QNEthernet staticIP
Browse files Browse the repository at this point in the history
### Release v1.10.2

1. Fix bug when using `QNEthernet` staticIP. Check [QNEthernet and NativeEthernet staticIP not working with WS Server #39](#39)
2. Add staticIP option to `NativeEthernet` examples
2. Update `Packages' Patches`
  • Loading branch information
khoih-prog authored Mar 14, 2022
1 parent ce563bb commit 9a5c131
Show file tree
Hide file tree
Showing 65 changed files with 254 additions and 113 deletions.
7 changes: 4 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ If you don't find anything, please [open a new issue](https://github.com/khoih-p
Please ensure to specify the following:

* Arduino IDE version (e.g. 1.8.19) or Platform.io version
* `RP2040` Core Version (e.g. Arduino-mbed RP2040 v2.7.2 or arduino-pico core v1.12.0)
* `RP2040` Core Version (e.g. Arduino-mbed RP2040 v2.8.0 or arduino-pico core v1.13.0)
* `RP2040` Board type (e.g. NANO_RP2040_CONNECT, RASPBERRY_PI_PICO, ADAFRUIT_FEATHER_RP2040, GENERIC_RP2040, etc.)
* Contextual information (e.g. what you were trying to achieve)
* Simplest possible steps to reproduce
Expand All @@ -28,10 +28,10 @@ Please ensure to specify the following:

```
Arduino IDE version: 1.8.19
Arduino-mbed mbed_nano v2.7.2
Arduino-mbed mbed_nano v2.8.0
NANO_RP2040_CONNECT Module
OS: Ubuntu 20.04 LTS
Linux xy-Inspiron-3593 5.4.0-100-generic #113-Ubuntu SMP Thu Feb 3 18:43:29 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
Linux xy-Inspiron-3593 5.13.0-35-generic #40~20.04.1-Ubuntu SMP Mon Mar 7 09:18:32 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
Context:
I encountered an endless loop while trying to connect to Local WiFi.
Expand All @@ -53,3 +53,4 @@ There are usually some outstanding feature requests in the [existing issues list
### Sending Pull Requests

Pull Requests with changes and fixes are also welcome!

116 changes: 85 additions & 31 deletions README.md

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
## Table of Contents

* [Changelog](#changelog)
* [Release v1.10.2](#release-v1102)
* [Release v1.10.1](#release-v1101)
* [Major Release v1.10.0](#major-release-v1100)
* [Release v1.9.1](#release-v191)
Expand Down Expand Up @@ -43,6 +44,12 @@

## Changelog

### Release v1.10.2

1. Fix bug when using `QNEthernet` staticIP. Check [QNEthernet and NativeEthernet staticIP not working with WS Server #39](https://github.com/khoih-prog/WebSockets2_Generic/issues/39)
2. Add staticIP option to `NativeEthernet` examples
2. Update `Packages' Patches`

### Release v1.10.1

1. Reduce QNEthernet latency. Check [QNEthernet higher latency #38](https://github.com/khoih-prog/WebSockets2_Generic/issues/38)
Expand Down
11 changes: 11 additions & 0 deletions keywords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,3 +180,14 @@ CloseReason_InternalServerError LITERAL1

FragmentsPolicy_Aggregate LITERAL1
FragmentsPolicy_Notify LITERAL1

#######################################
# Constants (LITERAL1)
#######################################

WEBSOCKETS2_GENERIC_VERSION LITERAL1
WEBSOCKETS2_GENERIC_VERSION_MAJOR LITERAL1
WEBSOCKETS2_GENERIC_VERSION_MINOR LITERAL1
WEBSOCKETS2_GENERIC_VERSION_PATCH LITERAL1
WEBSOCKETS2_GENERIC_VERSION_INT LITERAL1

10 changes: 5 additions & 5 deletions library.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "WebSockets2_Generic",
"version": "1.10.1",
"version": "1.10.2",
"description": "WebSocket Server and Client for Arduino based on RFC6455, originally designed for ESP8266/ESP32. Now supports ESP8266, ESP32 (including ESP32-C3; ESP32-S2 Saola, AI-Thinker ESP-12K, WT32_ETH01, etc.), nRF52, SAMD21, SAMD51, SAM DUE, STM32F/L/H/G/WB/MP1, Teensy, RP2040-based, Portenta_H7, etc. boards, with WiFiNINA, Teensy 4.1 NativeEthernet/QNEthernet, Ethernet W5x00/ENC28J60/LAN8742A/LAN8720, ESP8266/ESP32-AT modules/shields, Portenta_H7 WiFi/Ethernet, as well as SINRIC / Alexa / Google Home. With updated SSL CA Certs, Fingerprint and InSecure mode.",
"keywords": "communication, wifinina, wt32-eth01, websocket, webserver, Sinric, Alexa, ethernet, QNEthernet, NativeEthernet, lan8742a, lan8720, esp32, esp8266, stm32, samd, nrf52, rp2040, ssl, Portenta-H7, wifi, wifi101, sam-due, rpi-pico, esp32-s2, esp32-c3",
"authors": [
Expand Down Expand Up @@ -40,7 +40,7 @@
{
"owner": "khoih-prog",
"name": "DoubleResetDetector_Generic",
"version": ">=1.8.0",
"version": ">=1.8.1",
"platforms": ["*"]
},
{
Expand All @@ -58,13 +58,13 @@
{
"owner": "khoih-prog",
"name": "WiFiWebServer",
"version": ">=1.6.2",
"version": ">=1.6.3",
"platforms": ["*"]
},
{
"owner": "khoih-prog",
"name": "EthernetWebServer",
"version": ">=2.0.0",
"version": ">=2.0.1",
"platforms": ["*"]
},
{
Expand All @@ -76,7 +76,7 @@
{
"owner": "khoih-prog",
"name": "EthernetWebServer_STM32",
"version": ">=1.3.3",
"version": ">=1.3.4",
"platforms": ["ststm32"]
},
{
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=WebSockets2_Generic
version=1.10.1
version=1.10.2
author=Gil Maimon <mail.gilmaimon@gmail.com>, Khoi Hoang <khoih.prog@gmail.com>
maintainer=Khoi Hoang <khoih.prog@gmail.com>
sentence=A WebSocket Server and Client library for Arduino, based on RFC6455, for writing modern Websockets applications.
Expand Down
16 changes: 8 additions & 8 deletions platformio/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ lib_compat_mode = strict
lib_deps =
; PlatformIO 4.x
WiFiNINA_Generic@~1.8.14-3
WiFiWebServer@~1.6.2
EthernetWebServer@~2.0.0
WiFiWebServer@~1.6.3
EthernetWebServer@~2.0.1
WebServer_WT32_ETH01@~1.4.1
EthernetWebServer_STM32@>=1.3.3
EthernetWebServer_STM32@>=1.3.4
Ethernet@~2.0.0
EthernetLarge@~2.0.0
Ethernet2@~1.0.4
Expand All @@ -53,18 +53,18 @@ lib_deps =
UIPEthernet@~2.0.8
STM32duino LwIP@>=2.1.2
STM32duino STM32Ethernet@>=1.2.0
DoubleResetDetector_Generic@>=1.8.0
DoubleResetDetector_Generic@>=1.8.1
SinricPro_Generic@>=2.8.4
FlashStorage_SAMD@>=1.3.2
FlashStorage_STM32@~1.2.0
QNEthernet@>=0.13.0
https://github.com/khoih-prog/WiFi101
; PlatformIO 5.x
; khoih-prog/WiFiNINA_Generic@~1.8.14-3
; khoih-prog/WiFiWebServer@~1.6.2
; khoih-prog/EthernetWebServer@~2.0.0
; khoih-prog/WiFiWebServer@~1.6.3
; khoih-prog/EthernetWebServer@~2.0.1
; khoih-prog/WebServer_WT32_ETH01@~1.4.1
; khoih-prog/EthernetWebServer_STM32@>=1.3.3
; khoih-prog/EthernetWebServer_STM32@>=1.3.4
; PaulStoffregen/Ethernet@~2.0.0
; PaulStoffregen/EthernetLarge@~2.0.0
; adafruit/Ethernet2@~1.0.4
Expand All @@ -73,7 +73,7 @@ lib_deps =
; UIPEthernet/UIPEthernet@~2.0.8
; stm32duino/STM32duino LwIP@>=2.1.2
; stm32duino/STM32duino STM32Ethernet@>=1.2.0
; khoih-prog/DoubleResetDetector_Generic@>=1.8.0
; khoih-prog/DoubleResetDetector_Generic@>=1.8.1
; khoih-prog/SinricPro_Generic@>=2.8.4
; khoih-prog/FlashStorage_SAMD@~1.3.2
; khoih-prog/FlashStorage_STM32@~1.2.0
Expand Down
3 changes: 2 additions & 1 deletion src/Tiny_Websockets_Generic/client.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#ifndef _CLIENT_HPP_
Expand Down
3 changes: 2 additions & 1 deletion src/Tiny_Websockets_Generic/internals/data_frame.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
3 changes: 2 additions & 1 deletion src/Tiny_Websockets_Generic/internals/ws_common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
3 changes: 2 additions & 1 deletion src/Tiny_Websockets_Generic/internals/ws_common_WiFi101.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
3 changes: 2 additions & 1 deletion src/Tiny_Websockets_Generic/internals/ws_common_WiFiNINA.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
3 changes: 2 additions & 1 deletion src/Tiny_Websockets_Generic/internals/wscrypto/crypto.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Built by Khoi Hoang https://github.com/khoih-prog/Websockets2_Generic
Licensed under MIT license
Version: 1.10.1
Version: 1.10.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -19,6 +19,7 @@
1.9.1 K Hoang 17/12/2021 Fix QNEthernet TCP interface
1.10.0 K Hoang 18/12/2021 Supporting case-insensitive headers, according to RFC2616
1.10.1 K Hoang 26/02/2022 Reduce QNEthernet latency
1.10.2 K Hoang 14/03/2022 Fix bug when using QNEthernet staticIP. Add staticIP option to NativeEthernet
*****************************************************************************************************************************/

#pragma once
Expand Down
Loading

0 comments on commit 9a5c131

Please sign in to comment.