C3MA/PlantCtrl
6
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

Add target_pct field to PlantInfo for target moisture mode

Browse Source
This commit is contained in:
Empire Phoenix
2026-05-30 20:56:36 +02:00
parent bba959f2a2
commit 4b3c003996
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Software/MainBoard/rust/src/plant_state.rs
View File

@@ -1,4 +1,6 @@
use crate::config::SensorCombineMode;
use crate::hal::Moistures; use crate::hal::Moistures;
use crate::plant_state::PlantWateringMode::TargetMoisture;
use crate::{config::PlantConfig, hal::HAL, in_time_range}; use crate::{config::PlantConfig, hal::HAL, in_time_range};
use chrono::{DateTime, TimeDelta, Utc}; use chrono::{DateTime, TimeDelta, Utc};
use chrono_tz::Tz; use chrono_tz::Tz;
@@ -353,6 +355,11 @@ impl PlantState {
sensor_a: Self::sensor_to_telemetry(&self.sensor_a), sensor_a: Self::sensor_to_telemetry(&self.sensor_a),
sensor_b: Self::sensor_to_telemetry(&self.sensor_b), sensor_b: Self::sensor_to_telemetry(&self.sensor_b),
mode: plant_conf.mode, mode: plant_conf.mode,
target_pct: if plant_conf.mode == TargetMoisture {
Some(plant_conf.target_moisture as f32)
} else {
None
},
do_water: self.needs_to_be_watered(plant_conf, current_time), do_water: self.needs_to_be_watered(plant_conf, current_time),
dry: if let Some(moisture_percent) = moisture_pct { dry: if let Some(moisture_percent) = moisture_pct {
moisture_percent < plant_conf.target_moisture.into() moisture_percent < plant_conf.target_moisture.into()
@@ -438,6 +445,8 @@ impl PlantState {
pub struct PlantInfo { pub struct PlantInfo {
/// combined plant moisture from available sensors /// combined plant moisture from available sensors
moisture_pct: Option<f32>, moisture_pct: Option<f32>,
/// moisture target, if in targetmode
target_pct: Option<f32>,
/// state of humidity sensor on bank a /// state of humidity sensor on bank a
sensor_a: SensorTelemetry, sensor_a: SensorTelemetry,
/// state of humidity sensor on bank b /// state of humidity sensor on bank b