stuff

rust/src/webserver/get_json.rs

@@ -1,3 +1,4 @@
+use core::str::FromStr;
 use crate::fat_error::{FatError, FatResult};
 use crate::hal::{esp_time, PLANT_COUNT};
 use crate::log::LogMessage;
@@ -8,9 +9,9 @@ use alloc::format;
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
 use chrono_tz::Tz;
-use core::str::FromStr;
 use edge_http::io::server::Connection;
 use embedded_io_async::{Read, Write};
+use log::info;
 use serde::Serialize;
 
 #[derive(Serialize, Debug)]
@@ -139,7 +140,24 @@ pub(crate) async fn get_time<T, const N: usize>(
 ) -> FatResult<Option<String>> {
     let mut board = BOARD_ACCESS.get().await.lock().await;
     let conf = board.board_hal.get_config();
-    let tz = Tz::from_str(conf.timezone.as_ref().unwrap().as_str()).unwrap();
+
+    let tz:Tz = match conf.timezone.as_ref(){
+        None => {
+            Tz::UTC
+        }
+        Some(tz_string) => {
+            match Tz::from_str(tz_string) {
+                Ok(tz) => {
+                    tz
+                }
+                Err(err) => {
+                    info!("failed parsing timezone {}", err);
+                    Tz::UTC
+                }
+            }
+        }
+    };
+
     let native = esp_time().await.with_timezone(&tz).to_rfc3339();
 
     let rtc = match board.board_hal.get_rtc_module().get_rtc_time().await {