fold all asyncify types here

Author: ivmarkov

.cargo/config.toml

@@ -1,3 +1,6 @@
+[build]
+target = "riscv32imc-esp-espidf"
+
 [target.xtensa-esp32-espidf]
 linker = "ldproxy"
 rustflags = ["--cfg", "espidf_time64"]
@@ -19,7 +22,7 @@ linker = "ldproxy"
 rustflags = ["--cfg", "espidf_time64"]
 
 [env]
-ESP_IDF_SDKCONFIG_DEFAULTS = ".github/configs/sdkconfig.defaults"
+ESP_IDF_SDKCONFIG_DEFAULTS = "/home/ivan/dev/esp-idf-svc/.github/configs/sdkconfig.defaults"
 ESP_IDF_VERSION = "v5.1.2"
 
 [unstable]

CHANGELOG.md

@@ -6,14 +6,23 @@ 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).
 
 ## [?.??.?] - ????-??-??
-* Breaking change in module `mqtt::client`: This is partially due to the breaking change in `embedded_svc::mqtt::client`, but additionally:
-  * All event conversion logic now retired, significantly simplifying the type signatures of `EspMqttClient` and `EspMqttConnection`, as well as the number of offered constructors
-  * For MQTT events, user always gets an instance of `EspMqttEvent` which implements the `embedded_svc::mqtt::client::Event` trait - valid for both callback-based event processing as well as for connection-based blocking and asynchronous event processing
-* Breaking change in module `http::server`: This is due to the breaking change in `embedded_svc::http::server`, whereas `HandlerError` and `HandlerResult` were removed. Check the Changelog of `embedded_svc` for more details
+* Breaking changes in module `eventloop`: 
+  * All async post/receive functionality now implemented directly on the `esp-idf-svc` event loop types, as the `embedded_svc::utils::asyncify` module is now gone
+  * Types `EspTypedEventLoop` and `EspPostbox` are now retired. Use `EspEventLoop` directly, as it has the same functionality
+  * Trait `EspTypedEventSource` is now marked as unsafe (i.e., implementors should do `unsafe impl EspTypedEventSource for ...`); check the documentation of the trait for justification
+* Breaking changes in module `http::server`: 
+  * All async WS functionality now implemented directly on the `esp-idf-svc` HTTP types, as the `embedded_svc::utils::asyncify` module is now gone
+  * Due to the breaking change in `embedded_svc::http::server`, whereas `HandlerError` and `HandlerResult` were removed, these types are no longer used in the `embedded_svc::http::server` module either. Check the Changelog of `embedded_svc` for more details
+* Breaking change in module `timer`: all async timer functionality now implemented directly on the `esp-idf-svc` timer types, as the `embedded_svc::utils::asyncify` module is now gone
+* Breaking changes in module `mqtt::client`: 
+  * All async send/receive functionality now implemented directly on the `esp-idf-svc` MQTT types, as the `embedded_svc::utils::asyncify` module is now gone
+  * Changes induced by breaking changes in `embedded_svc::mqtt::client` API contract:
+    * All event conversion logic now retired, significantly simplifying the type signatures of `EspMqttClient` and `EspMqttConnection`, as well as the number of offered constructors
+    * For MQTT events, user always gets an instance of `EspMqttEvent` which implements the `embedded_svc::mqtt::client::Event` trait - valid for both callback-based event processing as well as for connection-based blocking and asynchronous event processing
 * MSRV 1.75; remove the nightly feature flag from all async trait implementations
 * Update public dependency `heapless` to 0.8
 * Remove dependency on `embassy-time` and replace it with a dependency on `embassy-time-driver`; get rid of the custom embassy time queue as it was anyway re-implementing something like a generic timer queue, which is available in the `embassy-time` crate (with its feature `generic-queue` enabled)
-* #316 - BREAKING CHANGE addressing a typo - `http::server::Configuration::max_resp_handlers` renamed to `http::server::Configuration::max_resp_headers`
+* #316 - breaking change addressing a typo - `http::server::Configuration::max_resp_handlers` renamed to `http::server::Configuration::max_resp_headers`
 * #319 - Set default TTL in `EspPing` to 64
 * #322 - Fix MQTT PSK code (did not compile)
 * #323 - ETH example with a statically configured IP

Cargo.toml

@@ -47,7 +47,8 @@ num_enum = { version = "0.7", default-features = false }
 enumset = { version = "1", default-features = false }
 log = { version = "0.4", default-features = false }
 uncased = { version = "0.9.7", default-features = false }
-embedded-svc = { version = "0.26.4", default-features = false, features = ["asyncify"] }
+embedded-hal-async = { version = "1", default-features = false }
+embedded-svc = { version = "0.26.4", default-features = false }
 esp-idf-hal = { version = "0.42.5", default-features = false }
 embassy-time-driver = { version = "0.1", optional = true, features = ["tick-hz-1_000_000"] }
 embassy-futures = "0.1"

src/espnow.rs

@@ -14,20 +14,18 @@ use alloc::boxed::Box;
 
 use crate::sys::*;
 
-use crate::private::mutex::{Mutex, RawMutex};
+use crate::private::mutex::Mutex;
 
 type Singleton<T> = Mutex<Option<Box<T>>>;
 
 pub const BROADCAST: [u8; 6] = [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF];
 
 #[allow(clippy::type_complexity)]
-static RECV_CALLBACK: Singleton<dyn FnMut(&[u8], &[u8]) + Send + 'static> =
-    Mutex::wrap(RawMutex::new(), None);
+static RECV_CALLBACK: Singleton<dyn FnMut(&[u8], &[u8]) + Send + 'static> = Mutex::new(None);
 #[allow(clippy::type_complexity)]
-static SEND_CALLBACK: Singleton<dyn FnMut(&[u8], SendStatus) + Send + 'static> =
-    Mutex::wrap(RawMutex::new(), None);
+static SEND_CALLBACK: Singleton<dyn FnMut(&[u8], SendStatus) + Send + 'static> = Mutex::new(None);
 
-static TAKEN: Mutex<bool> = Mutex::wrap(RawMutex::new(), false);
+static TAKEN: Mutex<bool> = Mutex::new(false);
 
 #[derive(Debug)]
 pub enum SendStatus {

src/eth.rs

@@ -1005,7 +1005,7 @@ impl EthEvent {
     }
 }
 
-impl EspTypedEventSource for EthEvent {
+unsafe impl EspTypedEventSource for EthEvent {
     fn source() -> *const ffi::c_char {
         unsafe { ETH_EVENT }
     }
@@ -1218,13 +1218,8 @@ where
         mut matcher: F,
         timeout: Option<Duration>,
     ) -> Result<(), EspError> {
-        use embedded_svc::utils::asyncify::event_bus::AsyncEventBus;
-        use embedded_svc::utils::asyncify::timer::AsyncTimerService;
-
-        let event_loop = AsyncEventBus::new((), self.event_loop.clone());
-        let timer_service = AsyncTimerService::new(self.timer_service.clone());
-
-        let mut wait = crate::eventloop::AsyncWait::<EthEvent, _>::new(event_loop, timer_service)?;
+        let mut wait =
+            crate::eventloop::AsyncWait::<EthEvent, _>::new(&self.event_loop, &self.timer_service)?;
 
         wait.wait_while(|| matcher(self), timeout).await
     }
@@ -1250,13 +1245,8 @@ where
         mut matcher: F,
         timeout: Option<core::time::Duration>,
     ) -> Result<(), EspError> {
-        use embedded_svc::utils::asyncify::event_bus::AsyncEventBus;
-        use embedded_svc::utils::asyncify::timer::AsyncTimerService;
-
-        let event_loop = AsyncEventBus::new((), self.event_loop.clone());
-        let timer_service = AsyncTimerService::new(self.timer_service.clone());
-
-        let mut wait = crate::eventloop::AsyncWait::<IpEvent, _>::new(event_loop, timer_service)?;
+        let mut wait =
+            crate::eventloop::AsyncWait::<IpEvent, _>::new(&self.event_loop, &self.timer_service)?;
 
         wait.wait_while(|| matcher(self), timeout).await
     }