Skip to content

Commit b394b4c

Browse files
burrbullburrbull
committed
swap embedded-hals
1 parent f848188 commit b394b4c

32 files changed

+77
-100
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1111

1212
- shorten gpio ptr access
1313
- bump embedded-hal to `1.0.0-rc.3`
14+
- make `embedded-hal` `1.0` main implementation
1415

1516
## [v0.19.0] - 2023-12-11
1617

@@ -59,7 +60,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
5960

6061
### Changed
6162

62-
- implement `embedded_hal::blocking::i2c::Transactional` for `I2c` [#671]
63+
- implement `embedded_hal_02::blocking::i2c::Transactional` for `I2c` [#671]
6364

6465
### Fixed
6566

@@ -334,7 +335,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
334335

335336
### Fixed
336337

337-
- Fix `embedded_hal 1.0-alpha.7` version, public `PinMode`, update deps [#485]
338+
- Fix `embedded_hal_02 1.0-alpha.7` version, public `PinMode`, update deps [#485]
338339
- Remove the defmt feature/dependency name workaround [#479]
339340

340341
[#479]: https://github.com/stm32-rs/stm32f4xx-hal/pull/479
@@ -393,7 +394,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
393394
- Move `MonoTimer` from `timer` to dwt mode [#448]
394395
- Unify serial trait impls for embedded-hal 0.2 & 1.0 [#447]
395396
- Add possibility to select Timer master mode
396-
- Add inherent impl of `embedded_hal::Pwm` methods on `Pwm`s [#439]
397+
- Add inherent impl of `embedded_hal_02::Pwm` methods on `Pwm`s [#439]
397398
- Use `embedded-dma` v0.2 [#440]
398399
- Add LSI support for `Rtc` [#438]
399400
- Use `time` for `Rtc` instead of `rtcc`, add `rtc` example [#436]

‎Cargo.toml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ sdio-host = { version = "0.6.0", optional = true }
3939
embedded-dma = "0.2.0"
4040
bare-metal = { version = "1" }
4141
void = { default-features = false, version = "1.0.2" }
42-
embedded-hal = { features = ["unproven"], version = "0.2.7" }
43-
embedded-hal-nb = "=1.0.0-rc.3"
4442
display-interface = { version = "0.4.1", optional = true }
4543
fugit = "0.3.7"
4644
fugit-timer = "0.1.3"
@@ -54,9 +52,16 @@ vcell = "0.1.3"
5452
version = "0.3.14"
5553
default-features = false
5654

57-
[dependencies.embedded-hal-one]
58-
version = "=1.0.0-rc.3"
55+
[dependencies.embedded-hal-02]
5956
package = "embedded-hal"
57+
version = "0.2.7"
58+
features = ["unproven"]
59+
60+
[dependencies.embedded-hal]
61+
git = "https://github.com/rust-embedded/embedded-hal"
62+
63+
[dependencies.embedded-hal-nb]
64+
git = "https://github.com/rust-embedded/embedded-hal"
6065

6166
[dependencies.stm32_i2s_v12x]
6267
version = "0.5.0"

‎examples/delay-timer-blinky.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn main() -> ! {
3333
loop {
3434
// On for 1s, off for 3s.
3535
led.set_high();
36-
// Use `embedded_hal::DelayMs` trait
36+
// Use `embedded_hal_02::DelayMs` trait
3737
delay.delay_ms(1000_u32);
3838
led.set_low();
3939
// or use `fugit::ExtU32` trait

‎examples/qei.rs

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

1515
use cortex_m_rt::entry;
16-
use embedded_hal::Direction as RotaryDirection;
16+
use embedded_hal_02::Direction as RotaryDirection;
1717
use stm32f4xx_hal::{pac, prelude::*, qei::Qei};
1818

1919
#[entry]

‎examples/rtic-spi-slave-dma.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#[rtic::app(device = stm32f4xx_hal::pac, peripherals = true, dispatchers = [TIM2])]
77
mod app {
88

9-
use embedded_hal::spi::{Mode, Phase, Polarity};
9+
use embedded_hal_02::spi::{Mode, Phase, Polarity};
1010
use hal::{
1111
dma::{
1212
config::DmaConfig, DmaFlag, MemoryToPeripheral, PeripheralToMemory, Stream0, Stream5,

‎examples/spi-dma.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use stm32f4xx_hal::dma::DmaFlag;
88
use core::cell::RefCell;
99
use cortex_m::interrupt::Mutex;
1010
use cortex_m_rt::entry;
11-
use embedded_hal::spi::{Mode, Phase, Polarity};
11+
use embedded_hal_02::spi::{Mode, Phase, Polarity};
1212
use stm32f4xx_hal::pac::interrupt;
1313
use stm32f4xx_hal::{
1414
dma::{config, MemoryToPeripheral, Stream4, StreamsTuple, Transfer},

‎src/adc.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ macro_rules! adc {
860860
/// to sample for at a given ADC clock frequency
861861
pub fn configure_channel<CHANNEL>(&mut self, _channel: &CHANNEL, sequence: config::Sequence, sample_time: config::SampleTime)
862862
where
863-
CHANNEL: embedded_hal::adc::Channel<pac::$adc_type, ID=u8>
863+
CHANNEL: embedded_hal_02::adc::Channel<pac::$adc_type, ID=u8>
864864
{
865865
//Check the sequence is long enough
866866
self.adc_reg.sqr1.modify(|r, w| {
@@ -953,7 +953,7 @@ macro_rules! adc {
953953
/// Note that it reconfigures the adc sequence and doesn't restore it
954954
pub fn convert<PIN>(&mut self, pin: &PIN, sample_time: config::SampleTime) -> u16
955955
where
956-
PIN: embedded_hal::adc::Channel<pac::$adc_type, ID=u8>
956+
PIN: embedded_hal_02::adc::Channel<pac::$adc_type, ID=u8>
957957
{
958958
self.adc_reg.cr2.modify(|_, w| w
959959
.dma().clear_bit() //Disable dma
@@ -986,7 +986,7 @@ macro_rules! adc {
986986

987987
impl Adc<pac::$adc_type> {
988988
fn read<PIN>(&mut self, pin: &mut PIN) -> nb::Result<u16, ()>
989-
where PIN: embedded_hal::adc::Channel<pac::$adc_type, ID=u8>,
989+
where PIN: embedded_hal_02::adc::Channel<pac::$adc_type, ID=u8>,
990990
{
991991
let enabled = self.is_enabled();
992992
if !enabled {
@@ -1003,9 +1003,9 @@ macro_rules! adc {
10031003
}
10041004
}
10051005

1006-
impl<PIN> embedded_hal::adc::OneShot<pac::$adc_type, u16, PIN> for Adc<pac::$adc_type>
1006+
impl<PIN> embedded_hal_02::adc::OneShot<pac::$adc_type, u16, PIN> for Adc<pac::$adc_type>
10071007
where
1008-
PIN: embedded_hal::adc::Channel<pac::$adc_type, ID=u8>,
1008+
PIN: embedded_hal_02::adc::Channel<pac::$adc_type, ID=u8>,
10091009
{
10101010
type Error = ();
10111011

‎src/adc/f4.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use super::*;
33
macro_rules! adc_pins {
44
($($pin:ty => ($adc:ident, $chan:expr)),+ $(,)*) => {
55
$(
6-
impl embedded_hal::adc::Channel<pac::$adc> for $pin {
6+
impl embedded_hal_02::adc::Channel<pac::$adc> for $pin {
77
type ID = u8;
88
fn channel() -> u8 { $chan }
99
}

‎src/dwt.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ impl Delay {
9797
}
9898

9999
// Implement DelayUs/DelayMs for various integer types
100-
impl<T: Into<u64>> embedded_hal::blocking::delay::DelayUs<T> for Delay {
100+
impl<T: Into<u64>> embedded_hal_02::blocking::delay::DelayUs<T> for Delay {
101101
fn delay_us(&mut self, us: T) {
102102
// Convert us to ticks
103103
let start = DWT::cycle_count();
104104
let ticks = (us.into() * self.clock.raw() as u64) / 1_000_000;
105105
Delay::delay_ticks(start, ticks);
106106
}
107107
}
108-
impl<T: Into<u64>> embedded_hal::blocking::delay::DelayMs<T> for Delay {
108+
impl<T: Into<u64>> embedded_hal_02::blocking::delay::DelayMs<T> for Delay {
109109
fn delay_ms(&mut self, ms: T) {
110110
// Convert ms to ticks
111111
let start = DWT::cycle_count();
@@ -114,7 +114,7 @@ impl<T: Into<u64>> embedded_hal::blocking::delay::DelayMs<T> for Delay {
114114
}
115115
}
116116

117-
impl embedded_hal_one::delay::DelayNs for Delay {
117+
impl embedded_hal::delay::DelayNs for Delay {
118118
fn delay_ns(&mut self, ns: u32) {
119119
// Convert us to ticks
120120
let start = DWT::cycle_count();

‎src/fmpi2c/hal_02.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mod blocking {
22
use super::super::{fmpi2c1, Error, FMPI2c, Instance};
33
use core::ops::Deref;
4-
use embedded_hal::blocking::i2c::{Read, Write, WriteRead};
4+
use embedded_hal_02::blocking::i2c::{Read, Write, WriteRead};
55

66
impl<I2C: Instance> WriteRead for FMPI2c<I2C>
77
where

‎src/fmpi2c/hal_1.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use embedded_hal_one::i2c::ErrorType;
1+
use embedded_hal::i2c::ErrorType;
22

33
use super::Instance;
44

@@ -9,9 +9,9 @@ impl<I2C: Instance> ErrorType for super::FMPI2c<I2C> {
99
mod blocking {
1010
use super::super::{fmpi2c1, FMPI2c, Instance};
1111
use core::ops::Deref;
12-
use embedded_hal_one::i2c::Operation;
12+
use embedded_hal::i2c::Operation;
1313

14-
impl<I2C: Instance> embedded_hal_one::i2c::I2c for FMPI2c<I2C>
14+
impl<I2C: Instance> embedded_hal::i2c::I2c for FMPI2c<I2C>
1515
where
1616
I2C: Deref<Target = fmpi2c1::RegisterBlock>,
1717
{

‎src/gpio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ mod hal_02;
7171
mod hal_1;
7272
pub mod outport;
7373

74-
pub use embedded_hal::digital::v2::PinState;
74+
pub use embedded_hal_02::digital::v2::PinState;
7575

7676
use core::fmt;
7777

‎src/gpio/dynamic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::*;
2-
use embedded_hal_one::digital::ErrorKind;
2+
use embedded_hal::digital::ErrorKind;
33

44
/// Pin type with dynamic mode
55
///
@@ -31,7 +31,7 @@ pub enum PinModeError {
3131
IncorrectMode,
3232
}
3333

34-
impl embedded_hal_one::digital::Error for PinModeError {
34+
impl embedded_hal::digital::Error for PinModeError {
3535
fn kind(&self) -> ErrorKind {
3636
ErrorKind::Other
3737
}

‎src/gpio/hal_02.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use super::{
55
PartiallyErasedPin, Pin, PinMode, PinState,
66
};
77

8-
use embedded_hal::digital::v2::{
8+
use embedded_hal_02::digital::v2::{
99
InputPin, IoPin, OutputPin, StatefulOutputPin, ToggleableOutputPin,
1010
};
1111

‎src/gpio/hal_1.rs

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ use super::{
44
dynamic::PinModeError, marker, DynamicPin, ErasedPin, Output, PartiallyErasedPin, Pin,
55
};
66

7-
use embedded_hal_one::digital::{
8-
ErrorType, InputPin, OutputPin, StatefulOutputPin, ToggleableOutputPin,
9-
};
7+
use embedded_hal::digital::{ErrorType, InputPin, OutputPin, StatefulOutputPin};
108

119
// Implementations for `Pin`
1210
impl<const P: char, const N: u8, MODE> ErrorType for Pin<P, N, MODE> {
@@ -39,14 +37,6 @@ impl<const P: char, const N: u8, MODE> StatefulOutputPin for Pin<P, N, Output<MO
3937
}
4038
}
4139

42-
impl<const P: char, const N: u8, MODE> ToggleableOutputPin for Pin<P, N, Output<MODE>> {
43-
#[inline(always)]
44-
fn toggle(&mut self) -> Result<(), Self::Error> {
45-
self.toggle();
46-
Ok(())
47-
}
48-
}
49-
5040
impl<const P: char, const N: u8, MODE> InputPin for Pin<P, N, MODE>
5141
where
5242
MODE: marker::Readable,
@@ -93,14 +83,6 @@ impl<MODE> StatefulOutputPin for ErasedPin<Output<MODE>> {
9383
}
9484
}
9585

96-
impl<MODE> ToggleableOutputPin for ErasedPin<Output<MODE>> {
97-
#[inline(always)]
98-
fn toggle(&mut self) -> Result<(), Self::Error> {
99-
self.toggle();
100-
Ok(())
101-
}
102-
}
103-
10486
impl<MODE> InputPin for ErasedPin<MODE>
10587
where
10688
MODE: marker::Readable,
@@ -147,14 +129,6 @@ impl<const P: char, MODE> StatefulOutputPin for PartiallyErasedPin<P, Output<MOD
147129
}
148130
}
149131

150-
impl<const P: char, MODE> ToggleableOutputPin for PartiallyErasedPin<P, Output<MODE>> {
151-
#[inline(always)]
152-
fn toggle(&mut self) -> Result<(), Self::Error> {
153-
self.toggle();
154-
Ok(())
155-
}
156-
}
157-
158132
impl<const P: char, MODE> InputPin for PartiallyErasedPin<P, MODE>
159133
where
160134
MODE: marker::Readable,

‎src/i2c.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pub struct I2c<I2C: Instance> {
7070
pins: (I2C::Scl, I2C::Sda),
7171
}
7272

73-
pub use embedded_hal_one::i2c::NoAcknowledgeSource;
73+
pub use embedded_hal::i2c::NoAcknowledgeSource;
7474

7575
#[derive(Debug, Eq, PartialEq, Copy, Clone)]
7676
#[non_exhaustive]
@@ -605,5 +605,5 @@ macro_rules! transaction_impl {
605605
}
606606
use transaction_impl;
607607

608-
type Hal1Operation<'a> = embedded_hal_one::i2c::Operation<'a>;
609-
type Hal02Operation<'a> = embedded_hal::blocking::i2c::Operation<'a>;
608+
type Hal1Operation<'a> = embedded_hal::i2c::Operation<'a>;
609+
type Hal02Operation<'a> = embedded_hal_02::blocking::i2c::Operation<'a>;

‎src/i2c/hal_02.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
mod blocking {
22
use super::super::{Error, I2c, Instance};
3-
use embedded_hal::blocking::i2c::{
3+
use embedded_hal_02::blocking::i2c::{
44
Operation, Read, Transactional, Write, WriteIter, WriteIterRead, WriteRead,
55
};
66

‎src/i2c/hal_1.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use embedded_hal_one::i2c::{Error, ErrorKind, ErrorType};
1+
use embedded_hal::i2c::{Error, ErrorKind, ErrorType};
22

33
impl Error for super::Error {
44
fn kind(&self) -> ErrorKind {
@@ -18,9 +18,9 @@ impl<I2C: super::Instance> ErrorType for super::I2c<I2C> {
1818

1919
mod blocking {
2020
use super::super::{I2c, Instance};
21-
use embedded_hal_one::i2c::Operation;
21+
use embedded_hal::i2c::Operation;
2222

23-
impl<I2C: Instance> embedded_hal_one::i2c::I2c for I2c<I2C> {
23+
impl<I2C: Instance> embedded_hal::i2c::I2c for I2c<I2C> {
2424
fn read(&mut self, addr: u8, buffer: &mut [u8]) -> Result<(), Self::Error> {
2525
self.read(addr, buffer)
2626
}

‎src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ compile_error!(
2626
);
2727

2828
#[cfg(feature = "device-selected")]
29-
pub use embedded_hal as hal;
29+
pub use embedded_hal_02 as hal;
3030

3131
#[cfg(feature = "device-selected")]
3232
pub use nb;

‎src/prelude.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@
3636
//! ```
3737
//! use stm32f4xx_hal::prelude::*;
3838
//! ```
39-
pub use embedded_hal::adc::OneShot as _embedded_hal_adc_OneShot;
40-
pub use embedded_hal::blocking::delay::DelayMs as _embedded_hal_blocking_delay_DelayMs;
41-
pub use embedded_hal::blocking::delay::DelayUs as _embedded_hal_blocking_delay_DelayUs;
42-
pub use embedded_hal::blocking::serial::Write as _embedded_hal_blocking_serial_Write;
43-
pub use embedded_hal::serial::Read as _embedded_hal_serial_Read;
44-
pub use embedded_hal::serial::Write as _embedded_hal_serial_Write;
45-
pub use embedded_hal::Capture as _embedded_hal_Capture;
46-
pub use embedded_hal::Pwm as _embedded_hal_Pwm;
47-
pub use embedded_hal::Qei as _embedded_hal_Qei;
39+
pub use embedded_hal::delay::DelayNs as _;
40+
pub use embedded_hal_02::adc::OneShot as _embedded_hal_adc_OneShot;
41+
pub use embedded_hal_02::blocking::serial::Write as _embedded_hal_blocking_serial_Write;
42+
pub use embedded_hal_02::serial::Read as _embedded_hal_serial_Read;
43+
pub use embedded_hal_02::serial::Write as _embedded_hal_serial_Write;
44+
pub use embedded_hal_02::Capture as _embedded_hal_Capture;
45+
pub use embedded_hal_02::Pwm as _embedded_hal_Pwm;
46+
pub use embedded_hal_02::Qei as _embedded_hal_Qei;
4847
pub use fugit::ExtU32 as _fugit_ExtU32;
4948
pub use fugit::RateExtU32 as _fugit_RateExtU32;
5049

‎src/qei.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,18 @@ impl<TIM: Instance> Qei<TIM> {
7878
}
7979
}
8080

81-
impl<TIM: Instance> embedded_hal::Qei for Qei<TIM> {
81+
impl<TIM: Instance> embedded_hal_02::Qei for Qei<TIM> {
8282
type Count = TIM::Width;
8383

8484
fn count(&self) -> Self::Count {
8585
self.tim.read_count()
8686
}
8787

88-
fn direction(&self) -> embedded_hal::Direction {
88+
fn direction(&self) -> embedded_hal_02::Direction {
8989
if self.tim.read_direction() {
90-
embedded_hal::Direction::Upcounting
90+
embedded_hal_02::Direction::Upcounting
9191
} else {
92-
embedded_hal::Direction::Downcounting
92+
embedded_hal_02::Direction::Downcounting
9393
}
9494
}
9595
}

‎src/rng.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use crate::pac::RNG;
2727
use crate::rcc::{Clocks, Enable, Reset};
2828
use core::num::NonZeroU32;
2929
use core::ops::Shl;
30-
use embedded_hal::blocking::rng;
30+
use embedded_hal_02::blocking::rng;
3131
use fugit::RateExtU32;
3232
use rand_core::RngCore;
3333

0 commit comments

Comments
 (0)