Better consistency with STM32F4XX-HAL

Author: dtjones-atse

Cargo.toml

@@ -43,20 +43,21 @@ panic-halt = "0.2.0"
 panic-semihosting = "0.5.2"
 
 [features]
+device-selected = []
 rt = ["stm32f7/rt"]
-stm32f722 = ["stm32f7/stm32f7x2"]
-stm32f723 = ["stm32f7/stm32f7x3"]
-stm32f732 = ["stm32f7/stm32f7x2"]
-stm32f733 = ["stm32f7/stm32f7x3"]
-stm32f745 = ["stm32f7/stm32f745"]
-stm32f746 = ["stm32f7/stm32f7x6"]
-stm32f756 = ["stm32f7/stm32f7x6"]
-stm32f765 = ["stm32f7/stm32f765"]
-stm32f767 = ["stm32f7/stm32f7x7"]
-stm32f769 = ["stm32f7/stm32f7x9"]
-stm32f777 = ["stm32f7/stm32f7x7"]
-stm32f778 = ["stm32f7/stm32f7x9"]
-stm32f779 = ["stm32f7/stm32f7x9"]
+stm32f722 = ["stm32f7/stm32f7x2", "device-selected"]
+stm32f723 = ["stm32f7/stm32f7x3", "device-selected"]
+stm32f732 = ["stm32f7/stm32f7x2", "device-selected"]
+stm32f733 = ["stm32f7/stm32f7x3", "device-selected"]
+stm32f745 = ["stm32f7/stm32f745", "device-selected"]
+stm32f746 = ["stm32f7/stm32f7x6", "device-selected"]
+stm32f756 = ["stm32f7/stm32f7x6", "device-selected"]
+stm32f765 = ["stm32f7/stm32f765", "device-selected"]
+stm32f767 = ["stm32f7/stm32f7x7", "device-selected"]
+stm32f769 = ["stm32f7/stm32f7x9", "device-selected"]
+stm32f777 = ["stm32f7/stm32f7x7", "device-selected"]
+stm32f778 = ["stm32f7/stm32f7x9", "device-selected"]
+stm32f779 = ["stm32f7/stm32f7x9", "device-selected"]
 
 [profile.dev]
 incremental = false

examples/blinky.rs

@@ -9,12 +9,12 @@ extern crate panic_halt;
 
 use stm32f7xx_hal as hal;
 
-use crate::hal::{device, prelude::*};
+use crate::hal::{stm32, prelude::*};
 use cortex_m_rt::entry;
 
 #[entry]
 fn main() -> ! {
-    let p = device::Peripherals::take().unwrap();
+    let p = stm32::Peripherals::take().unwrap();
 
     let gpioi = p.GPIOI.split();
     let mut led = gpioi.pi1.into_push_pull_output();

examples/blinky_delay.rs

@@ -8,11 +8,11 @@
 extern crate panic_halt;
 
 use cortex_m_rt::entry;
-use stm32f7xx_hal::{delay::Delay, device, prelude::*};
+use stm32f7xx_hal::{delay::Delay, stm32, prelude::*};
 
 #[entry]
 fn main() -> ! {
-    let p = device::Peripherals::take().unwrap();
+    let p = stm32::Peripherals::take().unwrap();
     let cp = cortex_m::Peripherals::take().unwrap();
 
     let gpioi = p.GPIOI.split();

examples/serial_delay.rs

@@ -14,14 +14,14 @@ use core::fmt::Write;
 use cortex_m_rt::entry;
 use stm32f7xx_hal::{
     delay::Delay,
-    device,
+    stm32,
     prelude::*,
     serial::{self, Serial},
 };
 
 #[entry]
 fn main() -> ! {
-    let p = device::Peripherals::take().unwrap();
+    let p = stm32::Peripherals::take().unwrap();
     let cp = cortex_m::Peripherals::take().unwrap();
 
     let rcc = p.RCC.constrain();

examples/serial_dma.rs

@@ -16,15 +16,15 @@ use core::pin::Pin;
 use cortex_m::{asm, interrupt};
 use cortex_m_rt::entry;
 use stm32f7xx_hal::{
-    device,
+    stm32,
     dma::{self, DMA},
     prelude::*,
     serial::{self, Serial},
 };
 
 #[entry]
 fn main() -> ! {
-    let p = device::Peripherals::take().unwrap();
+    let p = stm32::Peripherals::take().unwrap();
 
     let mut rcc = p.RCC.constrain();
 

examples/serial_echo.rs

@@ -13,14 +13,14 @@ use nb::block;
 
 use cortex_m_rt::entry;
 use stm32f7xx_hal::{
-    device,
+    stm32,
     prelude::*,
     serial::{self, Serial},
 };
 
 #[entry]
 fn main() -> ! {
-    let p = device::Peripherals::take().unwrap();
+    let p = stm32::Peripherals::take().unwrap();
 
     let rcc = p.RCC.constrain();
     let clocks = rcc.cfgr.sysclk(216.mhz()).freeze();

examples/spi.rs

@@ -5,14 +5,14 @@ extern crate panic_semihosting;
 
 use cortex_m_rt::entry;
 use stm32f7xx_hal::{
-    device,
+    stm32,
     prelude::*,
     spi::{self, Spi},
 };
 
 #[entry]
 fn main() -> ! {
-    let p = device::Peripherals::take().unwrap();
+    let p = stm32::Peripherals::take().unwrap();
 
     let mut rcc = p.RCC.constrain();
 

examples/spi_16.rs

@@ -5,14 +5,14 @@ extern crate panic_semihosting;
 
 use cortex_m_rt::entry;
 use stm32f7xx_hal::{
-    device,
+    stm32,
     prelude::*,
     spi::{self, Spi},
 };
 
 #[entry]
 fn main() -> ! {
-    let p = device::Peripherals::take().unwrap();
+    let p = stm32::Peripherals::take().unwrap();
 
     let mut rcc = p.RCC.constrain();
 

examples/spi_dma.rs

@@ -8,15 +8,15 @@ use core::pin::Pin;
 use cortex_m::{asm, interrupt};
 use cortex_m_rt::entry;
 use stm32f7xx_hal::{
-    device,
+    stm32,
     dma::{self, DMA},
     prelude::*,
     spi::{self, Spi},
 };
 
 #[entry]
 fn main() -> ! {
-    let p = device::Peripherals::take().unwrap();
+    let p = stm32::Peripherals::take().unwrap();
 
     let mut rcc = p.RCC.constrain();
 

examples/spi_dma_16.rs

@@ -8,15 +8,15 @@ use core::pin::Pin;
 use cortex_m::{asm, interrupt};
 use cortex_m_rt::entry;
 use stm32f7xx_hal::{
-    device,
+    stm32,
     dma::{self, DMA},
     prelude::*,
     spi::{self, Spi},
 };
 
 #[entry]
 fn main() -> ! {
-    let p = device::Peripherals::take().unwrap();
+    let p = stm32::Peripherals::take().unwrap();
 
     let mut rcc = p.RCC.constrain();