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

No need for Arc<RwLock<_>> inside the device wrapper anymore
All checks were successful
Build and deploy / Build application (push) Successful in 4m27s
Details
Check / Run checks (push) Successful in 2m14s
Details
Build and deploy / Build container (push) Successful in 55s
Details
Build and deploy / Deploy container (push) Has been skipped
Details

Browse Source
This commit is contained in:
Dreaded_X
2024-07-26 01:17:12 +02:00
parent 3fd8dddeb2
commit 14e14ca479
7 changed files with 52 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/devices/contact_sensor.rs
View File

@@ -85,14 +85,13 @@ impl LuaDeviceCreate for ContactSensor {
if let Some(trigger) = &config.trigger {
for device in &trigger.devices {
{
let device = device.read().await;
let id = device.get_id().to_owned();
if (device.as_ref().cast() as Option<&dyn OnOff>).is_none() {
if (device.cast() as Option<&dyn OnOff>).is_none() {
return Err(DeviceConfigError::MissingTrait(id, "OnOff".into()));
}
if trigger.timeout.is_none()
&& (device.as_ref().cast() as Option<&dyn Timeout>).is_none()
&& (device.cast() as Option<&dyn Timeout>).is_none()
{
return Err(DeviceConfigError::MissingTrait(id, "Timeout".into()));
}
@@ -160,8 +159,7 @@ impl OnMqtt for ContactSensor {
.iter()
.zip(self.state_mut().await.previous.iter_mut())
{
let light = light.write().await;
if let Some(light) = light.as_ref().cast() as Option<&dyn OnOff> {
if let Some(light) = light.cast() as Option<&dyn OnOff> {
*previous = light.on().await.unwrap();
light.set_on(true).await.ok();
}
@@ -172,15 +170,14 @@ impl OnMqtt for ContactSensor {
.iter()
.zip(self.state_mut().await.previous.iter())
{
let light = light.write().await;
if !previous {
// If the timeout is zero just turn the light off directly
if trigger.timeout.is_none()
&& let Some(light) = light.as_ref().cast() as Option<&dyn OnOff>
&& let Some(light) = light.cast() as Option<&dyn OnOff>
{
light.set_on(false).await.ok();
} else if let Some(timeout) = trigger.timeout
&& let Some(light) = light.as_ref().cast() as Option<&dyn Timeout>
&& let Some(light) = light.cast() as Option<&dyn Timeout>
{
light.start_timeout(timeout).await.unwrap();
}