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

Converted google home traits to be async
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Dreaded_X
2023-08-11 03:46:44 +02:00
parent a67e47997b
commit 522fe27f11
8 changed files with 60 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/devices/audio_setup.rs
View File

@@ -87,21 +87,21 @@ impl OnMqtt for AudioSetup {
match action {
RemoteAction::On => {
if self.mixer.is_on().unwrap() {
self.speakers.set_on(false).unwrap();
self.mixer.set_on(false).unwrap();
if self.mixer.is_on().await.unwrap() {
self.speakers.set_on(false).await.unwrap();
self.mixer.set_on(false).await.unwrap();
} else {
self.speakers.set_on(true).unwrap();
self.mixer.set_on(true).unwrap();
self.speakers.set_on(true).await.unwrap();
self.mixer.set_on(true).await.unwrap();
}
},
RemoteAction::BrightnessMoveUp => {
if !self.mixer.is_on().unwrap() {
self.mixer.set_on(true).unwrap();
} else if self.speakers.is_on().unwrap() {
self.speakers.set_on(false).unwrap();
if !self.mixer.is_on().await.unwrap() {
self.mixer.set_on(true).await.unwrap();
} else if self.speakers.is_on().await.unwrap() {
self.speakers.set_on(false).await.unwrap();
} else {
self.speakers.set_on(true).unwrap();
self.speakers.set_on(true).await.unwrap();
}
},
RemoteAction::BrightnessStop => { /* Ignore this action */ },
@@ -116,8 +116,8 @@ impl OnPresence for AudioSetup {
// Turn off the audio setup when we leave the house
if !presence {
debug!(id = self.identifier, "Turning devices off");
self.speakers.set_on(false).unwrap();
self.mixer.set_on(false).unwrap();
self.speakers.set_on(false).await.unwrap();
self.mixer.set_on(false).await.unwrap();
}
}
}