max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update embassy-nrf with lifetime bounds on gpio implementations.

Browse Source
This commit is contained in:
Wilfried Chauveau 2021-11-21 10:19:34 +00:00
parent eac604accd
commit d5a2462cba
No known key found for this signature in database
GPG Key ID: 0BC4C0B2B0879D6A
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
embassy-nrf/src/gpiote.rs
View File

@ -338,7 +338,10 @@ impl<'d, T: GpioPin> InputPin for PortInput<'d, T> {
} }
impl<'d, T: GpioPin> WaitForHigh for PortInput<'d, T> { impl<'d, T: GpioPin> WaitForHigh for PortInput<'d, T> {
type Future<'a> = PortInputFuture<'a>; type Future<'a>
where
Self: 'a,
= PortInputFuture<'a>;
fn wait_for_high<'a>(&'a mut self) -> Self::Future<'a> { fn wait_for_high<'a>(&'a mut self) -> Self::Future<'a> {
self.pin.pin.conf().modify(|_, w| w.sense().high()); self.pin.pin.conf().modify(|_, w| w.sense().high());
@ -351,7 +354,10 @@ impl<'d, T: GpioPin> WaitForHigh for PortInput<'d, T> {
} }
impl<'d, T: GpioPin> WaitForLow for PortInput<'d, T> { impl<'d, T: GpioPin> WaitForLow for PortInput<'d, T> {
type Future<'a> = PortInputFuture<'a>; type Future<'a>
where
Self: 'a,
= PortInputFuture<'a>;
fn wait_for_low<'a>(&'a mut self) -> Self::Future<'a> { fn wait_for_low<'a>(&'a mut self) -> Self::Future<'a> {
self.pin.pin.conf().modify(|_, w| w.sense().low()); self.pin.pin.conf().modify(|_, w| w.sense().low());
@ -364,7 +370,11 @@ impl<'d, T: GpioPin> WaitForLow for PortInput<'d, T> {
} }
impl<'d, T: GpioPin> WaitForAnyEdge for PortInput<'d, T> { impl<'d, T: GpioPin> WaitForAnyEdge for PortInput<'d, T> {
type Future<'a> = PortInputFuture<'a>; type Future<'a>
where
Self: 'a,
= PortInputFuture<'a>;
fn wait_for_any_edge<'a>(&'a mut self) -> Self::Future<'a> { fn wait_for_any_edge<'a>(&'a mut self) -> Self::Future<'a> {
if self.is_high().ok().unwrap() { if self.is_high().ok().unwrap() {
self.pin.pin.conf().modify(|_, w| w.sense().low()); self.pin.pin.conf().modify(|_, w| w.sense().low());