From 9a367139e937ebbc239463ba0b23f45c0a9cf8fd Mon Sep 17 00:00:00 2001 From: Ben Kuper Date: Fri, 5 Jul 2024 15:43:51 +0200 Subject: [PATCH] fix wifi when eth enabled --- .../src/Component/components/wifi/WifiComponent.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Firmware/Bentuino/src/Component/components/wifi/WifiComponent.cpp b/Firmware/Bentuino/src/Component/components/wifi/WifiComponent.cpp index 1c58090..9cc646a 100644 --- a/Firmware/Bentuino/src/Component/components/wifi/WifiComponent.cpp +++ b/Firmware/Bentuino/src/Component/components/wifi/WifiComponent.cpp @@ -23,7 +23,11 @@ ImplementSingleton(WifiComponent) void WifiComponent::updateInternal() { -#ifndef USE_ETHERNET +#ifdef USE_ETHERNET + if (mode == MODE_ETH) + return; +#endif + long curTime = millis(); if (curTime > lastConnectTime + timeBetweenTries) { @@ -68,7 +72,6 @@ void WifiComponent::updateInternal() break; } } -#endif } void WifiComponent::clearInternal() @@ -183,7 +186,8 @@ void WifiComponent::WiFiEvent(WiFiEvent_t event) break; case ARDUINO_EVENT_ETH_CONNECTED: - setState(Connected); + NDBG("Ethernet connected, getting IP..."); + // setState(Connected); break; case ARDUINO_EVENT_ETH_GOT_IP: