aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-05-26 17:33:03 +0200
committerGitHub <[email protected]>2023-05-26 17:33:03 +0200
commita8b426d0fe86e6fc3d1813765946cc82e774c3d3 (patch)
tree0133074262997db2a20ef74e89856bc29c3a2a06
parentee20fd4c16756f1d9dab53ef540bd381d034fb3e (diff)
parentf4736457f5f6d0d72d27d5d560bf048ca2df359f (diff)
Merge pull request #1493 from linusharberg/nrf-buffered-uarte-drop
Disable ppi group in BufferedUarte drop
-rw-r--r--embassy-nrf/src/buffered_uarte.rs2
-rw-r--r--embassy-nrf/src/timer.rs2
2 files changed, 3 insertions, 1 deletions
diff --git a/embassy-nrf/src/buffered_uarte.rs b/embassy-nrf/src/buffered_uarte.rs
index c41d8398c..4d053c023 100644
--- a/embassy-nrf/src/buffered_uarte.rs
+++ b/embassy-nrf/src/buffered_uarte.rs
@@ -646,6 +646,8 @@ mod _embedded_io {
646 646
647impl<'a, U: UarteInstance, T: TimerInstance> Drop for BufferedUarte<'a, U, T> { 647impl<'a, U: UarteInstance, T: TimerInstance> Drop for BufferedUarte<'a, U, T> {
648 fn drop(&mut self) { 648 fn drop(&mut self) {
649 self._ppi_group.disable_all();
650
649 let r = U::regs(); 651 let r = U::regs();
650 652
651 self.timer.stop(); 653 self.timer.stop();
diff --git a/embassy-nrf/src/timer.rs b/embassy-nrf/src/timer.rs
index e9d2132c1..2a0e16a50 100644
--- a/embassy-nrf/src/timer.rs
+++ b/embassy-nrf/src/timer.rs
@@ -124,7 +124,7 @@ impl<'d, T: Instance> Timer<'d, T> {
124 this.stop(); 124 this.stop();
125 125
126 if is_counter { 126 if is_counter {
127 regs.mode.write(|w| w.mode().counter()); 127 regs.mode.write(|w| w.mode().low_power_counter());
128 } else { 128 } else {
129 regs.mode.write(|w| w.mode().timer()); 129 regs.mode.write(|w| w.mode().timer());
130 } 130 }