Merge remote-tracking branch 'remotes/origin/master' into remove-softap

src/main.cpp

@@ -30,6 +30,7 @@
 // #include <driver/rtc_io.h>
 
 #include "mesh/http/WiFiAPClient.h"
+#include "mesh/eth/ethClient.h"
 
 #ifdef ARCH_ESP32
 #include "mesh/http/WebServer.h"
@@ -41,6 +42,11 @@
 #include "mqtt/MQTT.h"
 #endif
 
+#if HAS_ETHERNET
+#include "mesh/eth/ethServerAPI.h"
+#include "mqtt/MQTT.h"
+#endif
+
 #include "LLCC68Interface.h"
 #include "RF95Interface.h"
 #include "SX1262Interface.h"
@@ -270,11 +276,12 @@ void setup()
 #ifdef ARCH_NRF52
     nrf52Setup();
 #endif
-    playStartMelody();
     // We do this as early as possible because this loads preferences from flash
     // but we need to do this after main cpu iniot (esp32setup), because we need the random seed set
     nodeDB.init();
 
+    playStartMelody();
+
     // Currently only the tbeam has a PMU
     power = new Power();
     power->setStatusHandler(powerStatus);
@@ -431,13 +438,18 @@ void setup()
     }
 #endif
 
-#if HAS_WIFI
+#if HAS_WIFI || HAS_ETHERNET
     mqttInit();
 #endif
 
+#ifndef ARCH_PORTDUINO
     // Initialize Wifi
     initWifi();
 
+    // Initialize Ethernet
+    initEthernet();
+#endif
+
 #ifdef ARCH_ESP32
     // Start web server thread.
     webServerThread = new WebServerThread();