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

Commit

Permalink
v1.5.0 for LwIP W6100
Browse files Browse the repository at this point in the history
#### Releases v1.5.0

1. Add support to `ESP32` and `ESP32S2/S3/C3` boards using `LwIP W6100 Ethernet`
  • Loading branch information
khoih-prog authored Jan 10, 2023
1 parent 1a62e52 commit e3054bc
Show file tree
Hide file tree
Showing 9 changed files with 246 additions and 61 deletions.
11 changes: 6 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,27 @@ 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
* Board Type (e.g. ESP32S3_DEV, ESP32S2_DEV, ESP32C3_DEV)
* Board Core Version (e.g. ESP32 core v2.0.5)
* Board Type (e.g. ESP32_DEV, ESP32S3_DEV, ESP32S2_DEV, ESP32C3_DEV)
* Board Core Version (e.g. ESP32 core v2.0.6)
* Contextual information (e.g. what you were trying to achieve)
* Simplest possible steps to reproduce
* Anything that might be relevant in your opinion, such as:
* Operating system (Windows, Ubuntu, etc.) and the output of `uname -a`
* Network configuration


Please be educated, civilized and constructive. Disrespective posts against [GitHub Code of Conduct](https://docs.github.com/en/site-policy/github-terms/github-event-code-of-conduct) will be ignored and deleted.
Please be educated, civilized and constructive as you've always been. Disrespective posts against [GitHub Code of Conduct](https://docs.github.com/en/site-policy/github-terms/github-event-code-of-conduct) will be ignored and deleted.

---

### Example

```
Arduino IDE version: 1.8.19
ESP32S3_DEV board
ESP32 core v2.0.5
ESP32 core v2.0.6
OS: Ubuntu 20.04 LTS
Linux xy-Inspiron-3593 5.15.0-56-generic #62~20.04.1-Ubuntu SMP Tue Nov 22 21:24:20 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
Linux xy-Inspiron-3593 5.15.0-57-generic #63~20.04.1-Ubuntu SMP Wed Nov 30 13:40:16 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
Context:
I encountered a crash while using this library
Expand Down
Binary file added Images/W6100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
215 changes: 184 additions & 31 deletions README.md

Large diffs are not rendered by default.

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

* [Changelog](#changelog)
* [Releases v1.5.0](#releases-v150)
* [Releases v1.4.0](#releases-v140)
* [Releases v1.3.0](#releases-v130)
* [Releases v1.2.0](#releases-v120)
Expand All @@ -26,6 +27,10 @@

## Changelog

#### Releases v1.5.0

1. Add support to `ESP32` and `ESP32S2/S3/C3` boards using `LwIP W6100 Ethernet`

#### Releases v1.4.0

1. Add support to `ESP32S2/C3` using `LwIP W5500 or ENC28J60`
Expand Down
3 changes: 3 additions & 0 deletions keywords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -528,3 +528,6 @@ macAddress KEYWORD2

# LITERAL1
ENC28J60_Default_Mac LITERAL1
W5500_Default_Mac LITERAL1
W6100_Default_Mac LITERAL1

32 changes: 22 additions & 10 deletions library.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name":"HTTPS_Server_Generic",
"version": "1.4.0",
"description":"This is HTTPS/HTTP Server Library for ESP32, WT32_ETH01, ESP32 + LwIP W5500, ESP32 + LwIP ENC28J60. In the future, this library will support powerful-enough boards using LwIP WiFi/Ethernet, such as ESP8266, Portenta_H7, RP2040W, Teensy 4.1, etc.",
"keywords":"http, https, async, async-https-webserver, async-http-webserver, websocket, webserver, esp32, w5500, enc28j60, wt32-eth01, lwip, lwip-ethernet, lwip-wifi, lwip-w5500, lwip-enc28j60, esp8266, mbed, ssl, tls",
"version": "1.5.0",
"description":"This is HTTPS/HTTP Server Library for ESP32, WT32_ETH01, ESP32 + LwIP W5500, ESP32 + LwIP W6100, ESP32 + LwIP ENC28J60. In the future, this library will support powerful-enough boards using LwIP WiFi/Ethernet, such as ESP8266, Portenta_H7, RP2040W, Teensy 4.1, etc.",
"keywords":"http, https, async, async-https-webserver, async-http-webserver, websocket, webserver, esp32, w5500, w6100, enc28j60, wt32-eth01, lwip, lwip-ethernet, lwip-wifi, lwip-w5500, lwip-w6100, lwip-enc28j60, esp8266, mbed, ssl, tls",
"authors":
[
{
Expand Down Expand Up @@ -40,19 +40,25 @@
{
"owner": "khoih-prog",
"name": "WebServer_WT32_ETH01",
"version": "^1.5.1",
"version": ">=1.5.1",
"platforms": ["espressif32"]
},
{
"owner": "khoih-prog",
"name": "WebServer_ESP32_W5500",
"version": "^1.5.1",
"name": "WebServer_ESP32_ENC",
"version": ">=1.5.1",
"platforms": ["espressif32"]
},
{
"owner": "khoih-prog",
"name": "WebServer_ESP32_ENC",
"version": ">=1.5.1",
"name": "WebServer_ESP32_SC_ENC",
"version": ">=1.2.0",
"platforms": ["espressif32"]
},
{
"owner": "khoih-prog",
"name": "WebServer_ESP32_W5500",
"version": ">=1.5.2",
"platforms": ["espressif32"]
},
{
Expand All @@ -63,8 +69,14 @@
},
{
"owner": "khoih-prog",
"name": "WebServer_ESP32_SC_ENC",
"version": ">=1.2.0",
"name": "WebServer_ESP32_W6100",
"version": ">=1.5.2",
"platforms": ["espressif32"]
},
{
"owner": "khoih-prog",
"name": "WebServer_ESP32_SC_W6100",
"version": ">=1.2.1",
"platforms": ["espressif32"]
}
],
Expand Down
6 changes: 3 additions & 3 deletions library.properties
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name=HTTPS_Server_Generic
version=1.4.0
version=1.5.0
author=Frank Hessel,Khoi Hoang
maintainer=Khoi Hoang <[email protected]>
license=MIT
sentence=This is HTTPS/HTTP Server Library for ESP32, WT32_ETH01, ESP32 + LwIP W5500, ESP32 + LwIP ENC28J60
sentence=This is HTTPS/HTTP Server Library for ESP32, WT32_ETH01, ESP32 + LwIP W5500, ESP32 + LwIP W6100, ESP32 + LwIP ENC28J60
paragraph=In the future, this library will support powerful-enough boards using LwIP WiFi/Ethernet, such as ESP8266, Portenta_H7, RP2040W, Teensy 4.1, etc.
category=Communication
url=https://github.com/khoih-prog/HTTPS_Server_Generic
architectures=esp32
depends=Functional-Vlpp, WebServer_WT32_ETH01, WebServer_ESP32_W5500, WebServer_ESP32_ENC, WebServer_ESP32_SC_W5500, WebServer_ESP32_SC_ENC
depends=Functional-Vlpp, WebServer_WT32_ETH01, WebServer_ESP32_ENC, WebServer_ESP32_W5500, WebServer_ESP32_SC_ENC, WebServer_ESP32_SC_W5500, WebServer_ESP32_W6100, WebServer_ESP32_SC_W6100
includes=HTTPS_Server_Generic.h
26 changes: 18 additions & 8 deletions platformio/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,31 +32,41 @@ upload_speed = 921600
;monitor_speed = 9600
;monitor_port = COM11

; ============================================================
; Checks for the compatibility with frameworks and dev/platforms
lib_compat_mode = strict
lib_ldf_mode = chain+
;lib_ldf_mode = deep+

; ============================================================
lib_deps =
; PlatformIO 4.x
; AsyncTCP@~1.1.1
; Functional-Vlpp@~1.0.2
; WebServer_WT32_ETH01@~1.5.1
; WebServer_ESP32_W5500@~1.5.1
; WebServer_ESP32_ENC@~1.5.1
; WebServer_ESP32_SC_W5500@>=1.2.1
; WebServer_WT32_ETH01@>=1.5.1
; WebServer_ESP32_ENC@>=1.5.1
; WebServer_ESP32_SC_ENC@>=1.2.0
; WebServer_ESP32_W5500@>=1.5.2
; WebServer_ESP32_SC_W5500@>=1.2.1
; WebServer_ESP32_W6100@>=1.5.2
; WebServer_ESP32_SC_W6100@>=1.2.1

; PlatformIO 5.x
; me-no-dev/AsyncTCP@~1.1.1
khoih-prog/Functional-Vlpp@~1.0.2
khoih-prog/WebServer_WT32_ETH01@~1.5.1
khoih-prog/WebServer_ESP32_W5500@~1.5.1
khoih-prog/WebServer_ESP32_ENC@~1.5.1
khoih-prog/WebServer_ESP32_SC_W5500@>=1.2.1
khoih-prog/WebServer_WT32_ETH01@>=1.5.1
khoih-prog/WebServer_ESP32_ENC@>=1.5.1
khoih-prog/WebServer_ESP32_SC_ENC@>=1.2.0
khoih-prog/WebServer_ESP32_W5500@>=1.5.2
khoih-prog/WebServer_ESP32_SC_W5500@>=1.2.1
khoih-prog/WebServer_ESP32_W6100@>=1.5.2
khoih-prog/WebServer_ESP32_SC_W6100@>=1.2.1

; ============================================================
build_flags =
; set your build_flags

; ============================================================
[env:ESP32]
platform = espressif32
framework = arduino
Expand Down
9 changes: 5 additions & 4 deletions src/HTTPS_Server_Generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
Original author: Frank Hessel
Version: 1.4.0
Version: 1.5.0
Version Modified By Date Comments
------- ----------- ---------- -----------
1.2.0 K Hoang 03/12/2022 Initial porting for ESP32, WT32_ETH01, ESP32_W5500 and ESP32_ENC
1.3.0 K Hoang 17/12/2022 Add support to ESP32S3 using LwIP W5500 or ENC28J60
1.4.0 K Hoang 23/12/2022 Add support to ESP32S2/C3 using LwIP W5500 or ENC28J60
1.5.0 K Hoang 09/01/2023 Add support to `ESP32` and `ESP32S2/S3/C3` boards using `LwIP W6100 Ethernet`
*****************************************************************************************************************************/

#ifndef HTTPS_SERVER_GENERIC_H_
Expand Down Expand Up @@ -57,13 +58,13 @@

////////////////////////////////////////

#define HTTPS_SERVER_GENERIC_VERSION "HTTPS_Server_Generic v1.4.0"
#define HTTPS_SERVER_GENERIC_VERSION "HTTPS_Server_Generic v1.5.0"

#define HTTPS_SERVER_GENERIC_VERSION_MAJOR 1
#define HTTPS_SERVER_GENERIC_VERSION_MINOR 4
#define HTTPS_SERVER_GENERIC_VERSION_MINOR 5
#define HTTPS_SERVER_GENERIC_VERSION_PATCH 0

#define HTTPS_SERVER_GENERIC_VERSION_INT 1004000
#define HTTPS_SERVER_GENERIC_VERSION_INT 1005000

////////////////////////////////////////

Expand Down

0 comments on commit e3054bc

Please sign in to comment.