emgauwa/controller
2
0
Fork 0
Code Issues Pull requests Projects Releases1 Packages Wiki Activity

Add null driver

Browse source
This commit is contained in:
Tobias Reisinger 2024-04-28 01:38:57 +02:00
parent 4ed1cd3182
commit 07d3322c5a
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
7 changed files with 58 additions and 28 deletions
emgauwa-controller/src
driver.rssettings.rs

6
emgauwa-controller/src/driver.rs
View file

@ -2,8 +2,9 @@ use serde::{Deserialize, Deserializer};
#[derive(Debug, Clone, Copy)]
pub enum Driver {
Null,
Gpio,
Piface,
PiFace,
}
impl<'de> Deserialize<'de> for Driver {
@ -12,8 +13,9 @@ impl<'de> Deserialize<'de> for Driver {
D: Deserializer<'de>,
{
match String::deserialize(deserializer)?.as_str() {
"null" => Ok(Driver::Null),
"gpio" => Ok(Driver::Gpio),
"piface" => Ok(Driver::Piface),
"piface" => Ok(Driver::PiFace),
_ => Err(serde::de::Error::custom("invalid driver")),
}
}

18
emgauwa-controller/src/settings.rs
View file

@ -1,6 +1,5 @@
use emgauwa_lib::drivers::{GpioDriver, PifaceDriver, RelayDriver};
use emgauwa_lib::errors::EmgauwaError;
use emgauwa_lib::settings;
use emgauwa_lib::{drivers, settings};
use rppal_pfd::PiFaceDigital;
use serde_derive::Deserialize;
@ -78,7 +77,7 @@ impl Settings {
pub fn relays_make_drivers(
&self,
pfd: &mut Option<PiFaceDigital>,
) -> Result<Vec<Box<dyn RelayDriver>>, EmgauwaError> {
) -> Result<Vec<Box<dyn drivers::RelayDriver>>, EmgauwaError> {
let mut drivers = Vec::new();
for relay in &self.relays {
drivers.push(relay.make_driver(pfd)?);
@ -91,14 +90,15 @@ impl Relay {
pub fn make_driver(
&self,
pfd: &mut Option<PiFaceDigital>,
) -> Result<Box<dyn RelayDriver>, EmgauwaError> {
let driver: Box<dyn RelayDriver> = match self.driver {
Driver::Gpio => Box::new(GpioDriver::new(self.pin, self.inverted)?),
Driver::Piface => {
) -> Result<Box<dyn drivers::RelayDriver>, EmgauwaError> {
let driver: Box<dyn drivers::RelayDriver> = match self.driver {
Driver::Null => Box::new(drivers::NullDriver::new(self.pin)),
Driver::Gpio => Box::new(drivers::GpioDriver::new(self.pin, self.inverted)?),
Driver::PiFace => {
if pfd.is_none() {
*pfd = Some(PifaceDriver::init_piface()?);
*pfd = Some(drivers::PiFaceDriver::init_piface()?);
}
Box::new(PifaceDriver::new(self.pin, pfd)?)
Box::new(drivers::PiFaceDriver::new(self.pin, pfd)?)
}
};
Ok(driver)