From 16f8db4fcd0f5c0b362865b36141428227ba55cc Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Wed, 19 May 2021 12:57:22 +0200 Subject: [PATCH 1/2] Build with executor-agnostic in CI --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 32c294b7f..bfb6aa0bb 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -19,7 +19,7 @@ jobs: target: thumbv7em-none-eabi - package: embassy target: thumbv7em-none-eabi - features: log + features: log,executor-agnostic - package: embassy target: thumbv7em-none-eabi features: defmt From a8902b0592ccb60566a426a00a3bf5e8f5762382 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Wed, 19 May 2021 13:00:01 +0200 Subject: [PATCH 2/2] Fix build with executor-agnostic --- embassy/src/util/waker_agnostic.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embassy/src/util/waker_agnostic.rs b/embassy/src/util/waker_agnostic.rs index 53f1ec135..f43cc8c33 100644 --- a/embassy/src/util/waker_agnostic.rs +++ b/embassy/src/util/waker_agnostic.rs @@ -2,7 +2,7 @@ use core::cell::Cell; use core::mem; use core::task::Waker; -use cortex_m::interrupt::Mutex; +use crate::util::CriticalSectionMutex as Mutex; /// Utility struct to register and wake a waker. #[derive(Debug)]