cleanups

Software/MainBoard/rust/src/config.rs

@@ -0,0 +1,156 @@
+use crate::hal::PLANT_COUNT;
+use crate::plant_state::PlantWateringMode;
+use alloc::string::String;
+use core::str::FromStr;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[serde(default)]
+pub struct NetworkConfig {
+    pub ap_ssid: heapless::String<32>,
+    pub ssid: Option<heapless::String<32>>,
+    pub password: Option<heapless::String<64>>,
+    pub mqtt_url: Option<String>,
+    pub base_topic: Option<heapless::String<64>>,
+    pub mqtt_user: Option<String>,
+    pub mqtt_password: Option<String>,
+    pub max_wait: u32,
+}
+impl Default for NetworkConfig {
+    fn default() -> Self {
+        Self {
+            ap_ssid: heapless::String::from_str("PlantCtrl Init").unwrap(),
+            ssid: None,
+            password: None,
+            mqtt_url: None,
+            base_topic: None,
+            mqtt_user: None,
+            mqtt_password: None,
+            max_wait: 10000,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[serde(default)]
+pub struct NightLampConfig {
+    pub enabled: bool,
+    pub night_lamp_hour_start: u8,
+    pub night_lamp_hour_end: u8,
+    pub night_lamp_only_when_dark: bool,
+    pub low_soc_cutoff: u8,
+    pub low_soc_restore: u8,
+}
+impl Default for NightLampConfig {
+    fn default() -> Self {
+        Self {
+            enabled: true,
+            night_lamp_hour_start: 19,
+            night_lamp_hour_end: 2,
+            night_lamp_only_when_dark: true,
+            low_soc_cutoff: 30,
+            low_soc_restore: 50,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[serde(default)]
+pub struct TankConfig {
+    pub tank_sensor_enabled: bool,
+    pub tank_allow_pumping_if_sensor_error: bool,
+    pub tank_useable_ml: u32,
+    pub tank_warn_percent: u8,
+    pub tank_empty_percent: u8,
+    pub tank_full_percent: u8,
+    pub ml_per_pulse: f32,
+}
+impl Default for TankConfig {
+    fn default() -> Self {
+        Self {
+            tank_sensor_enabled: false,
+            tank_allow_pumping_if_sensor_error: true,
+            tank_useable_ml: 50000,
+            tank_warn_percent: 40,
+            tank_empty_percent: 5,
+            tank_full_percent: 95,
+            ml_per_pulse: 0.0,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)]
+pub enum BatteryBoardVersion {
+    #[default]
+    Disabled,
+    BQ34Z100G1,
+    WchI2cSlave,
+}
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)]
+pub enum BoardVersion {
+    #[default]
+    INITIAL,
+    V3,
+    V4,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)]
+pub struct BoardHardware {
+    pub board: BoardVersion,
+    pub battery: BatteryBoardVersion,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)]
+#[serde(default)]
+pub struct PlantControllerConfig {
+    pub hardware: BoardHardware,
+    pub network: NetworkConfig,
+    pub tank: TankConfig,
+    pub night_lamp: NightLampConfig,
+    pub plants: [PlantConfig; PLANT_COUNT],
+    pub timezone: Option<String>,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[serde(default)]
+pub struct PlantConfig {
+    pub mode: PlantWateringMode,
+    pub target_moisture: f32,
+    pub min_moisture: f32,
+    pub pump_time_s: u16,
+    pub pump_limit_ml: u16,
+    pub pump_cooldown_min: u16,
+    pub pump_hour_start: u8,
+    pub pump_hour_end: u8,
+    pub sensor_a: bool,
+    pub sensor_b: bool,
+    pub max_consecutive_pump_count: u8,
+    pub moisture_sensor_min_frequency: Option<f32>, // Optional min frequency
+    pub moisture_sensor_max_frequency: Option<f32>, // Optional max frequency
+    pub min_pump_current_ma: u16,
+    pub max_pump_current_ma: u16,
+    pub ignore_current_error: bool,
+}
+
+impl Default for PlantConfig {
+    fn default() -> Self {
+        Self {
+            mode: PlantWateringMode::OFF,
+            target_moisture: 40.,
+            min_moisture: 30.,
+            pump_time_s: 30,
+            pump_limit_ml: 5000,
+            pump_cooldown_min: 60,
+            pump_hour_start: 9,
+            pump_hour_end: 20,
+            sensor_a: true,
+            sensor_b: false,
+            max_consecutive_pump_count: 10,
+            moisture_sensor_min_frequency: None, // No override by default
+            moisture_sensor_max_frequency: None, // No override by default
+            min_pump_current_ma: 10,
+            max_pump_current_ma: 3000,
+            ignore_current_error: true,
+        }
+    }
+}