progress new ui

rust/src/main.rs

@@ -258,7 +258,7 @@ fn safe_main() -> anyhow::Result<()> {
         Err(err) => {
             println!("Missing normal config, entering config mode {}", err);
             //config upload will trigger reboot!
-            let _ = board.wifi_ap();
+            let _ = board.wifi_ap(Option::None);
             drop(board);
             let reboot_now = Arc::new(AtomicBool::new(false));
             let _webserver = httpd(reboot_now.clone());
@@ -293,13 +293,15 @@ fn safe_main() -> anyhow::Result<()> {
                         board.general_fault(true);
                     }
                 }
-                match board.mqtt(&config) {
-                    Ok(_) => {
-                        println!("Mqtt connection ready");
-                        mqtt = true;
-                    }
-                    Err(err) => {
-                        println!("Could not connect mqtt due to {}", err);
+                if (config.network.mqtt_url.is_some()){
+                    match board.mqtt(&config) {
+                        Ok(_) => {
+                            println!("Mqtt connection ready");
+                            mqtt = true;
+                        }
+                        Err(err) => {
+                            println!("Could not connect mqtt due to {}", err);
+                        }
                     }
                 }
             }
@@ -312,6 +314,16 @@ fn safe_main() -> anyhow::Result<()> {
         println!("No wifi configured");
     }
 
+    if !wifi && to_config {
+        println!("Could not connect to station and config mode forced, switching to ap mode!");
+        match board.wifi_ap(Some(config.network.ap_ssid.clone())) {
+            Ok(_) => {
+                println!("Started ap, continuing")
+            },
+            Err(err) => println!("Could not start config override ap mode due to {}", err.to_string()),
+        }
+    }
+
     let timezone_time = cur.with_timezone(&TIME_ZONE);
     println!(
         "Running logic at utc {} and {} {}",