Fixed bug introduced in latest commit casuing wifi timeout error on

onboarding.
SeedLabs-it · Jan 3, 2025 · afab86a · afab86a
1 parent d4ab9a4
commit afab86a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/firmware/src/root_task.cpp b/firmware/src/root_task.cpp
@@ -818,17 +818,26 @@ void RootTask::loadConfiguration()
             OSMode os_mode = configuration_->getOSConfiguration()->mode;
 #if SK_WIFI
             if ((os_mode == OSMode::HASS || os_mode == OSMode::SPOTIFY) && !configuration_->loadWiFiConfiguration())
+            {
+                WiFiConfiguration wifi_config = configuration_->getWiFiConfiguration();
+                // TODO: send event to wifi to start STA part with given credentials
+                wifi_task_->getNotifier()->requestSTA(wifi_config);
+            }
+            else
             {
                 // handle wifi config not loaded.
             }
-            WiFiConfiguration wifi_config = configuration_->getWiFiConfiguration();
-            // TODO: send event to wifi to start STA part with given credentials
-            wifi_task_->getNotifier()->requestSTA(wifi_config);
 #endif
-            if (configuration_->getOSConfiguration()->mode == HASS && !configuration_->loadMQTTConfiguration())
+#if SK_MQTT
+            if (configuration_->getOSConfiguration()->mode == HASS && configuration_->loadMQTTConfiguration())
+            {
+            }
+            else
             {
                 // handle mqtt config not loaded.
             }
+#endif
+
             configuration_loaded_ = true;
         }
     }

diff --git a/software/web-preact/src/components/wifi.tsx b/software/web-preact/src/components/wifi.tsx
@@ -45,7 +45,7 @@ const WiFiComp = () => {
         var json = await response.json();
         if (json.redirect == 'spotify') {
           //   window.location.href = '/?' + json.redirect;
-          window.location.href = 'http://192.168.2.90/?spotify';
+          window.location.href = `http://${window.location.hostname}/?spotify`;
         } else {
           window.location.href = '/?' + json.redirect;
         }