diff --git a/components/espwifistack b/components/espwifistack index 0497b7a..04ed820 160000 --- a/components/espwifistack +++ b/components/espwifistack @@ -1 +1 @@ -Subproject commit 0497b7a1345f87ed2f54fd6ddf89dca0755276cc +Subproject commit 04ed8200f503b2b376ec0e045bc4bd2ed046eb4c diff --git a/main/can.h b/main/can.h index c3fd59c..f4560a9 100644 --- a/main/can.h +++ b/main/can.h @@ -417,7 +417,7 @@ void sendCanCommands() case 10: if (send(Boardcomputer::Feedback::ButtonLeds, buttonLeds) == ESP_OK) lastValues.buttonLeds = buttonLeds; - [[fallthrough]] + [[fallthrough]]; default: i=0; break; diff --git a/main/displays/statusdisplay.h b/main/displays/statusdisplay.h index 4b20577..1b6a709 100644 --- a/main/displays/statusdisplay.h +++ b/main/displays/statusdisplay.h @@ -157,9 +157,12 @@ void StatusDisplay::redraw() m_backStatus.redraw(controllers.back); tft.setTextFont(2); - //m_labelWifiStatus.redraw(to_string(WiFi.status())); + m_labelWifiStatus.redraw(wifi_stack::toString(wifi_stack::get_sta_status())); m_labelLimit0.redraw(std::to_string(controllers.front.command.left.iMotMax) + "A"); - //m_labelIpAddress.redraw(to_string(WiFi.localIP())); + if (const auto result = wifi_stack::get_ip_info(TCPIP_ADAPTER_IF_STA)) + m_labelIpAddress.redraw(wifi_stack::toString(result->ip)); + else + m_labelIpAddress.clear(); m_labelLimit1.redraw(std::to_string(controllers.front.command.left.iDcMax) + "A"); m_labelPerformance.redraw(std::to_string(performance.last)); m_labelMode.redraw(currentMode->displayName());