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

Devices now handles subscribing to mqtt topics

Browse Source
This commit is contained in:
Dreaded_X
2023-04-12 04:37:16 +02:00
parent 34e5274e0b
commit 92c8f3074f
12 changed files with 93 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/config.rs
View File

@@ -281,9 +281,14 @@ impl Device {
info.name,
info.room
);
IkeaOutlet::build(identifier, info, mqtt, outlet_type, timeout, client)
.await
.map(Box::new)?
Box::new(IkeaOutlet::new(
identifier,
info,
mqtt,
outlet_type,
timeout,
client,
))
}
Device::WakeOnLAN {
info,
@@ -297,9 +302,13 @@ impl Device {
info.name,
info.room
);
WakeOnLAN::build(identifier, info, mqtt, mac_address, broadcast_ip, client)
.await
.map(Box::new)?
Box::new(WakeOnLAN::new(
identifier,
info,
mqtt,
mac_address,
broadcast_ip,
))
}
Device::KasaOutlet { ip } => {
trace!(id = identifier, "KasaOutlet [{}]", identifier);
@@ -319,7 +328,7 @@ impl Device {
.create(&speakers_id, config, client.clone())
.await?;
AudioSetup::build(identifier, mqtt, mixer, speakers, client)
AudioSetup::build(identifier, mqtt, mixer, speakers)
.await
.map(Box::new)?
}
@@ -329,9 +338,7 @@ impl Device {
.map(|p| p.generate_topic("contact", identifier, config))
.transpose()?;
ContactSensor::build(identifier, mqtt, presence, client)
.await
.map(Box::new)?
Box::new(ContactSensor::new(identifier, mqtt, presence, client))
}
};