combine all branches

rust/src/config.rs

@@ -1,11 +1,7 @@
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
-
-use chrono_tz::{Europe::Berlin, Tz};
-use std::str::FromStr;
-
+use crate::hal::PLANT_COUNT;
 use crate::plant_state::PlantWateringMode;
-use crate::PLANT_COUNT;
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 #[serde(default)]
@@ -15,8 +11,7 @@ pub struct NetworkConfig {
     pub password: Option<heapless::String<64>>,
     pub mqtt_url: Option<heapless::String<128>>,
     pub base_topic: Option<heapless::String<64>>,
-    pub max_wait: u32,
-    pub timezone: heapless::String<64>,
+    pub max_wait: u32
 }
 impl Default for NetworkConfig {
     fn default() -> Self {
@@ -26,8 +21,7 @@ impl Default for NetworkConfig {
             password: None,
             mqtt_url: None,
             base_topic: None,
-            max_wait: 10000,
-            timezone: heapless::String::from_str("Europe/Berlin").unwrap(),
+            max_wait: 10000
         }
     }
 }