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

Commit a688aaa

Browse files
authored
v1.9.3 to add support to Seeeduino nRF52
### Releases v1.9.3 1. Add support to Seeeduino nRF52840-based boards such as **Seeed XIAO_NRF52840 and XIAO_NRF52840_SENSE**, etc. using Seeed `mbed` or `nRF52` core 2. Add astyle using `allman` style. Restyle the library 3. Display warning only when `_ETHERNET_WEBSERVER_LOGLEVEL_` > 3 4. Update examples 5. Update `Packages' Patches` to add Seeeduino `nRF52` core
1 parent 67c9ce2 commit a688aaa

File tree

8 files changed

+211
-70
lines changed

8 files changed

+211
-70
lines changed

CONTRIBUTING.md

Lines changed: 28 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, ESP32 core v2.0.4, ESP8266 core v3.0.2, ArduinoCore-mbed v3.1.1, etc.)
18+
* Board Core Version (e.g. Arduino SAMDUE core v1.6.12, ESP32 core v2.0.5, ESP8266 core v3.0.2, ArduinoCore-mbed v3.4.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.1.1
31+
ArduinoCore-mbed v3.4.1
3232
OS: Ubuntu 20.04 LTS
33-
Linux xy-Inspiron-3593 5.15.0-46-generic #49~20.04.1-Ubuntu SMP Thu Aug 4 19:15:44 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
33+
Linux xy-Inspiron-3593 5.15.0-52-generic #58~20.04.1-Ubuntu SMP Thu Oct 13 13:09:46 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
3434
3535
Context:
3636
I encountered a crash while trying to use the library
@@ -42,15 +42,40 @@ Steps to reproduce:
4242
4. ...
4343
```
4444

45+
### Additional context
46+
47+
Add any other context about the problem here.
48+
49+
---
50+
4551
### Sending Feature Requests
4652

4753
Feel free to post feature requests. It's helpful if you can explain exactly why the feature would be useful.
4854

4955
There are usually some outstanding feature requests in the [existing issues list](https://github.com/khoih-prog/EthernetWebServer_SSL/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement), feel free to add comments to them.
5056

57+
---
58+
5159
### Sending Pull Requests
5260

5361
Pull Requests with changes and fixes are also welcome!
5462

63+
Please use the `astyle` to reformat the updated library code as follows (demo for Ubuntu Linux)
64+
65+
1. Change directory to the library GitHub
66+
67+
```
68+
xy@xy-Inspiron-3593:~$ cd Arduino/xy/EthernetWebServer_SSL_GitHub/
69+
xy@xy-Inspiron-3593:~/Arduino/xy/EthernetWebServer_SSL_GitHub$
70+
```
71+
72+
2. Issue astyle command
73+
74+
```
75+
xy@xy-Inspiron-3593:~/Arduino/xy/EthernetWebServer_SSL_GitHub$ bash utils/restyle.sh
76+
```
77+
78+
79+
5580

5681

README.md

Lines changed: 90 additions & 61 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

1313

1414
* [Changelog](#changelog)
15+
* [Releases v1.9.3](#releases-v193)
1516
* [Releases v1.9.2](#releases-v192)
1617
* [Releases v1.9.1](#releases-v191)
1718
* [Releases v1.9.0](#releases-v190)
@@ -43,6 +44,14 @@
4344

4445
## Changelog
4546

47+
### Releases v1.9.3
48+
49+
1. Add support to Seeeduino nRF52840-based boards such as **Seeed XIAO_NRF52840 and XIAO_NRF52840_SENSE**, etc. using Seeed `mbed` or `nRF52` core
50+
2. Add astyle using `allman` style. Restyle the library
51+
3. Display warning only when `_ETHERNET_WEBSERVER_LOGLEVEL_` > 3
52+
4. Update examples
53+
5. Update `Packages' Patches` to add Seeeduino `nRF52` core
54+
4655
### Releases v1.9.2
4756

4857
1. Slow SPI clock for old `W5100` shield or `SAMD Zero`

library.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "EthernetWebServer_SSL",
3-
"version": "1.9.2",
3+
"version": "1.9.3",
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",
55
"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 with custom SPI",
66
"authors":
@@ -27,12 +27,14 @@
2727
{
2828
"owner": "khoih-prog",
2929
"name": "Functional-Vlpp",
30-
"version": "^1.0.2"
30+
"version": "^1.0.2",
31+
"platforms": ["*"]
3132
},
3233
{
3334
"owner": "khoih-prog",
3435
"name": "Ethernet_Generic",
35-
"version": "^2.5.2"
36+
"version": "^2.6.2",
37+
"platforms": ["*"]
3638
},
3739
{
3840
"owner": "ssilverman",

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=EthernetWebServer_SSL
2-
version=1.9.2
2+
version=1.9.3
33
author=Khoi Hoang
44
license=GPLv3
55
maintainer=Khoi Hoang <khoih.prog@gmail.com>

platformio/platformio.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ lib_ldf_mode = chain+
4444
lib_deps =
4545
; PlatformIO 4.x
4646
; Functional-Vlpp@~1.0.2
47-
; Ethernet_Generic>=2.5.2
47+
; Ethernet_Generic>=2.6.2
4848
; EthernetENC@~2.0.3
4949
; UIPEthernet@~2.0.12
5050
; QNEthernet@>=0.15.0
5151

5252
; PlatformIO 5.x
5353
khoih-prog/Functional-Vlpp@~1.0.2
54-
khoih-prog/Ethernet_Generic@~2.5.2
54+
khoih-prog/Ethernet_Generic@~2.6.2
5555
jandrassy/EthernetENC@~2.0.3
5656
uipethernet/UIPEthernet@~2.0.12
5757
ssilverman/QNEthernet@>=0.15.0

utils/astyle_library.conf

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Code formatting rules for Arduino libraries, modified from for KH libraries:
2+
#
3+
# https://github.com/arduino/Arduino/blob/master/build/shared/examples_formatter.conf
4+
#
5+
6+
# astyle --style=allman -s2 -t2 -C -S -xW -Y -M120 -f -p -xg -H -xb -c --xC120 -xL *.h *.cpp *.ino
7+
8+
--mode=c
9+
--lineend=linux
10+
--style=allman
11+
12+
# -r or -R
13+
#--recursive
14+
15+
# -c => Converts tabs into spaces
16+
convert-tabs
17+
18+
# -s2 => 2 spaces indentation
19+
--indent=spaces=2
20+
21+
# -t2 => tab =2 spaces
22+
#--indent=tab=2
23+
24+
# -C
25+
--indent-classes
26+
27+
# -S
28+
--indent-switches
29+
30+
# -xW
31+
--indent-preproc-block
32+
33+
# -Y => indent classes, switches (and cases), comments starting at column 1
34+
--indent-col1-comments
35+
36+
# -M120 => maximum of 120 spaces to indent a continuation line
37+
--max-continuation-indent=120
38+
39+
# -xC120 => max‑code‑length will break a line if the code exceeds # characters
40+
--max-code-length=120
41+
42+
# -f =>
43+
--break-blocks
44+
45+
# -p => put a space around operators
46+
--pad-oper
47+
48+
# -xg => Insert space padding after commas
49+
--pad-comma
50+
51+
# -H => put a space after if/for/while
52+
pad-header
53+
54+
# -xb => Break one line headers (e.g. if/for/while)
55+
--break-one-line-headers
56+
57+
# -c => Converts tabs into spaces
58+
#--convert-tabs
59+
60+
# if you like one-liners, keep them
61+
#keep-one-line-statements
62+
63+
# -xV
64+
--attach-closing-while
65+
66+
#unpad-paren
67+
68+
# -xp
69+
remove-comment-prefix
70+

utils/restyle.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
for dir in . ; do
4+
find $dir -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.ino" \) -exec astyle --suffix=none --options=./utils/astyle_library.conf \{\} \;
5+
done
6+

0 commit comments

Comments
 (0)