Skip to content

Commit

Permalink
Merge #72
Browse files Browse the repository at this point in the history
72: Move reading functions from OutputPin trait to StatefulOutputPin r=japaric a=astro

As it has come up in #29, here is a proposal for removing the burden of caching the state on implementations that cannot read it from an output pin.

Co-authored-by: Astro <[email protected]>
  • Loading branch information
bors[bot] and astro committed May 12, 2018
2 parents ce85b01 + 6549d73 commit c940b77
Showing 1 changed file with 83 additions and 6 deletions.
89 changes: 83 additions & 6 deletions src/digital.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,96 @@

/// Single digital output pin
pub trait OutputPin {
/// Is the output pin high?
fn is_high(&self) -> bool;

/// Is the output pin low?
fn is_low(&self) -> bool;

/// Sets the pin low
fn set_low(&mut self);

/// Sets the pin high
fn set_high(&mut self);
}

/// Output pin that can read its output state
#[cfg(feature = "unproven")]
pub trait StatefulOutputPin {
/// Is the pin set to high?
fn is_set_high(&self) -> bool;

/// Is the pin set to low?
fn is_set_low(&self) -> bool;
}

/// Output pin that can be toggled
///
/// See [toggleable](toggleable) to use a software implementation if
/// both [OutputPin](trait.OutputPin.html) and
/// [StatefulOutputPin](trait.StatefulOutputPin.html) are
/// implemented. Otherwise, implement this using hardware mechanisms.
#[cfg(feature = "unproven")]
pub trait ToggleableOutputPin {
/// Toggle pin output.
fn toggle(&mut self);
}

/// If you can read **and** write the output state, a pin is
/// toggleable by software.
///
/// ```
/// use embedded_hal::digital::{OutputPin, StatefulOutputPin, ToggleableOutputPin};
/// use embedded_hal::digital::toggleable;
///
/// /// A virtual output pin that exists purely in software
/// struct MyPin {
/// state: bool
/// }
///
/// impl OutputPin for MyPin {
/// fn set_low(&mut self) {
/// self.state = false;
/// }
/// fn set_high(&mut self) {
/// self.state = true;
/// }
/// }
///
/// impl StatefulOutputPin for MyPin {
/// fn is_set_low(&self) -> bool {
/// !self.state
/// }
/// fn is_set_high(&self) -> bool {
/// self.state
/// }
/// }
///
/// /// Opt-in to the software implementation.
/// impl toggleable::Default for MyPin {}
///
/// let mut pin = MyPin { state: false };
/// pin.toggle();
/// assert!(pin.is_set_high());
/// pin.toggle();
/// assert!(pin.is_set_low());
/// ```
#[cfg(feature = "unproven")]
pub mod toggleable {
use super::{OutputPin, StatefulOutputPin, ToggleableOutputPin};

/// Software-driven `toggle()` implementation.
pub trait Default: OutputPin + StatefulOutputPin {}

impl<P> ToggleableOutputPin for P
where
P: Default,
{
/// Toggle pin output
fn toggle(&mut self) {
if self.is_set_low() {
self.set_high();
} else {
self.set_low();
}
}
}
}

/// Single digital input pin
#[cfg(feature = "unproven")]
pub trait InputPin {
Expand Down

0 comments on commit c940b77

Please sign in to comment.