For WebUI v3, ESP 800 was sending hardcoded values for the WebSocket …

…address, rather than the values as actually configured (#1337)
bdring · Nov 4, 2024 · 20e6a77 · 20e6a77
1 parent b69dd39
commit 20e6a77
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/FluidNC/src/WebUI/WifiConfig.cpp b/FluidNC/src/WebUI/WifiConfig.cpp
@@ -512,9 +512,23 @@ namespace WebUI {
                 j.member("Authentication", "Disabled");
 #endif
                 j.member("WebCommunication", "Synchronous");
-                j.member("WebSocketIP", "localhost");
 
-                j.member("WebSocketPort", "82");
+                switch (WiFi.getMode()) {
+                  case WIFI_AP:
+                    j.member("WebSocketIP", IP_string(WiFi.softAPIP()));
+                    break;
+                  case WIFI_STA:
+                    j.member("WebSocketIP", IP_string(WiFi.localIP()));
+                    break;
+                  case WIFI_AP_STA:
+                    j.member("WebSocketIP", IP_string(WiFi.softAPIP()));
+                    break;
+                  default:
+                    j.member("WebSocketIP", "0.0.0.0");
+                    break;
+                }
+
+                j.member("WebSocketPort", std::to_string(Web_Server::port() + 2));
                 j.member("HostName", WiFi.getHostname());
                 j.member("WiFiMode", modeName());
                 j.member("FlashFileSystem", "LittleFS");