stm32duino
diff --git a/‎src/STM32Ethernet.cpp
Copy file name to clipboardExpand all lines: src/STM32Ethernet.cpp
+2-16Lines changed: 2 additions & 16 deletions b/‎src/STM32Ethernet.cpp
Copy file name to clipboardExpand all lines: src/STM32Ethernet.cpp
+2-16Lines changed: 2 additions & 16 deletions
diff --git a/‎src/STM32Ethernet.h
Copy file name to clipboardExpand all lines: src/STM32Ethernet.h
-1Lines changed: 0 additions & 1 deletion b/‎src/STM32Ethernet.h
Copy file name to clipboardExpand all lines: src/STM32Ethernet.h
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎src/utility/ethernetif.cpp
Copy file name to clipboardExpand all lines: src/utility/ethernetif.cpp
+19Lines changed: 19 additions & 0 deletions b/‎src/utility/ethernetif.cpp
Copy file name to clipboardExpand all lines: src/utility/ethernetif.cpp
+19Lines changed: 19 additions & 0 deletions
@@ -5,7 +5,7 @@ int EthernetClass::begin(unsigned long timeout, unsigned long responseTimeout)
 {
   static DhcpClass s_dhcp;
   _dhcp = &s_dhcp;
-  stm32_eth_init(MACAddressDefault(), NULL, NULL, NULL);
+  stm32_eth_init(NULL, NULL, NULL, NULL);
 
   // Now try to get our config info from a DHCP server
   int ret = _dhcp->beginWithDHCP(mac_address, timeout, responseTimeout);
@@ -39,7 +39,7 @@ void EthernetClass::begin(IPAddress local_ip, IPAddress subnet, IPAddress gatewa
 
 void EthernetClass::begin(IPAddress local_ip, IPAddress subnet, IPAddress gateway, IPAddress dns_server)
 {
-  stm32_eth_init(MACAddressDefault(), local_ip.raw_address(), gateway.raw_address(), subnet.raw_address());
+  stm32_eth_init(NULL, local_ip.raw_address(), gateway.raw_address(), subnet.raw_address());
   /* If there is a local DHCP informs it of our manual IP configuration to
   prevent IP conflict */
   stm32_DHCP_manual_config();
@@ -133,20 +133,6 @@ void EthernetClass::schedule(void)
   stm32_eth_scheduler();
 }
 
-uint8_t *EthernetClass::MACAddressDefault(void)
-{
-  if ((mac_address[0] + mac_address[1] + mac_address[2] + mac_address[3] + mac_address[4] + mac_address[5]) == 0) {
-    uint32_t baseUID = *(uint32_t *)UID_BASE;
-    mac_address[0] = 0x00;
-    mac_address[1] = 0x80;
-    mac_address[2] = 0xE1;
-    mac_address[3] = (baseUID & 0x00FF0000) >> 16;
-    mac_address[4] = (baseUID & 0x0000FF00) >> 8;
-    mac_address[5] = (baseUID & 0x000000FF);
-  }
-  return mac_address;
-}
-
 void EthernetClass::MACAddress(uint8_t *mac)
 {
   mac_address[0] = mac[0];
 
@@ -18,7 +18,6 @@ class EthernetClass {
     IPAddress _dnsServerAddress;
     DhcpClass *_dhcp;
     uint8_t mac_address[6];
-    uint8_t   *MACAddressDefault(void);
 
   public:
     // Initialise the Ethernet with the internal provided MAC address and gain the rest of the
 
@@ -96,6 +96,25 @@ __ALIGN_BEGIN uint8_t Tx_Buff[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __ALIGN_END; /* Ethe
 
 static ETH_HandleTypeDef EthHandle;
 
+/* If default MAC fields is not defined use default values based on UID */
+#if !defined(MAC_ADDR0)
+#define MAC_ADDR0   0x00
+#endif
+#if !defined(MAC_ADDR1)
+#define MAC_ADDR1   0x80
+#endif
+#if !defined(MAC_ADDR2)
+#define MAC_ADDR2   0xE1
+#endif
+#if !defined(MAC_ADDR3)
+#define MAC_ADDR3   ((uint8_t)(((*(uint32_t *)UID_BASE) & 0x00FF0000) >> 16))
+#endif
+#if !defined(MAC_ADDR4)
+#define MAC_ADDR4   ((uint8_t)(((*(uint32_t *)UID_BASE) & 0x0000FF00) >> 8))
+#endif
+#if !defined(MAC_ADDR5)
+#define MAC_ADDR5   ((uint8_t)((*(uint32_t *)UID_BASE) & 0x000000FF))
+#endif
 static uint8_t macaddress[6] = { MAC_ADDR0, MAC_ADDR1, MAC_ADDR2, MAC_ADDR3, MAC_ADDR4, MAC_ADDR5 };
 
 #if LWIP_IGMP