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

Adjust timeouts and constants for improved moisture sensor and backup management accuracy

Browse Source 
- Increased CAN measurement timeout to 5000ms for reliability.
- Updated `SAVEGAME_SLOT_SIZE` usage in backup handling for consistency.
- Refined moisture sensor frequency thresholds for better sensor calibration (400Hz-70kHz).
This commit is contained in:
Empire Phoenix
2026-05-03 21:03:13 +02:00
parent 4771a77686
commit 0ed9d6bb57
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Software/MainBoard/rust/src/hal/v4_hal.rs
View File

@@ -391,7 +391,7 @@ impl<'a> BoardInteraction<'a> for V4<'a> {
let mut moistures = Moistures::default(); let mut moistures = Moistures::default();
let _ = wait_for_can_measurements(&mut twai, &mut moistures) let _ = wait_for_can_measurements(&mut twai, &mut moistures)
.with_timeout(Duration::from_millis(1000)) .with_timeout(Duration::from_millis(5000))
.await; .await;
Ok(moistures) Ok(moistures)
}) })

2
Software/MainBoard/rust/src/mcutie_3_0_0/lib.rs
View File

@@ -220,7 +220,7 @@ impl<'t, T: Deref<Target = str> + 't, L: Publishable + 't, const S: usize>
username: self.username, username: self.username,
password: self.password, password: self.password,
subscriptions: self.subscriptions, subscriptions: self.subscriptions,
keep_alive keep_alive,
}, },
) )
} }

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

@@ -4,8 +4,8 @@ use chrono::{DateTime, TimeDelta, Utc};
use chrono_tz::Tz; use chrono_tz::Tz;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
const MOIST_SENSOR_MAX_FREQUENCY: f32 = 7500.; // 60kHz (500Hz margin) const MOIST_SENSOR_MAX_FREQUENCY: f32 = 70000.; // 70kHz
const MOIST_SENSOR_MIN_FREQUENCY: f32 = 150.; // this is really, really dry, think like cactus levels const MOIST_SENSOR_MIN_FREQUENCY: f32 = 400.; // this is really, really dry, think like cactus levels
#[derive(Debug, PartialEq, Serialize)] #[derive(Debug, PartialEq, Serialize)]
pub enum MoistureSensorError { pub enum MoistureSensorError {
@@ -312,7 +312,7 @@ impl PlantState {
}, },
sensor_a_firmware_build_minutes: self.sensor_a_firmware_build_minutes, sensor_a_firmware_build_minutes: self.sensor_a_firmware_build_minutes,
sensor_b_firmware_build_minutes: self.sensor_b_firmware_build_minutes, sensor_b_firmware_build_minutes: self.sensor_b_firmware_build_minutes,
last_fertilizer_time: self.last_fertilizer_time last_fertilizer_time: self.last_fertilizer_time,
} }
} }
} }

3
Software/MainBoard/rust/src/webserver/backup_manager.rs
View File

@@ -1,4 +1,5 @@
use crate::fat_error::{FatError, FatResult}; use crate::fat_error::{FatError, FatResult};
use crate::hal::savegame_manager::SAVEGAME_SLOT_SIZE;
use crate::webserver::read_up_to_bytes_from_request; use crate::webserver::read_up_to_bytes_from_request;
use crate::BOARD_ACCESS; use crate::BOARD_ACCESS;
use alloc::borrow::ToOwned; use alloc::borrow::ToOwned;
@@ -46,7 +47,7 @@ pub(crate) async fn backup_config<T, const N: usize>(
where where
T: Read + Write, T: Read + Write,
{ {
let input = read_up_to_bytes_from_request(conn, Some(4096)).await?; let input = read_up_to_bytes_from_request(conn, Some(SAVEGAME_SLOT_SIZE)).await?;
info!("Read input with length {}", input.len()); info!("Read input with length {}", input.len());
let mut board = BOARD_ACCESS.get().await.lock().await; let mut board = BOARD_ACCESS.get().await.lock().await;
let config_to_backup = serde_json::from_slice(&input)?; let config_to_backup = serde_json::from_slice(&input)?;