Dreaded_X/automation_rs
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Only activate the contact sensor presence if there is the overall presence is currently false

Browse Source
This commit is contained in:
Dreaded_X 2023-01-06 04:51:43 +01:00
parent e16e30ffe2
commit 1326a8878c
Signed by: Dreaded_X
GPG Key ID: 76BDEC4E165D8AD9
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/devices/contact_sensor.rs
View File

@ -5,7 +5,7 @@ use rumqttc::AsyncClient;
use tokio::task::JoinHandle;
use tracing::{error, debug, warn};
use crate::{config::{MqttDeviceConfig, PresenceDeviceConfig}, mqtt::{OnMqtt, ContactMessage, PresenceMessage}};
use crate::{config::{MqttDeviceConfig, PresenceDeviceConfig}, mqtt::{OnMqtt, ContactMessage, PresenceMessage}, presence::OnPresence};
use super::Device;
@ -15,6 +15,7 @@ pub struct ContactSensor {
presence: Option<PresenceDeviceConfig>,
client: AsyncClient,
overall_presence: bool,
is_closed: bool,
handle: Option<JoinHandle<()>>,
}
@ -28,6 +29,7 @@ impl ContactSensor {
mqtt,
presence,
client,
overall_presence: false,
is_closed: true,
handle: None,
}
@ -40,6 +42,12 @@ impl Device for ContactSensor {
}
}
impl OnPresence for ContactSensor {
fn on_presence(&mut self, presence: bool) {
self.overall_presence = presence;
}
}
impl OnMqtt for ContactSensor {
fn on_mqtt(&mut self, message: &rumqttc::Publish) {
if message.topic != self.mqtt.topic {
@ -82,8 +90,12 @@ impl OnMqtt for ContactSensor {
handle.abort();
}
self.client.publish(topic, rumqttc::QoS::AtLeastOnce, false, serde_json::to_string(&PresenceMessage::new(true)).unwrap()).block_on().unwrap();
// Only use the door as an presence sensor if there the current presence is set false
// This is to prevent the house from being marked as present for however long the
// timeout is set when leaving the house
if !self.overall_presence {
self.client.publish(topic, rumqttc::QoS::AtLeastOnce, false, serde_json::to_string(&PresenceMessage::new(true)).unwrap()).block_on().unwrap();
}
} else {
// Once the door is closed again we start a timeout for removing the presence
let client = self.client.clone();