From c5cd97064a9c1de026b01e9227d9ccafd4b6ba1e Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 2 Feb 2021 18:02:24 +0100
Subject: [PATCH] Fix ETH_ADDR related warning

---
 tasmota/my_user_config.h           |  6 +++---
 tasmota/settings.ino               |  4 ++--
 tasmota/xdrv_82_esp32_ethernet.ino | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 74d2941c4..25a629c05 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -851,15 +851,15 @@
 //#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 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
   // Olimex ESP32-PoE
   #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
   // wESP32-PoE
 //  #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 USE_ADC                                  // Add support for ADC on GPIO32 to GPIO39
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 64efab53c..61ef453e2 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -778,7 +778,7 @@ void SettingsDefaultSet2(void) {
 #ifdef ESP32
   Settings.eth_type = ETH_TYPE;
   Settings.eth_clk_mode = ETH_CLKMODE;
-  Settings.eth_address = ETH_ADDR;
+  Settings.eth_address = ETH_ADDRESS;
 #endif  // ESP32
 
   // Wifi
@@ -1309,7 +1309,7 @@ void SettingsDelta(void) {
     if (Settings.version < 0x08030105) {
       Settings.eth_type = ETH_TYPE;
       Settings.eth_clk_mode = ETH_CLKMODE;
-      Settings.eth_address = ETH_ADDR;
+      Settings.eth_address = ETH_ADDRESS;
     }
 #endif  // ESP32
     if (Settings.version < 0x08030106) {
diff --git a/tasmota/xdrv_82_esp32_ethernet.ino b/tasmota/xdrv_82_esp32_ethernet.ino
index 680839b37..4872f194c 100644
--- a/tasmota/xdrv_82_esp32_ethernet.ino
+++ b/tasmota/xdrv_82_esp32_ethernet.ino
@@ -38,14 +38,14 @@
  * GPIO23 = ETH MDC
  * #define ETH_TYPE          ETH_PHY_LAN8720
  * #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}
  * GPIO16 = ETH MDC
  * GPIO17 = ETH MDIO
  * #define ETH_TYPE          ETH_PHY_LAN8720
  * #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}
  * GPIO16 = Force Hi
@@ -53,7 +53,7 @@
  * GPIO23 = ETH MDC
  * #define ETH_TYPE          ETH_PHY_LAN8720
  * #define ETH_CLKMODE       ETH_CLOCK_GPIO0_IN
- * #define ETH_ADDR          1
+ * #define ETH_ADDRESS       1
  *
 \*********************************************************************************************/
 
@@ -66,8 +66,8 @@
 
 //********************************************************************************************
 
-#ifndef ETH_ADDR
-#define ETH_ADDR          0                      // esp_eth.h eth_phy_base_t:   0 = PHY0 .. 31 = PHY31
+#ifndef ETH_ADDRESS
+#define ETH_ADDRESS       0                      // esp_eth.h eth_phy_base_t:   0 = PHY0 .. 31 = PHY31
 #endif
 
 #ifndef ETH_TYPE