diff options
| author | Dario Nieuwenhuis <[email protected]> | 2020-10-26 12:43:28 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2020-10-26 12:43:28 +0100 |
| commit | 878bfd2b7520631ab4b39dbe928dec6fc1a69f00 (patch) | |
| tree | 3b0b81674098d733961b7801de58b5d0bc1daa6b | |
| parent | a0cc229a3a5d9c9a157ff9aa17e947bbfef32ef3 (diff) | |
Fixes
| -rw-r--r-- | embassy/Cargo.toml | 8 | ||||
| -rw-r--r-- | embassy/src/executor/executor.rs | 3 | ||||
| -rw-r--r-- | embassy/src/util/macros.rs | 2 | ||||
| -rw-r--r-- | embassy/src/util/mod.rs | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/embassy/Cargo.toml b/embassy/Cargo.toml index 4abcda99e..7e9ea91d8 100644 --- a/embassy/Cargo.toml +++ b/embassy/Cargo.toml | |||
| @@ -6,11 +6,17 @@ edition = "2018" | |||
| 6 | 6 | ||
| 7 | [features] | 7 | [features] |
| 8 | std = ["futures/std"] | 8 | std = ["futures/std"] |
| 9 | defmt-default = [] | ||
| 10 | defmt-trace = [] | ||
| 11 | defmt-debug = [] | ||
| 12 | defmt-info = [] | ||
| 13 | defmt-warn = [] | ||
| 14 | defmt-error = [] | ||
| 9 | 15 | ||
| 10 | [dependencies] | 16 | [dependencies] |
| 11 | defmt = "0.1.0" | 17 | defmt = "0.1.0" |
| 12 | cortex-m = "0.6.3" | 18 | cortex-m = "0.6.3" |
| 13 | futures = { version = "0.3.5", default-features = false, features = [ "async-await" ] } | 19 | futures = { version = "0.3.5", default-features = false } |
| 14 | pin-project = { version = "0.4.23", default-features = false } | 20 | pin-project = { version = "0.4.23", default-features = false } |
| 15 | futures-intrusive = { version = "0.3.1", default-features = false } | 21 | futures-intrusive = { version = "0.3.1", default-features = false } |
| 16 | embassy-macros = { version = "0.1.0", path = "../embassy-macros"} | 22 | embassy-macros = { version = "0.1.0", path = "../embassy-macros"} |
diff --git a/embassy/src/executor/executor.rs b/embassy/src/executor/executor.rs index 43127d61c..e7bb659fb 100644 --- a/embassy/src/executor/executor.rs +++ b/embassy/src/executor/executor.rs | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![feature(const_fn)] | ||
| 3 | |||
| 4 | use core::cell::Cell; | 1 | use core::cell::Cell; |
| 5 | use core::cell::UnsafeCell; | 2 | use core::cell::UnsafeCell; |
| 6 | use core::future::Future; | 3 | use core::future::Future; |
diff --git a/embassy/src/util/macros.rs b/embassy/src/util/macros.rs index 69987e42c..3773af698 100644 --- a/embassy/src/util/macros.rs +++ b/embassy/src/util/macros.rs | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #![macro_use] | 1 | #![macro_use] |
| 2 | 2 | ||
| 3 | #[macro_export] | ||
| 3 | macro_rules! depanic { | 4 | macro_rules! depanic { |
| 4 | ($( $i:expr ),*) => { | 5 | ($( $i:expr ),*) => { |
| 5 | { | 6 | { |
| @@ -9,6 +10,7 @@ macro_rules! depanic { | |||
| 9 | } | 10 | } |
| 10 | } | 11 | } |
| 11 | 12 | ||
| 13 | #[macro_export] | ||
| 12 | macro_rules! deassert { | 14 | macro_rules! deassert { |
| 13 | ($cond:expr) => { | 15 | ($cond:expr) => { |
| 14 | deassert!($cond, "assertion failed"); | 16 | deassert!($cond, "assertion failed"); |
diff --git a/embassy/src/util/mod.rs b/embassy/src/util/mod.rs index 601a9b4af..109cc35a8 100644 --- a/embassy/src/util/mod.rs +++ b/embassy/src/util/mod.rs | |||
| @@ -13,6 +13,8 @@ pub use drop_bomb::*; | |||
| 13 | 13 | ||
| 14 | use defmt::{debug, error, info, intern, trace, warn}; | 14 | use defmt::{debug, error, info, intern, trace, warn}; |
| 15 | 15 | ||
| 16 | pub use macros::*; | ||
| 17 | |||
| 16 | pub trait Dewrap<T> { | 18 | pub trait Dewrap<T> { |
| 17 | /// dewrap = defmt unwrap | 19 | /// dewrap = defmt unwrap |
| 18 | fn dewrap(self) -> T; | 20 | fn dewrap(self) -> T; |
