mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ETH_ADDR related warning

This commit is contained in:
Theo Arends 2021-02-02 18:02:24 +01:00
parent 13713dccc1
commit c5cd97064a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasmota/my_user_config.h
View File

@ -851,15 +851,15 @@
//#define USE_ETHERNET // Add support for ethernet (Currently fixed for Olimex ESP32-PoE) //#define USE_ETHERNET // Add support for ethernet (Currently fixed for Olimex ESP32-PoE)
// #define USE_WT32_ETH01 // Add support for Wireless-Tag WT32-ETH01 // #define USE_WT32_ETH01 // Add support for Wireless-Tag WT32-ETH01
// #define ETH_TYPE 0 // [EthType] 0 = ETH_PHY_LAN8720, 1 = ETH_PHY_TLK110, 2 = ETH_PHY_IP101 // #define ETH_TYPE 0 // [EthType] 0 = ETH_PHY_LAN8720, 1 = ETH_PHY_TLK110, 2 = ETH_PHY_IP101
// #define ETH_ADDR 1 // [EthAddress] 0 = PHY0 .. 31 = PHY31 // #define ETH_ADDRESS 1 // [EthAddress] 0 = PHY0 .. 31 = PHY31
// #define ETH_CLKMODE 0 // [EthClockMode] 0 = ETH_CLOCK_GPIO0_IN, 1 = ETH_CLOCK_GPIO0_OUT, 2 = ETH_CLOCK_GPIO16_OUT, 3 = ETH_CLOCK_GPIO17_OUT // #define ETH_CLKMODE 0 // [EthClockMode] 0 = ETH_CLOCK_GPIO0_IN, 1 = ETH_CLOCK_GPIO0_OUT, 2 = ETH_CLOCK_GPIO16_OUT, 3 = ETH_CLOCK_GPIO17_OUT
// Olimex ESP32-PoE // Olimex ESP32-PoE
#define ETH_TYPE 0 // [EthType] 0 = ETH_PHY_LAN8720, 1 = ETH_PHY_TLK110, 2 = ETH_PHY_IP101 #define ETH_TYPE 0 // [EthType] 0 = ETH_PHY_LAN8720, 1 = ETH_PHY_TLK110, 2 = ETH_PHY_IP101
#define ETH_ADDR 0 // [EthAddress] 0 = PHY0 .. 31 = PHY31 #define ETH_ADDRESS 0 // [EthAddress] 0 = PHY0 .. 31 = PHY31
#define ETH_CLKMODE 3 // [EthClockMode] 0 = ETH_CLOCK_GPIO0_IN, 1 = ETH_CLOCK_GPIO0_OUT, 2 = ETH_CLOCK_GPIO16_OUT, 3 = ETH_CLOCK_GPIO17_OUT #define ETH_CLKMODE 3 // [EthClockMode] 0 = ETH_CLOCK_GPIO0_IN, 1 = ETH_CLOCK_GPIO0_OUT, 2 = ETH_CLOCK_GPIO16_OUT, 3 = ETH_CLOCK_GPIO17_OUT
// wESP32-PoE // wESP32-PoE
// #define ETH_TYPE 0 // [EthType] 0 = ETH_PHY_LAN8720, 1 = ETH_PHY_TLK110, 2 = ETH_PHY_IP101 // #define ETH_TYPE 0 // [EthType] 0 = ETH_PHY_LAN8720, 1 = ETH_PHY_TLK110, 2 = ETH_PHY_IP101
// #define ETH_ADDR 0 // [EthAddress] 0 = PHY0 .. 31 = PHY31 // #define ETH_ADDRESS 0 // [EthAddress] 0 = PHY0 .. 31 = PHY31
// #define ETH_CLKMODE 0 // [EthClockMode] 0 = ETH_CLOCK_GPIO0_IN, 1 = ETH_CLOCK_GPIO0_OUT, 2 = ETH_CLOCK_GPIO16_OUT, 3 = ETH_CLOCK_GPIO17_OUT // #define ETH_CLKMODE 0 // [EthClockMode] 0 = ETH_CLOCK_GPIO0_IN, 1 = ETH_CLOCK_GPIO0_OUT, 2 = ETH_CLOCK_GPIO16_OUT, 3 = ETH_CLOCK_GPIO17_OUT
#define USE_ADC // Add support for ADC on GPIO32 to GPIO39 #define USE_ADC // Add support for ADC on GPIO32 to GPIO39

