More Network tidy

Author: troyhacks

wled00/json.cpp

@@ -912,14 +912,6 @@ String restartCode2Info(esp_reset_reason_t reason) {
 #endif
 // end WLEDMM
 
-// Helper function to format the MAC address (BSSID) into a string
-String format_mac_address(const uint8_t* mac) {
-  char mac_str[18];
-  snprintf(mac_str, sizeof(mac_str), "%02X:%02X:%02X:%02X:%02X:%02X",
-    mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-  return String(mac_str);
-}
-
 void serializeInfo(JsonObject root)
 {
   root[F("ver")] = versionString;
@@ -1039,7 +1031,7 @@ void serializeInfo(JsonObject root)
     JsonObject wifi_obj = network_info.createNestedObject("wifi");
     // Get local Wi-Fi MAC
     if (esp_wifi_get_mac(WIFI_IF_STA, mac) == ESP_OK) {
-      wifi_obj["mac"] = format_mac_address(mac);
+      wifi_obj["mac"] = Network.format_mac_address(mac);
     }
     // Get local Wi-Fi IP
     if (esp_netif_get_ip_info(wifi_netif, &ip_info) == ESP_OK && ip_info.ip.addr != 0) {
@@ -1053,7 +1045,7 @@ void serializeInfo(JsonObject root)
     if (esp_wifi_sta_get_ap_info(&ap_info) == ESP_OK) {
       JsonObject ap_obj = wifi_obj.createNestedObject("ap");
       ap_obj["ssid"] = (char*)ap_info.ssid;
-      ap_obj["bssid"] = format_mac_address(ap_info.bssid);
+      ap_obj["bssid"] = Network.format_mac_address(ap_info.bssid);
       ap_obj["rssi"] = ap_info.rssi;
       ap_obj["signal"] = getSignalQuality(ap_info.rssi);
       ap_obj["channel"] = ap_info.primary;
@@ -1165,7 +1157,7 @@ void serializeInfo(JsonObject root)
   if (eth_netif && eth_handle) {
     JsonObject eth_obj = network_info.createNestedObject("ethernet");
     if (esp_netif_get_mac(eth_netif, mac) == ESP_OK) {
-      eth_obj["mac"] = format_mac_address(mac);
+      eth_obj["mac"] = Network.format_mac_address(mac);
     }
     if (esp_netif_get_ip_info(eth_netif, &ip_info) == ESP_OK && ip_info.ip.addr != 0) {
       char ip_str[16];

wled00/src/dependencies/network/Network.cpp

@@ -48,17 +48,13 @@ IPAddress NetworkClass::gatewayIP() {
 }
 
 void NetworkClass::localMAC(uint8_t* MAC) {
-
   memset(MAC, 0, 6);
-
   esp_netif_t* default_netif = esp_netif_get_default_netif();
   if (default_netif == NULL) {
     return; // No default interface is active
   }
-
   esp_netif_t* wifi_netif = esp_netif_get_handle_from_ifkey("WIFI_STA_DEF");
   esp_netif_t* eth_netif = esp_netif_get_handle_from_ifkey("ETH_DEF");
-
   if (default_netif == wifi_netif) {
     esp_wifi_get_mac(WIFI_IF_STA, MAC);
   } else {
@@ -113,6 +109,32 @@ IPAddress NetworkClass::hostByName(const char* hostname) {
   return INADDR_NONE;
 }
 
+String NetworkClass::format_mac_address(const uint8_t* mac) {
+  char mac_str[18];
+  snprintf(mac_str, sizeof(mac_str), "%02X:%02X:%02X:%02X:%02X:%02X",
+    mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+  return String(mac_str);
+}
+
+esp_err_t NetworkClass::get_hardware_mac_address(uint8_t* mac_addr) {
+  // This gets the MAC from the hardware, before any network init happens.
+  esp_err_t err = esp_eth_ioctl(eth_handle, ETH_CMD_G_MAC_ADDR, mac_addr);
+  if (err == ESP_OK) {
+    return ESP_OK;
+  }
+  err = esp_wifi_get_mac(WIFI_IF_STA, mac_addr);
+  return err;
+}
+
+String NetworkClass::getEscapedMac() {
+  uint8_t mac_addr[6];
+  this->get_hardware_mac_address(mac_addr);
+  String formatted_mac = this->format_mac_address(mac_addr);
+  formatted_mac.replace(":", "");
+  formatted_mac.toLowerCase();
+  return formatted_mac;
+}
+
 bool NetworkClass::isEthernet() {
   return eth_is_connected;
 }

wled00/src/dependencies/network/Network.h

@@ -22,6 +22,9 @@ class NetworkClass
   bool isConnected();
   bool isEthernet();
   IPAddress hostByName(const char* hostname);
+  String format_mac_address(const uint8_t* mac);
+  esp_err_t get_hardware_mac_address(uint8_t* mac_addr);
+  String getEscapedMac();
 };
 
 #ifdef ARDUINO_ARCH_ESP32

wled00/wled.cpp

@@ -1202,28 +1202,7 @@ void WLED::setup()
   USER_PRINT(F("done Mounting FS; "));
   USER_PRINT(((fsBytesTotal-fsBytesUsed)/1024)); USER_PRINTLN(F(" kB free.\n"));
 
-  // generate module IDs must be done before AP setup
-  #ifdef ARDUINO_ARCH_ESP32P4
-    #ifdef WLED_USE_ETHERNET
-      char buf[18];
-      uint8_t mac_addr[6];
-      esp_eth_ioctl(eth_handle, ETH_CMD_G_MAC_ADDR, mac_addr);
-      sprintf(buf,"%02X:%02X:%02X:%02X:%02X:%02X", mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
-      USER_PRINTF("Ethernet Mac Address: %02X:%02X:%02X:%02X:%02X:%02X\n", mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
-      escapedMac = buf;
-    #else
-      uint8_t mymac[6];
-      char buf[18];
-      esp_err_t result = esp_wifi_get_mac(WIFI_IF_STA, mymac);
-      sprintf(buf,"%02X:%02X:%02X:%02X:%02X:%02X", mymac[0], mymac[1], mymac[2], mymac[3], mymac[4], mymac[5]);
-      USER_PRINTF("WiFi Mac Address: %02X:%02X:%02X:%02X:%02X:%02X\n", mymac[0], mymac[1], mymac[2], mymac[3], mymac[4], mymac[5]);
-      escapedMac = buf;
-    #endif
-  #else
-    escapedMac = WiFi.macAddress();
-  #endif
-  escapedMac.replace(":", "");
-  escapedMac.toLowerCase();
+  escapedMac = Network.getEscapedMac();
 
   WLED_SET_AP_SSID(); // otherwise it is empty on first boot until config is saved