diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-07-18 18:15:03 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-07-18 18:15:03 +0000 |
| commit | e5d3f01bc444c257dbdfc75e504767e8e13d2a02 (patch) | |
| tree | 2b92b1187bdb1b732b9058878417dbf03affc3e6 /embassy-embedded-hal/src/shared_bus/mod.rs | |
| parent | 4dc800710d2269d5baebd62ae5a62205570db365 (diff) | |
| parent | a3a40bad6c6cb5a3de67234d0206475e9042e8e7 (diff) | |
Merge #868
868: Rename XXBusDevice to XXDevice. r=Dirbaio a=Dirbaio
I think the current naming is a bit odd, the EH traits are organized as "Bus" vs "Device", and XxxBusDevice is a Device (not a Bus, not both)
`@kalkyl`
Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'embassy-embedded-hal/src/shared_bus/mod.rs')
| -rw-r--r-- | embassy-embedded-hal/src/shared_bus/mod.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/embassy-embedded-hal/src/shared_bus/mod.rs b/embassy-embedded-hal/src/shared_bus/mod.rs index 61200443d..3cd380f72 100644 --- a/embassy-embedded-hal/src/shared_bus/mod.rs +++ b/embassy-embedded-hal/src/shared_bus/mod.rs | |||
| @@ -9,11 +9,11 @@ pub mod asynch; | |||
| 9 | pub mod blocking; | 9 | pub mod blocking; |
| 10 | 10 | ||
| 11 | #[derive(Copy, Clone, Eq, PartialEq, Debug)] | 11 | #[derive(Copy, Clone, Eq, PartialEq, Debug)] |
| 12 | pub enum I2cBusDeviceError<BUS> { | 12 | pub enum I2cDeviceError<BUS> { |
| 13 | I2c(BUS), | 13 | I2c(BUS), |
| 14 | } | 14 | } |
| 15 | 15 | ||
| 16 | impl<BUS> i2c::Error for I2cBusDeviceError<BUS> | 16 | impl<BUS> i2c::Error for I2cDeviceError<BUS> |
| 17 | where | 17 | where |
| 18 | BUS: i2c::Error + Debug, | 18 | BUS: i2c::Error + Debug, |
| 19 | { | 19 | { |
| @@ -25,12 +25,12 @@ where | |||
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | #[derive(Copy, Clone, Eq, PartialEq, Debug)] | 27 | #[derive(Copy, Clone, Eq, PartialEq, Debug)] |
| 28 | pub enum SpiBusDeviceError<BUS, CS> { | 28 | pub enum SpiDeviceError<BUS, CS> { |
| 29 | Spi(BUS), | 29 | Spi(BUS), |
| 30 | Cs(CS), | 30 | Cs(CS), |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | impl<BUS, CS> spi::Error for SpiBusDeviceError<BUS, CS> | 33 | impl<BUS, CS> spi::Error for SpiDeviceError<BUS, CS> |
| 34 | where | 34 | where |
| 35 | BUS: spi::Error + Debug, | 35 | BUS: spi::Error + Debug, |
| 36 | CS: Debug, | 36 | CS: Debug, |
