Skip to content

Commit d9379e5

Browse files
committed
eh-1.0.0: support both e-h v1.0 and e-h v0.2 for key traits
1 parent a524a60 commit d9379e5

29 files changed

+39
-31
lines changed

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ rustdoc-args = ["--cfg", "docsrs"]
2828

2929
[dependencies]
3030
fugit = "0.3.5"
31-
embedded-hal = { version = "1.0" }
31+
embedded-hal-02 = { package = "embedded-hal", version = "0.2.7", features = ["unproven"] }
32+
embedded-hal-1 = { package = "embedded-hal", version = "1.0" }
3233
embedded-dma = "0.2.0"
3334
embedded-io = "0.6.1"
3435
cortex-m = { version = "^0.7.7", features = ["critical-section-single-core"] }

examples/blinky-stm32h747i-disco.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
use cortex_m_rt::entry;
77
use stm32h7xx_hal::{pac, prelude::*};
88

9+
use embedded_hal_1::delay::DelayNs; // this example uses embedded-hal v1.0
10+
911
use log::info;
1012

1113
#[macro_use]
@@ -53,13 +55,13 @@ fn main() -> ! {
5355
led2.set_low();
5456
led3.set_high();
5557
led4.set_low();
56-
delay.delay_ms(500_u16);
58+
delay.delay_ms(500);
5759

5860
led1.set_low();
5961
led2.set_high();
6062
led3.set_low();
6163
led4.set_high();
62-
delay.delay_ms(500_u16);
64+
delay.delay_ms(500);
6365
}
6466
}
6567
}

examples/blinky.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use cortex_m_rt::entry;
88
#[macro_use]
99
mod utilities;
1010

11-
use embedded_hal::delay::DelayNs;
11+
use embedded_hal_1::delay::DelayNs; // this example uses embedded-hal v1.0
1212
use stm32h7xx_hal::{pac, prelude::*};
1313

1414
use log::info;

examples/blinky_random.rs

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

99
use cortex_m_rt::entry;
10-
use embedded_hal::delay::DelayNs;
10+
use embedded_hal_1::delay::DelayNs; // this example uses embedded-hal v1.0
1111
use stm32h7xx_hal::{pac, prelude::*};
1212

1313
#[macro_use]

examples/blinky_timer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ mod utilities;
1010
extern crate nb;
1111

1212
use cortex_m_rt::entry;
13-
use embedded_hal::delay::DelayNs;
13+
use embedded_hal_1::delay::DelayNs; // this example uses embedded-hal v1.0
1414
use stm32h7xx_hal::{pac, prelude::*};
1515

1616
use log::info;

examples/can-echo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::hal::{
1818
rcc,
1919
rcc::rec,
2020
};
21-
use embedded_hal::delay::DelayNs;
21+
use embedded_hal_1::delay::DelayNs; // this example uses embedded-hal v1.0
2222
use fdcan::{
2323
config::NominalBitTiming,
2424
filter::{StandardFilter, StandardFilterSlot},

examples/can-fd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use crate::hal::{
3030
rcc,
3131
rcc::rec,
3232
};
33-
use embedded_hal::delay::DelayNs;
33+
use embedded_hal_1::delay::DelayNs; // this example uses embedded-hal v1.0
3434
use fdcan::{
3535
config::{DataBitTiming, FrameTransmissionConfig, NominalBitTiming},
3636
filter::{StandardFilter, StandardFilterSlot},

examples/display-dsi-command-teartest-stm32h747i-disco.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ use log::info;
2727
use otm8009a::Otm8009AConfig;
2828
use stm32h7xx_hal::dsi::{ColorCoding, DsiChannel, DsiConfig, DsiPllConfig};
2929

30+
use embedded_hal_1::delay::DelayNs; // this example uses embedded-hal v1.0
31+
3032
extern crate cortex_m;
3133
extern crate cortex_m_rt as rt;
3234
use cortex_m_rt::{entry, exception};

examples/display-dsi-video-stm32h747i-disco.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ use log::info;
2222
use otm8009a::Otm8009AConfig;
2323
use stm32h7xx_hal::dsi::{ColorCoding, DsiChannel, DsiConfig, DsiPllConfig};
2424

25+
use embedded_hal_1::delay::DelayNs; // this example uses embedded-hal v1.0
26+
2527
extern crate cortex_m;
2628
extern crate cortex_m_rt as rt;
2729
use cortex_m_rt::{entry, exception};

examples/display-dsi-video-teartest-stm32h747i-disco.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ extern crate cortex_m;
3030
extern crate cortex_m_rt as rt;
3131
use cortex_m_rt::{entry, exception};
3232

33+
use embedded_hal_1::delay::DelayNs; // this example uses embedded-hal v1.0
34+
3335
use crate::utilities_display::display_target::BufferedDisplay;
3436
use stm32h7xx_hal::gpio::Speed;
3537
use stm32h7xx_hal::ltdc;

0 commit comments

Comments
 (0)