diff --git a/Software/MainBoard/rust/src/hal/v4_hal.rs b/Software/MainBoard/rust/src/hal/v4_hal.rs index 3ba5654..e0bce77 100644 --- a/Software/MainBoard/rust/src/hal/v4_hal.rs +++ b/Software/MainBoard/rust/src/hal/v4_hal.rs @@ -391,7 +391,7 @@ impl<'a> BoardInteraction<'a> for V4<'a> { let mut moistures = Moistures::default(); let _ = wait_for_can_measurements(&mut twai, &mut moistures) - .with_timeout(Duration::from_millis(1000)) + .with_timeout(Duration::from_millis(5000)) .await; Ok(moistures) }) diff --git a/Software/MainBoard/rust/src/mcutie_3_0_0/lib.rs b/Software/MainBoard/rust/src/mcutie_3_0_0/lib.rs index 126c9af..56ca442 100644 --- a/Software/MainBoard/rust/src/mcutie_3_0_0/lib.rs +++ b/Software/MainBoard/rust/src/mcutie_3_0_0/lib.rs @@ -220,7 +220,7 @@ impl<'t, T: Deref + 't, L: Publishable + 't, const S: usize> username: self.username, password: self.password, subscriptions: self.subscriptions, - keep_alive + keep_alive, }, ) } diff --git a/Software/MainBoard/rust/src/plant_state.rs b/Software/MainBoard/rust/src/plant_state.rs index 5f00a8a..445e5fa 100644 --- a/Software/MainBoard/rust/src/plant_state.rs +++ b/Software/MainBoard/rust/src/plant_state.rs @@ -4,8 +4,8 @@ use chrono::{DateTime, TimeDelta, Utc}; use chrono_tz::Tz; use serde::{Deserialize, Serialize}; -const MOIST_SENSOR_MAX_FREQUENCY: f32 = 7500.; // 60kHz (500Hz margin) -const MOIST_SENSOR_MIN_FREQUENCY: f32 = 150.; // this is really, really dry, think like cactus levels +const MOIST_SENSOR_MAX_FREQUENCY: f32 = 70000.; // 70kHz +const MOIST_SENSOR_MIN_FREQUENCY: f32 = 400.; // this is really, really dry, think like cactus levels #[derive(Debug, PartialEq, Serialize)] pub enum MoistureSensorError { @@ -312,7 +312,7 @@ impl PlantState { }, sensor_a_firmware_build_minutes: self.sensor_a_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, } } } diff --git a/Software/MainBoard/rust/src/webserver/backup_manager.rs b/Software/MainBoard/rust/src/webserver/backup_manager.rs index 0dde713..5b6db73 100644 --- a/Software/MainBoard/rust/src/webserver/backup_manager.rs +++ b/Software/MainBoard/rust/src/webserver/backup_manager.rs @@ -1,4 +1,5 @@ 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::BOARD_ACCESS; use alloc::borrow::ToOwned; @@ -46,7 +47,7 @@ pub(crate) async fn backup_config( where 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()); let mut board = BOARD_ACCESS.get().await.lock().await; let config_to_backup = serde_json::from_slice(&input)?;