4
tasmota/settings.ino
View File

@ -778,7 +778,7 @@ void SettingsDefaultSet2(void) {
#ifdef ESP32 #ifdef ESP32
Settings.eth_type = ETH_TYPE; Settings.eth_type = ETH_TYPE;
Settings.eth_clk_mode = ETH_CLKMODE; Settings.eth_clk_mode = ETH_CLKMODE;
Settings.eth_address = ETH_ADDR; Settings.eth_address = ETH_ADDRESS;
#endif // ESP32 #endif // ESP32
// Wifi // Wifi
@ -1309,7 +1309,7 @@ void SettingsDelta(void) {
if (Settings.version < 0x08030105) { if (Settings.version < 0x08030105) {
Settings.eth_type = ETH_TYPE; Settings.eth_type = ETH_TYPE;
Settings.eth_clk_mode = ETH_CLKMODE; Settings.eth_clk_mode = ETH_CLKMODE;
Settings.eth_address = ETH_ADDR; Settings.eth_address = ETH_ADDRESS;
} }
#endif // ESP32 #endif // ESP32
if (Settings.version < 0x08030106) { if (Settings.version < 0x08030106) {

10
tasmota/xdrv_82_esp32_ethernet.ino
View File

@ -38,14 +38,14 @@
* GPIO23 = ETH MDC * GPIO23 = ETH MDC
* #define ETH_TYPE ETH_PHY_LAN8720 * #define ETH_TYPE ETH_PHY_LAN8720
* #define ETH_CLKMODE ETH_CLOCK_GPIO17_OUT * #define ETH_CLKMODE ETH_CLOCK_GPIO17_OUT
* #define ETH_ADDR 0 * #define ETH_ADDRESS 0
* *
* {"NAME":"wESP32","GPIO":[0,0,1,0,1,1,0,0,1,1,1,1,5568,5600,1,0,0,0,0,1,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,1],"FLAG":0,"BASE":1} * {"NAME":"wESP32","GPIO":[0,0,1,0,1,1,0,0,1,1,1,1,5568,5600,1,0,0,0,0,1,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,1],"FLAG":0,"BASE":1}
* GPIO16 = ETH MDC * GPIO16 = ETH MDC
* GPIO17 = ETH MDIO * GPIO17 = ETH MDIO
* #define ETH_TYPE ETH_PHY_LAN8720 * #define ETH_TYPE ETH_PHY_LAN8720
* #define ETH_CLKMODE ETH_CLOCK_GPIO0_IN * #define ETH_CLKMODE ETH_CLOCK_GPIO0_IN
* #define ETH_ADDR 0 * #define ETH_ADDRESS 0
* *
* {"NAME":"WT32-ETH01","GPIO":[1,1,1,1,1,1,0,0,1,0,1,1,3840,576,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,1,1,0,1,1,0,0,1],"FLAG":0,"BASE":1} * {"NAME":"WT32-ETH01","GPIO":[1,1,1,1,1,1,0,0,1,0,1,1,3840,576,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,1,1,0,1,1,0,0,1],"FLAG":0,"BASE":1}
* GPIO16 = Force Hi * GPIO16 = Force Hi
@ -53,7 +53,7 @@
* GPIO23 = ETH MDC * GPIO23 = ETH MDC
* #define ETH_TYPE ETH_PHY_LAN8720 * #define ETH_TYPE ETH_PHY_LAN8720
* #define ETH_CLKMODE ETH_CLOCK_GPIO0_IN * #define ETH_CLKMODE ETH_CLOCK_GPIO0_IN
* #define ETH_ADDR 1 * #define ETH_ADDRESS 1
* *
\*********************************************************************************************/ \*********************************************************************************************/
@ -66,8 +66,8 @@
//******************************************************************************************** //********************************************************************************************
#ifndef ETH_ADDR #ifndef ETH_ADDRESS
#define ETH_ADDR 0 // esp_eth.h eth_phy_base_t: 0 = PHY0 .. 31 = PHY31 #define ETH_ADDRESS 0 // esp_eth.h eth_phy_base_t: 0 = PHY0 .. 31 = PHY31
#endif #endif
#ifndef ETH_TYPE #ifndef ETH_TYPE