From fb23a04088bd5419535d5f861bd397a13b14e2be Mon Sep 17 00:00:00 2001 From: Khoi Hoang <57012152+khoih-prog@users.noreply.github.com> Date: Tue, 6 Dec 2022 00:15:14 -0500 Subject: [PATCH] v1.6.3 to add `WebSockets` examples #### Releases v1.6.3 1. Add `Async_WebSocketsServer`, `Async_HttpBasicAuth` and `MQTT` examples --- .codespellrc | 7 ++ CONTRIBUTING.md | 5 +- README.md | 130 ++++++++++++++++----- changelog.md | 7 +- library.json | 2 +- library.properties | 2 +- platformio/platformio.ini | 3 + src/AsyncEventSource.cpp | 3 +- src/AsyncEventSource.h | 3 +- src/AsyncJson.h | 3 +- src/AsyncWebServer_ESP32_ENC.cpp | 3 +- src/AsyncWebServer_ESP32_ENC.h | 11 +- src/AsyncWebServer_ESP32_ENC_Debug.h | 3 +- src/AsyncWebSocket.cpp | 3 +- src/AsyncWebSocket.h | 3 +- src/AsyncWebSynchronization.h | 3 +- src/ESP32_ENC_SPIFFSEditor.cpp | 3 +- src/ESP32_ENC_SPIFFSEditor.h | 3 +- src/StringArray.h | 3 +- src/WebAuthentication.cpp | 3 +- src/WebAuthentication.h | 3 +- src/WebHandlerImpl.h | 3 +- src/WebHandlers.cpp | 3 +- src/WebRequest.cpp | 3 +- src/WebResponseImpl.h | 3 +- src/WebResponses.cpp | 3 +- src/WebServer.cpp | 3 +- src/enc28j60/esp32_enc28j60.cpp | 19 --- src/enc28j60/esp32_enc28j60.h | 20 +--- src/enc28j60/extmod/enc28j60.h | 12 ++ src/enc28j60/extmod/esp_eth_enc28j60.h | 12 ++ src/enc28j60/extmod/esp_eth_mac_enc28j60.c | 12 ++ src/enc28j60/extmod/esp_eth_phy_enc28j60.c | 12 ++ src/enc28j60/extmod/esp_eth_spi_enc28j60.c | 17 +++ 34 files changed, 235 insertions(+), 93 deletions(-) create mode 100644 .codespellrc diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 0000000..00fe362 --- /dev/null +++ b/.codespellrc @@ -0,0 +1,7 @@ +# See: https://github.com/codespell-project/codespell#using-a-config-file +[codespell] +# In the event of a false positive, add the problematic word, in all lowercase, to a comma-separated list here: +ignore-words-list = , +check-filenames = +check-hidden = +skip = ./.git,./src,./examples,./Packages_Patches,./LibraryPatches diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f7f80a2..f7c68d4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,6 +23,9 @@ Please ensure to specify the following: * 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. + + ### Example ``` @@ -30,7 +33,7 @@ Arduino IDE version: 1.8.19 ESP32_DEV board ESP32 core v2.0.5 OS: Ubuntu 20.04 LTS -Linux xy-Inspiron-3593 5.15.0-53-generic #59~20.04.1-Ubuntu SMP Thu Oct 20 15:10:22 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux +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 Context: I encountered a crash while using this library diff --git a/README.md b/README.md index 8b554de..dcc3071 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ Donate to my libraries using BuyMeACoffee + --- --- @@ -78,22 +79,29 @@ * [Path variable](#path-variable) * [Examples](#examples) * [ 1. Async_AdvancedWebServer](examples/Async_AdvancedWebServer) - * [ 2. Async_HelloServer](examples/Async_HelloServer) - * [ 3. Async_HelloServer2](examples/Async_HelloServer2) - * [ 4. AsyncMultiWebServer_ESP32_ENC](examples/AsyncMultiWebServer_ESP32_ENC) - * [ 5. Async_PostServer](examples/Async_PostServer) - * [ 6. Async_RegexPatterns_ESP32_ENC](examples/Async_RegexPatterns_ESP32_ENC) - * [ 7. AsyncSimpleServer_ESP32_ENC](examples/AsyncSimpleServer_ESP32_ENC) - * [ 8. Async_AdvancedWebServer_MemoryIssues_SendArduinoString](examples/Async_AdvancedWebServer_MemoryIssues_SendArduinoString) - * [ 9. Async_AdvancedWebServer_MemoryIssues_Send_CString](examples/Async_AdvancedWebServer_MemoryIssues_Send_CString) - * [10. Async_AdvancedWebServer_SendChunked](examples/Async_AdvancedWebServer_SendChunked) - * [11. AsyncWebServer_SendChunked](examples/AsyncWebServer_SendChunked) + * [ 2. Async_AdvancedWebServer_MemoryIssues_SendArduinoString](examples/Async_AdvancedWebServer_MemoryIssues_SendArduinoString) + * [ 3. Async_AdvancedWebServer_MemoryIssues_Send_CString](examples/Async_AdvancedWebServer_MemoryIssues_Send_CString) + * [ 4. Async_AdvancedWebServer_SendChunked](examples/Async_AdvancedWebServer_SendChunked) + * [ 5. Async_HelloServer](examples/Async_HelloServer) + * [ 6. Async_HelloServer2](examples/Async_HelloServer2) + * [ 7. Async_HttpBasicAuth](examples/Async_HttpBasicAuth) + * [ 8. AsyncMultiWebServer_ESP32_ENC28J60](examples/AsyncMultiWebServer_ESP32_ENC28J60) + * [ 9. Async_PostServer](examples/Async_PostServer) + * [10. Async_RegexPatterns_ESP32_ENC28J60](examples/Async_RegexPatterns_ESP32_ENC28J60) + * [11. AsyncSimpleServer_ESP32_ENC28J60](examples/AsyncSimpleServer_ESP32_ENC28J60) + * [12. AsyncWebServer_SendChunked](examples/AsyncWebServer_SendChunked) + * [13. Async_WebSocketsServer](examples/Async_WebSocketsServer) + * [14. MQTTClient_Auth](examples/MQTTClient_Auth) + * [15. MQTTClient_Basic](examples/MQTTClient_Basic) + * [16. MQTT_ThingStream](examples/MQTT_ThingStream) * [Example Async_AdvancedWebServer](#Example-Async_AdvancedWebServer) * [Debug Terminal Output Samples](#debug-terminal-output-samples) * [1. AsyncMultiWebServer_ESP32_ENC on ESP32_DEV with ESP32_ENC28J60](#1-AsyncMultiWebServer_ESP32_ENC-on-ESP32_DEV-with-ESP32_ENC28J60) * [2. Async_AdvancedWebServer_MemoryIssues_Send_CString on ESP32_DEV with ESP32_ENC28J60](#2-Async_AdvancedWebServer_MemoryIssues_Send_CString-on-ESP32_DEV-with-ESP32_ENC28J60) * [3. Async_AdvancedWebServer_SendChunked on ESP32_DEV with ESP32_ENC28J60](#3-Async_AdvancedWebServer_SendChunked-on-ESP32_DEV-with-ESP32_ENC28J60) * [4. AsyncWebServer_SendChunked on ESP32_DEV with ESP32_ENC28J60](#4-AsyncWebServer_SendChunked-on-ESP32_DEV-with-ESP32_ENC28J60) + * [5. Async_WebSocketsServer on ESP32_DEV with ESP32_ENC28J60](#5-Async_WebSocketsServer-on-ESP32_DEV-with-ESP32_ENC28J60) + * [6. Async_HTTPBasicAuth on ESP32_DEV with ESP32_ENC28J60](#6-Async_HTTPBasicAuth-on-ESP32_DEV-with-ESP32_ENC28J60) * [Debug](#debug) * [Troubleshooting](#troubleshooting) * [Issues](#issues) @@ -1470,16 +1478,21 @@ build_flags = ### Examples 1. [Async_AdvancedWebServer](examples/Async_AdvancedWebServer) - 2. [Async_HelloServer](examples/Async_HelloServer) - 3. [Async_HelloServer2](examples/Async_HelloServer2) - 4. [AsyncMultiWebServer_ESP32_ENC](examples/AsyncMultiWebServer_ESP32_ENC) - 5. [Async_PostServer](examples/Async_PostServer) - 6. [Async_RegexPatterns_ESP32_ENC](examples/Async_RegexPatterns_ESP32_ENC) - 7. [AsyncSimpleServer_ESP32_ENC](examples/AsyncSimpleServer_ESP32_ENC) - 8. [Async_AdvancedWebServer_MemoryIssues_SendArduinoString](examples/Async_AdvancedWebServer_MemoryIssues_SendArduinoString) - 9. [Async_AdvancedWebServer_MemoryIssues_Send_CString](examples/Async_AdvancedWebServer_MemoryIssues_Send_CString) -10. [Async_AdvancedWebServer_SendChunked](examples/Async_AdvancedWebServer_SendChunked) -11. [AsyncWebServer_SendChunked](examples/AsyncWebServer_SendChunked) + 2. [Async_AdvancedWebServer_MemoryIssues_SendArduinoString](examples/Async_AdvancedWebServer_MemoryIssues_SendArduinoString) + 3. [Async_AdvancedWebServer_MemoryIssues_Send_CString](examples/Async_AdvancedWebServer_MemoryIssues_Send_CString) + 4. [Async_AdvancedWebServer_SendChunked](examples/Async_AdvancedWebServer_SendChunked) + 5. [Async_HelloServer](examples/Async_HelloServer) + 6. [Async_HelloServer2](examples/Async_HelloServer2) + 7. [Async_HttpBasicAuth](examples/Async_HttpBasicAuth) + 8. [AsyncMultiWebServer_ESP32_ENC28J60](examples/AsyncMultiWebServer_ESP32_ENC28J60) + 9. [Async_PostServer](examples/Async_PostServer) +10. [Async_RegexPatterns_ESP32_ENC28J60](examples/Async_RegexPatterns_ESP32_ENC28J60) +11. [AsyncSimpleServer_ESP32_ENC28J60](examples/AsyncSimpleServer_ESP32_ENC28J60) +12. [AsyncWebServer_SendChunked](examples/AsyncWebServer_SendChunked) +13. [Async_WebSocketsServer](examples/Async_WebSocketsServer) +14. [MQTTClient_Auth](examples/MQTTClient_Auth) +15. [MQTTClient_Basic](examples/MQTTClient_Basic) +16. [MQTT_ThingStream](examples/MQTT_ThingStream) --- --- @@ -1507,7 +1520,7 @@ Following are debug terminal output and screen shots when running example [Async ```cpp Start AsyncMultiWebServer_ESP32_ENC on ESP32_DEV with ESP32_ENC28J60 -AsyncWebServer_ESP32_ENC v1.6.2 for core v2.0.0+ +AsyncWebServer_ESP32_ENC v1.6.3 for core v2.0.0+ [AWS] Default SPI pinout: [AWS] MOSI: 23 [AWS] MISO: 19 @@ -1556,7 +1569,7 @@ Following is the debug terminal and screen shot when running example [Async_Adva ```cpp Start Async_AdvancedWebServer_MemoryIssues_Send_CString on ESP32_DEV with ESP32_ENC28J60 -AsyncWebServer_ESP32_ENC v1.6.2 for core v2.0.0+ +AsyncWebServer_ESP32_ENC v1.6.3 for core v2.0.0+ [AWS] Default SPI pinout: [AWS] MOSI: 23 [AWS] MISO: 19 @@ -1588,7 +1601,7 @@ While using `Arduino String`, the HEAP usage is very large ```cpp Start Async_AdvancedWebServer_MemoryIssues_SendArduinoString on ESP32_DEV with ESP32_ENC28J60 -AsyncWebServer_ESP32_ENC v1.6.2 for core v2.0.0+ +AsyncWebServer_ESP32_ENC v1.6.3 for core v2.0.0+ [AWS] Default SPI pinout: [AWS] MOSI: 23 [AWS] MISO: 19 @@ -1627,7 +1640,7 @@ Following is debug terminal output when running example [Async_AdvancedWebServer ```cpp Start Async_AdvancedWebServer_SendChunked on ESP32_DEV with ESP32_ENC28J60 -AsyncWebServer_ESP32_ENC v1.6.2 for core v2.0.0+ +AsyncWebServer_ESP32_ENC v1.6.3 for core v2.0.0+ [AWS] Default SPI pinout: [AWS] MOSI: 23 [AWS] MISO: 19 @@ -1686,7 +1699,7 @@ Following is debug terminal output when running example [AsyncWebServer_SendChun ```cpp Start AsyncWebServer_SendChunked on ESP32_DEV with ESP32_ENC28J60 -AsyncWebServer_ESP32_ENC v1.6.2 for core v2.0.0+ +AsyncWebServer_ESP32_ENC v1.6.3 for core v2.0.0+ [AWS] Default SPI pinout: [AWS] MOSI: 23 [AWS] MISO: 19 @@ -1738,9 +1751,70 @@ AsyncWebServer is @ IP : 192.168.2.232 [AWS] Bytes sent in chunk = 2864 [AWS] Bytes sent in chunk = 1080 [AWS] Bytes sent in chunk = 0 +``` + + +--- + +#### 5. Async_WebSocketsServer on ESP32_DEV with ESP32_ENC28J60 + +Following is debug terminal output when running example [Async_WebSocketsServer](examples/Async_WebSocketsServer) on `ESP32_DEV with LwIP ENC28J60`, using ESP32 core `v2.0.0+`, to demo how to use `Async_WebSocketsServer` feature + + +```cpp +Starting Async_WebSocketsServer on ESP32_DEV with ESP32_ENC28J60 +AsyncWebServer_ESP32_ENC v1.6.3 for core v2.0.0+ +[AWS] Default SPI pinout: +[AWS] MOSI: 23 +[AWS] MISO: 19 +[AWS] SCK: 18 +[AWS] CS: 5 +[AWS] INT: 4 +[AWS] SPI Clock (MHz): 8 +[AWS] ========================= + +ETH Started +ETH Connected +ETH MAC: DE:AD:BE:EF:FE:01, IPv4: 192.168.2.95 +FULL_DUPLEX, 10Mbps +ws[Server: /ws][ClientID: 1] WSClient connected +ws[Server: /ws][ClientID: 2] WSClient connected +ws[Server: /ws][ClientID: 3] WSClient connected +ws[Server: /ws][ClientID: 1] WSClient disconnected +ws[Server: /ws][ClientID: 4] WSClient connected +ws[Server: /ws][ClientID: 2] WSClient disconnected +ws[Server: /ws][ClientID: 3] WSClient disconnected +``` + +--- + +#### 6. Async_HTTPBasicAuth on ESP32_DEV with ESP32_ENC28J60 + +Following is debug terminal output when running example [Async_HTTPBasicAuth](examples/Async_HTTPBasicAuth) on `ESP32_DEV with LwIP ENC28J60`, using ESP32 core `v2.0.0+`, to demo how to use `Async_Auth` feature + + +```cpp +Start Async_HTTPBasicAuth on ESP32_DEV with ESP32_ENC28J60 +AsyncWebServer_ESP32_ENC v1.6.3 for core v2.0.0+ +[AWS] Default SPI pinout: +[AWS] MOSI: 23 +[AWS] MISO: 19 +[AWS] SCK: 18 +[AWS] CS: 5 +[AWS] INT: 4 +[AWS] SPI Clock (MHz): 8 +[AWS] ========================= +ETH Started +ETH Connected +ETH MAC: DE:AD:BE:EF:FE:01, IPv4: 192.168.2.95 +FULL_DUPLEX, 10Mbps +Async_HttpBasicAuth started @ IP : 192.168.2.95 +Open http://192.168.2.95/ in your browser to see it working +Login using username = admin and password = esp32_enc28j60 ``` + --- --- @@ -1777,6 +1851,8 @@ Submit issues to: [AsyncWebServer_ESP32_ENC issues](https://github.com/khoih-pro 1. Fix bug. Add enhancement 2. Add support to more Ethernet shields, such as **W5x00, DP83848, TLK110, IP101, RTL8201, DM9051, KSZ8041, KSZ8081, etc.** + 3. Add `LittleFS` support to use with new cores + --- @@ -1791,7 +1867,7 @@ Submit issues to: [AsyncWebServer_ESP32_ENC issues](https://github.com/khoih-pro 7. Support using `CString` to save heap to send `very large data`. Check [request->send(200, textPlainStr, jsonChartDataCharStr); - Without using String Class - to save heap #8](https://github.com/khoih-prog/Portenta_H7_AsyncWebServer/pull/8) 8. Add examples [Async_AdvancedWebServer_SendChunked](https://github.com/khoih-prog/AsyncWebServer_RP2040W/tree/main/examples/Async_AdvancedWebServer_SendChunked) and [AsyncWebServer_SendChunked](https://github.com/khoih-prog/AsyncWebServer_RP2040W/tree/main/examples/AsyncWebServer_SendChunked) to demo how to use `beginChunkedResponse()` to send large `html` in chunks 9. Use `allman astyle` and add `utils` - +10. Add `Async_WebSocketsServer`, `Async_HttpBasicAuth` and `MQTT` examples --- --- @@ -1832,7 +1908,7 @@ If you want to contribute to this project: - Copyright (c) 2016- Hristo Gochkov -- Copyright (c) 2021- Khoi Hoang +- Copyright (c) 2022- Khoi Hoang diff --git a/changelog.md b/changelog.md index 6ab2780..51126c4 100644 --- a/changelog.md +++ b/changelog.md @@ -8,21 +8,26 @@ Donate to my libraries using BuyMeACoffee + --- --- ## Table of contents * [Changelog](#changelog) + * [Releases v1.6.3](#releases-v163) * [Releases v1.6.2](#releases-v162) - --- --- ## Changelog +#### Releases v1.6.3 + +1. Add `Async_WebSocketsServer`, `Async_HttpBasicAuth` and `MQTT` examples + #### Releases v1.6.2 1. Initial coding to port [ESPAsyncWebServer](https://github.com/me-no-dev/ESPAsyncWebServer) to ESP32 boards using ENC28J60 Ethernet. diff --git a/library.json b/library.json index af928c6..2135509 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name":"AsyncWebServer_ESP32_ENC", - "version": "1.6.2", + "version": "1.6.3", "description":"Asynchronous HTTP and WebSocket Server Library for (ESP32 + ENC28J60). Now supporting using CString to save heap to send very large data and with examples to demo how to use beginChunkedResponse() to send large html in chunks", "keywords":"http, async, async-webserver, websocket, webserver, esp32, enc28j60", "authors": diff --git a/library.properties b/library.properties index 12a9ed6..82341a8 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=AsyncWebServer_ESP32_ENC -version=1.6.2 +version=1.6.3 author=Hristo Gochkov,Khoi Hoang maintainer=Khoi Hoang license=GPLv3 diff --git a/platformio/platformio.ini b/platformio/platformio.ini index ec74c99..2f4592b 100644 --- a/platformio/platformio.ini +++ b/platformio/platformio.ini @@ -32,6 +32,9 @@ upload_speed = 921600 ; 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 diff --git a/src/AsyncEventSource.cpp b/src/AsyncEventSource.cpp index 5f32dbb..a719976 100644 --- a/src/AsyncEventSource.cpp +++ b/src/AsyncEventSource.cpp @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #include "Arduino.h" diff --git a/src/AsyncEventSource.h b/src/AsyncEventSource.h index 3e8ddac..9d75799 100644 --- a/src/AsyncEventSource.h +++ b/src/AsyncEventSource.h @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #ifndef ASYNCEVENTSOURCE_H_ diff --git a/src/AsyncJson.h b/src/AsyncJson.h index 1b2ae04..bc9255c 100644 --- a/src/AsyncJson.h +++ b/src/AsyncJson.h @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ /* Async Response to use with ArduinoJson and AsyncWebServer diff --git a/src/AsyncWebServer_ESP32_ENC.cpp b/src/AsyncWebServer_ESP32_ENC.cpp index 0f215c6..2439a49 100644 --- a/src/AsyncWebServer_ESP32_ENC.cpp +++ b/src/AsyncWebServer_ESP32_ENC.cpp @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #include "AsyncWebServer_ESP32_ENC.h" diff --git a/src/AsyncWebServer_ESP32_ENC.h b/src/AsyncWebServer_ESP32_ENC.h index 6fa7068..b7718ef 100644 --- a/src/AsyncWebServer_ESP32_ENC.h +++ b/src/AsyncWebServer_ESP32_ENC.h @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #ifndef _AsyncWebServer_ESP32_ENC_H_ @@ -54,21 +55,21 @@ #warning Using code for ESP32 core v2.0.0+ in AsyncWebServer_ESP32_ENC.h #endif - #define ASYNC_WEBSERVER_ESP32_ENC_VERSION "AsyncWebServer_ESP32_ENC v1.6.2 for core v2.0.0+" + #define ASYNC_WEBSERVER_ESP32_ENC_VERSION "AsyncWebServer_ESP32_ENC v1.6.3 for core v2.0.0+" #else #if (_ASYNC_WEBSERVER_LOGLEVEL_ > 2 ) #warning Using code for ESP32 core v1.0.6- in AsyncWebServer_ESP32_ENC.h #endif - #define ASYNC_WEBSERVER_ESP32_ENC_VERSION "AsyncWebServer_ESP32_ENC v1.6.2 for core v1.0.6-" + #define ASYNC_WEBSERVER_ESP32_ENC_VERSION "AsyncWebServer_ESP32_ENC v1.6.3 for core v1.0.6-" #endif #define ASYNC_WEBSERVER_ESP32_ENC_VERSION_MAJOR 1 #define ASYNC_WEBSERVER_ESP32_ENC_VERSION_MINOR 6 -#define ASYNC_WEBSERVER_ESP32_ENC_VERSION_PATCH 2 +#define ASYNC_WEBSERVER_ESP32_ENC_VERSION_PATCH 3 -#define ASYNC_WEBSERVER_ESP32_ENC_VERSION_INT 1006002 +#define ASYNC_WEBSERVER_ESP32_ENC_VERSION_INT 1006003 ///////////////////////////////////////////////// diff --git a/src/AsyncWebServer_ESP32_ENC_Debug.h b/src/AsyncWebServer_ESP32_ENC_Debug.h index b9d888f..a29d214 100644 --- a/src/AsyncWebServer_ESP32_ENC_Debug.h +++ b/src/AsyncWebServer_ESP32_ENC_Debug.h @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #pragma once diff --git a/src/AsyncWebSocket.cpp b/src/AsyncWebSocket.cpp index 98e1353..9706c06 100644 --- a/src/AsyncWebSocket.cpp +++ b/src/AsyncWebSocket.cpp @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #include "Arduino.h" diff --git a/src/AsyncWebSocket.h b/src/AsyncWebSocket.h index 53cff78..051368a 100644 --- a/src/AsyncWebSocket.h +++ b/src/AsyncWebSocket.h @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #ifndef ASYNCWEBSOCKET_H_ diff --git a/src/AsyncWebSynchronization.h b/src/AsyncWebSynchronization.h index a0c5c57..f9e05cc 100644 --- a/src/AsyncWebSynchronization.h +++ b/src/AsyncWebSynchronization.h @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #ifndef ASYNCWEBSYNCHRONIZATION_H_ diff --git a/src/ESP32_ENC_SPIFFSEditor.cpp b/src/ESP32_ENC_SPIFFSEditor.cpp index a8aa04a..bd79365 100644 --- a/src/ESP32_ENC_SPIFFSEditor.cpp +++ b/src/ESP32_ENC_SPIFFSEditor.cpp @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #include "ESP32_ENC_SPIFFSEditor.h" diff --git a/src/ESP32_ENC_SPIFFSEditor.h b/src/ESP32_ENC_SPIFFSEditor.h index 9cd1901..43b98c9 100644 --- a/src/ESP32_ENC_SPIFFSEditor.h +++ b/src/ESP32_ENC_SPIFFSEditor.h @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #ifndef ESP32_ENC_SPIFFSEditor_H_ diff --git a/src/StringArray.h b/src/StringArray.h index e4a206d..9df2122 100644 --- a/src/StringArray.h +++ b/src/StringArray.h @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #ifndef STRINGARRAY_H_ diff --git a/src/WebAuthentication.cpp b/src/WebAuthentication.cpp index d896a47..e9fb087 100644 --- a/src/WebAuthentication.cpp +++ b/src/WebAuthentication.cpp @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #include "WebAuthentication.h" diff --git a/src/WebAuthentication.h b/src/WebAuthentication.h index 6812864..34c8d38 100644 --- a/src/WebAuthentication.h +++ b/src/WebAuthentication.h @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #ifndef WEB_AUTHENTICATION_H_ diff --git a/src/WebHandlerImpl.h b/src/WebHandlerImpl.h index a5e27e0..488aad1 100644 --- a/src/WebHandlerImpl.h +++ b/src/WebHandlerImpl.h @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #ifndef ASYNCWEBSERVERHANDLERIMPL_H_ diff --git a/src/WebHandlers.cpp b/src/WebHandlers.cpp index 0c0120f..0967be9 100644 --- a/src/WebHandlers.cpp +++ b/src/WebHandlers.cpp @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #include "AsyncWebServer_ESP32_ENC.h" diff --git a/src/WebRequest.cpp b/src/WebRequest.cpp index b99b13b..2f3ad9c 100644 --- a/src/WebRequest.cpp +++ b/src/WebRequest.cpp @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ //#include "ESPAsyncWebServer.h" diff --git a/src/WebResponseImpl.h b/src/WebResponseImpl.h index 0d6fafd..8bbacf7 100644 --- a/src/WebResponseImpl.h +++ b/src/WebResponseImpl.h @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #ifndef ASYNCWEBSERVERRESPONSEIMPL_H_ diff --git a/src/WebResponses.cpp b/src/WebResponses.cpp index 64b13ee..dc4fc33 100644 --- a/src/WebResponses.cpp +++ b/src/WebResponses.cpp @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #include "AsyncWebServer_ESP32_ENC.h" diff --git a/src/WebServer.cpp b/src/WebServer.cpp index caf4ea5..112847b 100644 --- a/src/WebServer.cpp +++ b/src/WebServer.cpp @@ -22,11 +22,12 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Version: 1.6.2 + Version: 1.6.3 Version Modified By Date Comments ------- ----------- ---------- ----------- 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 + 1.6.3 K Hoang 05/12/2022 Add Async_WebSocketsServer, MQTT examples *****************************************************************************************************************************/ #include "AsyncWebServer_ESP32_ENC.h" diff --git a/src/enc28j60/esp32_enc28j60.cpp b/src/enc28j60/esp32_enc28j60.cpp index 1954e64..348f294 100644 --- a/src/enc28j60/esp32_enc28j60.cpp +++ b/src/enc28j60/esp32_enc28j60.cpp @@ -8,25 +8,6 @@ Based on and modified from ESPAsyncWebServer (https://github.com/me-no-dev/ESPAsyncWebServer) Built by Khoi Hoang https://github.com/khoih-prog/AsyncWebServer_ESP32_ENC Licensed under GPLv3 license - - Original author: Hristo Gochkov - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - - This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License along with this library; - if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Version: 1.6.2 - - Version Modified By Date Comments - ------- ----------- ---------- ----------- - 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 *****************************************************************************************************************************/ /* Based on ETH.h from arduino-esp32 and esp-idf diff --git a/src/enc28j60/esp32_enc28j60.h b/src/enc28j60/esp32_enc28j60.h index 1d62d16..11a30aa 100644 --- a/src/enc28j60/esp32_enc28j60.h +++ b/src/enc28j60/esp32_enc28j60.h @@ -8,26 +8,8 @@ Based on and modified from ESPAsyncWebServer (https://github.com/me-no-dev/ESPAsyncWebServer) Built by Khoi Hoang https://github.com/khoih-prog/AsyncWebServer_ESP32_ENC Licensed under GPLv3 license - - Original author: Hristo Gochkov - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - - This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License along with this library; - if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Version: 1.6.2 - - Version Modified By Date Comments - ------- ----------- ---------- ----------- - 1.6.2 K Hoang 27/11/2022 Initial porting for ENC28J60 + ESP32. Sync with AsyncWebServer_WT32_ETH01 v1.6.2 *****************************************************************************************************************************/ + /* esp32_enc28j60.h - ETH PHY support for ENC28J60 Based on ETH.h from arduino-esp32 and esp-idf diff --git a/src/enc28j60/extmod/enc28j60.h b/src/enc28j60/extmod/enc28j60.h index a696484..d36cc47 100644 --- a/src/enc28j60/extmod/enc28j60.h +++ b/src/enc28j60/extmod/enc28j60.h @@ -1,3 +1,15 @@ +/**************************************************************************************************************************** + enc28j60.h + + For ENC28J60 Ethernet in ESP32 (ESP32 + ENC28J60) + + AsyncWebServer_ESP32_ENC is a library for the Ethernet ENC28J60 in ESSP32 to run AsyncWebServer + + Based on and modified from ESPAsyncWebServer (https://github.com/me-no-dev/ESPAsyncWebServer) + Built by Khoi Hoang https://github.com/khoih-prog/AsyncWebServer_ESP32_ENC + Licensed under GPLv3 license + *****************************************************************************************************************************/ + // Copyright 2019 Espressif Systems (Shanghai) PTE LTD // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/enc28j60/extmod/esp_eth_enc28j60.h b/src/enc28j60/extmod/esp_eth_enc28j60.h index 37a3c56..63d91b1 100644 --- a/src/enc28j60/extmod/esp_eth_enc28j60.h +++ b/src/enc28j60/extmod/esp_eth_enc28j60.h @@ -1,3 +1,15 @@ +/**************************************************************************************************************************** + esp_eth_enc28j60.h + + For ENC28J60 Ethernet in ESP32 (ESP32 + ENC28J60) + + AsyncWebServer_ESP32_ENC is a library for the Ethernet ENC28J60 in ESSP32 to run AsyncWebServer + + Based on and modified from ESPAsyncWebServer (https://github.com/me-no-dev/ESPAsyncWebServer) + Built by Khoi Hoang https://github.com/khoih-prog/AsyncWebServer_ESP32_ENC + Licensed under GPLv3 license + *****************************************************************************************************************************/ + // Copyright 2021 Espressif Systems (Shanghai) PTE LTD // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/enc28j60/extmod/esp_eth_mac_enc28j60.c b/src/enc28j60/extmod/esp_eth_mac_enc28j60.c index 8f83d4b..901f1e1 100644 --- a/src/enc28j60/extmod/esp_eth_mac_enc28j60.c +++ b/src/enc28j60/extmod/esp_eth_mac_enc28j60.c @@ -1,3 +1,15 @@ +/**************************************************************************************************************************** + esp_eth_mac_enc28j60.c + + For ENC28J60 Ethernet in ESP32 (ESP32 + ENC28J60) + + AsyncWebServer_ESP32_ENC is a library for the Ethernet ENC28J60 in ESSP32 to run AsyncWebServer + + Based on and modified from ESPAsyncWebServer (https://github.com/me-no-dev/ESPAsyncWebServer) + Built by Khoi Hoang https://github.com/khoih-prog/AsyncWebServer_ESP32_ENC + Licensed under GPLv3 license + *****************************************************************************************************************************/ + // Copyright 2019 Espressif Systems (Shanghai) PTE LTD // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/enc28j60/extmod/esp_eth_phy_enc28j60.c b/src/enc28j60/extmod/esp_eth_phy_enc28j60.c index 6d6402f..03f13aa 100644 --- a/src/enc28j60/extmod/esp_eth_phy_enc28j60.c +++ b/src/enc28j60/extmod/esp_eth_phy_enc28j60.c @@ -1,3 +1,15 @@ +/**************************************************************************************************************************** + esp_eth_phy_enc28j60.c + + For ENC28J60 Ethernet in ESP32 (ESP32 + ENC28J60) + + AsyncWebServer_ESP32_ENC is a library for the Ethernet ENC28J60 in ESSP32 to run AsyncWebServer + + Based on and modified from ESPAsyncWebServer (https://github.com/me-no-dev/ESPAsyncWebServer) + Built by Khoi Hoang https://github.com/khoih-prog/AsyncWebServer_ESP32_ENC + Licensed under GPLv3 license + *****************************************************************************************************************************/ + // Copyright 2019 Espressif Systems (Shanghai) PTE LTD // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/enc28j60/extmod/esp_eth_spi_enc28j60.c b/src/enc28j60/extmod/esp_eth_spi_enc28j60.c index 7f208f1..9625ece 100644 --- a/src/enc28j60/extmod/esp_eth_spi_enc28j60.c +++ b/src/enc28j60/extmod/esp_eth_spi_enc28j60.c @@ -1,3 +1,20 @@ +/**************************************************************************************************************************** + esp_eth_spi_enc28j60.c + + For ENC28J60 Ethernet in ESP32 (ESP32 + ENC28J60) + + AsyncWebServer_ESP32_ENC is a library for the Ethernet ENC28J60 in ESSP32 to run AsyncWebServer + + Based on and modified from ESPAsyncWebServer (https://github.com/me-no-dev/ESPAsyncWebServer) + Built by Khoi Hoang https://github.com/khoih-prog/AsyncWebServer_ESP32_ENC + Licensed under GPLv3 license + *****************************************************************************************************************************/ + +/* + esp_eth_spi_enc28j60.c - ETH PHY support for ENC28J60 + Based on ETH.h from arduino-esp32 and esp-idf + and Tobozo ESP32-ENC28J60 library +*/ #include #include