From 8dd413c190a6845817a3ac0d3e5c596f57018476 Mon Sep 17 00:00:00 2001 From: Florian Jung <flo@windfisch.org> Date: Thu, 3 Oct 2019 15:43:29 +0200 Subject: [PATCH] use generic stm32f4xx crate --- blinky-hal/Cargo.lock | 28 ++++++++-------------------- blinky-hal/Cargo.toml | 5 +++-- blinky-hal/src/main.rs | 12 ++++++------ 3 files changed, 17 insertions(+), 28 deletions(-) diff --git a/blinky-hal/Cargo.lock b/blinky-hal/Cargo.lock index 47140a7..42e646d 100644 --- a/blinky-hal/Cargo.lock +++ b/blinky-hal/Cargo.lock @@ -39,7 +39,7 @@ dependencies = [ "cortex-m-rt 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "panic-halt 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "stm32f407g-disc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "stm32f4xx-hal 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -185,38 +185,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "stm32f4" -version = "0.4.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bare-metal 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "cortex-m 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cortex-m 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "cortex-m-rt 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "vcell 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "stm32f407g-disc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cortex-m 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "cortex-m-rt 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "stm32f4xx-hal 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "stm32f4xx-hal" -version = "0.2.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bare-metal 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "cortex-m 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cortex-m 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "cortex-m-rt 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "stm32f4 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "stm32f4 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -282,9 +271,8 @@ dependencies = [ "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" -"checksum stm32f4 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a2c7606593e8020bdf9a1b725ce46bb8bae4095bef789eef97cf35554b825b8" -"checksum stm32f407g-disc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77a7421a10a70ac8c9c195bc7352f20524be28933d46c1b71a634c5320840597" -"checksum stm32f4xx-hal 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b19a51538ae88a2e034fbdaf670354218bbd66f1da0ddaee2fb0cbe6fb57ab0d" +"checksum stm32f4 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3cf6415d9b74bf664bdd154daf9bd84289aafdca8a8d7ece011fa5eb92fb7422" +"checksum stm32f4xx-hal 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdee466aa95237fec6962f3709cff5478e6de70de8c758271ec612c7a65fe42" "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" "checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" diff --git a/blinky-hal/Cargo.toml b/blinky-hal/Cargo.toml index 5eccacc..0b02768 100644 --- a/blinky-hal/Cargo.toml +++ b/blinky-hal/Cargo.toml @@ -24,8 +24,9 @@ repository = "https://github.com/timbod7/..." version = "0.2.2" default-features = false -[dependencies.stm32f407g-disc] -version = "0.1.0" +[dependencies.stm32f4xx-hal] +version = "0.5.0" +features = ["rt", "stm32f411"] [dependencies.embedded-hal] version = "0.2.1" diff --git a/blinky-hal/src/main.rs b/blinky-hal/src/main.rs index ff6f31a..a4ccc16 100644 --- a/blinky-hal/src/main.rs +++ b/blinky-hal/src/main.rs @@ -5,16 +5,16 @@ extern crate cortex_m; extern crate cortex_m_rt; extern crate panic_halt; -extern crate stm32f407g_disc as board; +extern crate stm32f4xx_hal as mcu; extern crate embedded_hal as hal; use cortex_m_rt::entry; -use board::hal::delay::Delay; -use board::hal::prelude::*; -use board::hal::stm32; -use board::gpio; -use board::gpio::gpiod::{PD12, PD13, PD14, PD15}; +use mcu::delay::Delay; +use mcu::prelude::*; +use mcu::stm32; +use mcu::gpio; +use mcu::gpio::gpiod::{PD12, PD13, PD14, PD15}; use hal::digital::OutputPin; -- GitLab