alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2024-12-23 20:51:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Make the i2c error render as text if eh1_0_alpha is on.

Browse source
This commit is contained in:
Wilfried Chauveau 2022-08-22 22:31:13 +01:00
parent 6ef6838132
commit 6a29b3bb73
1 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
rp2040-hal/src/i2c.rs
View file

@ -65,8 +65,11 @@ pub mod peripheral;
/// I2C error /// I2C error
#[non_exhaustive] #[non_exhaustive]
#[derive(Debug)] #[cfg_attr(not(feature = "eh1_0_alpha"), derive(Debug))]
#[cfg_attr(feature = "defmt", derive(defmt::Format))] #[cfg_attr(
all(feature = "defmt", not(feature = "eh1_0_alpha")),
derive(defmt::Format)
)]
pub enum Error { pub enum Error {
/// I2C abort with error /// I2C abort with error
Abort(u32), Abort(u32),
@ -80,6 +83,38 @@ pub enum Error {
AddressReserved(u16), AddressReserved(u16),
} }
#[cfg(feature = "eh1_0_alpha")]
impl core::fmt::Debug for Error {
fn fmt(&self, fmt: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
use eh1_0_alpha::i2c::Error as _;
match self {
Error::InvalidReadBufferLength => write!(fmt, "InvalidReadBufferLength"),
Error::InvalidWriteBufferLength => write!(fmt, "InvalidWriteBufferLength"),
Error::AddressOutOfRange(addr) => write!(fmt, "AddressOutOfRange({:x})", addr),
Error::AddressReserved(addr) => write!(fmt, "AddressReserved({:x})", addr),
Error::Abort(_) => {
write!(fmt, "{:?}", self.kind())
}
}
}
}
#[cfg(all(feature = "defmt", feature = "eh1_0_alpha"))]
impl defmt::Format for Error {
fn format(&self, fmt: defmt::Formatter) {
use eh1_0_alpha::i2c::Error as _;
match self {
Error::InvalidReadBufferLength => defmt::write!(fmt, "InvalidReadBufferLength"),
Error::InvalidWriteBufferLength => defmt::write!(fmt, "InvalidWriteBufferLength"),
Error::AddressOutOfRange(addr) => defmt::write!(fmt, "AddressOutOfRange({:x})", addr),
Error::AddressReserved(addr) => defmt::write!(fmt, "AddressReserved({:x})", addr),
Error::Abort(_) => {
defmt::write!(fmt, "{}", defmt::Debug2Format(&self.kind()))
}
}
}
}
#[cfg(feature = "eh1_0_alpha")] #[cfg(feature = "eh1_0_alpha")]
impl eh1_0_alpha::i2c::Error for Error { impl eh1_0_alpha::i2c::Error for Error {
fn kind(&self) -> eh1_0_alpha::i2c::ErrorKind { fn kind(&self) -> eh1_0_alpha::i2c::ErrorKind {