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

Commit

Permalink
v1.5.3 using SPI_DMA_CH_AUTO
Browse files Browse the repository at this point in the history
#### Releases v1.5.3

1. Using `SPI_DMA_CH_AUTO`
  • Loading branch information
khoih-prog committed Jan 11, 2023
1 parent 6842139 commit 3dfc812
Show file tree
Hide file tree
Showing 16 changed files with 76 additions and 44 deletions.
34 changes: 20 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,12 @@ This [**WebServer_ESP32_W6100** library](https://github.com/khoih-prog/WebServer

1. **ESP32_DEV with W6100 boards** using `LwIP W6100 Ethernet`


---

#### W6100

`FULL_DUPLEX, 100Mbps`

<p align="center">
<img src="https://github.com/khoih-prog/WebServer_ESP32_W6100/raw/main/pics/W6100.png">
</p>
Expand Down Expand Up @@ -399,6 +401,8 @@ You can change the `INT` pin to another one. Default is `GPIO4`

#### W6100

`FULL_DUPLEX, 100Mbps`

<p align="center">
<img src="https://github.com/khoih-prog/WebServer_ESP32_W6100/raw/main/pics/W6100.png">
</p>
Expand Down Expand Up @@ -471,7 +475,7 @@ The following are debug terminal output and screen shot when running example [Ad

```cpp
Start AdvancedWebServer on ESP32_DEV with ESP32_W6100
WebServer_ESP32_W6100 v1.5.2 for core v2.0.0+
WebServer_ESP32_W6100 v1.5.3 for core v2.0.0+
[EWS] Default SPI pinout:
[EWS] SPI_HOST: 2
[EWS] MOSI: 23
Expand Down Expand Up @@ -499,7 +503,7 @@ The terminal output of **ESP32_DEV with W6100** running [MQTT_ThingStream exampl
```cpp
Start MQTT_ThingStream on ESP32_DEV with ESP32_W6100
WebServer_ESP32_W6100 v1.5.2 for core v2.0.0+
WebServer_ESP32_W6100 v1.5.3 for core v2.0.0+
[EWS] Default SPI pinout:
[EWS] SPI_HOST: 2
[EWS] MOSI: 23
Expand Down Expand Up @@ -532,7 +536,7 @@ The terminal output of **ESP32_DEV with W6100** running [MQTTClient_Auth example

```cpp
Start MQTTClient_Auth on ESP32_DEV with ESP32_W6100
WebServer_ESP32_W6100 v1.5.2 for core v2.0.0+
WebServer_ESP32_W6100 v1.5.3 for core v2.0.0+
[EWS] Default SPI pinout:
[EWS] SPI_HOST: 2
[EWS] MOSI: 23
Expand Down Expand Up @@ -562,7 +566,7 @@ The terminal output of **ESP32_DEV with W6100** running [MQTTClient_Basic exampl
```cpp
Start MQTTClient_Basic on ESP32_DEV with ESP32_W6100
WebServer_ESP32_W6100 v1.5.2 for core v2.0.0+
WebServer_ESP32_W6100 v1.5.3 for core v2.0.0+
[EWS] Default SPI pinout:
[EWS] SPI_HOST: 2
[EWS] MOSI: 23
Expand Down Expand Up @@ -593,7 +597,7 @@ The terminal output of **ESP32_DEV with W6100** running [WebClient example](exam

```cpp
Start WebClient on ESP32_DEV with ESP32_W6100
WebServer_ESP32_W6100 v1.5.2 for core v2.0.0+
WebServer_ESP32_W6100 v1.5.3 for core v2.0.0+
[EWS] Default SPI pinout:
[EWS] SPI_HOST: 2
[EWS] MOSI: 23
Expand All @@ -612,7 +616,7 @@ FULL_DUPLEX, 100Mbps
Starting connection to server...
Connected to server
HTTP/1.1 200 OK
Date: Sun, 08 Jan 2023 21:34:02 GMT
Date: Wed, 11 Jan 2023 19:29:39 GMT
Content-Type: text/plain
Content-Length: 2263
Connection: close
Expand Down Expand Up @@ -679,7 +683,7 @@ The terminal output of **ESP32_DEV with W6100** running [UdpNTPClient example](e
```cpp
Start UdpNTPClient on ESP32_DEV with ESP32_W6100
WebServer_ESP32_W6100 v1.5.2 for core v2.0.0+
WebServer_ESP32_W6100 v1.5.3 for core v2.0.0+
[EWS] Default SPI pinout:
[EWS] SPI_HOST: 2
[EWS] MOSI: 23
Expand All @@ -695,10 +699,10 @@ ETH Connected
ETH MAC: 0C:B8:15:D8:01:D7, IPv4: 192.168.2.87
FULL_DUPLEX, 100Mbps
UDP Packet received, size 48
From 132.163.96.6, port 123
Seconds since Jan 1 1900 = 3882196591
Unix time = 1673207791
The UTC time is 19:56:31
From 132.163.97.3, port 123
Seconds since Jan 1 1900 = 3882452857
Unix time = 1673464057
The UTC time is 19:07:37
```

---
Expand Down Expand Up @@ -739,7 +743,9 @@ Submit issues to: [WebServer_ESP32_W6100 issues](https://github.com/khoih-prog/W
### DONE

1. Add support to ESP32-based **ESP32_DEV with W6100** using `LwIP W6100 Ethernet`

2. Using `SPI_DMA_CH_AUTO`


---
---

Expand Down Expand Up @@ -780,6 +786,6 @@ If you want to contribute to this project:

- Copyright (c) 2016- Hristo Gochkov

- Copyright (c) 2022- Khoi Hoang
- Copyright (c) 2023- Khoi Hoang


5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,18 @@


* [Changelog](#changelog)
* [Releases v1.5.3](#releases-v153)
* [Releases v1.5.2](#releases-v152)

---
---

## Changelog

#### Releases v1.5.3

1. Using `SPI_DMA_CH_AUTO`

#### Releases v1.5.2

1. Initial coding to support ESP32 boards using `W6100 LwIP Ethernet`. Sync with [WebServer_ESP32_W6100 v1.5.2](https://github.com/khoih-prog/WebServer_ESP32_W6100)
Expand Down
4 changes: 2 additions & 2 deletions library.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "WebServer_ESP32_W6100",
"version": "1.5.2",
"keywords": "WebServer, Ethernet, MQTT, MQTTS, HTTP, HTTPS, SSL, Arduino, ESP32, W6100, HTTP-Client, WebSocket-Client, MQTT-Client, server, client, websocket, LittleFS, SPIFFS, ThingStream",
"version": "1.5.3",
"keywords": "WebServer, Ethernet, MQTT, MQTTS, HTTP, HTTPS, SSL, Arduino, ESP32, w6100, lwip-w6100, lwip-ethernet, HTTP-Client, WebSocket-Client, MQTT-Client, server, client, websocket, LittleFS, SPIFFS, ThingStream",
"description": "Simple Ethernet WebServer, HTTP/HTTPS Client wrapper library for ESP32 boards using W6100 with LwIP Ethernet library. The WebServer supports HTTP(S) GET and POST requests, provides argument parsing, handles one client at a time. It provides HTTP(S), MQTT(S) Client and supports WebServer serving from LittleFS/SPIFFS",
"authors":
{
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=WebServer_ESP32_W6100
version=1.5.2
version=1.5.3
author=Khoi Hoang
license=GPLv3
maintainer=Khoi Hoang <khoih.prog@gmail.com>
Expand Down
12 changes: 9 additions & 3 deletions platformio/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,24 @@ 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 =

; ============================================================
build_flags =
; set your debug output (default=Serial)
-D DEBUG_ESP_PORT=Serial
; comment the following line to enable WiFi debugging
-D NDEBUG

; ============================================================
; ============================================================
[env:ESP32]
platform = espressif32
framework = arduino
Expand Down Expand Up @@ -85,7 +90,7 @@ board = esp32doit-devkit-v1
;board = nina_w10

; ============================================================

; ============================================================
[env:esp32s2]
platform = espressif32
framework = arduino
Expand Down Expand Up @@ -115,7 +120,7 @@ build_flags =
-DARDUINO_VARIANT="esp32s2"

; ============================================================

; ============================================================
[env:esp32s3]
platform = espressif32
framework = arduino
Expand All @@ -135,7 +140,7 @@ build_flags =
-DARDUINO_VARIANT="esp32s3"

; ============================================================

; ============================================================
[env:esp32sc3]
platform = espressif32
framework = arduino
Expand All @@ -155,3 +160,4 @@ build_flags =
-DARDUINO_VARIANT="esp32c3"

; ============================================================
; ============================================================
13 changes: 7 additions & 6 deletions src/WebServer_ESP32_W6100.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
Built by Khoi Hoang https://github.com/khoih-prog/WebServer_ESP32_W6100
Licensed under GPLv3 license
Version: 1.5.2
Version: 1.5.3
Version Modified By Date Comments
------- ----------- ---------- -----------
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W5500 v1.5.2
1.5.3 K Hoang 11/01/2023 Using `SPI_DMA_CH_AUTO`
*****************************************************************************************************************************/

#pragma once
Expand All @@ -31,20 +32,20 @@
#warning Using code for ESP32 core v2.0.0+ in WebServer_ESP32_W6100.h
#endif

#define WEBSERVER_ESP32_W6100_VERSION "WebServer_ESP32_W6100 v1.5.2 for core v2.0.0+"
#define WEBSERVER_ESP32_W6100_VERSION "WebServer_ESP32_W6100 v1.5.3 for core v2.0.0+"
#else
#if (_ETHERNET_WEBSERVER_LOGLEVEL_ > 3)
#warning Using code for ESP32 core v1.0.6- in WebServer_ESP32_W6100.h
#endif

#define WEBSERVER_ESP32_W6100_VERSION "WebServer_ESP32_W6100 v1.5.2 for core v1.0.6-"
#define WEBSERVER_ESP32_W6100_VERSION "WebServer_ESP32_W6100 v1.5.3 for core v1.0.6-"
#endif

#define WEBSERVER_ESP32_W6100_VERSION_MAJOR 1
#define WEBSERVER_ESP32_W6100_VERSION_MINOR 5
#define WEBSERVER_ESP32_W6100_VERSION_PATCH 2
#define WEBSERVER_ESP32_W6100_VERSION_PATCH 3

#define WEBSERVER_ESP32_W6100_VERSION_INT 1005002
#define WEBSERVER_ESP32_W6100_VERSION_INT 1005003

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

Expand All @@ -54,7 +55,7 @@

#error ESP32_S2 not supported. Use WebServer_ESP32_SC_W6100 library

#elif ( ARDUINO_ESP32C3_DEV )
#elif ( defined(ARDUINO_ESP32C3_DEV) )

#error ESP32_C3 not supported. Use WebServer_ESP32_SC_W6100 library

Expand Down
5 changes: 4 additions & 1 deletion src/WebServer_ESP32_W6100.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
Built by Khoi Hoang https://github.com/khoih-prog/WebServer_ESP32_W6100
Licensed under GPLv3 license
Version: 1.5.2
Version: 1.5.3
Version Modified By Date Comments
------- ----------- ---------- -----------
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W5500 v1.5.2
1.5.3 K Hoang 11/01/2023 Using `SPI_DMA_CH_AUTO`
*****************************************************************************************************************************/

#pragma once
Expand Down Expand Up @@ -69,6 +70,8 @@
#define SHIELD_TYPE "ESP32_W6100"
#endif

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

extern bool ESP32_W6100_eth_connected;

extern void ESP32_W6100_onEvent();
Expand Down
3 changes: 2 additions & 1 deletion src/WebServer_ESP32_W6100_Debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
Built by Khoi Hoang https://github.com/khoih-prog/WebServer_ESP32_W6100
Licensed under GPLv3 license
Version: 1.5.2
Version: 1.5.3
Version Modified By Date Comments
------- ----------- ---------- -----------
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W5500 v1.5.2
1.5.3 K Hoang 11/01/2023 Using `SPI_DMA_CH_AUTO`
*****************************************************************************************************************************/

#pragma once
Expand Down
5 changes: 4 additions & 1 deletion src/WebServer_ESP32_W6100_Impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
Built by Khoi Hoang https://github.com/khoih-prog/WebServer_ESP32_W6100
Licensed under GPLv3 license
Version: 1.5.2
Version: 1.5.3
Version Modified By Date Comments
------- ----------- ---------- -----------
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W5500 v1.5.2
1.5.3 K Hoang 11/01/2023 Using `SPI_DMA_CH_AUTO`
*****************************************************************************************************************************/

#pragma once
Expand Down Expand Up @@ -154,4 +155,6 @@ void ESP32_W6100_event(WiFiEvent_t event)
}
}

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

#endif // WEBSERVER_ESP32_W6100_IMPL_H
5 changes: 3 additions & 2 deletions src/w6100/esp32_w6100.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
Built by Khoi Hoang https://github.com/khoih-prog/WebServer_ESP32_W6100
Licensed under GPLv3 license
Version: 1.5.2
Version: 1.5.3
Version Modified By Date Comments
------- ----------- ---------- -----------
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W6100 v1.5.2
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W5500 v1.5.2
1.5.3 K Hoang 11/01/2023 Using `SPI_DMA_CH_AUTO`
*****************************************************************************************************************************/

#define _ETHERNET_WEBSERVER_LOGLEVEL_ 1
Expand Down
5 changes: 3 additions & 2 deletions src/w6100/esp32_w6100.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
Built by Khoi Hoang https://github.com/khoih-prog/WebServer_ESP32_W6100
Licensed under GPLv3 license
Version: 1.5.2
Version: 1.5.3
Version Modified By Date Comments
------- ----------- ---------- -----------
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W6100 v1.5.2
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W5500 v1.5.2
1.5.3 K Hoang 11/01/2023 Using `SPI_DMA_CH_AUTO`
*****************************************************************************************************************************/

#pragma once
Expand Down
5 changes: 3 additions & 2 deletions src/w6100/esp_eth/esp_eth_mac_w6100.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
Built by Khoi Hoang https://github.com/khoih-prog/WebServer_ESP32_W6100
Licensed under GPLv3 license
Version: 1.5.2
Version: 1.5.3
Version Modified By Date Comments
------- ----------- ---------- -----------
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W6100 v1.5.2
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W5500 v1.5.2
1.5.3 K Hoang 11/01/2023 Using `SPI_DMA_CH_AUTO`
*****************************************************************************************************************************/

// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
Expand Down
5 changes: 3 additions & 2 deletions src/w6100/esp_eth/esp_eth_phy_w6100.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
Built by Khoi Hoang https://github.com/khoih-prog/WebServer_ESP32_W6100
Licensed under GPLv3 license
Version: 1.5.2
Version: 1.5.3
Version Modified By Date Comments
------- ----------- ---------- -----------
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W6100 v1.5.2
1.5.2 K Hoang 06/01/2022 Initial coding for ESP32_W6100 (ESP32 + W6100). Sync with WebServer_ESP32_W5500 v1.5.2
1.5.3 K Hoang 11/01/2023 Using `SPI_DMA_CH_AUTO`
*****************************************************************************************************************************/
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
//
Expand Down
Loading

0 comments on commit 3dfc812

Please sign in to comment.