v1.4.0 to use Ethernet_Generic library

### Releases v1.4.0

1. Use new [Ethernet_Generic library](https://github.com/khoih-prog/Ethernet_Generic) as default for W5x00.
2. Rewrite all the examples to support new features
3. Add example [multiFileProject](examples/multiFileProject) to demo how to avoid `multiple-definitions` linker error for multiple-file project

Author: khoih-prog

CONTRIBUTING.md

@@ -29,7 +29,7 @@ Please ensure to specify the following:
 Arduino IDE version: 1.8.19
 STM32F7 Nucleo-144 NUCLEO_F767ZI, STM32 core v2.2.0
 OS: Ubuntu 20.04 LTS
-Linux xy-Inspiron-3593 5.4.0-100-generic #113-Ubuntu SMP Thu Feb 3 18:43:29 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
+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
 
 Context:
 I encountered a crash while trying to use the Timer Interrupt.
@@ -49,3 +49,4 @@ There are usually some outstanding feature requests in the [existing issues list
 ### Sending Pull Requests
 
 Pull Requests with changes and fixes are also welcome!
+

README.md

@@ -12,6 +12,7 @@
 ## Table of Contents
 
 * [Changelog](#changelog)
+  * [Releases v1.4.0](#releases-v140)
   * [Releases v1.3.4](#releases-v134)
   * [Releases v1.3.3](#releases-v133)
   * [Releases v1.3.2](#releases-v132)
@@ -33,6 +34,12 @@
 
 ## Changelog
 
+### Releases v1.4.0
+
+1. Use new [Ethernet_Generic library](https://github.com/khoih-prog/Ethernet_Generic) as default for W5x00.
+2. Rewrite all the examples to support new features
+3. Add example [multiFileProject](examples/multiFileProject) to demo how to avoid `multiple-definitions` linker error for multiple-file project
+
 ### Releases v1.3.4
 
 1. Fix decoding error bug when using special `&` in data fields. Check [Decoding Error. two times called urlDecode in Parsing-impl.h. #17](https://github.com/khoih-prog/WiFiWebServer/issues/17)

changelog.md

@@ -1,8 +1,8 @@
 {
   "name": "EthernetWebServer_STM32",
-  "version": "1.3.4",
+  "version": "1.4.0",
   "keywords": "WebServer, built-in-Ethernet, STM32F, STM32L, STM32H, STM32G, STM32WB, STM32MP1, Ethernet-shield, Nucleo-144, Nucleo-64, Nucleo-32, LAN8742A, LAN8720, ENC28J60, W5x00, W5500, W5100, Ethernet, Ethernet2, Ethernet3, EthernetLarge, EtnernetENC, UIPEthernet, HTTP-Client, WebSocket-Client, server, client, websocket",
-  "description": "Simple Ethernet WebServer, HTTP Client and WebSocket Client library for STM32F/L/H/G/WB/MP1 boards running built-in Ethernet LAN8742A, LAN8720 or Ethernet W5x00, ENC28J60 shields",
+  "description": "Simple Ethernet WebServer, HTTP Client and WebSocket Client library for STM32F/L/H/G/WB/MP1 boards running built-in Ethernet LAN8742A, LAN8720 or Ethernet W5x00, ENC28J60 shields.  Ethernet_Generic library is used as default for W5x00",
   "authors":
   {
     "name":  "Khoi Hoang",
@@ -40,10 +40,15 @@
       "owner": "khoih-prog",
       "name": "Functional-Vlpp",
       "version": "^1.0.2"
+    },
+    {
+      "owner": "khoih-prog",
+      "name": "Ethernet_Generic",
+      "version": "^2.0.0"
     }
   ],
   "frameworks": "arduino",
   "platforms": "ststm32",
   "examples": "examples/*/*/*.ino",
-  "headers": ["EthernetWebServer_STM32.h", "EthernetHttpClient_STM32.h"]
+  "headers": ["EthernetWebServer_STM32.h", "EthernetWebServer_STM32.hpp", "EthernetHttpClient_STM32.h"]
 }

library.json

@@ -1,12 +1,12 @@
 name=EthernetWebServer_STM32
-version=1.3.4
+version=1.4.0
 author=Khoi Hoang
 license=MIT
 maintainer=Khoi Hoang <khoih.prog@gmail.com>
 sentence=EthernetWebServer_STM32 is a simple Ethernet WebServer, HTTP Client and WebSocket Client library for STM32F/L/H/G/WB/MP1 boards using built-in Ethernet LAN8742A, LAN8720, Ethernet W5x00 or ENC28J60 shields
-paragraph=The library supports HTTP GET and POST requests, provides argument parsing, handles one client at a time. It now provides HTTP Client and WebSocket Client. It supports Arduino STM32F/L/H/G/WB/MP1 series with 32+ Kbytes of Flash, using built-in Ethernet (Nucleo-144: F429ZI, F767ZI, Discovery: STM32F746G-DISCOVERY), or LAN8720, ENC28J60, W5x00 Ethernet shields.
+paragraph=The library supports HTTP GET and POST requests, provides argument parsing, handles one client at a time. It now provides HTTP Client and WebSocket Client. It supports Arduino STM32F/L/H/G/WB/MP1 series with 32+ Kbytes of Flash, using built-in Ethernet (Nucleo-144: F429ZI, F767ZI, Discovery: STM32F746G-DISCOVERY), or LAN8720, ENC28J60, W5x00 Ethernet shields. Ethernet_Generic library is used as default for W5x00
 category=Communication
 url=https://github.com/khoih-prog/EthernetWebServer_STM32
 architectures=stm32
-depends=STM32duino LwIP,STM32duino STM32Ethernet,Functional-Vlpp
-includes=EthernetWebServer_STM32.h,EthernetHttpClient_STM32.h
+depends=STM32duino LwIP, STM32duino STM32Ethernet, Functional-Vlpp, Ethernet_Generic
+includes=EthernetWebServer_STM32.h, EthernetWebServer_STM32.hpp, EthernetHttpClient_STM32.h

library.properties

@@ -31,25 +31,27 @@ lib_compat_mode = strict
 
 lib_deps =
 ; PlatformIO 4.x
-  STM32duino LwIP@~2.1.2
-  STM32duino STM32Ethernet@~1.2.0
-  Functional-Vlpp@~1.0.2
-  UIPEthernet@~2.0.9
-  Ethernet@~2.0.0
-  EthernetLarge@~2.0.0
-  Ethernet2@~1.0.4
-  Ethernet3@~1.5.5
+;  STM32duino LwIP@~2.1.2
+;  STM32duino STM32Ethernet@~1.2.0
+;  Functional-Vlpp@~1.0.2
+;  UIPEthernet@~2.0.9
+;  Ethernet_Generic>=2.0.0
+;  Ethernet@~2.0.0
+;  EthernetLarge@~2.0.0
+;  Ethernet2@~1.0.4
+;  Ethernet3@~1.5.5
   EthernetENC@~2.0.2
 ; PlatformIO 5.x  
-;  stm32duino/STM32duino LwIP@~2.1.2
-;  stm32duino/STM32duino STM32Ethernet@~1.2.0
-;  khoih-prog/Functional-Vlpp@~1.0.2
-;  UIPEthernet/UIPEthernet@~2.0.9
+  stm32duino/STM32duino LwIP@~2.1.2
+  stm32duino/STM32duino STM32Ethernet@~1.2.0
+  khoih-prog/Functional-Vlpp@~1.0.2
+  khoih-prog/Ethernet_Generic@~2.0.0
+  UIPEthernet/UIPEthernet@~2.0.9
 ;  PaulStoffregen/Ethernet@~2.0.0
 ;  PaulStoffregen/EthernetLarge@~2.0.0
 ;  adafruit/Ethernet2@~1.0.4
 ;  sstaub/Ethernet3@~1.5.5
-;  jandrassy/EthernetENC@~2.0.2
+  jandrassy/EthernetENC@~2.0.2
 
 build_flags =
 ; set your build_flags

platformio/platformio.ini

@@ -1,5 +1,5 @@
 /****************************************************************************************************************************
-  EthernetHttpClient.h - Dead simple HTTP WebClient.
+  EthernetHttpClient_STM32.h - Dead simple HTTP WebClient.
   For STM32 with built-in Ethernet LAN8742A (Nucleo-144, DISCOVERY, etc) or W5x00/ENC28J60 shield/module
 
   EthernetWebServer_STM32 is a library for the STM32 running Ethernet WebServer
@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.3.4
+  Version: 1.4.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -23,6 +23,7 @@
   1.3.2   K Hoang      28/12/2021 Fix wrong http status header bug and authenticate issue caused by libb64
   1.3.3   K Hoang      11/01/2022 Fix libb64 fallthrough compile warning
   1.3.4   K Hoang      02/03/2022 Fix decoding error bug
+  1.4.0   K Hoang      04/04/2022 Use Ethernet_Generic library as default for W5x00 Ethernet.
  *************************************************************************************************************************************/
 
 // Library to simplify HTTP fetching on Arduino
@@ -31,10 +32,15 @@
 
 #pragma once
 
+#ifndef ETHERNET_HTTP_CLIENT_STM32_H
+#define ETHERNET_HTTP_CLIENT_STM32_H
+
 #include <Arduino.h>
 
 #include "detail/Debug_STM32.h"
 #include "Ethernet_HTTPClient/Ethernet_HttpClient.h"
 #include "Ethernet_HTTPClient/Ethernet_WebSocketClient.h"
 #include "Ethernet_HTTPClient/Ethernet_URLEncoder.h"
 
+#endif		// ETHERNET_HTTP_CLIENT_STM32_H
+

src/EthernetHttpClient_STM32.h

@@ -1,5 +1,5 @@
 /****************************************************************************************************************************
-  EthernetWebServer-impl.h - Dead simple web-server.
+  EthernetWebServer_STM32-impl.h - Dead simple web-server.
   For STM32 with built-in Ethernet LAN8742A (Nucleo-144, DISCOVERY, etc) or W5x00/ENC28J60 shield/module
 
   EthernetWebServer_STM32 is a library for the STM32 running Ethernet WebServer
@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.3.4
+  Version: 1.4.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -23,13 +23,17 @@
   1.3.2   K Hoang      28/12/2021 Fix wrong http status header bug and authenticate issue caused by libb64
   1.3.3   K Hoang      11/01/2022 Fix libb64 fallthrough compile warning
   1.3.4   K Hoang      02/03/2022 Fix decoding error bug
+  1.4.0   K Hoang      04/04/2022 Use Ethernet_Generic library as default for W5x00 Ethernet.
  *************************************************************************************************************************************/
 
 #pragma once
 
+#ifndef ETHERNET_WEBSERVER_STM32_IMPL_H
+#define ETHERNET_WEBSERVER_STM32_IMPL_H
+
 #include <Arduino.h>
 #include <libb64/cencode.h>
-#include "EthernetWebServer_STM32.h"
+#include "EthernetWebServer_STM32.hpp"
 #include "detail/RequestHandlersImpl_STM32.h"
 #include "detail/Debug_STM32.h"
 #include "detail/mimetable.h"
@@ -38,6 +42,30 @@ const char * AUTHORIZATION_HEADER = "Authorization";
 
 // New to use EWString
 
+/////////////////////////////////////////////////////////////////////////
+
+EWString fromString(const String& str)
+{
+  return str.c_str();
+}
+
+EWString fromString(const String&& str)
+{
+  return str.c_str();
+}
+
+String fromEWString(const EWString& str)
+{
+  return str.c_str();
+}
+
+String fromEWString(const EWString&& str)
+{
+  return str.c_str();
+}
+
+/////////////////////////////////////////////////////////////////////////
+
 EthernetWebServer::EthernetWebServer(int port)
   : _server(port)
   , _currentMethod(HTTP_ANY)
@@ -931,3 +959,4 @@ String EthernetWebServer::_responseCodeToString(int code)
   }
 }
 
+#endif		// ETHERNET_WEBSERVER_STM32_IMPL_H