Skip to content

Commit

Permalink
Merge #118
Browse files Browse the repository at this point in the history
118: Add adc & Watchdog traits to prelude r=therealprof a=david-sawatzke

Fixes #117 

Co-authored-by: David Sawatzke <david-sawatzke@users.noreply.github.com>
  • Loading branch information
bors[bot] and david-sawatzke committed Dec 21, 2018
2 parents d8c78cc + bc3a231 commit 9628ccc
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
//! The traits have been renamed to avoid collisions with other items when
//! performing a glob import.

#[cfg(feature = "unproven")]
pub use adc::OneShot as _embedded_hal_adc_OneShot;
pub use blocking::delay::DelayMs as _embedded_hal_blocking_delay_DelayMs;
pub use blocking::delay::DelayUs as _embedded_hal_blocking_delay_DelayUs;
pub use blocking::i2c::{
Expand All @@ -28,6 +30,12 @@ pub use serial::Write as _embedded_hal_serial_Write;
pub use spi::FullDuplex as _embedded_hal_spi_FullDuplex;
pub use timer::CountDown as _embedded_hal_timer_CountDown;
#[cfg(feature = "unproven")]
pub use watchdog::Watchdog as _embedded_hal_watchdog_Watchdog;
#[cfg(feature = "unproven")]
pub use watchdog::WatchdogDisable as _embedded_hal_watchdog_WatchdogDisable;
#[cfg(feature = "unproven")]
pub use watchdog::WatchdogEnable as _embedded_hal_watchdog_WatchdogEnable;
#[cfg(feature = "unproven")]
pub use Capture as _embedded_hal_Capture;
#[cfg(feature = "unproven")]
pub use Pwm as _embedded_hal_Pwm;
Expand Down

0 comments on commit 9628ccc

Please sign in to comment.