stm32-rs · Jan 5, 2019 · Jan 8, 2019 · Jan 8, 2019 · Feb 4, 2019 · Feb 9, 2019
Showing with 109 additions and 17 deletions.

+34 −0 CHANGELOG.md

+7 −7 Cargo.toml

+12 −0 README.md

+50 −6 src/gpio.rs

+6 −4 src/i2c.rs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,34 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+## [v0.2.0] - 2019-02-10
+
+### Added
+
+- Add support for setting initial pin state
+- Added ChangeLog
+
+### Changed
+
+- Add information about device features to readme
+- Allow read-/write-only transactions in write_read
+- Bumped dependency versions (breaking change)
+
+### Fixed
+
+- Fix link to docs.rs
+
+## [v0.1.1] - 2018-12-17
+
+### Added
+
+- First tagged version
+
+[Unreleased]: https://github.com/stm32-rs/stm32f1xx-hal/compare/v0.2.0...HEAD
+[v0.2.0]: https://github.com/stm32-rs/stm32f1xx-hal/compare/v0.1.1...v0.2.0
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,8 +6,8 @@ keywords = ["arm", "cortex-m", "stm32", "hal"]
 license = "MIT OR Apache-2.0"
 name = "stm32f1xx-hal"
 repository = "https://github.com/stm32-rs/stm32f1xx-hal"
-documentation = "https://docs.rs/crate/stm32f1xx-hal"
-version = "0.1.1"
+documentation = "https://docs.rs/stm32f1xx-hal"
+version = "0.2.0"
 
 [package.metadata.docs.rs]
 features = ["stm32f103", "rt"]
@@ -16,7 +16,7 @@ features = ["stm32f103", "rt"]
 cortex-m = "0.5.8"
 nb = "0.1.1"
 cortex-m-rt = "0.6.7"
-stm32f1 = "0.5.0"
+stm32f1 = "0.6.0"
 
 [dependencies.void]
 default-features = false
@@ -35,15 +35,15 @@ panic-semihosting = "0.5.1"
 panic-itm = "0.4.0"
 # cortex-m-rtfm = "0.3.1"
 cortex-m-semihosting = "0.3.2"
-enc28j60 = "0.2.0"
+enc28j60 = "0.2.1"
 heapless = "0.4.1"
 m = "0.1.1"
 mfrc522 = "0.2.0"
-serde_derive = "1.0.82"
+serde_derive = "1.0.87"
 
 [dev-dependencies.byteorder]
 default-features = false
-version = "1.2.7"
+version = "1.3.1"
 
 [dev-dependencies.cobs]
 default-features = false
@@ -71,7 +71,7 @@ version = "1.5.0"
 
 [dev-dependencies.serde]
 default-features = false
-version = "1.0.82"
+version = "1.0.87"
 
 #[dev-dependencies.serde-json-core]
 #git = "https://github.com/japaric/serde-json-core"

diff --git a/README.md b/README.md
@@ -4,6 +4,18 @@
 
 [HAL]: https://crates.io/crates/embedded-hal
 
+## Usage
+
+This crate will eventually contain support for multiple microcontrollers in the
+stm32f1 family. Which specific microcontroller you want to build for has to be
+specified with a feature, for example `stm32f103`.
+
+```
+cargo build --features stm32f103
+```
+
+If no device is specified, the crate does not compile.
+
 ## License
 
 Licensed under either of

diff --git a/src/gpio.rs b/src/gpio.rs
@@ -46,6 +46,11 @@ pub struct Alternate<MODE> {
     _mode: PhantomData<MODE>,
 }
 
