From 95281d617fc0926153616524eabdf490f46b1149 Mon Sep 17 00:00:00 2001 From: Empire Phoenix Date: Sat, 30 May 2026 20:59:38 +0200 Subject: [PATCH] clippy fixed --- Software/MainBoard/rust/src/config.rs | 9 ++------- Software/MainBoard/rust/src/hal/battery.rs | 1 - Software/MainBoard/rust/src/hal/esp.rs | 2 +- Software/MainBoard/rust/src/plant_state.rs | 6 ++---- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Software/MainBoard/rust/src/config.rs b/Software/MainBoard/rust/src/config.rs index 5bb52e7..6985ce1 100644 --- a/Software/MainBoard/rust/src/config.rs +++ b/Software/MainBoard/rust/src/config.rs @@ -112,19 +112,14 @@ pub struct PlantControllerConfig { pub timezone: Option, } -#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)] +#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)] pub enum SensorCombineMode { Min, Max, + #[default] Avg, } -impl Default for SensorCombineMode { - fn default() -> Self { - SensorCombineMode::Avg - } -} - #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)] #[serde(default)] pub struct PlantConfig { diff --git a/Software/MainBoard/rust/src/hal/battery.rs b/Software/MainBoard/rust/src/hal/battery.rs index ba67601..7489cc1 100644 --- a/Software/MainBoard/rust/src/hal/battery.rs +++ b/Software/MainBoard/rust/src/hal/battery.rs @@ -1,5 +1,4 @@ use crate::fat_error::{FatError, FatResult}; -use crate::hal::Box; use alloc::string::String; use async_trait::async_trait; use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice; diff --git a/Software/MainBoard/rust/src/hal/esp.rs b/Software/MainBoard/rust/src/hal/esp.rs index 6444b42..2a072f0 100644 --- a/Software/MainBoard/rust/src/hal/esp.rs +++ b/Software/MainBoard/rust/src/hal/esp.rs @@ -226,7 +226,7 @@ impl Esp<'_> { ssid: ap.ssid.as_str().to_string(), bssid: format_bssid(&ap.bssid), rssi: ap.signal_strength as i32, - channel: ap.channel as u8, + channel: ap.channel, auth_method: format!("{:?}", ap.auth_method), }) .collect(); diff --git a/Software/MainBoard/rust/src/plant_state.rs b/Software/MainBoard/rust/src/plant_state.rs index b7e3c46..8e26db5 100644 --- a/Software/MainBoard/rust/src/plant_state.rs +++ b/Software/MainBoard/rust/src/plant_state.rs @@ -287,7 +287,7 @@ impl PlantState { /// - Tuple of errors from sensor A and B /// - Sensor warning indicating if warning LED should be lit (MissingSecondSensor) pub fn plant_moisture_with_warning(&self, plant_conf: &PlantConfig) -> Option { - let moisture = match ( + match ( self.sensor_a.moisture_percent(), self.sensor_b.moisture_percent(), ) { @@ -299,9 +299,7 @@ impl PlantState { (Some(moisture), _) => Some(moisture), (_, Some(moisture)) => Some(moisture), _ => None, - }; - - moisture + } } pub fn needs_to_be_watered(