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

Commit cc4dc3c

Browse files
authored
v1.5.2 to auto-detect ESP32 core version.
### Release v1.5.2 1. Auto detect ESP32 core version. 2. Fix bug in examples for WT32_ETH01 3. Update `Packages' Patches`
1 parent 2d2e288 commit cc4dc3c

File tree

10 files changed

+43
-32
lines changed

10 files changed

+43
-32
lines changed

examples/WT32_ETH01/Basic_Insert_WT32_ETH01/Basic_Insert_WT32_ETH01.ino

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@
4444
#error This code is intended to run on the WT32 boards and ESP32 platform ! Please check your Tools->Board setting.
4545
#endif
4646

47-
#define MYSQL_DEBUG_PORT Serial
47+
#define MYSQL_DEBUG_PORT Serial
4848

4949
// Debug Level from 0 to 4
50-
#define _MYSQL_LOGLEVEL_ 1
50+
#define _ETHERNET_WEBSERVER_LOGLEVEL_ 3
51+
#define _MYSQL_LOGLEVEL_ 1
5152

5253
#include <WebServer_WT32_ETH01.h>
5354

@@ -61,7 +62,7 @@ IPAddress mySN(255, 255, 255, 0);
6162
// Google DNS Server IP
6263
IPAddress myDNS(8, 8, 8, 8);
6364

64-
#define USING_HOST_NAME true
65+
#define USING_HOST_NAME false //true
6566

6667
#if USING_HOST_NAME
6768
// Optional using hostname, and Ethernet built-in DNS lookup
@@ -97,6 +98,9 @@ void setup()
9798
MYSQL_DISPLAY(WEBSERVER_WT32_ETH01_VERSION);
9899
MYSQL_DISPLAY(MYSQL_MARIADB_GENERIC_VERSION);
99100

101+
// To be called before ETH.begin()
102+
WT32_ETH01_onEvent();
103+
100104
//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
101105
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
102106
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
@@ -106,8 +110,6 @@ void setup()
106110
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
107111
ETH.config(myIP, myGW, mySN, myDNS);
108112

109-
WT32_ETH01_onEvent();
110-
111113
WT32_ETH01_waitForConnect();
112114

113115
// print out info about the connection:

examples/WT32_ETH01/Basic_Select_WT32_ETH01/Basic_Select_WT32_ETH01.ino

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ IPAddress mySN(255, 255, 255, 0);
6767
// Google DNS Server IP
6868
IPAddress myDNS(8, 8, 8, 8);
6969

70-
#define USING_HOST_NAME true
70+
#define USING_HOST_NAME false //true
7171

7272
#if USING_HOST_NAME
7373
// Optional using hostname, and Ethernet built-in DNS lookup
@@ -104,6 +104,9 @@ void setup()
104104
MYSQL_DISPLAY(WEBSERVER_WT32_ETH01_VERSION);
105105
MYSQL_DISPLAY(MYSQL_MARIADB_GENERIC_VERSION);
106106

107+
// To be called before ETH.begin()
108+
WT32_ETH01_onEvent();
109+
107110
//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
108111
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
109112
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
@@ -113,8 +116,6 @@ void setup()
113116
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
114117
ETH.config(myIP, myGW, mySN, myDNS);
115118

116-
WT32_ETH01_onEvent();
117-
118119
WT32_ETH01_waitForConnect();
119120

120121
// print out info about the connection:

examples/WT32_ETH01/Complex_Insert_WT32_ETH01/Complex_Insert_WT32_ETH01.ino

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ IPAddress mySN(255, 255, 255, 0);
8686
// Google DNS Server IP
8787
IPAddress myDNS(8, 8, 8, 8);
8888

89-
#define USING_HOST_NAME true
89+
#define USING_HOST_NAME false //true
9090

9191
#if USING_HOST_NAME
9292
// Optional using hostname, and Ethernet built-in DNS lookup
@@ -131,6 +131,9 @@ void setup()
131131
MYSQL_DISPLAY(WEBSERVER_WT32_ETH01_VERSION);
132132
MYSQL_DISPLAY(MYSQL_MARIADB_GENERIC_VERSION);
133133

134+
// To be called before ETH.begin()
135+
WT32_ETH01_onEvent();
136+
134137
//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
135138
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
136139
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
@@ -140,8 +143,6 @@ void setup()
140143
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
141144
ETH.config(myIP, myGW, mySN, myDNS);
142145

