Skip to content

Commit 237836e

Browse files
author
Johannes Draaijer
committed
Update to latest stm32f4xx-hal and stm32f7xx-hal
1 parent 412afc4 commit 237836e

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ features = ["smi", "smoltcp-phy", "stm32f429", "smoltcp/socket-tcp"]
2020
[dependencies]
2121
volatile-register = "0.2"
2222
aligned = "0.4"
23-
stm32f7xx-hal = { git = "https://github.com/stm32-rs/stm32f7xx-hal", rev = "d632a5c", optional = true }
24-
stm32f4xx-hal = { version = "0.10", optional = true }
23+
stm32f7xx-hal = { git = "https://github.com/stm32-rs/stm32f7xx-hal", rev = "9503b8df0e983f04c00f4e503c44da7438355250", optional = true }
24+
stm32f4xx-hal = { version = "0.13", optional = true }
2525
stm32f1xx-hal = { version = "0.9", optional = true }
2626
cortex-m = "0.7"
2727
log = { version = "0.4", optional = true }

src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,6 @@ pub unsafe fn new_unchecked<'rx, 'tx>(
143143
) -> Result<(EthernetDMA<'rx, 'tx>, EthernetMAC), WrongClock> {
144144
setup::setup();
145145

146-
#[cfg(any(feature = "stm32f4xx-hal", feature = "stm32f7xx-hal"))]
147-
let clock_frequency = clocks.hclk().0;
148-
149-
#[cfg(feature = "stm32f1xx-hal")]
150146
let clock_frequency = clocks.hclk().to_Hz();
151147

152148
let clock_range = match clock_frequency {

src/setup.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use stm32f4xx_hal::{
66
gpiob::{PB11, PB12, PB13},
77
gpioc::{PC4, PC5},
88
gpiog::{PG11, PG13, PG14},
9-
Floating, Input,
9+
Input,
1010
Speed::VeryHigh,
1111
},
1212
pac::{RCC, SYSCFG},
@@ -21,7 +21,7 @@ use stm32f7xx_hal::{
2121
gpiob::{PB11, PB12, PB13},
2222
gpioc::{PC4, PC5},
2323
gpiog::{PG11, PG13, PG14},
24-
Floating, Input,
24+
Input,
2525
Speed::VeryHigh,
2626
},
2727
pac::{RCC, SYSCFG},
@@ -231,28 +231,28 @@ macro_rules! impl_pins {
231231
))]
232232
impl_pins!(
233233
RmiiRefClk: [
234-
PA1<Input<Floating>>,
234+
PA1<Input>,
235235
],
236236
RmiiCrsDv: [
237-
PA7<Input<Floating>>,
237+
PA7<Input>,
238238
],
239239
RmiiTxEN: [
240-
PB11<Input<Floating>>,
241-
PG11<Input<Floating>>,
240+
PB11<Input>,
241+
PG11<Input>,
242242
],
243243
RmiiTxD0: [
244-
PB12<Input<Floating>>,
245-
PG13<Input<Floating>>,
244+
PB12<Input>,
245+
PG13<Input>,
246246
],
247247
RmiiTxD1: [
248-
PB13<Input<Floating>>,
249-
PG14<Input<Floating>>,
248+
PB13<Input>,
249+
PG14<Input>,
250250
],
251251
RmiiRxD0: [
252-
PC4<Input<Floating>>,
252+
PC4<Input>,
253253
],
254254
RmiiRxD1: [
255-
PC5<Input<Floating>>,
255+
PC5<Input>,
256256
],
257257
);
258258

0 commit comments

Comments
 (0)