Merge branch 'master' into update-wifimanager

src/networkDevices/W5500Device.cpp

@@ -4,6 +4,7 @@
 #include "../PreferencesKeys.h"
 #include "../Logger.h"
 #include "../MqttTopics.h"
+#include "sdkconfig.h"
 
 W5500Device::W5500Device(const String &hostname, Preferences* preferences, const IPConfiguration* ipConfiguration, int variant)
 : NetworkDevice(hostname, ipConfiguration),
@@ -48,7 +49,11 @@ void W5500Device::initialize()
     {
         case W5500Variant::M5StackAtomPoe:
             _resetPin = -1;
+            #if defined(CONFIG_IDF_TARGET_ESP32S3)
+            Ethernet.init(6, 5, 7, 8);
+            #else
             Ethernet.init(19, 22, 23, 33);
+            #endif
             break;
         default:
             _resetPin = -1;

src/networkDevices/WifiDevice.cpp

@@ -66,7 +66,7 @@ void WifiDevice::initialize()
     wm_menu.push_back("wifi");
     wm_menu.push_back("exit");
     _wm.setEnableConfigPortal(_startAp || !_preferences->getBool(preference_network_wifi_fallback_disabled));
-    // reduced tieout if ESP is set to restart on disconnect
+    // reduced timeout if ESP is set to restart on disconnect
     _wm.setFindBestRSSI(_preferences->getBool(preference_find_best_rssi));
     _wm.setConfigPortalTimeout(_restartOnDisconnect ? 60 * 3 : 60 * 30);
     _wm.setShowInfoUpdate(false);