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

Commit

Permalink
v3.4.2 to auto-detect ESP32 core version
Browse files Browse the repository at this point in the history
### Releases v3.4.2

1. Auto detect ESP32 core version. Fix bug in examples for WT32_ETH01
  • Loading branch information
khoih-prog authored Dec 1, 2021
1 parent 902bcdb commit f9b5fc8
Show file tree
Hide file tree
Showing 14 changed files with 91 additions and 79 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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.16) or Platform.io version
* Board Core Version (e.g. Arduino SAMDUE core v1.6.12, ESP8266 core v3.0.2, ArduinoCore-mbed v2.5.2, etc.)
* Board Core Version (e.g. Arduino SAMDUE core v1.6.12, ESP8266 core v3.0.2, ArduinoCore-mbed v2.6.1, etc.)
* 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:
Expand All @@ -28,9 +28,9 @@ Please ensure to specify the following:
```
Arduino IDE version: 1.8.16
RASPBERRY_PI_PICO board
ArduinoCore-mbed v2.5.2
ArduinoCore-mbed v2.6.1
OS: Ubuntu 20.04 LTS
Linux xy-Inspiron-3593 5.4.0-88-generic #99-Ubuntu SMP Thu Sep 23 17:29:00 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
Linux xy-Inspiron-3593 5.4.0-91-generic #102-Ubuntu SMP Fri Nov 5 16:31:28 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
Context:
I encountered a crash while trying to use the Timer Interrupt.
Expand Down
98 changes: 49 additions & 49 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 @@ -12,6 +12,7 @@
## Table of Contents

* [Changelog](#changelog)
* [Releases v3.4.2](#releases-v342)
* [Releases v3.4.1](#releases-v341)
* [Major Releases v3.4.0](#major-releases-v340)
* [Major Releases v3.3.0](#major-releases-v330)
Expand All @@ -24,6 +25,10 @@
## Changelog

### Releases v3.4.2

1. Auto detect ESP32 core version. Fix bug in examples for WT32_ETH01

### Releases v3.4.1

1. Update `platform.ini` and `library.json` to use original `khoih-prog` instead of `khoih.prog` after PIO fix
Expand Down
3 changes: 1 addition & 2 deletions examples/ESP/SimpleServer_ESP8266/SimpleServer_ESP8266.ino
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,7 @@ void setup(void)
For DDNS Providers where you get username and password: ( Leave the password field empty "" if not required )
DDNSGeneric.client("domain", "username", "password");
*/
//DDNSGeneric.client("account.duckdns.org", "12345678-1234-1234-1234-123456789012");
DDNSGeneric.client("khoih.duckdns.org", "59f1e2ed-ab09-4089-875a-8357e2705392");
DDNSGeneric.client("account.duckdns.org", "12345678-1234-1234-1234-123456789012");

DDNSGeneric.onUpdate(onUpdateCallback);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@ void setup(void)

showLED();

// To be called before ETH.begin()
WT32_ETH01_onEvent();

//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
Expand All @@ -211,8 +214,6 @@ void setup(void)
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
ETH.config(myIP, myGW, mySN, myDNS);

WT32_ETH01_onEvent();

WT32_ETH01_waitForConnect();

IPAddress localIP = ETH.localIP();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************************************************************
SimpleServerEsp32.ino
SimpleServer_WT32_ETH01.ino
For all Generic boards such as ESP8266, ESP32, WT32_ETH01, SAMD21/SAMD51, nRF52, STM32F/L/H/G/WB/MP1,Teensy, Portenta_H7
with WiFiNINA, ESP8266/ESP32 WiFi, ESP8266/ESP32-AT, W5x00, ENC28J60, Native-Ethernet, Portenta Ethernet/WiFi
Expand Down Expand Up @@ -141,6 +141,9 @@ void setup(void)
Serial.println(DDNS_GENERIC_VERSION);
Serial.println(UPNP_GENERIC_VERSION);

// To be called before ETH.begin()
WT32_ETH01_onEvent();

//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
Expand All @@ -150,8 +153,6 @@ void setup(void)
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
ETH.config(myIP, myGW, mySN, myDNS);

WT32_ETH01_onEvent();

WT32_ETH01_waitForConnect();

IPAddress localIP = ETH.localIP();
Expand Down
15 changes: 8 additions & 7 deletions library.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "UPnP_Generic",
"version": "3.4.1",
"version": "3.4.2",
"description": "Automatically add port mappings to router using UPnP SSDP for Arduino boards, running on nRF52, SAMD21/SAMD51, STM32F/L/H/G/WB/MP1, Teensy, RP2040-based, WT32_ETH01 boards, Portenta_H7, etc. besides ESP8266/ESP32, using ESP WiFi, WiFiNINA, Ethernet W5x00, LAN8720, ESP8266/ESP32 AT-command WiFi",
"keywords": "uPnP, SSDP, router, port-mappings, port-forwarding, mbed, wifi, ethernet, wifinina, w5x00, communication, esp32, esp8266, samd, nrf52, stm32, nano-rp2040-connect, rp2040, wt32-eth01, Portenta-H7, rpi-pico, nano-33-iot",
"authors":
Expand Down Expand Up @@ -29,7 +29,7 @@
{
"owner": "khoih-prog",
"name": "WiFiNINA_Generic",
"version": ">=1.8.13",
"version": ">=1.8.14-1",
"platforms": ["*"]
},
{
Expand All @@ -47,13 +47,13 @@
{
"owner": "khoih-prog",
"name": "WebServer_WT32_ETH01",
"version": ">=1.2.0",
"version": ">=1.4.1",
"platforms": ["espressif32"]
},
{
"owner": "khoih-prog",
"name": "WiFiWebServer",
"version": ">=1.4.1",
"version": ">=1.4.2",
"platforms": ["*"]
},
{
Expand All @@ -65,12 +65,13 @@
{
"owner": "khoih-prog",
"name": "DDNS_Generic",
"version": ">=1.5.1",
"version": ">=1.6.1",
"platforms": ["*"]
}
],
"frameworks": "*",
"platforms": "*",
"platforms": "*",
"license": "GPL-3.0-or-later",
"examples": "examples/*/*/*.ino",
"license": "GPL-3.0-or-later"
"headers": ["UPnP_Generic.h"]
}
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=UPnP_Generic
version=3.4.1
version=3.4.2
author=Ofek Pearl, Khoi Hoang
license=GPLv3
maintainer=Khoi Hoang <[email protected]>
Expand Down
12 changes: 6 additions & 6 deletions platformio/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,25 @@ lib_compat_mode = strict

lib_deps =
; PlatformIO 4.x
WiFiNINA_Generic@>=1.8.13
WiFiNINA_Generic@>=1.8.14-1
WiFiWebServer@>=1.4.2
EthernetWebServer@>1.7.1
EthernetWebServer_STM32@>=1.2.1
WebServer_WT32_ETH01@>=1.2.0
WebServer_WT32_ETH01@>=1.4.1
ESP8266_AT_WebServer@>=1.4.0
DDNS_Generic@>=1.5.1
DDNS_Generic@>=1.6.1
Ethernet@>=2.0.0
EthernetLarge@>=2.0.0
Ethernet2@>=1.0.4
Ethernet3@>=1.5.5
; PlatformIO 5.x
; khoih-prog/WiFiNINA_Generic@>=1.8.13
; khoih-prog/WiFiNINA_Generic@>=1.8.14-1
; khoih-prog/WiFiWebServer@>=1.4.2
; khoih-prog/EthernetWebServer@>=1.7.1
; khoih-prog/EthernetWebServer_STM32@>=1.2.1
; khoih-prog/WebServer_WT32_ETH01@>=1.2.0
; khoih-prog/WebServer_WT32_ETH01@>=1.4.1
; khoih-prog/ESP8266_AT_WebServer@>=1.4.0
; khoih-prog/DDNS_Generic@>=1.5.1
; khoih-prog/DDNS_Generic@>=1.6.1
; PaulStoffregen/Ethernet@>=2.0.0
; PaulStoffregen/EthernetLarge@>=2.0.0
; adafruit/Ethernet2@>=1.0.4
Expand Down
5 changes: 3 additions & 2 deletions src/UPnP_Generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Based on and modified from Ofek Pearl's TinyUPnP Library (https://github.com/ofekp/TinyUPnP)
Built by Khoi Hoang https://github.com/khoih-prog/UPnP_Generic
Licensed under GPL-3.0 license
Version: 3.4.1
Version: 3.4.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -20,14 +20,15 @@
3.3.0 K Hoang 16/07/2021 Add support to WT32_ETH01 (ESP32 + LAN8720)
3.4.0 K Hoang 16/09/2021 Add support to Portenta_H7, using either WiFi or Vision-shield Ethernet
3.4.1 K Hoang 12/10/2021 Update `platform.ini` and `library.json`
3.4.2 K Hoang 01/12/2021 Auto detect ESP32 core version. Fix bug in examples for WT32_ETH01
*****************************************************************************************************************************/

#ifndef UPnP_Generic_h
#define UPnP_Generic_h

#include "UPnP_Generic_Debug.h"

#define UPNP_GENERIC_VERSION "UPnP_Generic v3.4.1"
#define UPNP_GENERIC_VERSION "UPnP_Generic v3.4.2"

#if UPNP_USING_ETHERNET
#include "UPnP_Generic_Ethernet.h"
Expand Down
3 changes: 2 additions & 1 deletion src/UPnP_Generic_Debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Based on and modified from Ofek Pearl's TinyUPnP Library (https://github.com/ofekp/TinyUPnP)
Built by Khoi Hoang https://github.com/khoih-prog/UPnP_Generic
Licensed under GPL-3.0 license
Version: 3.4.1
Version: 3.4.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -20,6 +20,7 @@
3.3.0 K Hoang 16/07/2021 Add support to WT32_ETH01 (ESP32 + LAN8720)
3.4.0 K Hoang 16/09/2021 Add support to Portenta_H7, using either WiFi or Vision-shield Ethernet
3.4.1 K Hoang 12/10/2021 Update `platform.ini` and `library.json`
3.4.2 K Hoang 01/12/2021 Auto detect ESP32 core version. Fix bug in examples for WT32_ETH01
*****************************************************************************************************************************/

#ifndef UPnP_Generic_Debug_H
Expand Down
3 changes: 2 additions & 1 deletion src/UPnP_Generic_Ethernet.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Based on and modified from Ofek Pearl's TinyUPnP Library (https://github.com/ofekp/TinyUPnP)
Built by Khoi Hoang https://github.com/khoih-prog/UPnP_Generic
Licensed under GPL-3.0 license
Version: 3.4.1
Version: 3.4.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -20,6 +20,7 @@
3.3.0 K Hoang 16/07/2021 Add support to WT32_ETH01 (ESP32 + LAN8720)
3.4.0 K Hoang 16/09/2021 Add support to Portenta_H7, using either WiFi or Vision-shield Ethernet
3.4.1 K Hoang 12/10/2021 Update `platform.ini` and `library.json`
3.4.2 K Hoang 01/12/2021 Auto detect ESP32 core version. Fix bug in examples for WT32_ETH01
*****************************************************************************************************************************/

#ifndef UPnP_Generic_Ethernet_h
Expand Down
3 changes: 2 additions & 1 deletion src/UPnP_Generic_Impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Based on and modified from Ofek Pearl's TinyUPnP Library (https://github.com/ofekp/TinyUPnP)
Built by Khoi Hoang https://github.com/khoih-prog/UPnP_Generic
Licensed under GPL-3.0 license
Version: 3.4.1
Version: 3.4.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -20,6 +20,7 @@
3.3.0 K Hoang 16/07/2021 Add support to WT32_ETH01 (ESP32 + LAN8720)
3.4.0 K Hoang 16/09/2021 Add support to Portenta_H7, using either WiFi or Vision-shield Ethernet
3.4.1 K Hoang 12/10/2021 Update `platform.ini` and `library.json`
3.4.2 K Hoang 01/12/2021 Auto detect ESP32 core version. Fix bug in examples for WT32_ETH01
*****************************************************************************************************************************/

#ifndef UPnP_Generic_Impl_h
Expand Down
3 changes: 2 additions & 1 deletion src/UPnP_Generic_WiFi.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Based on and modified from Ofek Pearl's TinyUPnP Library (https://github.com/ofekp/TinyUPnP)
Built by Khoi Hoang https://github.com/khoih-prog/UPnP_Generic
Licensed under GPL-3.0 license
Version: 3.4.1
Version: 3.4.2
Version Modified By Date Comments
------- ----------- ---------- -----------
Expand All @@ -20,6 +20,7 @@
3.3.0 K Hoang 16/07/2021 Add support to WT32_ETH01 (ESP32 + LAN8720)
3.4.0 K Hoang 16/09/2021 Add support to Portenta_H7, using either WiFi or Vision-shield Ethernet
3.4.1 K Hoang 12/10/2021 Update `platform.ini` and `library.json`
3.4.2 K Hoang 01/12/2021 Auto detect ESP32 core version. Fix bug in examples for WT32_ETH01
*****************************************************************************************************************************/

#ifndef UPnP_Generic_WiFi_h
Expand Down

0 comments on commit f9b5fc8

Please sign in to comment.