Merge pull request #116 from ra-kete/fix-pac-features

Use correct PACs for stm32f318 and stm32f378

According to the "Supported Devices" table in the stm32f3 crate's README
(https://crates.io/crates/stm32f3) we were using the wrong PAC module
(`stm32f3x8`) for both smt32f318 and stm32f378. Because of that we also
supported some peripherals for these devices that are not actually
available for them.

This commit adds the correct PAC modules for the two devices in question
and fixes up the HAL code to use the correct peripherals.

Author: teskje

CHANGELOG.md

@@ -45,6 +45,9 @@ let clocks = rcc
 - Split up `stm32f302` into sub-targets `stm32f302xb`,`stm32f302xc`,`stm32f302xd`,`stm32f302xe`
 - Bump `stm32f3` dependency to `0.11.0` ([#97](https://github.com/stm32-rs/stm32f3xx-hal/pull/97))
 - The `stm32f3` reexport is now renamed from `stm32` to `pac` ([#101](https://github.com/stm32-rs/stm32f3xx-hal/pull/101))
+- The correct `stm32f3` modules are now used for the `stm32f318` and `stm32f738`
+  targets. As a result, some previously (wrongly) supported peripherals have
+  been removed from these targets. ([#116](https://github.com/stm32-rs/stm32f3xx-hal/pull/116))
 
 ## [v0.4.3] - 2020-04-11
 

Cargo.toml

@@ -58,7 +58,7 @@ direct-call-deprecated = []
 rt = ["stm32f3/rt"]
 # Any Changes here should be mirrored in README.md and src/lib.rs
 stm32f301 = ["stm32f3/stm32f301", "device-selected"]
-stm32f318 = ["stm32f3/stm32f3x8", "device-selected"]
+stm32f318 = ["stm32f3/stm32f301", "device-selected"]
 stm32f302 = ["stm32f3/stm32f302", "direct-call-deprecated"]
 stm32f302xb = ["stm32f302", "device-selected"]
 stm32f302xc = ["stm32f302", "device-selected"]
@@ -72,7 +72,7 @@ stm32f303xe = ["stm32f303", "stm32-usbd/ram_access_2x16", "device-selected"]
 stm32f303x6 = ["stm32f303", "device-selected"]
 stm32f303x8 = ["stm32f303", "device-selected"]
 stm32f373 = ["stm32f3/stm32f373", "device-selected"]
-stm32f378 = ["stm32f3/stm32f3x8", "device-selected"]
+stm32f378 = ["stm32f3/stm32f373", "device-selected"]
 stm32f334 = ["stm32f3/stm32f3x4", "device-selected"]
 stm32f328 = ["stm32f3/stm32f3x8", "device-selected"]
 stm32f358 = ["stm32f3/stm32f3x8", "device-selected"]

src/gpio.rs

@@ -12,7 +12,6 @@ use crate::gpio::gpiob::{PB6, PB7, PB8, PB9};
     feature = "stm32f303xc",
     feature = "stm32f303xd",
     feature = "stm32f303xe",
-    feature = "stm32f318",
     feature = "stm32f328",
     feature = "stm32f358",
     feature = "stm32f398",
@@ -61,7 +60,6 @@ unsafe impl SclPin<I2C2> for PF1<AF4> {}
     feature = "stm32f303xc",
     feature = "stm32f303xd",
     feature = "stm32f303xe",
-    feature = "stm32f318",
     feature = "stm32f328",
     feature = "stm32f358",
     feature = "stm32f398",

src/i2c.rs

@@ -82,7 +82,7 @@ pub use embedded_hal as hal;
 pub use nb;
 pub use nb::block;
 
-#[cfg(feature = "stm32f301")]
+#[cfg(any(feature = "stm32f301", feature = "stm32f318"))]
 pub use stm32f3::stm32f301 as pac;
 
 #[cfg(feature = "stm32f302")]
@@ -91,19 +91,13 @@ pub use stm32f3::stm32f302 as pac;
 #[cfg(feature = "stm32f303")]
 pub use stm32f3::stm32f303 as pac;
 
-#[cfg(feature = "stm32f373")]
+#[cfg(any(feature = "stm32f373", feature = "stm32f378"))]
 pub use stm32f3::stm32f373 as pac;
 
 #[cfg(feature = "stm32f334")]
 pub use stm32f3::stm32f3x4 as pac;
 
-#[cfg(any(
-    feature = "stm32f318",
-    feature = "stm32f328",
-    feature = "stm32f358",
-    feature = "stm32f378",
-    feature = "stm32f398"
-))]
+#[cfg(any(feature = "stm32f328", feature = "stm32f358", feature = "stm32f398"))]
 pub use stm32f3::stm32f3x8 as pac;
 
 #[cfg(feature = "device-selected")]

src/lib.rs

@@ -97,7 +97,7 @@ impl APB2 {
 const HSI: u32 = 8_000_000; // Hz
 
 // some microcontrollers do not have USB
-#[cfg(any(feature = "stm32f301", feature = "stm32f334",))]
+#[cfg(any(feature = "stm32f301", feature = "stm32f318", feature = "stm32f334",))]
 mod usb_clocking {
     use crate::rcc::PllConfig;
 
@@ -116,7 +116,6 @@ mod usb_clocking {
 }
 
 #[cfg(any(
-    feature = "stm32f318",
     feature = "stm32f302",
     feature = "stm32f303",
     feature = "stm32f373",

src/rcc.rs

@@ -15,7 +15,6 @@ use crate::gpio::gpioa::{PA5, PA6, PA7};
     feature = "stm32f328",
     feature = "stm32f334",
     feature = "stm32f358",
-    feature = "stm32f378",
     feature = "stm32f398"
 ))]
 use crate::gpio::gpiob::PB13;
@@ -38,7 +37,6 @@ use crate::rcc::APB1;
 #[cfg(any(
     feature = "stm32f302",
     feature = "stm32f303",
-    feature = "stm32f318",
     feature = "stm32f328",
     feature = "stm32f334",
     feature = "stm32f358",
@@ -83,7 +81,6 @@ unsafe impl SckPin<SPI1> for PA5<AF5> {}
     feature = "stm32f328",
     feature = "stm32f334",
     feature = "stm32f358",
-    feature = "stm32f378",
     feature = "stm32f398"
 ))]
 unsafe impl SckPin<SPI2> for PB13<AF5> {}