+pub enum State {
+    High,
+    Low,
+}
+
 macro_rules! gpio {
     ($GPIOX:ident, $gpiox:ident, $gpioy:ident, $iopxenr:ident, $iopxrst:ident, $PXx:ident, [
         $($PXi:ident: ($pxi:ident, $i:expr, $MODE:ty, $CR:ident),)+
@@ -66,6 +71,7 @@ macro_rules! gpio {
                 PullUp,
                 PushPull,
                 Analog,
+                State,
             };
 
             /// GPIO parts
@@ -182,7 +188,8 @@ macro_rules! gpio {
                 }
 
                 impl<MODE> $PXi<MODE> {
-                    /// Configures the pin to operate as an alternate function push pull output pin
+                    /// Configures the pin to operate as an alternate function push-pull output
+                    /// pin.
                     pub fn into_alternate_push_pull(
                         self,
                         cr: &mut $CR,
@@ -204,6 +211,8 @@ macro_rules! gpio {
                         $PXi { _mode: PhantomData }
                     }
 
+                    /// Configures the pin to operate as an alternate function open-drain output
+                    /// pin.
                     pub fn into_alternate_open_drain(
                         self,
                         cr: &mut $CR,
@@ -299,10 +308,21 @@ macro_rules! gpio {
                         $PXi { _mode: PhantomData }
                     }
 
-                    /// Configures the pin to operate as an open drain output pin
+                    /// Configures the pin to operate as an open-drain output pin.
+                    /// Initial state will be low.
                     pub fn into_open_drain_output(
                         self,
                         cr: &mut $CR,
+                    ) -> $PXi<Output<OpenDrain>> {
+                        self.into_open_drain_output_with_state(cr, State::Low)
+                    }
+
+                    /// Configures the pin to operate as an open-drain output pin.
+                    /// `initial_state` specifies whether the pin should be initially high or low.
+                    pub fn into_open_drain_output_with_state(
+                        self,
+                        cr: &mut $CR,
+                        initial_state: State,
                     ) -> $PXi<Output<OpenDrain>> {
                         let offset = (4 * $i) % 32;
                         // General purpose output open-drain
@@ -311,19 +331,36 @@ macro_rules! gpio {
                         let mode = 0b11;
                         let bits = (cnf << 2) | mode;
 
+                        let mut res = $PXi { _mode: PhantomData };
+
+                        match initial_state {
+                            State::High => res.set_high(),
+                            State::Low  => res.set_low(),
+                        }
+
                         cr
                             .cr()
                             .modify(|r, w| unsafe {
                                 w.bits((r.bits() & !(0b1111 << offset)) | (bits << offset))
                             });
 
-                        $PXi { _mode: PhantomData }
+                        res
                     }
-
-                    /// Configures the pin to operate as an push pull output pin
+                    /// Configures the pin to operate as an push-pull output pin.
+                    /// Initial state will be low.
                     pub fn into_push_pull_output(
                         self,
                         cr: &mut $CR,
+                    ) -> $PXi<Output<PushPull>> {
+                        self.into_push_pull_output_with_state(cr, State::Low)
+                    }
+
+                    /// Configures the pin to operate as an push-pull output pin.
+                    /// `initial_state` specifies whether the pin should be initially high or low.
+                    pub fn into_push_pull_output_with_state(
+                        self,
+                        cr: &mut $CR,
+                        initial_state: State,
                     ) -> $PXi<Output<PushPull>> {
                         let offset = (4 * $i) % 32;
                         // General purpose output push-pull
@@ -332,13 +369,20 @@ macro_rules! gpio {
                         let mode = 0b11;
                         let bits = (cnf << 2) | mode;
 
+                        let mut res = $PXi { _mode: PhantomData };
+
+                        match initial_state {
+                            State::High => res.set_high(),
+                            State::Low  => res.set_low(),
+                        }
+
                         cr
                             .cr()
                             .modify(|r, w| unsafe {
                                 w.bits((r.bits() & !(0b1111 << offset)) | (bits << offset))
                             });
 
-                        $PXi { _mode: PhantomData }
+                        res
                     }
 
                     /// Configures the pin to operate as an analog input pin

diff --git a/src/i2c.rs b/src/i2c.rs
@@ -459,13 +459,15 @@ macro_rules! hal {
                     bytes: &[u8],
                     buffer: &mut [u8],
                 ) -> Result<(), Self::Error> {
-                    assert!(buffer.len() > 0);
-
-                    if bytes.len() != 0 {
+                    if !bytes.is_empty() {
                         self.write_without_stop(addr, bytes)?;
                     }
 
-                    self.read(addr, buffer)?;
+                    if !buffer.is_empty() {
+                        self.read(addr, buffer)?;
+                    } else if !bytes.is_empty() {
+                        self.nb.send_stop();
+                    }
 
                     Ok(())
                 }