add publish flag to SensorData and conditionally process MQTT messages (#17)

* add publish flag to SensorData and update MQTT publishing logic

* simplify sensor task logic by always sending sensor data and removing empty sample check

* update serde and esp-backtrace dependencies; refactor pump trigger logic in update_task

Author: psytraxx

Cargo.lock

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-esp-backtrace = { version = "0.15.0", features = [
+esp-backtrace = { version = "0.15.1", features = [
     "esp32s3",
     "exception-handler",
     "panic-handler",
@@ -36,12 +36,12 @@ rust-mqtt = { version = "0.3.0", default-features = false, features = [] }
 embedded-text = "0.7.2"
 embedded-graphics = { version = "0.8.1", features = [] }
 embedded-hal = { version = "1.0.0", features = [] }
-serde = { version = "1.0.215", default-features = false, features = ["derive"] }
-serde_json = { version = "1.0.133", default-features = false, features = [
+serde = { version = "1.0.219", default-features = false, features = ["derive"] }
+serde_json = { version = "1.0.140", default-features = false, features = [
     "alloc",
 ] }
 embassy-futures = { version = "0.1.1", features = [] }
-embassy-sync = { version = "0.6.0", features = [] }
+embassy-sync = { version = "0.6.2", features = [] }
 static_cell = "2.1.0"
 nb = { version = "1.1.0", features = [] }
 

Cargo.toml

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

src/domain.rs

@@ -199,18 +199,12 @@ pub async fn sensor_task(
                 .data
                 .push(Sensor::BatteryVoltage(avg_battery_voltage))
                 .expect("Too many samples");
-        } else {
-            println!("Error measuring battery voltage");
         }
 
-        if battery_voltage_samples.is_empty() {
-            println!(
-                "No battery voltage samples collected - skipping this cycle {:?}",
-                &sensor_data
-            );
-        } else {
-            sender.send(sensor_data).await;
-        }
+        // no battery samples - no publish!
+        sensor_data.publish = !battery_voltage_samples.is_empty();
+
+        sender.send(sensor_data).await;
 
         // Power off the sensors
         moisture_power_pin.set_low();

src/sensors_task.rs

@@ -146,6 +146,20 @@ async fn handle_sensor_data(
     client: &mut MqttClientImpl<'_>,
     display: &mut Display<'static, Delay>,
     sensor_data: SensorData,
+) -> Result<(), Error> {
+    if sensor_data.publish {
+        process_mqtt(client, &sensor_data).await?;
+    } else {
+        println!("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 {
@@ -186,11 +200,9 @@ async fn handle_sensor_data(
             println!("Water level is full, stopping pump");
             update_pump_state(false);
         } else if let Sensor::PumpTrigger(enabled) = entry {
-            // Pump trigger is enabled, start the pump
-            if *enabled {
-                println!("Soil moisture is low, starting pump");
-                update_pump_state(true);
-            }
+            let enabled = *enabled;
+            println!("Pump trigger value: {} - updating pump state", enabled);
+            update_pump_state(enabled);
         }
     });
 
@@ -216,8 +228,6 @@ async fn handle_sensor_data(
             .await?;
     }
 
-    display.write_multiline(&format!("{}", sensor_data))?;
-
     let pump_topic = format!("{}/pump/state", DEVICE_ID);
     let message = "OFF";
     println!(
@@ -234,11 +244,16 @@ async fn handle_sensor_data(
             false,
         )
         .await?;
+    Ok(())
+}
 
+async fn process_display(
+    display: &mut Display<'static, Delay>,
+    sensor_data: &SensorData,
+) -> Result<(), Error> {
+    display.write_multiline(&format!("{}", sensor_data))?;
     Timer::after(Duration::from_secs(AWAKE_DURATION_SECONDS)).await;
-
     display.enable_powersave()?;
-
     Ok(())
 }