Remove dependency on embassy-executor

Cargo.toml

@@ -42,7 +42,6 @@ cortex-m-rt = "0.7.5"
 critical-section = "1.1"
 defmt = "0.3"
 document-features = "0.2.7"
-embassy-executor = "0.9.1"
 embassy-futures = "0.1.2"
 embassy-imxrt = { git = "https://github.com/OpenDevicePartnership/embassy-imxrt" }
 embassy-sync = "0.7.2"
@@ -69,7 +68,7 @@ postcard = "1.*"
 proc-macro2 = "1.0"
 quote = "1.0"
 rand_core = "0.6.4"
-rstest = {version = "0.26.1", default-features = false }
+rstest = { version = "0.26.1", default-features = false }
 serde = { version = "1.0.*", default-features = false }
 static_cell = "2.1.0"
 toml = { version = "0.8", default-features = false }

battery-service/Cargo.toml

@@ -12,7 +12,6 @@ workspace = true
 
 [dependencies]
 defmt = { workspace = true, optional = true }
-embassy-executor.workspace = true
 embassy-futures.workspace = true
 embassy-sync.workspace = true
 embassy-time.workspace = true
@@ -31,7 +30,6 @@ defmt = [
     "embedded-services/defmt",
     "embassy-time/defmt",
     "embassy-sync/defmt",
-    "embassy-executor/defmt",
     "embedded-batteries-async/defmt",
     "mctp-rs/defmt",
 ]
@@ -40,5 +38,4 @@ log = [
     "embedded-services/log",
     "embassy-time/log",
     "embassy-sync/log",
-    "embassy-executor/log",
 ]

battery-service/src/lib.rs

@@ -7,13 +7,14 @@ use embassy_futures::select::select;
 use embedded_services::{
     comms::{self, EndpointID},
     ec_type::message::StdHostRequest,
-    error, info, trace,
+    trace,
 };
 
 mod acpi;
 pub mod context;
 pub mod controller;
 pub mod device;
+pub mod task;
 pub mod wrapper;
 
 /// Standard Battery Service.
@@ -134,18 +135,3 @@ pub async fn wait_for_battery_response() -> context::BatteryResponse {
 pub async fn get_state() -> context::State {
     SERVICE.context.get_state().await
 }
-
-/// Battery service task.
-#[embassy_executor::task]
-pub async fn task() {
-    info!("Starting battery-service task");
-
-    if comms::register_endpoint(&SERVICE, &SERVICE.endpoint).await.is_err() {
-        error!("Failed to register battery service endpoint");
-        return;
-    }
-
-    loop {
-        SERVICE.process_next().await;
-    }
-}

battery-service/src/task.rs

@@ -0,0 +1,17 @@
+use embedded_services::{comms, error, info};
+
+use crate::SERVICE;
+
+/// Battery service task.
+pub async fn task() {
+    info!("Starting battery-service task");
+
+    if comms::register_endpoint(&SERVICE, &SERVICE.endpoint).await.is_err() {
+        error!("Failed to register battery service endpoint");
+        return;
+    }
+
+    loop {
+        SERVICE.process_next().await;
+    }
+}

cfu-service/Cargo.toml

@@ -9,7 +9,6 @@ workspace = true
 
 [dependencies]
 defmt = { workspace = true, optional = true }
-embassy-executor.workspace = true
 embassy-futures.workspace = true
 embassy-sync.workspace = true
 embassy-time.workspace = true
@@ -25,14 +24,12 @@ defmt = [
     "embedded-services/defmt",
     "embassy-time/defmt",
     "embassy-sync/defmt",
-    "embassy-executor/defmt",
     "embedded-cfu-protocol/defmt",
 ]
 log = [
     "dep:log",
     "embedded-services/log",
     "embassy-time/log",
     "embassy-sync/log",
-    "embassy-executor/log",
     "embedded-cfu-protocol/log",
 ]

cfu-service/src/lib.rs

@@ -1,6 +1,5 @@
 #![no_std]
 
-use embassy_sync::once_lock::OnceLock;
 use embedded_cfu_protocol::client::CfuReceiveContent;
 use embedded_cfu_protocol::components::CfuComponentTraits;
 use embedded_cfu_protocol::protocol_definitions::*;
@@ -11,6 +10,7 @@ use embedded_services::{comms, error, info, trace};
 pub mod buffer;
 pub mod host;
 pub mod splitter;
+pub mod task;
 
 pub struct CfuClient {
     /// Cfu Client context
@@ -110,21 +110,3 @@ impl CfuClient {
 }
 
 impl comms::MailboxDelegate for CfuClient {}
-
-#[embassy_executor::task]
-pub async fn task() {
-    info!("Starting cfu client task");
-    static CLIENT: OnceLock<CfuClient> = OnceLock::new();
-    let cfuclient = CLIENT.get_or_init(|| CfuClient::create().expect("cfu client singleton already initialized"));
-
-    if comms::register_endpoint(cfuclient, &cfuclient.tp).await.is_err() {
-        error!("Failed to register cfu endpoint");
-        return;
-    }
-
-    loop {
-        if let Err(e) = cfuclient.process_request().await {
-            error!("Error processing request: {:?}", e);
-        }
-    }
-}

cfu-service/src/task.rs

@@ -0,0 +1,21 @@
+use embassy_sync::once_lock::OnceLock;
+use embedded_services::{comms, error, info};
+
+use crate::CfuClient;
+
+pub async fn task() {
+    info!("Starting cfu client task");
+    static CLIENT: OnceLock<CfuClient> = OnceLock::new();
+    let cfuclient = CLIENT.get_or_init(|| CfuClient::create().expect("cfu client singleton already initialized"));
+
+    if comms::register_endpoint(cfuclient, &cfuclient.tp).await.is_err() {
+        error!("Failed to register cfu endpoint");
+        return;
+    }
+
+    loop {
+        if let Err(e) = cfuclient.process_request().await {
+            error!("Error processing request: {:?}", e);
+        }
+    }
+}

debug-service/Cargo.toml

@@ -9,7 +9,6 @@ repository.workspace = true
 bbq2 = "0.4.2"
 critical-section.workspace = true
 defmt.workspace = true
-embassy-executor.workspace = true
 embassy-sync.workspace = true
 embassy-time.workspace = true
 embedded-services.workspace = true

debug-service/src/debug_service.rs

@@ -134,7 +134,7 @@ pub async fn host_endpoint_id() -> EndpointID {
 /// - Idempotent: repeated or concurrent calls return the same global instance.
 /// - Panics if endpoint registration fails (e.g. duplicate registration).
 ///
-/// The typical caller is the Embassy task [`debug_service`].
+/// The typical caller is the task [`crate::task::debug_service`].
 ///
 /// # Example
 /// ```no_run
@@ -153,8 +153,3 @@ pub async fn debug_service_entry(endpoint: comms::Endpoint) {
     // Emit an initial defmt frame so the defmt_to_host_task can drain and verify the path.
     debug!("debug service initialized and endpoint registered");
 }
-
-#[embassy_executor::task]
-pub async fn debug_service(endpoint: comms::Endpoint) {
-    debug_service_entry(endpoint).await;
-}