From 93cbd079ec1f5b8371fb4d52b00e0a404403f73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Als=C3=A9r?= <henrik@mindbite.se>
Date: Thu, 12 May 2022 15:35:32 +0200
Subject: [PATCH] Remove OnDrop handler, start sampling in new

---
 embassy-nrf/src/qdec.rs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/embassy-nrf/src/qdec.rs b/embassy-nrf/src/qdec.rs
index c124ba35..c2681538 100644
--- a/embassy-nrf/src/qdec.rs
+++ b/embassy-nrf/src/qdec.rs
@@ -11,7 +11,7 @@ use core::task::Poll;
 use embassy::interrupt::InterruptExt;
 use embassy::util::Unborrow;
 use embassy::waitqueue::AtomicWaker;
-use embassy_hal_common::{drop::OnDrop, unborrow};
+use embassy_hal_common::unborrow;
 use futures::future::poll_fn;
 
 /// Quadrature decoder
@@ -128,6 +128,9 @@ impl<'d> Qdec<'d> {
         // Enable peripheral
         r.enable.write(|w| w.enable().set_bit());
 
+        // Start sampling
+        unsafe { r.tasks_start.write(|w| w.bits(1)) };
+
         irq.disable();
         irq.set_handler(|_| {
             let r = Self::regs();
@@ -155,16 +158,8 @@ impl<'d> Qdec<'d> {
     /// let delta = q.read().await;
     /// ```
     pub async fn read(&mut self) -> i16 {
-        // In case the future is dropped, stop the task and reset events.
-        let on_drop = OnDrop::new(|| {
-            let t = Self::regs();
-            t.tasks_stop.write(|w| unsafe { w.bits(1) });
-            t.events_reportrdy.reset();
-        });
-
         let t = Self::regs();
         t.intenset.write(|w| w.reportrdy().set());
-        unsafe { t.tasks_start.write(|w| w.bits(1)) };
         unsafe { t.tasks_readclracc.write(|w| w.bits(1)) };
 
         let value = poll_fn(|cx| {
@@ -178,7 +173,6 @@ impl<'d> Qdec<'d> {
             }
         })
         .await;
-        on_drop.defuse();
         value
     }