Merge branch 'master' into new-watchdog-design

Author: Luo Jia

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- The method `try_write` from the trait `blocking::i2c::WriteIter` trait
+  has been renamed `try_write_iter` for consistency.
+- Updated `nb` dependency to version `1`.
 - The watchdog API now uses move semantics. See [PR](https://github.com/rust-embedded/embedded-hal/pull/222).
 
 ## [v1.0.0-alpha.1] - 2020-06-16
@@ -28,7 +31,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Void has been replaced with `core::convert::Infallible` which should be used
   in trait implementations where methods cannot fail.
 - A new [process](https://github.com/rust-embedded/embedded-hal#how-to-add-a-new-trait)
-  has been adopted for the addition of traits to the embedded-hal. 
+  has been adopted for the addition of traits to the embedded-hal.
 - The minimum supported Rust version is 1.35 due to [this issue](https://github.com/rust-lang/rust/issues/54973).
 
 ## [v0.2.3] - 2019-05-09

Cargo.toml

@@ -15,7 +15,7 @@ repository = "https://github.com/rust-embedded/embedded-hal"
 version = "1.0.0-alpha.1"
 
 [dependencies]
-nb = { version = "0.1.1", features = ["unstable"] }
+nb = "1"
 
 [dev-dependencies]
 stm32f3 = { version = "0.8", features = ["stm32f303", "rt"] }

src/blocking/i2c.rs

@@ -36,7 +36,7 @@ pub trait Write {
     /// Error type
     type Error;
 
-    /// Sends bytes to slave with address `addr`
+    /// Sends bytes to slave with address `address`
     ///
     /// # I2C Events (contract)
     ///
@@ -52,20 +52,20 @@ pub trait Write {
     /// - `SAK` = slave acknowledge
     /// - `Bi` = ith byte of data
     /// - `SP` = stop condition
-    fn try_write(&mut self, addr: u8, bytes: &[u8]) -> Result<(), Self::Error>;
+    fn try_write(&mut self, address: u8, bytes: &[u8]) -> Result<(), Self::Error>;
 }
 
 /// Blocking write (iterator version)
 pub trait WriteIter {
     /// Error type
     type Error;
 
-    /// Sends bytes to slave with address `addr`
+    /// Sends bytes to slave with address `address`
     ///
     /// # I2C Events (contract)
     ///
     /// Same as `Write`
-    fn try_write<B>(&mut self, addr: u8, bytes: B) -> Result<(), Self::Error>
+    fn try_write_iter<B>(&mut self, address: u8, bytes: B) -> Result<(), Self::Error>
     where
         B: IntoIterator<Item = u8>;
 }
@@ -75,7 +75,7 @@ pub trait WriteRead {
     /// Error type
     type Error;
 
-    /// Sends bytes to slave with address `addr` and then reads enough bytes to fill `buffer` *in a
+    /// Sends bytes to slave with address `address` and then reads enough bytes to fill `buffer` *in a
     /// single transaction*
     ///
     /// # I2C Events (contract)
@@ -110,7 +110,7 @@ pub trait WriteIterRead {
     /// Error type
     type Error;
 
-    /// Sends bytes to slave with address `addr` and then reads enough bytes to fill `buffer` *in a
+    /// Sends bytes to slave with address `address` and then reads enough bytes to fill `buffer` *in a
     /// single transaction*
     ///
     /// # I2C Events (contract)

src/prelude.rs

@@ -3,21 +3,26 @@
 //! The traits have been renamed to avoid collisions with other items when
 //! performing a glob import.
 
+pub use crate::adc::Channel as _embedded_hal_adc_Channel;
 pub use crate::adc::OneShot as _embedded_hal_adc_OneShot;
 pub use crate::blocking::delay::DelayMs as _embedded_hal_blocking_delay_DelayMs;
 pub use crate::blocking::delay::DelayUs as _embedded_hal_blocking_delay_DelayUs;
 pub use crate::blocking::i2c::{
     Read as _embedded_hal_blocking_i2c_Read, Write as _embedded_hal_blocking_i2c_Write,
+    WriteIter as _embedded_hal_blocking_i2c_WriteIter,
+    WriteIterRead as _embedded_hal_blocking_i2c_WriteIterRead,
     WriteRead as _embedded_hal_blocking_i2c_WriteRead,
 };
 pub use crate::blocking::rng::Read as _embedded_hal_blocking_rng_Read;
 pub use crate::blocking::serial::Write as _embedded_hal_blocking_serial_Write;
 pub use crate::blocking::spi::{
     Transfer as _embedded_hal_blocking_spi_Transfer, Write as _embedded_hal_blocking_spi_Write,
+    WriteIter as _embedded_hal_blocking_spi_WriteIter,
 };
 pub use crate::capture::Capture as _embedded_hal_Capture;
 pub use crate::digital::InputPin as _embedded_hal_digital_InputPin;
 pub use crate::digital::OutputPin as _embedded_hal_digital_OutputPin;
+pub use crate::digital::StatefulOutputPin as _embedded_hal_digital_StatefulOutputPin;
 pub use crate::digital::ToggleableOutputPin as _embedded_hal_digital_ToggleableOutputPin;
 pub use crate::pwm::Pwm as _embedded_hal_Pwm;
 pub use crate::pwm::PwmPin as _embedded_hal_PwmPin;
@@ -26,7 +31,9 @@ pub use crate::rng::Read as _embedded_hal_rng_Read;
 pub use crate::serial::Read as _embedded_hal_serial_Read;
 pub use crate::serial::Write as _embedded_hal_serial_Write;
 pub use crate::spi::FullDuplex as _embedded_hal_spi_FullDuplex;
+pub use crate::timer::Cancel as _embedded_hal_timer_Cancel;
 pub use crate::timer::CountDown as _embedded_hal_timer_CountDown;
+pub use crate::timer::Periodic as _embedded_hal_timer_Periodic;
 pub use crate::watchdog::Disable as _embedded_hal_watchdog_Disable;
 pub use crate::watchdog::Enable as _embedded_hal_watchdog_Enable;
 pub use crate::watchdog::Watchdog as _embedded_hal_watchdog_Watchdog;