itsscb/esp-idf-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-idf-hal.git synced 2025-09-28 21:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to embedded-hal 1.0.0-alpha.9

Browse Source
This commit is contained in:
Ronen Ulanovsky 2022-10-06 01:29:52 +03:00 committed by Ivan Markov
parent 472ae286c4
commit d68d1db958
7 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.toml
View File

@ -24,10 +24,12 @@ embassy-time-isr-queue-timer10 = ["embassy-time", "embassy-sync"]
embassy-time-isr-queue-timer11 = ["embassy-time", "embassy-sync"]
[dependencies]
nb = "0.1.2"
embedded-hal = "=1.0.0-alpha.8"
nb = "1.0.0"
embedded-can = "0.4.1"
embedded-hal = "=1.0.0-alpha.9"
embedded-hal-0-2 = { package = "embedded-hal", version = "0.2.7", features = ["unproven"] }
esp-idf-sys = { version = "0.31.9", optional = true, default-features = false, features = ["native"] }
embedded-hal-nb = "=1.0.0-alpha.1"
esp-idf-sys = { version = "0.31.10", optional = true, default-features = false, features = ["native"] }
critical-section = { version = "1.1", optional = true }
heapless = "0.7"
embassy-sync = { version = "0.1", optional = true, git = "https://github.com/ivmarkov/embassy" }
@ -35,9 +37,9 @@ embassy-time = { version = "0.1", optional = true, features = ["tick-hz-1_000_00
edge-executor = { version = "0.2", optional = true, default-features = false }
[build-dependencies]
embuild = "0.30.3"
embuild = "0.30.4"
anyhow = "1"
[dev-dependencies]
anyhow = "1"
esp-idf-sys = { version = "0.31.9", features = ["native", "binstart"] }
esp-idf-sys = { version = "0.31.10", features = ["native", "binstart"] }

41
src/can.rs
View File

@ -6,9 +6,9 @@
//!
//! Create a CAN peripheral and then transmit and receive a message.
//! ```
//! use embedded_hal::can::nb::Can;
//! use embedded_hal::can::Frame;
//! use embedded_hal::can::StandardId;
//! use embedded_can::nb::Can;
//! use embedded_can::Frame;
//! use embedded_can::StandardId;
//! use esp_idf_hal::prelude::*;
//! use esp_idf_hal::can;
//!
@ -38,11 +38,7 @@ use crate::delay::{BLOCK, NON_BLOCK};
use crate::gpio::*;
use crate::peripheral::{Peripheral, PeripheralRef};
crate::embedded_hal_error!(
CanError,
embedded_hal::can::Error,
embedded_hal::can::ErrorKind
);
crate::embedded_hal_error!(CanError, embedded_can::Error, embedded_can::ErrorKind);
crate::embedded_hal_error!(
Can02Error,
@ -319,7 +315,7 @@ impl<'d> embedded_hal_0_2::blocking::can::Can for CanDriver<'d> {
}
}
impl<'d> embedded_hal::can::blocking::Can for CanDriver<'d> {
impl<'d> embedded_can::blocking::Can for CanDriver<'d> {
type Frame = Frame;
type Error = CanError;
@ -354,7 +350,7 @@ impl<'d> embedded_hal_0_2::can::nb::Can for CanDriver<'d> {
}
}
impl<'d> embedded_hal::can::nb::Can for CanDriver<'d> {
impl<'d> embedded_can::nb::Can for CanDriver<'d> {
type Frame = Frame;
type Error = CanError;
@ -524,20 +520,20 @@ impl embedded_hal_0_2::can::Frame for Frame {
}
}
impl embedded_hal::can::Frame for Frame {
fn new(id: impl Into<embedded_hal::can::Id>, data: &[u8]) -> Option<Self> {
impl embedded_can::Frame for Frame {
fn new(id: impl Into<embedded_can::Id>, data: &[u8]) -> Option<Self> {
let (id, extended) = match id.into() {
embedded_hal::can::Id::Standard(id) => (id.as_raw() as u32, false),
embedded_hal::can::Id::Extended(id) => (id.as_raw(), true),
embedded_can::Id::Standard(id) => (id.as_raw() as u32, false),
embedded_can::Id::Extended(id) => (id.as_raw(), true),
};
Self::new(id, extended, data)
}
fn new_remote(id: impl Into<embedded_hal::can::Id>, dlc: usize) -> Option<Self> {
fn new_remote(id: impl Into<embedded_can::Id>, dlc: usize) -> Option<Self> {
let (id, extended) = match id.into() {
embedded_hal::can::Id::Standard(id) => (id.as_raw() as u32, false),
embedded_hal::can::Id::Extended(id) => (id.as_raw(), true),
embedded_can::Id::Standard(id) => (id.as_raw() as u32, false),
embedded_can::Id::Extended(id) => (id.as_raw(), true),
};
Self::new_remote(id, extended, dlc)
@ -559,14 +555,13 @@ impl embedded_hal::can::Frame for Frame {
!self.is_remote_frame()
}
fn id(&self) -> embedded_hal::can::Id {
fn id(&self) -> embedded_can::Id {
if self.is_standard() {
let id =
unsafe { embedded_hal::can::StandardId::new_unchecked(self.identifier() as u16) };
embedded_hal::can::Id::Standard(id)
let id = unsafe { embedded_can::StandardId::new_unchecked(self.identifier() as u16) };
embedded_can::Id::Standard(id)
} else {
let id = unsafe { embedded_hal::can::ExtendedId::new_unchecked(self.identifier()) };
embedded_hal::can::Id::Extended(id)
let id = unsafe { embedded_can::ExtendedId::new_unchecked(self.identifier()) };
embedded_can::Id::Extended(id)
}
}

4
src/delay.rs
View File

@ -110,7 +110,7 @@ impl embedded_hal_0_2::blocking::delay::DelayMs<u8> for Ets {
}
}
impl embedded_hal::delay::blocking::DelayUs for Ets {
impl embedded_hal::delay::DelayUs for Ets {
type Error = Infallible;
fn delay_us(&mut self, us: u32) -> Result<(), Self::Error> {
@ -185,7 +185,7 @@ impl embedded_hal_0_2::blocking::delay::DelayMs<u8> for FreeRtos {
}
}
impl embedded_hal::delay::blocking::DelayUs for FreeRtos {
impl embedded_hal::delay::DelayUs for FreeRtos {
type Error = Infallible;
fn delay_us(&mut self, us: u32) -> Result<(), Self::Error> {

9
src/gpio.rs
View File

@ -1137,7 +1137,7 @@ impl<'d, T: Pin, MODE> embedded_hal::digital::ErrorType for PinDriver<'d, T, MOD
type Error = EspError;
}
impl<'d, T: Pin, MODE> embedded_hal::digital::blocking::InputPin for PinDriver<'d, T, MODE>
impl<'d, T: Pin, MODE> embedded_hal::digital::InputPin for PinDriver<'d, T, MODE>
where
MODE: InputMode,
{
@ -1165,7 +1165,7 @@ where
}
}
impl<'d, T: Pin, MODE> embedded_hal::digital::blocking::OutputPin for PinDriver<'d, T, MODE>
impl<'d, T: Pin, MODE> embedded_hal::digital::OutputPin for PinDriver<'d, T, MODE>
where
MODE: OutputMode,
{
@ -1178,7 +1178,7 @@ where
}
}
impl<'d, T: Pin, MODE> embedded_hal::digital::blocking::StatefulOutputPin for PinDriver<'d, T, MODE>
impl<'d, T: Pin, MODE> embedded_hal::digital::StatefulOutputPin for PinDriver<'d, T, MODE>
where
MODE: OutputMode,
{
@ -1215,8 +1215,7 @@ where
}
}
impl<'d, T: Pin, MODE> embedded_hal::digital::blocking::ToggleableOutputPin
for PinDriver<'d, T, MODE>
impl<'d, T: Pin, MODE> embedded_hal::digital::ToggleableOutputPin for PinDriver<'d, T, MODE>
where
MODE: OutputMode,
{

8
src/i2c.rs
View File

@ -9,7 +9,7 @@ use crate::gpio::*;
use crate::peripheral::{Peripheral, PeripheralRef};
use crate::units::*;
pub use embedded_hal::i2c::blocking::Operation;
pub use embedded_hal::i2c::Operation;
crate::embedded_hal_error!(
I2cError,
@ -349,7 +349,7 @@ where
type Error = I2cError;
}
impl<'d, I2C> embedded_hal::i2c::blocking::I2c<embedded_hal::i2c::SevenBitAddress>
impl<'d, I2C> embedded_hal::i2c::I2c<embedded_hal::i2c::SevenBitAddress>
for I2cMasterDriver<'d, I2C>
where
I2C: I2c,
@ -388,14 +388,14 @@ where
fn transaction<'a>(
&mut self,
address: u8,
operations: &mut [embedded_hal::i2c::blocking::Operation<'a>],
operations: &mut [embedded_hal::i2c::Operation<'a>],
) -> Result<(), Self::Error> {
I2cMasterDriver::transaction(self, address, operations, BLOCK).map_err(to_i2c_err)
}
fn transaction_iter<'a, O>(&mut self, _address: u8, _operations: O) -> Result<(), Self::Error>
where
O: IntoIterator<Item = embedded_hal::i2c::blocking::Operation<'a>>,
O: IntoIterator<Item = embedded_hal::i2c::Operation<'a>>,
{
todo!()
}

2
src/spi.rs
View File

@ -24,7 +24,7 @@ use core::cmp::{max, min, Ordering};
use core::marker::PhantomData;
use core::ptr;
use embedded_hal::spi::blocking::{SpiBus, SpiBusFlush, SpiBusRead, SpiBusWrite, SpiDevice};
use embedded_hal::spi::{SpiBus, SpiBusFlush, SpiBusRead, SpiBusWrite, SpiDevice};
use esp_idf_sys::*;

14
src/uart.rs
View File

@ -475,9 +475,9 @@ impl<'d, UART: Uart> embedded_hal_0_2::serial::Read<u8> for UartDriver<'d, UART>
}
}
impl<'d, UART: Uart> embedded_hal::serial::nb::Read<u8> for UartDriver<'d, UART> {
impl<'d, UART: Uart> embedded_hal_nb::serial::Read<u8> for UartDriver<'d, UART> {
fn read(&mut self) -> nb::Result<u8, Self::Error> {
embedded_hal::serial::nb::Read::read(&mut self.rx)
embedded_hal_nb::serial::Read::read(&mut self.rx)
}
}
@ -493,13 +493,13 @@ impl<'d, UART: Uart> embedded_hal_0_2::serial::Write<u8> for UartDriver<'d, UART
}
}
impl<'d, UART: Uart> embedded_hal::serial::nb::Write<u8> for UartDriver<'d, UART> {
impl<'d, UART: Uart> embedded_hal_nb::serial::Write<u8> for UartDriver<'d, UART> {
fn flush(&mut self) -> nb::Result<(), Self::Error> {
embedded_hal::serial::nb::Write::flush(&mut self.tx)
embedded_hal_nb::serial::Write::flush(&mut self.tx)
}
fn write(&mut self, byte: u8) -> nb::Result<(), Self::Error> {
embedded_hal::serial::nb::Write::write(&mut self.tx, byte)
embedded_hal_nb::serial::Write::write(&mut self.tx, byte)
}
}
@ -562,7 +562,7 @@ impl<'d, UART: Uart> embedded_hal_0_2::serial::Read<u8> for UartRxDriver<'d, UAR
}
}
impl<'d, UART: Uart> embedded_hal::serial::nb::Read<u8> for UartRxDriver<'d, UART> {
impl<'d, UART: Uart> embedded_hal_nb::serial::Read<u8> for UartRxDriver<'d, UART> {
fn read(&mut self) -> nb::Result<u8, Self::Error> {
let mut buf = [0_u8];
@ -610,7 +610,7 @@ impl<'d, UART: Uart> embedded_hal_0_2::serial::Write<u8> for UartTxDriver<'d, UA
}
}
impl<'d, UART: Uart> embedded_hal::serial::nb::Write<u8> for UartTxDriver<'d, UART> {
impl<'d, UART: Uart> embedded_hal_nb::serial::Write<u8> for UartTxDriver<'d, UART> {
fn flush(&mut self) -> nb::Result<(), Self::Error> {
UartTxDriver::flush(self).map_err(to_nb_err)
}