Skip to content

Commit 07b50ea

Browse files
committed
eh-1.0.0: gpio
1 parent 224d471 commit 07b50ea

File tree

7 files changed

+245
-273
lines changed

7 files changed

+245
-273
lines changed

examples/blinky.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
#![no_std]
66

77
use cortex_m_rt::entry;
8+
#[macro_use]
9+
mod utilities;
10+
11+
use embedded_hal::delay::DelayNs;
812
use stm32h7xx_hal::{pac, prelude::*};
913

1014
use log::info;
1115

12-
#[macro_use]
13-
mod utilities;
14-
1516
#[entry]
1617
fn main() -> ! {
1718
utilities::logger::init();
@@ -42,9 +43,9 @@ fn main() -> ! {
4243

4344
loop {
4445
led.set_high();
45-
delay.delay_ms(500_u16);
46+
delay.delay_ms(500);
4647

4748
led.set_low();
48-
delay.delay_ms(500_u16);
49+
delay.delay_ms(500);
4950
}
5051
}

examples/blinky_random.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#![no_std]
88

99
use cortex_m_rt::entry;
10+
use embedded_hal::delay::DelayNs;
1011
use stm32h7xx_hal::{pac, prelude::*};
1112

1213
#[macro_use]

examples/blinky_timer.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ mod utilities;
1010
extern crate nb;
1111

1212
use cortex_m_rt::entry;
13-
use stm32h7xx_hal::{pac, prelude::*, time::MilliSeconds};
13+
use embedded_hal::delay::DelayNs;
14+
use stm32h7xx_hal::{pac, prelude::*};
1415

1516
use log::info;
1617

@@ -50,13 +51,12 @@ fn main() -> ! {
5051
for _ in 0..5 {
5152
// 20ms wait with timer
5253
led.toggle();
53-
timer.start(MilliSeconds::from_ticks(20).into_rate());
54+
timer.start(50.Hz()).unwrap();
5455
block!(timer.wait()).ok();
5556

56-
// Delay for 500ms. Timer must operate correctly on next
57-
// use.
57+
// Delay for 500ms. Timer must operate correctly on next use.
5858
led.toggle();
59-
delay.delay_ms(500_u16);
59+
delay.delay_ms(500);
6060
}
6161
}
6262
}

examples/gpio_with_input.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#![no_std]
88

99
use cortex_m_rt::entry;
10-
10+
use embedded_hal::delay::DelayNs;
1111
use stm32h7xx_hal::{pac, prelude::*};
1212

1313
use log::info;
@@ -45,10 +45,10 @@ fn main() -> ! {
4545

4646
loop {
4747
led.set_high();
48-
delay.delay_ms(100_u16);
48+
delay.delay_ms(100);
4949

5050
led.set_low();
51-
delay.delay_ms(100_u16);
51+
delay.delay_ms(100);
5252

5353
let is_high = led.with_input(|x| x.is_high());
5454
info!("LED pin high? {}", is_high);

src/gpio.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ mod exti;
7575
pub use exti::ExtiPin;
7676
mod dynamic;
7777
pub use dynamic::{Dynamic, DynamicPin};
78-
mod hal_02;
78+
mod hal_1;
7979

80-
pub use embedded_hal::digital::v2::PinState;
80+
pub use embedded_hal::digital::PinState;
8181

8282
use core::fmt;
8383

@@ -458,7 +458,6 @@ impl<const P: char, const N: u8, MODE> Pin<P, N, Output<MODE>> {
458458
pub fn set_low(&mut self) {
459459
self._set_low()
460460
}
461-
462461
/// Is the pin in drive high or low mode?
463462
#[inline(always)]
464463
pub fn get_state(&self) -> PinState {

src/gpio/hal_02.rs

Lines changed: 0 additions & 257 deletions
This file was deleted.

0 commit comments

Comments
 (0)