From f9d0daad80827dd1b379ca727a2e27870a497122 Mon Sep 17 00:00:00 2001
From: Rasmus Melchior Jacobsen <rmja@laesoe.org>
Date: Wed, 20 Dec 2023 08:37:15 +0100
Subject: [PATCH 1/2] feat(embassy-sync): Add try_take() to signal

---
 embassy-sync/src/signal.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/embassy-sync/src/signal.rs b/embassy-sync/src/signal.rs
index bea67d8b..97d76b46 100644
--- a/embassy-sync/src/signal.rs
+++ b/embassy-sync/src/signal.rs
@@ -111,6 +111,17 @@ where
         poll_fn(move |cx| self.poll_wait(cx))
     }
 
+    /// non-blocking method to try and take the signal value.
+    pub fn try_take(&self) -> Option<T> {
+        self.state.lock(|cell| {
+            let state = cell.replace(State::None);
+            match state {
+                State::Signaled(res) => Some(res),
+                _ => None,
+            }
+        })
+    }
+
     /// non-blocking method to check whether this signal has been signaled.
     pub fn signaled(&self) -> bool {
         self.state.lock(|cell| {

From 13c107e81582e2249df2fd940791b611a1ddbd62 Mon Sep 17 00:00:00 2001
From: Rasmus Melchior Jacobsen <rmja@laesoe.org>
Date: Wed, 20 Dec 2023 13:09:16 +0100
Subject: [PATCH 2/2] Put waiting state back if any

---
 embassy-sync/src/signal.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/embassy-sync/src/signal.rs b/embassy-sync/src/signal.rs
index 97d76b46..d75750ce 100644
--- a/embassy-sync/src/signal.rs
+++ b/embassy-sync/src/signal.rs
@@ -117,7 +117,10 @@ where
             let state = cell.replace(State::None);
             match state {
                 State::Signaled(res) => Some(res),
-                _ => None,
+                state => {
+                    cell.set(state);
+                    None
+                }
             }
         })
     }