vmario/fabaccess-bffh
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabaccess/bffh.git synced 2024-11-14 03:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Subscriber is Actuator now

Browse Source
This commit is contained in:
Gregor Reitzenstein 2020-09-17 15:36:42 +02:00
parent 0ea9177e14
commit 4bd62216e2
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/shelly.rs
View File

@ -48,16 +48,8 @@ impl Shelly {
#[async_trait] #[async_trait]
impl Actuator for Shelly { impl Actuator for Shelly {
async fn power_on(&mut self, name: String) { async fn subscribe(&mut self, signal: StatusSignal) {
let topic = format!("shellies/{}/relay/0/command", name); self.signal.replace(signal);
let msg = mqtt::Message::new(topic, "on", 0);
self.client.publish(msg).map(|_| ()).await
}
async fn power_off(&mut self, name: String) {
let topic = format!("shellies/{}/relay/0/command", name);
let msg = mqtt::Message::new(topic, "off", 0);
self.client.publish(msg).map(|_| ()).await
} }
} }

21
src/registries/actuators.rs
View File

@ -36,19 +36,10 @@ impl Actuators {
} }
} }
#[async_trait]
pub trait Actuator: Stream<Item = future::BoxFuture<'static, ()>> {
// TODO: Is it smarter to pass a (reference to?) a machine instead of 'name'? Do we need to
// pass basically arbitrary parameters to the Actuator?
async fn power_on(&mut self, name: String);
async fn power_off(&mut self, name: String);
}
pub type StatusSignal = Pin<Box<dyn Signal<Item = Status> + Send + Sync>>; pub type StatusSignal = Pin<Box<dyn Signal<Item = Status> + Send + Sync>>;
#[async_trait] #[async_trait]
pub trait Subscriber { pub trait Actuator: Stream<Item = future::BoxFuture<'static, ()>> {
async fn subscribe(&mut self, signal: StatusSignal); async fn subscribe(&mut self, signal: StatusSignal);
} }
@ -60,16 +51,6 @@ struct Dummy {
} }
#[async_trait] #[async_trait]
impl Actuator for Dummy { impl Actuator for Dummy {
async fn power_on(&mut self, _name: String) {
return
}
async fn power_off(&mut self, _name: String) {
return
}
}
#[async_trait]
impl Subscriber for Dummy {
async fn subscribe(&mut self, signal: StatusSignal) { async fn subscribe(&mut self, signal: StatusSignal) {
self.signal.replace(signal); self.signal.replace(signal);
} }