Replace 'WiFi.macAddress()' by more reliable 'Network.macAddress()'

Author: 0xCAFEDECAF

VanLiveConnect/ESP32_IDE.bat

@@ -3,7 +3,7 @@
 rem  This batch file sets up the Arduino IDE with all the correct board options (as found in the IDE "Tools" menu)
 
 rem   Board spec for "Lilygo TTGO T7 V1.3 Mini32"
-set BOARDSPEC=esp32:esp32:ttgo-t7-v13-mini32:CPUFreq=240,FlashFreq=80,FlashSize=4M,PartitionScheme=min_spiffs,DebugLevel=none
+set BOARDSPEC=esp32:esp32:ttgo-t7-v13-mini32:CPUFreq=240,FlashFreq=80,FlashMode=qio,FlashSize=4M,PartitionScheme=min_spiffs,DebugLevel=none
 
 rem  Fill in your COM port here
 set COMPORT=COM3

VanLiveConnect/ESP32_IDE.sh

@@ -3,7 +3,7 @@
 # This script sets up the Arduino IDE with all the correct board options (as found in the IDE "Tools" menu)
 
 # Board spec for "Lilygo TTGO T7 V1.3 Mini32"
-BOARDSPEC=esp32:esp32:ttgo-t7-v13-mini32:CPUFreq=240,FlashFreq=80,FlashSize=4M,PartitionScheme=min_spiffs,DebugLevel=none
+BOARDSPEC=esp32:esp32:ttgo-t7-v13-mini32:CPUFreq=240,FlashFreq=80,FlashMode=qio,FlashSize=4M,PartitionScheme=min_spiffs,DebugLevel=none
 
 # Fill in your COM port here
 COMPORT=/dev/ttyUSB0

VanLiveConnect/Esp.ino

@@ -158,9 +158,9 @@ void PrintSystemSpecs()
     Serial.printf_P(PSTR(" (%s)\n"), compileDate);
 
     Serial.print(F("Wi-Fi MAC address: "));
-    Serial.print(WiFi.macAddress());
+    Serial.print(Network.macAddress());
   #ifdef ON_DESK_MFD_ESP_MAC
-    if (WiFi.macAddress() == ON_DESK_MFD_ESP_MAC)
+    if (Network.macAddress() == ON_DESK_MFD_ESP_MAC)
     {
         Serial.print(F(" == ON_DESK_MFD_ESP_MAC, i.e., this is the on-desk test setup, so:\n"));
         Serial.print(F("==> Will print detailed debug info when a VAN bus packet with CRC error is received.\n"));
@@ -239,7 +239,7 @@ const char* EspSystemDataToJson(char* buf, const int n)
         flashModeIde == FM_DOUT ? doutStr :
         unknownStr,
 
-        WiFi.macAddress().c_str(),
+        Network.macAddress().c_str(),
       #ifdef WIFI_AP_MODE // Wi-Fi access point mode
         IP_ADDR,
       #else

VanLiveConnect/IRrecv.ino

@@ -306,7 +306,7 @@ void IrSetup()
     Serial.print(F("Setting up IR receiver\n"));
 
   #ifdef ON_DESK_MFD_ESP_MAC
-    if (WiFi.macAddress() == ON_DESK_MFD_ESP_MAC)
+    if (Network.macAddress() == ON_DESK_MFD_ESP_MAC)
     {
         pinMode(TEST_IR_VCC_TEST, OUTPUT);
         digitalWrite(TEST_IR_VCC_TEST, HIGH);

VanLiveConnect/PacketToJson.ino

@@ -5624,7 +5624,7 @@ const char* ParseVanPacketToJson(TVanPacketRxDesc& pkt)
     if (dataLen < 0 || dataLen > VAN_MAX_DATA_BYTES) return ""; // Unexpected packet length
 
   #ifdef ON_DESK_MFD_ESP_MAC
-    if (WiFi.macAddress() == ON_DESK_MFD_ESP_MAC)
+    if (Network.macAddress() == ON_DESK_MFD_ESP_MAC)
     {
       // On the desk test setup, we want to see a lot of detailed output
         if (! pkt.CheckCrc())

VanLiveConnect/VanLiveConnect.ino

@@ -47,10 +47,14 @@ char dummy_var_to_use_cppXX[] PROGMEM = R"==(")==";
 #define STR(x) #x
 
 #ifdef ARDUINO_ARCH_ESP32
+ #if ! defined ESP_ARDUINO_VERSION || ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+  #define Network WiFi
+ #endif
   #define system_get_free_heap_size esp_get_free_heap_size
   #define LED_ON HIGH
   #define LED_OFF LOW
 #else
+  #define Network WiFi
   #define LED_ON LOW
   #define LED_OFF HIGH
 #endif // ARDUINO_ARCH_ESP32
@@ -379,12 +383,12 @@ void setup()
 
   #ifdef ON_DESK_MFD_ESP_MAC
     // On the desk test setup, go to sleep much quicker
-    if (WiFi.macAddress() == ON_DESK_MFD_ESP_MAC) sleepAfter = 10000;
+    if (Network.macAddress() == ON_DESK_MFD_ESP_MAC) sleepAfter = 10000;
   #endif // ON_DESK_MFD_ESP_MAC
 
   #ifdef WIFI_STRESS_TEST_MFD_ESP_MAC
     // Wi-Fi stress test: don't go to sleep
-    if (WiFi.macAddress() == WIFI_STRESS_TEST_MFD_ESP_MAC) sleepAfter = -1;
+    if (Network.macAddress() == WIFI_STRESS_TEST_MFD_ESP_MAC) sleepAfter = -1;
   #endif // WIFI_STRESS_TEST_MFD_ESP_MAC
 
     if (sleepAfter > 0)

VanLiveConnect/Wifi.ino

@@ -188,7 +188,7 @@ const char* SetupWifi()
 
   #ifdef ON_DESK_MFD_ESP_MAC
     // The test setup on the desk has a slightly different SSID
-    if (WiFi.macAddress() == ON_DESK_MFD_ESP_MAC) wifiSsid = WIFI_SSID" test";
+    if (Network.macAddress() == ON_DESK_MFD_ESP_MAC) wifiSsid = WIFI_SSID" test";
   #endif // ON_DESK_MFD_ESP_MAC
 
     Serial.printf_P(PSTR("Setting up captive portal on Wi-Fi access point '%s', channel %d\n"), wifiSsid, WIFI_CHANNEL);