diff options
| author | Mathias <[email protected]> | 2023-07-05 12:23:11 +0200 |
|---|---|---|
| committer | Mathias <[email protected]> | 2023-07-05 12:36:42 +0200 |
| commit | 1255d8a8ce2c5b2ed9b33a6c3d2ee5e0d6b99ba1 (patch) | |
| tree | f51f75e1e9b555f621bac59f5f8d2c68016fd39c /embassy-time | |
| parent | 60b2f075dcd561cdf3ff069c1cfc5d4177c1a133 (diff) | |
| parent | 3341b53eb4b04173f658d88fad7cd81c38083e8e (diff) | |
Merge branch 'main' of https://github.com/embassy-rs/embassy into embassy-stm32/rcc-rtc-l4
Diffstat (limited to 'embassy-time')
| -rw-r--r-- | embassy-time/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-time/src/queue_generic.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml index 857da5467..0213eef03 100644 --- a/embassy-time/Cargo.toml +++ b/embassy-time/Cargo.toml | |||
| @@ -152,8 +152,8 @@ defmt = { version = "0.3", optional = true } | |||
| 152 | log = { version = "0.4.14", optional = true } | 152 | log = { version = "0.4.14", optional = true } |
| 153 | 153 | ||
| 154 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" } | 154 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" } |
| 155 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.10", optional = true} | 155 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11", optional = true} |
| 156 | embedded-hal-async = { version = "=0.2.0-alpha.1", optional = true} | 156 | embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true} |
| 157 | 157 | ||
| 158 | futures-util = { version = "0.3.17", default-features = false } | 158 | futures-util = { version = "0.3.17", default-features = false } |
| 159 | atomic-polyfill = "1.0.1" | 159 | atomic-polyfill = "1.0.1" |
diff --git a/embassy-time/src/queue_generic.rs b/embassy-time/src/queue_generic.rs index 4795eb2f3..77947ab29 100644 --- a/embassy-time/src/queue_generic.rs +++ b/embassy-time/src/queue_generic.rs | |||
| @@ -16,7 +16,7 @@ const QUEUE_SIZE: usize = 16; | |||
| 16 | #[cfg(feature = "generic-queue-32")] | 16 | #[cfg(feature = "generic-queue-32")] |
| 17 | const QUEUE_SIZE: usize = 32; | 17 | const QUEUE_SIZE: usize = 32; |
| 18 | #[cfg(feature = "generic-queue-64")] | 18 | #[cfg(feature = "generic-queue-64")] |
| 19 | const QUEUE_SIZE: usize = 32; | 19 | const QUEUE_SIZE: usize = 64; |
| 20 | #[cfg(feature = "generic-queue-128")] | 20 | #[cfg(feature = "generic-queue-128")] |
| 21 | const QUEUE_SIZE: usize = 128; | 21 | const QUEUE_SIZE: usize = 128; |
| 22 | #[cfg(not(any( | 22 | #[cfg(not(any( |
