Skip to content

Commit 59f2221

Browse files
authored
Merge pull request #115 from ra-kete/fix-stm32f301-feature
Remove stm32f301 sub-target features
2 parents b0aaa37 + 67b0373 commit 59f2221

File tree

5 files changed

+5
-17
lines changed

5 files changed

+5
-17
lines changed

Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ device-selected = []
5656
direct-call-deprecated = []
5757
rt = ["stm32f3/rt"]
5858
# Any Changes here should be mirrored in README.md and src/lib.rs
59-
stm32f301 = ["stm32f3/stm32f301", "direct-call-deprecated"]
60-
stm32f301xb = ["stm32f301", "device-selected"]
61-
stm32f301xc = ["stm32f301", "device-selected"]
62-
stm32f301xd = ["stm32f301", "device-selected"]
63-
stm32f301xe = ["stm32f301", "device-selected"]
59+
stm32f301 = ["stm32f3/stm32f301", "device-selected"]
6460
stm32f318 = ["stm32f3/stm32f3x8", "device-selected"]
6561
stm32f302 = ["stm32f3/stm32f302", "direct-call-deprecated"]
6662
stm32f302xb = ["stm32f302", "device-selected"]

src/lib.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
Please select one of the following
77
88
(Note: `x` denotes any character in [a-z])
9-
* stm32f301xb
10-
* stm32f301xc
11-
* stm32f301xd
12-
* stm32f301xe
9+
* stm32f301
1310
* stm32f318
1411
* stm32f302xb
1512
* stm32f302xc
@@ -43,10 +40,7 @@ compile_error!(
4340
Please select one of the following
4441
4542
(Note: `x` denotes any character in [a-z])
46-
* stm32f301xb
47-
* stm32f301xc
48-
* stm32f301xd
49-
* stm32f301xe
43+
* stm32f301
5044
* stm32f318
5145
* stm32f302xb
5246
* stm32f302xc

src/serial.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ use crate::{
88
time::Bps,
99
};
1010
use core::{convert::Infallible, marker::PhantomData, ptr};
11-
use cortex_m::interrupt;
12-
use nb;
1311

1412
#[cfg(any(
1513
feature = "stm32f302",
@@ -41,6 +39,8 @@ use crate::gpio::gpioe;
4139

4240
#[cfg(feature = "stm32f303")]
4341
use crate::dma;
42+
#[cfg(feature = "stm32f303")]
43+
use cortex_m::interrupt;
4444

4545
/// Interrupt event
4646
pub enum Event {

src/spi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use core::ptr;
55
use crate::hal::spi::FullDuplex;
66
pub use crate::hal::spi::{Mode, Phase, Polarity};
77
use crate::pac::{SPI1, SPI2, SPI3};
8-
use nb;
98

109
use crate::gpio::gpioa::{PA5, PA6, PA7};
1110
#[cfg(any(

src/timer.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ use crate::pac::{TIM15, TIM16, TIM17, TIM2, TIM6};
5656
use crate::pac::{TIM3, TIM7};
5757

5858
use cast::{u16, u32};
59-
use nb;
6059
use void::Void;
6160

6261
use crate::rcc::{Clocks, APB1, APB2};

0 commit comments

Comments
 (0)