143-
WT32_ETH01_onEvent();
144-
145146
WT32_ETH01_waitForConnect();
146147

147148
// print out info about the connection:

examples/WT32_ETH01/Complex_Select_WT32_ETH01/Complex_Select_WT32_ETH01.ino

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ IPAddress mySN(255, 255, 255, 0);
6464
// Google DNS Server IP
6565
IPAddress myDNS(8, 8, 8, 8);
6666

67-
#define USING_HOST_NAME true
67+
#define USING_HOST_NAME false //true
6868

6969
#if USING_HOST_NAME
7070
// Optional using hostname, and Ethernet built-in DNS lookup
@@ -104,6 +104,9 @@ void setup()
104104
MYSQL_DISPLAY(WEBSERVER_WT32_ETH01_VERSION);
105105
MYSQL_DISPLAY(MYSQL_MARIADB_GENERIC_VERSION);
106106

107+
// To be called before ETH.begin()
108+
WT32_ETH01_onEvent();
109+
107110
//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
108111
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
109112
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
@@ -113,8 +116,6 @@ void setup()
113116
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
114117
ETH.config(myIP, myGW, mySN, myDNS);
115118

116-
WT32_ETH01_onEvent();
117-
118119
WT32_ETH01_waitForConnect();
119120

120121
// print out info about the connection:

examples/WT32_ETH01/Connect_Default_Database_WT32_ETH01/Connect_Default_Database_WT32_ETH01.ino

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ IPAddress mySN(255, 255, 255, 0);
6060
// Google DNS Server IP
6161
IPAddress myDNS(8, 8, 8, 8);
6262

63-
#define USING_HOST_NAME true
63+
#define USING_HOST_NAME false //true
6464

6565
#if USING_HOST_NAME
6666
// Optional using hostname, and Ethernet built-in DNS lookup
@@ -87,6 +87,9 @@ void setup()
8787
MYSQL_DISPLAY(WEBSERVER_WT32_ETH01_VERSION);
8888
MYSQL_DISPLAY(MYSQL_MARIADB_GENERIC_VERSION);
8989

90+
// To be called before ETH.begin()
91+
WT32_ETH01_onEvent();
92+
9093
//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
9194
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
9295
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
@@ -96,8 +99,6 @@ void setup()
9699
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
97100
ETH.config(myIP, myGW, mySN, myDNS);
98101

99-
WT32_ETH01_onEvent();
100-
101102
WT32_ETH01_waitForConnect();
102103

103104
// print out info about the connection:

examples/WT32_ETH01/Connect_Disconnect_WT32_ETH01/Connect_Disconnect_WT32_ETH01.ino

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ IPAddress mySN(255, 255, 255, 0);
6161
// Google DNS Server IP
6262
IPAddress myDNS(8, 8, 8, 8);
6363

64-
#define USING_HOST_NAME true
64+
#define USING_HOST_NAME false //true
6565

6666
#if USING_HOST_NAME
6767
// Optional using hostname, and Ethernet built-in DNS lookup
@@ -87,6 +87,9 @@ void setup()
8787
MYSQL_DISPLAY(WEBSERVER_WT32_ETH01_VERSION);
8888
MYSQL_DISPLAY(MYSQL_MARIADB_GENERIC_VERSION);
8989

90+
// To be called before ETH.begin()
91+
WT32_ETH01_onEvent();
92+
9093
//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
9194
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
9295
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
@@ -96,8 +99,6 @@ void setup()
9699
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
97100
ETH.config(myIP, myGW, mySN, myDNS);
98101

99-
WT32_ETH01_onEvent();
100-
101102
WT32_ETH01_waitForConnect();
102103

103104
// print out info about the connection:

examples/WT32_ETH01/Connect_WT32_ETH01/Connect_WT32_ETH01.ino

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ IPAddress mySN(255, 255, 255, 0);
6262
// Google DNS Server IP
6363
IPAddress myDNS(8, 8, 8, 8);
6464

65-
#define USING_HOST_NAME true
65+
#define USING_HOST_NAME false //true
6666

6767
#if USING_HOST_NAME
6868
// Optional using hostname, and Ethernet built-in DNS lookup
@@ -87,6 +87,9 @@ void setup()
8787
MYSQL_DISPLAY(WEBSERVER_WT32_ETH01_VERSION);
8888
MYSQL_DISPLAY(MYSQL_MARIADB_GENERIC_VERSION);
8989

