v1.0.1 to use Ethernet_Generic library, etc.

khoih-prog · web-flow · commit b758489d5589 · 2022-04-12T01:42:05.000-04:00
### Releases v1.0.1 1. Use new [Ethernet_Generic library](https://github.com/khoih-prog/Ethernet_Generic) as default for W5x00. 2. Add support to SPI1 for RP2040 using [arduino-pico core](https://github.com/earlephilhower/arduino-pico) 3. Rewrite all the examples to support new features 4. Use new `waitForLink()` function of QNEthernet 5. Update `Packages' Patches`
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ Please ensure to specify the following:
 Arduino IDE version: 1.8.19
 ESP32 Core Version 2.0.2
 OS: Ubuntu 20.04 LTS
-Linux xy-Inspiron-3593 5.13.0-37-generic #42~20.04.1-Ubuntu SMP Tue Mar 15 15:44:28 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 an endless loop while trying to connect to Local WiFi.
diff --git a/README.md b/README.md
diff --git a/changelog.md b/changelog.md
@@ -11,13 +11,24 @@
 ## Table of Contents
 
 * [Changelog](#changelog)
+  * [Releases v1.0.1](#releases-v101)
   * [Initial Releases v1.0.0](#Initial-Releases-v100)
 
 ---
 ---
 
 ## Changelog
 
+### Releases v1.0.1
+
+1. Use new [Ethernet_Generic library](https://github.com/khoih-prog/Ethernet_Generic) as default for W5x00.
+2. Add support to SPI1 for RP2040 using [arduino-pico core](https://github.com/earlephilhower/arduino-pico)
+3. Rewrite all the examples to support new features
+4. Use new `waitForLink()` function of QNEthernet
+5. Update `Packages' Patches`
+
 ### Initial Releases v1.0.0
 
 1. Initial porting and coding to support nRF52, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, Teensy, RP2040-based boards, besides ESP8266, ESP32 (ESP32, ESP32_S2, ESP32_S3 and ESP32_C3) and WT32_ETH01. Spporting Ethernet shields W5100, W5200, W5500, ENC28J60, Teensy 4.1 NativeEthernet/QNEthernet.
+
+
diff --git a/library.json b/library.json
@@ -1,7 +1,7 @@
 {
   "name": "MQTTPubSubClient_Generic",
-  "version": "1.0.0",
-  "description": "MQTT and MQTT over WebSoket Client for Arduino. Now supporting nRF52, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, Teensy, SAM DUE, RP2040-based boards, besides ESP8266, ESP32 (ESP32, ESP32_S2, ESP32_S3 and ESP32_C3) and WT32_ETH01. Ethernet shields W5100, W5200, W5500, ENC28J60, Teensy 4.1 NativeEthernet/QNEthernet.",
+  "version": "1.0.1",
+  "description": "MQTT and MQTT over WebSoket Client for Arduino. Now supporting nRF52, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, Teensy, SAM DUE, RP2040-based boards, besides ESP8266, ESP32 (ESP32, ESP32_S2, ESP32_S3 and ESP32_C3) and WT32_ETH01. Ethernet shields W5100, W5200, W5500, ENC28J60, Teensy 4.1 NativeEthernet/QNEthernet. Ethernet_Generic library is used as default for W5x00",
   "keywords": "mqtt, websocket, wifi, ethernet, tcp",
   "authors": 
   [
@@ -40,13 +40,13 @@
     {
       "owner": "khoih-prog",
       "name": "WiFiWebServer",
-      "version": ">=1.6.1",
+      "version": ">=1.7.0",
       "platforms": ["*"]
     },
     {
       "owner": "khoih-prog",
       "name": "EthernetWebServer",
-      "version": ">=2.0.0",
+      "version": ">=2.1.2",
       "platforms": ["*"]
     },
     {
@@ -92,28 +92,9 @@
       "platforms": ["*"]
     },
     {
-      "owner": "adafruit",
-      "name": "Ethernet2",
-      "version": ">=1.0.4",
-      "platforms": ["*"]
-    },
-    {
-      "owner": "sstaub",
-      "name": "Ethernet3",
-      "version": ">=1.5.5",
-      "platforms": ["*"]
-    },
-    {
-      "owner": "arduino-libraries",
-      "name": "Ethernet",
-      "version": ">=2.0.0",
-      "platforms": ["*"]
-    },
-    {
-      "owner": "openslab-osu",
-      "name": "EthernetLarge",
-      "version": ">=2.0.0",
-      "platforms": ["*"]
+      "owner": "khoih-prog",
+      "name": "Ethernet_Generic",
+      "version": "^2.0.1"
     },
     {
       "name": "WiFi101",
@@ -122,7 +103,7 @@
     {
       "owner": "ssilverman",
       "name": "QNEthernet",
-      "version": ">=0.13.0",
+      "version": ">=0.14.0",
       "platforms": ["teensy"]
     }
   ],
diff --git a/library.properties b/library.properties
@@ -1,11 +1,11 @@
 name=MQTTPubSubClient_Generic
-version=1.0.0
+version=1.0.1
 author=hideakitai, Khoi Hoang <khoih.prog@gmail.com>
 maintainer=Khoi Hoang <khoih.prog@gmail.com>
 sentence=MQTT and MQTT over WebSoket Client for Arduino
-paragraph=Now supporting nRF52, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, Teensy, SAM DUE, RP2040-based boards, besides ESP8266, ESP32 (ESP32, ESP32_S2, ESP32_S3 and ESP32_C3) and WT32_ETH01. Ethernet shields W5100, W5200, W5500, ENC28J60, Teensy 4.1 NativeEthernet/QNEthernet.
+paragraph=Now supporting nRF52, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, Teensy, SAM DUE, RP2040-based boards, besides ESP8266, ESP32 (ESP32, ESP32_S2, ESP32_S3 and ESP32_C3) and WT32_ETH01. Ethernet shields W5100, W5200, W5500, ENC28J60, Teensy 4.1 NativeEthernet/QNEthernet. Ethernet_Generic library is used as default for W5x00
 category=Communication
 url=https://github.com/khoih-prog/MQTTPubSubClient_Generic
 architectures=*
-depends=WiFiNINA_Generic, WiFiWebServer, EthernetWebServer, WebServer_WT32_ETH01, EthernetWebServer_STM32
+depends=WiFiNINA_Generic, WiFiWebServer, EthernetWebServer, Ethernet_Generic, WebServer_WT32_ETH01, EthernetWebServer_STM32
 includes=MQTTPubSubClient_Generic.h
diff --git a/platformio/platformio.ini b/platformio/platformio.ini
@@ -43,37 +43,32 @@ lib_compat_mode = strict
 
 lib_deps =  
 ; PlatformIO 4.x
-  WiFiNINA_Generic@~1.8.14-3
-  WiFiWebServer@~1.6.1
-  EthernetWebServer@~2.0.0
-  WebServer_WT32_ETH01@~1.4.1
-  EthernetWebServer_STM32@>=1.3.3
-  Ethernet@~2.0.0
-  EthernetLarge@~2.0.0
-  Ethernet2@~1.0.4
-  Ethernet3@~1.5.5
-  EthernetENC@~2.0.2
-  UIPEthernet@~2.0.8
-  STM32duino LwIP@>=2.1.2
-  STM32duino STM32Ethernet@>=1.2.0
-  QNEthernet@~0.13.0
-  https://github.com/khoih-prog/WiFi101
+;  WiFiNINA_Generic@~1.8.14-3
+;  WiFiWebServer@~1.7.0
+;  EthernetWebServer@~2.1.2
+;  WebServer_WT32_ETH01@~1.4.1
+;  EthernetWebServer_STM32@>=1.4.0
+;  Ethernet_Generic@>=2.0.1
+;  EthernetENC@~2.0.2
+;  UIPEthernet@~2.0.11
+;  STM32duino LwIP@>=2.1.2
+;  STM32duino STM32Ethernet@>=1.2.0
+;  QNEthernet@~0.14.0
+;  https://github.com/khoih-prog/WiFi101
+  
 ; PlatformIO 5.x
-; khoih-prog/WiFiNINA_Generic@~1.8.14-3
-; khoih-prog/WiFiWebServer@~1.6.1
-; khoih-prog/EthernetWebServer@~2.0.0
-; khoih-prog/WebServer_WT32_ETH01@~1.4.1
-; khoih-prog/EthernetWebServer_STM32@>=1.3.3
-; 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
-; UIPEthernet/UIPEthernet@~2.0.8
-; stm32duino/STM32duino LwIP@>=2.1.2
-; stm32duino/STM32duino STM32Ethernet@>=1.2.0
-; ssilverman/QNEthernet@~0.13.0
-; https://github.com/khoih-prog/WiFi101
+ khoih-prog/WiFiNINA_Generic@~1.8.14-3
+ khoih-prog/WiFiWebServer@~1.7.0
+ khoih-prog/EthernetWebServer@~2.1.2
+ khoih-prog/WebServer_WT32_ETH01@~1.4.1
+ khoih-prog/EthernetWebServer_STM32@>=1.4.0
+ khoih-prog/Ethernet_Generic@~2.0.1
+ jandrassy/EthernetENC@~2.0.2
+ uipethernet/UIPEthernet@~2.0.11
+ stm32duino/STM32duino LwIP@>=2.1.2
+ stm32duino/STM32duino STM32Ethernet@>=1.2.0
+ ssilverman/QNEthernet@~0.14.0
+ https://github.com/khoih-prog/WiFi101
   
 build_flags =
 ; set your debug output (default=Serial)
diff --git a/src/MQTTPubSubClient_Generic.h b/src/MQTTPubSubClient_Generic.h
@@ -13,25 +13,26 @@
   Built by Khoi Hoang https://github.com/khoih-prog/MQTTPubSubClient_Generic
   Licensed under MIT license
   
-  Version: 1.0.0
+  Version: 1.0.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
   1.0.0    K Hoang     23/03/2022 Initial porting and coding to add support to many boards, using Ethernet or WiFi
+  1.0.0    K Hoang     11/04/2022 Use Ethernet_Generic library as default. Support SPI1/SPI2 for RP2040/ESP32
  *****************************************************************************************************************************/
 
 #pragma once
 
 #ifndef MQTT_PUBSUB_CLIENT_GENERIC_H
 #define MQTT_PUBSUB_CLIENT_GENERIC_H
 
-#define MQTT_PUBSUB_CLIENT_GENERIC_VERSION            "MQTTPubSubClient_Generic v1.0.0"
+#define MQTT_PUBSUB_CLIENT_GENERIC_VERSION            "MQTTPubSubClient_Generic v1.0.1"
 
 #define MQTT_PUBSUB_CLIENT_GENERIC_VERSION_MAJOR      1
 #define MQTT_PUBSUB_CLIENT_GENERIC_VERSION_MINOR      0
-#define MQTT_PUBSUB_CLIENT_GENERIC_VERSION_PATCH      0
+#define MQTT_PUBSUB_CLIENT_GENERIC_VERSION_PATCH      1
 
-#define MQTT_PUBSUB_CLIENT_GENERIC_VERSION_INT        1000000
+#define MQTT_PUBSUB_CLIENT_GENERIC_VERSION_INT        1000001
 
 #include <Arduino.h>
 #include <Client.h>
diff --git a/src/MQTTPubSubClient_Generic_Debug.h b/src/MQTTPubSubClient_Generic_Debug.h
@@ -13,11 +13,12 @@
   Built by Khoi Hoang https://github.com/khoih-prog/MQTTPubSubClient_Generic
   Licensed under MIT license
   
-  Version: 1.0.0
+  Version: 1.0.1
   
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
   1.0.0    K Hoang     23/03/2022 Initial porting and coding to add support to many boards, using Ethernet or WiFi
+  1.0.0    K Hoang     11/04/2022 Use Ethernet_Generic library as default. Support SPI1/SPI2 for RP2040/ESP32
  *****************************************************************************************************************************/
 
 #pragma once
