Skip to content

Commit 031c887

Browse files
committed
embedded-hal-1
1 parent d42f1dd commit 031c887

27 files changed

+150
-197
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1919
### Added
2020

2121
- Allow to set HSE bypass bit in `RCC` clock configuration register to use an external clock input on the `OSC_IN` pin
22+
- support `embedded-hal-1.0`
2223

2324
## [v0.10.0] - 2022-12-12
2425

@@ -29,7 +30,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2930
fix errata.
3031
- `PwmHz::get_period`: fix computation of return value, prevent division by zero
3132
- return `i2c::Error::Timeout` instead of `nb::WouldBlock` when time is out
32-
- support `embedded-hal-1.0-alpha`
3333

3434
### Breaking changes
3535

Cargo.toml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,27 @@ default-target = "x86_64-unknown-linux-gnu"
2020
[dependencies]
2121
cortex-m = "0.7.6"
2222
cortex-m-rt = "0.7.1"
23-
nb = "1"
23+
nb = "1.1"
2424
stm32f1 = "0.15.1"
2525
embedded-dma = "0.2.0"
2626
bxcan = "0.7"
2727
void = { default-features = false, version = "1.0.2" }
28-
embedded-hal = { features = ["unproven"], version = "0.2.7" }
2928
fugit = "0.3.6"
3029
fugit-timer = "0.1.3"
3130
rtic-monotonic = { version = "1.0", optional = true }
3231
bitflags = "1.3.2"
3332
vcell = "0.1.3"
3433

35-
[dependencies.embedded-hal-one]
36-
version = "=1.0.0-alpha.8"
34+
[dependencies.embedded-hal-02]
3735
package = "embedded-hal"
36+
version = "0.2.7"
37+
features = ["unproven"]
38+
39+
[dependencies.embedded-hal]
40+
version = "1.0"
41+
42+
[dependencies.embedded-hal-nb]
43+
version = "1.0"
3844

3945
[dependencies.stm32-usbd]
4046
version = "0.6.0"

examples/delay-timer-blinky.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fn main() -> ! {
4141
loop {
4242
// On for 1s, off for 3s.
4343
led.set_high();
44-
// Use `embedded_hal::DelayMs` trait
44+
// Use `embedded_hal_02::DelayMs` trait
4545
delay.delay_ms(1000_u32);
4646
led.set_low();
4747
// or use `fugit` duration units

examples/delay.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fn main() -> ! {
3636

3737
loop {
3838
led.set_high();
39-
// Use `embedded_hal::DelayMs` trait
39+
// Use `embedded_hal_02::DelayMs` trait
4040
delay.delay_ms(1_000_u16);
4141
led.set_low();
4242
// or use `fugit` duration units

examples/dynamic_gpio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use nb::block;
88

99
use cortex_m_rt::entry;
1010
use cortex_m_semihosting::hprintln;
11-
use embedded_hal::digital::v2::{InputPin, OutputPin};
11+
use embedded_hal_02::digital::v2::{InputPin, OutputPin};
1212
use stm32f1xx_hal::{pac, prelude::*};
1313

1414
#[entry]

examples/mfrc522.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use panic_itm as _;
77
use cortex_m::iprintln;
88

99
use cortex_m_rt::entry;
10-
use embedded_hal::digital::v1_compat::OldOutputPin;
11-
use embedded_hal::spi::{Mode, Phase, Polarity};
10+
use embedded_hal_02::digital::v1_compat::OldOutputPin;
11+
use embedded_hal_02::spi::{Mode, Phase, Polarity};
1212
use mfrc522::Mfrc522;
1313
use stm32f1xx_hal::{pac, prelude::*, spi::Spi};
1414
pub const MODE: Mode = Mode {

examples/serial_9bits.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const MSG_MAX_LEN: usize = u8::MAX as usize;
2929
// Receives a message addressed to the slave device. Returns the size of the received message.
3030
fn receive_msg<RX>(serial_rx: &mut RX, buf: &mut [u8; MSG_MAX_LEN]) -> usize
3131
where
32-
RX: embedded_hal::serial::Read<u16, Error = serial::Error>,
32+
RX: embedded_hal_02::serial::Read<u16, Error = serial::Error>,
3333
{
3434
enum RxPhase {
3535
Start,
@@ -79,8 +79,8 @@ where
7979
// Send message.
8080
fn send_msg<TX>(serial_tx: &mut TX, msg: &[u8])
8181
where
82-
TX: embedded_hal::serial::Write<u8, Error = Infallible>
83-
+ embedded_hal::serial::Write<u16, Error = Infallible>,
82+
TX: embedded_hal_02::serial::Write<u8, Error = Infallible>
83+
+ embedded_hal_02::serial::Write<u16, Error = Infallible>,
8484
{
8585
// Send address.
8686
block!(serial_tx.write(SLAVE_ADDR as u16 | 0x100)).unwrap_infallible();

examples/spi-slave.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use cortex_m_rt::entry;
1313
use panic_halt as _;
1414

1515
use cortex_m::{asm, singleton};
16-
use embedded_hal::spi::{Mode, Phase, Polarity};
16+
use embedded_hal_02::spi::{Mode, Phase, Polarity};
1717
pub const MODE: Mode = Mode {
1818
phase: Phase::CaptureOnSecondTransition,
1919
polarity: Polarity::IdleHigh,

examples/spi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use cortex_m_rt::entry;
77
use panic_halt as _;
88

9-
use embedded_hal::spi::{Mode, Phase, Polarity};
9+
use embedded_hal_02::spi::{Mode, Phase, Polarity};
1010
pub const MODE: Mode = Mode {
1111
phase: Phase::CaptureOnSecondTransition,
1212
polarity: Polarity::IdleHigh,

src/adc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! # API for the Analog to Digital converter
22
33
use core::marker::PhantomData;
4-
use embedded_hal::adc::{Channel, OneShot};
4+
use embedded_hal_02::adc::{Channel, OneShot};
55

66
#[cfg(all(feature = "stm32f103", any(feature = "high", feature = "xl",),))]
77
use crate::dma::dma2;

0 commit comments

Comments
 (0)