Clear RSSI/SNR when not provided

sokolpezinok · May 23, 2024 · 44cd613 · 44cd613
1 parent 7d3c81e
commit 44cd613
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/message_handler.rs b/src/message_handler.rs
@@ -159,6 +159,8 @@ impl MessageHandler {
                 }
                 if let Some(rssi_snr) = log_message.rssi_snr.as_ref() {
                     status.update_rssi_snr(rssi_snr.clone());
+                } else {
+                    status.clear_rssi_snr();
                 }
                 if let Some((_, battery)) = log_message.voltage_battery.as_ref() {
                     status.update_battery(*battery);
@@ -358,5 +360,21 @@ mod test_punch {
         let node_infos = handler.node_infos();
         assert_eq!(node_infos.len(), 1);
         assert_eq!(node_infos[0].rssi_dbm, Some(-98));
+
+        let envelope2 = ServiceEnvelope {
+            packet: Some(MeshPacket {
+                payload_variant: Some(PayloadVariant::Decoded(data)),
+                ..Default::default()
+            }),
+            ..Default::default()
+        };
+        handler.msh_status_update(
+            &envelope2.encode_to_vec()[..],
+            Local::now().fixed_offset(),
+            None,
+        );
+        let node_infos = handler.node_infos();
+        assert_eq!(node_infos.len(), 1);
+        assert_eq!(node_infos[0].rssi_dbm, None);
     }
 }
diff --git a/src/status.rs b/src/status.rs
@@ -150,6 +150,11 @@ impl MeshtasticRocStatus {
         self.last_update = Some(Local::now().into());
     }
 
+    pub fn clear_rssi_snr(&mut self) {
+        self.rssi_snr = None;
+        self.last_update = Some(Local::now().into());
+    }
+
     pub fn punch(&mut self, punch: &SiPunch) {
         self.last_punch = Some(punch.time);
         self.codes.insert(punch.code);