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

Commit 0b2b308

Browse files
authored
v1.8.0 to use Ethernet_Generic library
### Releases v1.8.0 1. Use new [Ethernet_Generic library](https://github.com/khoih-prog/Ethernet_Generic) as default for W5x00. 2. Rewrite to avoid `multiple-definitions` linker error for multiple-file project 3. Add example [multiFileProject](examples/multiFileProject) to demo how to avoid `multiple-definitions` linker error for multiple-file project 4. Update `Packages' Patches`
1 parent 2dcc536 commit 0b2b308

File tree

5 files changed

+35
-20
lines changed

5 files changed

+35
-20
lines changed

CONTRIBUTING.md

Lines changed: 3 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 a crash while trying to use the Timer Interrupt.

changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313

1414
* [Changelog](#changelog)
15+
* [Releases v1.8.0](#releases-v180)
1516
* [Releases v1.7.8](#releases-v178)
1617
* [Releases v1.7.7](#releases-v177)
1718
* [Releases v1.7.6](#releases-v176)
@@ -37,6 +38,13 @@
3738

3839
## Changelog
3940

41+
### Releases v1.8.0
42+
43+
1. Use new [Ethernet_Generic library](https://github.com/khoih-prog/Ethernet_Generic) as default for W5x00.
44+
2. Rewrite to avoid `multiple-definitions` linker error for multiple-file project
45+
3. Add example [multiFileProject](examples/multiFileProject) to demo how to avoid `multiple-definitions` linker error for multiple-file project
46+
4. Update `Packages' Patches`
47+
4048
### Releases v1.7.8
4149

4250
1. Sync with [SSLClient v1.6.11](https://github.com/OPEnSLab-OSU/SSLClient/releases/tag/v1.6.11). Check [Pull in OPEnSLab-OSU's SSLClient v1.6.11 #17](https://github.com/khoih-prog/EthernetWebServer_SSL/issues/17)

library.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "EthernetWebServer_SSL",
3-
"version": "1.7.8",
3+
"version": "1.8.0",
44
"keywords": "WebServer, Ethernet, Ethernet2, Ethernet3, EthernetLarge, EtnernetENC, UIPEthernet, NativeEthernet, QNEthernet, Portenta-H7, Teensy, SAMD21, SAMD51, SAM DUE, nRF52, ESP32, ESP8266, rpi-pico, rp2040, W5x00, W5500, ENC28J60, Ethernet shield, SSL, TLS, HTTP-Client, WebSocket-Client, server, client, websocket",
5-
"description": "Simple TLS/SSL Ethernet WebServer, HTTP Client and WebSocket Client library for Teensy, SAM DUE, SAMD21, SAMD51, nRF52, ESP32, ESP8266 and RASPBERRY_PI_PICO boards using Ethernet shields W5100, W5200, W5500, ENC28J60 or Teensy 4.1 NativeEthernet/QNEthernet. It supports Arduino boards (Atmel AVR-s, SAM DUE, Atmel SAM3X8E ARM Cortex-M3, SAMD21, SAMD51, ESP8266, ESP32, Adafruit nRF52, Teensy boards, Realtek Ameba(RTL8195A,RTL8710)) using Wiznet W5x00 or ENC28J60 network shields",
5+
"description": "Simple TLS/SSL Ethernet WebServer, HTTP Client and WebSocket Client library for for AVR, Portenta_H7, Teensy, SAM DUE, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, nRF52 and RASPBERRY_PI_PICO boards using Ethernet shields W5100, W5200, W5500, ENC28J60 or Teensy 4.1 NativeEthernet/QNEthernet. It now supports Ethernet TLS/SSL Client. The WebServer supports HTTP/HTTPS GET and POST requests, provides argument parsing, handles one client at a time. It now provides HTTP Client and WebSocket Client. It supports Arduino boards (SAM DUE, Atmel SAM3X8E ARM Cortex-M3, SAMD21, SAMD51, ESP8266, ESP32, Adafruit nRF52, Teensy and RASPBERRY_PI_PICO boards) using Wiznet W5x00, ENC28J60 network shields or Teensy 4.1 built-in NativeEthernet/QNEthernet. Ethernet_Generic library is used as default for W5x00",
66
"authors":
77
{
88
"name": "Khoi Hoang",
@@ -29,6 +29,11 @@
2929
"name": "Functional-Vlpp",
3030
"version": "^1.0.2"
3131
},
32+
{
33+
"owner": "khoih-prog",
34+
"name": "Ethernet_Generic",
35+
"version": "^2.0.0"
36+
},
3237
{
3338
"owner": "ssilverman",
3439
"name": "QNEthernet",
@@ -40,5 +45,5 @@
4045
"frameworks": "*",
4146
"platforms": "*",
4247
"examples": "examples/*/*/*.ino",
43-
"headers": ["EthernetWebServer_SSL.h", "EthernetHttpClient_SSL.h"]
48+
"headers": ["EthernetWebServer_SSL.h", "EthernetWebServer_SSL.hpp", "EthernetHttpClient_SSL.h"]
4449
}

library.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name=EthernetWebServer_SSL
2-
version=1.7.8
2+
version=1.8.0
33
author=Khoi Hoang
44
license=GPLv3
55
maintainer=Khoi Hoang <khoih.prog@gmail.com>
66
sentence=Simple TLS/SSL Ethernet WebServer, HTTP Client and WebSocket Client library for for AVR, Portenta_H7, Teensy, SAM DUE, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, nRF52 and RASPBERRY_PI_PICO boards using Ethernet shields W5100, W5200, W5500, ENC28J60 or Teensy 4.1 NativeEthernet/QNEthernet. It now supports Ethernet TLS/SSL Client.
7-
paragraph=The WebServer supports HTTP/HTTPS GET and POST requests, provides argument parsing, handles one client at a time. It now provides HTTP Client and WebSocket Client. It supports Arduino boards (SAM DUE, Atmel SAM3X8E ARM Cortex-M3, SAMD21, SAMD51, ESP8266, ESP32, Adafruit nRF52, Teensy and RASPBERRY_PI_PICO boards) using Wiznet W5x00, ENC28J60 network shields or Teensy 4.1 built-in NativeEthernet/QNEthernet
7+
paragraph=The WebServer supports HTTP/HTTPS GET and POST requests, provides argument parsing, handles one client at a time. It now provides HTTP Client and WebSocket Client. It supports Arduino boards (SAM DUE, Atmel SAM3X8E ARM Cortex-M3, SAMD21, SAMD51, ESP8266, ESP32, Adafruit nRF52, Teensy and RASPBERRY_PI_PICO boards) using Wiznet W5x00, ENC28J60 network shields or Teensy 4.1 built-in NativeEthernet/QNEthernet. Ethernet_Generic library is used as default for W5x00
88
category=Communication
99
url=https://github.com/khoih-prog/EthernetWebServer_SSL
1010
architectures=*
11-
depends=Functional-Vlpp
12-
includes=EthernetWebServer_SSL.h,EthernetHttpClient_SSL.h
11+
depends=Functional-Vlpp, Ethernet_Generic
12+
includes=EthernetWebServer_SSL.h, EthernetWebServer_SSL.hpp, EthernetHttpClient_SSL.h

platformio/platformio.ini

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,25 @@ lib_compat_mode = strict
4141

4242
lib_deps =
4343
; PlatformIO 4.x
44-
Functional-Vlpp@~1.0.2
45-
Ethernet@~2.0.0
46-
EthernetLarge@~2.0.0
47-
Ethernet2@~1.0.4
48-
Ethernet3@~1.5.5
49-
EthernetENC@~2.0.2
50-
UIPEthernet@~2.0.9
51-
QNEthernet@>=0.13.0
44+
; Functional-Vlpp@~1.0.2
45+
; Ethernet@~2.0.0
46+
; EthernetLarge@~2.0.0
47+
; Ethernet2@~1.0.4
48+
; Ethernet3@~1.5.5
49+
; EthernetENC@~2.0.2
50+
; UIPEthernet@~2.0.9
51+
; QNEthernet@>=0.13.0
52+
; Ethernet_Generic>=2.0.0
5253
; PlatformIO 5.x
53-
; khoih-prog/Functional-Vlpp@~1.0.2
54+
khoih-prog/Functional-Vlpp@~1.0.2
55+
khoih-prog/Ethernet_Generic@~2.0.0
5456
; PaulStoffregen/Ethernet@~2.0.0
5557
; PaulStoffregen/EthernetLarge@~2.0.0
5658
; adafruit/Ethernet2@~1.0.4
5759
; sstaub/Ethernet3@~1.5.5
5860
; jandrassy/EthernetENC@~2.0.2
5961
; UIPEthernet/UIPEthernet@~2.0.9
60-
; ssilverman/QNEthernet@>=0.13.0
62+
ssilverman/QNEthernet@>=0.13.0
6163

6264
build_flags =
6365
; set your debug output (default=Serial)

0 commit comments

Comments
 (0)