NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge upstream

Browse source
This commit is contained in:
Henrik Alsér 2022-07-08 23:42:19 +02:00
parent b72ba0a6c4
commit 15384d27bb
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
embassy-embedded-hal/src/shared_bus/blocking/i2c.rs
View file

@ -101,7 +101,6 @@ where
}
}
<<<<<<< HEAD
pub struct I2cBusDeviceWithConfig<'a, M: RawMutex, BUS, C> {
bus: &'a Mutex<M, RefCell<BUS>>,
config: C,
@ -183,7 +182,8 @@ where
let _ = operations;
todo!()
}
=======
}
impl<'a, M, BUS, E> embedded_hal_02::blocking::i2c::Write for I2cBusDevice<'_, M, BUS>
where
M: RawMutex,
@ -224,5 +224,4 @@ where
.map_err(I2cBusDeviceError::I2c)
})
}
>>>>>>> master
}

7
embassy-embedded-hal/src/shared_bus/blocking/spi.rs
View file

@ -76,7 +76,6 @@ where
}
}
<<<<<<< HEAD
pub struct SpiBusDeviceWithConfig<'a, M: RawMutex, BUS, CS, C> {
bus: &'a Mutex<M, RefCell<BUS>>,
cs: CS,
@ -120,8 +119,11 @@ where
let f_res = f_res.map_err(SpiBusDeviceError::Spi)?;
flush_res.map_err(SpiBusDeviceError::Spi)?;
cs_res.map_err(SpiBusDeviceError::Cs)?;
Ok(f_res)
})
}
}
=======
impl<'d, M, BUS, CS, BusErr, CsErr> embedded_hal_02::blocking::spi::Transfer<u8> for SpiBusDevice<'_, M, BUS, CS>
where
M: RawMutex,
@ -158,7 +160,6 @@ where
let cs_res = self.cs.set_high();
let f_res = f_res.map_err(SpiBusDeviceError::Spi)?;
cs_res.map_err(SpiBusDeviceError::Cs)?;
>>>>>>> master
Ok(f_res)
})
}