allow single sensor detection, get rid of sensor disabled hardware state == nomessage

Software/MainBoard/rust/src/hal/mod.rs

@@ -101,7 +101,7 @@ use littlefs2::fs::{Allocation, Filesystem as lfs2Filesystem};
 use littlefs2::object_safe::DynStorage;
 use log::{error, info, warn};
 use portable_atomic::AtomicBool;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use shared_flash::MutexFlashStorage;
 
 pub static TIME_ACCESS: OnceLock<Mutex<CriticalSectionRawMutex, Rtc>> = OnceLock::new();
@@ -138,6 +138,12 @@ pub struct HAL<'a> {
     pub board_hal: Box<dyn BoardInteraction<'a> + Send>,
 }
 
+pub struct DetectionRequest {
+    pub sensorsa: [Sensor; PLANT_COUNT],
+    pub sensorsb: [Sensor; PLANT_COUNT],
+
+}
+
 #[async_trait(?Send)]
 pub trait BoardInteraction<'a> {
     fn get_tank_sensor(&mut self) -> Result<&mut TankSensor<'a>, FatError>;
@@ -163,7 +169,7 @@ pub trait BoardInteraction<'a> {
     async fn can_power(&mut self, state: bool) -> FatResult<()>;
 
     // Return JSON string with autodetected sensors per plant. Default: not supported.
-    async fn detect_sensors(&mut self) -> FatResult<DetectionResult> {
+    async fn detect_sensors(&mut self, request: Detection) -> FatResult<Detection> {
         bail!("Autodetection is only available on v4 HAL with CAN bus");
     }
 
@@ -684,12 +690,13 @@ pub struct Moistures {
     pub sensor_b_hz: [Option<f32>; PLANT_COUNT],
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize)]
-pub struct DetectionResult {
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
+pub struct Detection {
     plant: [DetectionSensorResult; PLANT_COUNT],
 }
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
 pub struct DetectionSensorResult {
     sensor_a: bool,
     sensor_b: bool,
 }
+

Software/MainBoard/rust/src/hal/v4_hal.rs

@@ -6,7 +6,7 @@ use crate::hal::esp::{hold_disable, hold_enable, Esp};
 use crate::hal::rtc::RTCModuleInteraction;
 use crate::hal::water::TankSensor;
 use crate::hal::{
-    BoardInteraction, DetectionResult, FreePeripherals, Moistures, Sensor, I2C_DRIVER, PLANT_COUNT,
+    BoardInteraction, Detection, FreePeripherals, Moistures, Sensor, I2C_DRIVER, PLANT_COUNT,
     TIME_ACCESS,
 };
 use crate::log::{LogMessage, LOG_ACCESS};
@@ -375,7 +375,7 @@ impl<'a> BoardInteraction<'a> for V4<'a> {
         Ok(moistures)
     }
 
-    async fn detect_sensors(&mut self) -> FatResult<DetectionResult> {
+    async fn detect_sensors(&mut self, request: Detection) -> FatResult<Detection> {
         self.can_power.set_high();
         let config = self.twai_config.take().expect("twai config not set");
         let mut twai = config.into_async().start();
@@ -385,6 +385,14 @@ impl<'a> BoardInteraction<'a> for V4<'a> {
         // Send a few test messages per potential sensor node
         for plant in 0..PLANT_COUNT {
             for sensor in [Sensor::A, Sensor::B] {
+                let detect = if sensor == Sensor::A {
+                    request.plant[plant].sensor_a
+                } else {
+                    request.plant[plant].sensor_b
+                };
+                if !detect {
+                    continue;
+                }
                 let target =
                     StandardId::new(plant_id(IDENTIFY_CMD_OFFSET, sensor.into(), (plant +1) as u16))
                         .context(">> Could not create address for sensor! (plant: {}) <<")?;
@@ -559,9 +567,9 @@ async fn wait_for_can_measurements(
     }
 }
 
-impl From<Moistures> for DetectionResult {
+impl From<Moistures> for Detection {
     fn from(value: Moistures) -> Self {
-        let mut result = DetectionResult::default();
+        let mut result = Detection::default();
         for (plant, sensor) in value.sensor_a_hz.iter().enumerate() {
             result.plant[plant].sensor_a = sensor.is_some();
         }