From 56476bc1624e13c2d4320ea597f8aed349da2dac Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Wed, 7 Jun 2023 18:43:39 +0700 Subject: [PATCH] Add simple battery level --- src/mqtt/event_cam.rs | 34 ++++++++++++++++++++++++++++++++++ src/mqtt/mod.rs | 8 ++++++++ 2 files changed, 42 insertions(+) diff --git a/src/mqtt/event_cam.rs b/src/mqtt/event_cam.rs index 70e5736..2d4fbb0 100644 --- a/src/mqtt/event_cam.rs +++ b/src/mqtt/event_cam.rs @@ -33,6 +33,7 @@ pub(crate) enum Messages { Ptz(Direction), Preset(i8), Snap(Vec), + BatteryLevel(u32), } #[derive(Debug, Copy, Clone)] @@ -215,6 +216,11 @@ impl EventCamThread { tx: self.tx.clone(), camera: arc_cam.clone(), }; + + let mut battery_thread = BatteryThread { + tx: self.tx.clone(), + camera: arc_cam.clone(), + }; let mut keepalive_thread = KeepaliveThread { camera: arc_cam.clone(), @@ -274,6 +280,18 @@ impl EventCamThread { Ok(()) } }, + val = async { + info!("{}: Updating Battery Level", camera_config.name); + battery_thread.run().await + } => { + if let Err(e) = val { + error!("Battery thread aborted: {:?}", e); + Err(e) + } else { + debug!("Normal finish on Battery thread"); + Ok(()) + } + }, val = async { info!("{}: Setting up camera actions", camera_config.name); message_handler.listen().await @@ -363,6 +381,22 @@ impl SnapThread { } } +struct BatteryLevelThread { + tx: Sender, + camera: Arc, +} + +impl BatteryLevelThread { + async fn run(&mut self) -> Result<()> { + let mut inter = interval(Duration::from_millis(500)); + loop { + inter.tick().await; + let battery = self.camera.battery_info().await?; + self.tx.send(Messages::BatteryLevel(battery.battery_percent)).await?; + } + } +} + struct KeepaliveThread { camera: Arc, } diff --git a/src/mqtt/mod.rs b/src/mqtt/mod.rs index 1c5a4af..4c48b28 100644 --- a/src/mqtt/mod.rs +++ b/src/mqtt/mod.rs @@ -223,6 +223,14 @@ async fn listen_on_camera(cam_config: Arc, mqtt_config: &MqttConfi format!("Failed to publish preview over MQTT for {}", camera_name) })?; } + Messages::BatteryLevel(data) => { + mqtt_sender_cam + .send_message("status/battery_level", format!("{}", data).as_str(), true) + .await + .with_context(|| { + format!("Failed to publish battery level over MQTT for {}", camera_name) + })?; + } _ => {} } }