90+
// To be called before ETH.begin()
91+
WT32_ETH01_onEvent();
92+
9093
//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
9194
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
9295
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
@@ -96,8 +99,6 @@ void setup()
9699
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
97100
ETH.config(myIP, myGW, mySN, myDNS);
98101

99-
WT32_ETH01_onEvent();
100-
101102
WT32_ETH01_waitForConnect();
102103

103104
// print out info about the connection:

examples/WT32_ETH01/Query_Progmem_WT32_ETH01/Query_Progmem_WT32_ETH01.ino

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ IPAddress mySN(255, 255, 255, 0);
6161
// Google DNS Server IP
6262
IPAddress myDNS(8, 8, 8, 8);
6363

64-
#define USING_HOST_NAME true
64+
#define USING_HOST_NAME false //true
6565

6666
#if USING_HOST_NAME
6767
// Optional using hostname, and Ethernet built-in DNS lookup
@@ -89,6 +89,9 @@ void setup()
8989
MYSQL_DISPLAY(WEBSERVER_WT32_ETH01_VERSION);
9090
MYSQL_DISPLAY(MYSQL_MARIADB_GENERIC_VERSION);
9191

92+
// To be called before ETH.begin()
93+
WT32_ETH01_onEvent();
94+
9295
//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
9396
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
9497
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
@@ -98,8 +101,6 @@ void setup()
98101
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
99102
ETH.config(myIP, myGW, mySN, myDNS);
100103

101-
WT32_ETH01_onEvent();
102-
103104
WT32_ETH01_waitForConnect();
104105

105106
// print out info about the connection:

examples/WT32_ETH01/Query_Results_WT32_ETH01/Query_Results_WT32_ETH01.ino

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ IPAddress mySN(255, 255, 255, 0);
6060
// Google DNS Server IP
6161
IPAddress myDNS(8, 8, 8, 8);
6262

63-
#define USING_HOST_NAME true
63+
#define USING_HOST_NAME false //true
6464

6565
#if USING_HOST_NAME
6666
// Optional using hostname, and Ethernet built-in DNS lookup
@@ -89,6 +89,9 @@ void setup()
8989
MYSQL_DISPLAY(WEBSERVER_WT32_ETH01_VERSION);
9090
MYSQL_DISPLAY(MYSQL_MARIADB_GENERIC_VERSION);
9191

92+
// To be called before ETH.begin()
93+
WT32_ETH01_onEvent();
94+
9295
//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
9396
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
9497
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
@@ -98,8 +101,6 @@ void setup()
98101
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
99102
ETH.config(myIP, myGW, mySN, myDNS);
100103

101-
WT32_ETH01_onEvent();
102-
103104
WT32_ETH01_waitForConnect();
104105

105106
// print out info about the connection:

examples/WT32_ETH01/Reboot_WT32_ETH01/Reboot_WT32_ETH01.ino

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ IPAddress mySN(255, 255, 255, 0);
5858
// Google DNS Server IP
5959
IPAddress myDNS(8, 8, 8, 8);
6060

61-
#define USING_HOST_NAME true
61+
#define USING_HOST_NAME false //true
6262

6363
#if USING_HOST_NAME
6464
// Optional using hostname, and Ethernet built-in DNS lookup
@@ -84,6 +84,9 @@ void setup()
8484
MYSQL_DISPLAY(WEBSERVER_WT32_ETH01_VERSION);
8585
MYSQL_DISPLAY(MYSQL_MARIADB_GENERIC_VERSION);
8686

87+
// To be called before ETH.begin()
88+
WT32_ETH01_onEvent();
89+
8790
//bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO,
8891
// eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
8992
//ETH.begin(ETH_PHY_ADDR, ETH_PHY_POWER, ETH_PHY_MDC, ETH_PHY_MDIO, ETH_PHY_TYPE, ETH_CLK_MODE);
@@ -93,8 +96,6 @@ void setup()
9396
//bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = 0, IPAddress dns2 = 0);
9497
ETH.config(myIP, myGW, mySN, myDNS);
9598

96-
WT32_ETH01_onEvent();
97-
9899
WT32_ETH01_waitForConnect();
99100

100101
// print out info about the connection:

0 commit comments

Comments
 (0)