@@ -255,7 +252,7 @@ hal! {
     SPI1: (spi1, APB2, spi1en, spi1rst, pclk2),
 }
 
-#[cfg(feature = "stm32f301")]
+#[cfg(any(feature = "stm32f301", feature = "stm32f318"))]
 hal! {
     SPI2: (spi2, APB1, spi2en, spi2rst, pclk1),
     SPI3: (spi3, APB1, spi3en, spi3rst, pclk1),
@@ -264,7 +261,6 @@ hal! {
 #[cfg(any(
     feature = "stm32f302",
     feature = "stm32f303",
-    feature = "stm32f318",
     feature = "stm32f328",
     feature = "stm32f358",
     feature = "stm32f373",

src/spi.rs

@@ -2,28 +2,25 @@
 
 use crate::hal::timer::{CountDown, Periodic};
 #[cfg(any(
+    feature = "stm32f301",
     feature = "stm32f302",
     feature = "stm32f303",
     feature = "stm32f334",
     feature = "stm32f318",
     feature = "stm32f328",
     feature = "stm32f358",
-    feature = "stm32f378",
     feature = "stm32f398",
 ))]
 use crate::pac::TIM1;
 #[cfg(any(
     feature = "stm32f303",
-    feature = "stm32f318",
     feature = "stm32f328",
     feature = "stm32f358",
-    feature = "stm32f378",
     feature = "stm32f398"
 ))]
 use crate::pac::TIM20;
 #[cfg(any(
     feature = "stm32f303",
-    feature = "stm32f318",
     feature = "stm32f328",
     feature = "stm32f358",
     feature = "stm32f373",
@@ -33,19 +30,16 @@ use crate::pac::TIM20;
 use crate::pac::TIM4;
 #[cfg(any(
     feature = "stm32f303",
-    feature = "stm32f318",
     feature = "stm32f328",
     feature = "stm32f358",
-    feature = "stm32f378",
     feature = "stm32f398",
 ))]
 use crate::pac::TIM8;
-#[cfg(feature = "stm32f373")]
+#[cfg(any(feature = "stm32f373", feature = "stm32f378"))]
 use crate::pac::{TIM12, TIM13, TIM14, TIM18, TIM19, TIM5};
 use crate::pac::{TIM15, TIM16, TIM17, TIM2, TIM6};
 #[cfg(any(
     feature = "stm32f303",
-    feature = "stm32f318",
     feature = "stm32f328",
     feature = "stm32f334",
     feature = "stm32f358",
@@ -189,8 +183,12 @@ macro_rules! hal {
     }
 }
 
-#[cfg(feature = "stm32f301")]
+#[cfg(any(feature = "stm32f301", feature = "stm32f318"))]
 hal! {
+    {
+        TIM1: (tim1, tim1en, tim1rst),
+        APB2: (apb2, pclk2),
+    },
     {
         TIM2: (tim2, tim2en, tim2rst),
         APB1: (apb1, pclk1),
@@ -325,7 +323,7 @@ hal! {
     },
 }
 
-#[cfg(feature = "stm32f373")]
+#[cfg(any(feature = "stm32f373", feature = "stm32f378"))]
 hal! {
     {
         TIM2: (tim2, tim2en, tim2rst),
@@ -385,13 +383,7 @@ hal! {
     },
 }
 
-#[cfg(any(
-    feature = "stm32f318",
-    feature = "stm32f328",
-    feature = "stm32f358",
-    feature = "stm32f378",
-    feature = "stm32f398"
-))]
+#[cfg(any(feature = "stm32f328", feature = "stm32f358", feature = "stm32f398"))]
 hal! {
     {
         TIM1: (tim1, tim1en, tim1rst),