From c7b4b22317f997d08b7b87cd10baccd1873f8d02 Mon Sep 17 00:00:00 2001
From: ivmarkov <ivan.markov@gmail.com>
Date: Thu, 19 Oct 2023 05:31:42 +0000
Subject: [PATCH] New release

---
 CHANGELOG.md     |  3 +++
 Cargo.toml       |  4 ++--
 src/eventloop.rs | 11 ++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 726e8457325..963f48c984f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.47.1] - 2023-10-18
+* Compatibility with `embedded-svc` 0.26.1
+
 ## [0.47.0] - 2023-10-17
 * MSRV raised to 1.71
 * New `experimental` module - `bt` - providing Bluetooth support based on the ESP-IDF Bluedroid implementation
diff --git a/Cargo.toml b/Cargo.toml
index bdd73ddc912..ebc83183318 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "esp-idf-svc"
-version = "0.47.0"
+version = "0.47.1"
 authors = ["Ivan Markov <ivan.markov@gmail.com>"]
 edition = "2018"
 resolver = "2"
@@ -44,7 +44,7 @@ num_enum = { version = "0.7", default-features = false }
 enumset = { version = "1", default-features = false }
 log = { version = "0.4", default-features = false }
 uncased = "0.9.7"
-embedded-svc = { version = "0.26", default-features = false }
+embedded-svc = { version = "0.26.1", default-features = false }
 esp-idf-hal = { version = "0.42", default-features = false, features = ["esp-idf-sys"] }
 embassy-sync = { version = "0.3", optional = true }
 embassy-time = { version = "0.1.3", optional = true, features = ["tick-hz-1_000_000"] }
diff --git a/src/eventloop.rs b/src/eventloop.rs
index 70632034bbf..2ea4e7eb806 100644
--- a/src/eventloop.rs
+++ b/src/eventloop.rs
@@ -999,8 +999,12 @@ mod async_wait {
         E: super::EspTypedEventDeserializer<E> + Send,
         T: super::EspEventLoopType,
     {
-        subscription:
-            AsyncSubscription<crate::private::mutex::RawCondvar, E, super::EspSubscription<'a, T>>,
+        subscription: AsyncSubscription<
+            crate::private::mutex::RawCondvar,
+            E,
+            super::EspSubscription<'a, T>,
+            EspError,
+        >,
         timer: AsyncTimer<EspTimer<'a>>,
         _event: PhantomData<fn() -> E>,
     }
@@ -1063,6 +1067,7 @@ mod async_wait {
                 crate::private::mutex::RawCondvar,
                 EE,
                 super::EspSubscription<'s, TT>,
+                EspError,
             >,
             mut matcher: F,
         ) -> Result<(), EspError>
@@ -1071,7 +1076,7 @@ mod async_wait {
             TT: super::EspEventLoopType,
         {
             while matcher()? {
-                subscription.recv().await;
+                subscription.recv().await?;
             }
 
             Ok(())