Merge branch 'feature/v4_modular' into develop

# Conflicts:
#	rust/src/config.rs
#	rust/src/main.rs
#	rust/src/tank.rs
This commit is contained in:
2025-06-18 19:07:24 +02:00
66 changed files with 2368449 additions and 199754 deletions

View File

@@ -1,6 +1,9 @@
use serde::{Deserialize, Serialize};
use std::str::FromStr;
use chrono_tz::{Europe::Berlin, Tz};
use std::str::FromStr;
use crate::plant_state::PlantWateringMode;
use crate::PLANT_COUNT;
@@ -12,7 +15,8 @@ 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 max_wait: u32,
pub timezone: heapless::String<64>,
}
impl Default for NetworkConfig {
fn default() -> Self {
@@ -23,6 +27,7 @@ impl Default for NetworkConfig {
mqtt_url: None,
base_topic: None,
max_wait: 10000,
timezone: heapless::String::from_str("Europe/Berlin").unwrap(),
}
}
}