add publish flag to SensorData and conditionally process MQTT messages

Author: psytraxx

src/domain.rs

@@ -21,6 +21,7 @@ const MOISTURE_DRY_THRESHOLD: f32 = 0.15;
 #[derive(Default, Debug)]
 pub struct SensorData {
     pub data: Vec<Sensor>,
+    pub publish: bool,
 }
 
 impl Display for SensorData {

src/sensors_task.rs

@@ -171,13 +171,16 @@ pub async fn sensor_task(
             warn!("Unable to generate average value of soil moisture");
         }
 
-        if let Some(avg) = calculate_average(&mut battery_voltage_samples) {
-            info!("Battery voltage: {}mV", avg);
-            sensor_data.data.push(Sensor::BatteryVoltage(avg));
-        } else {
-            warn!("Error measuring battery voltage");
+        if let Some(avg_battery_voltage) = calculate_average(&mut battery_voltage_samples) {
+            info!("Battery voltage: {}mV", avg_battery_voltage);
+            sensor_data
+                .data
+                .push(Sensor::BatteryVoltage(avg_battery_voltage));
         }
 
+        // no battery samples - no publish!
+        sensor_data.publish = !battery_voltage_samples.is_empty();
+
         sender.send(sensor_data).await;
 
         // Power off the sensors

src/update_task.rs

@@ -3,7 +3,7 @@ use alloc::{
     string::{String, ToString},
 };
 use core::{num::ParseIntError, str};
-use defmt::{error, info};
+use defmt::{error, info, warn};
 use embassy_futures::select::{select, Either};
 use embassy_net::{
     dns::{DnsQueryType, Error as DnsError},
@@ -146,6 +146,20 @@ async fn handle_sensor_data(
     client: &mut MqttClientImpl<'_>,
     display: &mut Display<'static>,
     sensor_data: SensorData,
+) -> Result<(), Error> {
+    if sensor_data.publish {
+        process_mqtt(client, &sensor_data).await?;
+    } else {
+        warn!("skipping publishing to MQTT");
+    }
+
+    process_display(display, &sensor_data).await?;
+    Ok(())
+}
+
+async fn process_mqtt(
+    client: &mut MqttClientImpl<'_>,
+    sensor_data: &SensorData,
 ) -> Result<(), Error> {
     let discovery_messages_sent = unsafe { DISCOVERY_MESSAGES_SENT };
     if !discovery_messages_sent {
@@ -179,14 +193,12 @@ async fn handle_sensor_data(
         info!("Discovery messages already sent");
     }
 
-    // act on sensor data - turn pump on/off
+    // Act on sensor data - turn pump on/off
     sensor_data.data.iter().for_each(|entry| {
         if let Sensor::WaterLevel(WaterLevel::Full) = entry {
-            // Water level is full, stop the pump in any case if it's running
             info!("Water level is full, stopping pump");
             ENABLE_PUMP.signal(false);
         } else if let Sensor::PumpTrigger(enabled) = entry {
-            // Pump trigger is enabled, start the pump
             if *enabled {
                 info!("Soil moisture is low, starting pump");
                 ENABLE_PUMP.signal(true);
@@ -199,7 +211,6 @@ async fn handle_sensor_data(
         let value = s.value();
         let message = json!({ "value": value }).to_string();
         let topic_name = format!("{}/{}", DEVICE_ID, key);
-
         info!(
             "Publishing to topic {}, message: {}",
             topic_name.as_str(),
@@ -216,8 +227,6 @@ async fn handle_sensor_data(
             .await?;
     }
 
-    display.write_multiline(&format!("{}", sensor_data))?;
-
     let pump_topic = format!("{}/pump/state", DEVICE_ID);
     let message = "OFF";
     info!(
@@ -234,11 +243,16 @@ async fn handle_sensor_data(
             false,
         )
         .await?;
+    Ok(())
+}
 
+async fn process_display(
+    display: &mut Display<'static>,
+    sensor_data: &SensorData,
+) -> Result<(), Error> {
+    display.write_multiline(&format!("{}", sensor_data))?;
     Timer::after(Duration::from_secs(AWAKE_DURATION_SECONDS)).await;
-
     display.enable_powersave()?;
-
     Ok(())
 }