aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-11-07 22:51:58 +0100
committerDario Nieuwenhuis <[email protected]>2022-11-07 22:51:58 +0100
commit8a81114baf4ffe12ec54e80e342f098c596177d1 (patch)
treeda4dc0d3bd98f1ae3b4d46a1636480d83217d699 /examples
parent27771e60afa0fe71c5512cee241400502e121b91 (diff)
Update Embassy, nightly, deps.
Diffstat (limited to 'examples')
-rw-r--r--examples/rpi-pico-w/Cargo.toml14
-rw-r--r--examples/rpi-pico-w/src/main.rs6
2 files changed, 10 insertions, 10 deletions
diff --git a/examples/rpi-pico-w/Cargo.toml b/examples/rpi-pico-w/Cargo.toml
index e82d12eb9..7ba22a69e 100644
--- a/examples/rpi-pico-w/Cargo.toml
+++ b/examples/rpi-pico-w/Cargo.toml
@@ -22,18 +22,18 @@ cortex-m-rt = "0.7.0"
22futures = { version = "0.3.17", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] } 22futures = { version = "0.3.17", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] }
23 23
24embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.9" } 24embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.9" }
25embedded-hal-async = { version = "0.1.0-alpha.2" } 25embedded-hal-async = { version = "0.1.0-alpha.3" }
26embedded-io = { version = "0.3.0", features = ["async", "defmt"] } 26embedded-io = { version = "0.3.0", features = ["async", "defmt"] }
27heapless = "0.7.15" 27heapless = "0.7.15"
28 28
29 29
30[patch.crates-io] 30[patch.crates-io]
31embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "73208d524843ca451b4cbfdb06e35f1b85290f4c" } 31embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "c53614f057cd7d9ac6e86aebd1fb6c1a1055d8b6" }
32embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "73208d524843ca451b4cbfdb06e35f1b85290f4c" } 32embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "c53614f057cd7d9ac6e86aebd1fb6c1a1055d8b6" }
33embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "73208d524843ca451b4cbfdb06e35f1b85290f4c" } 33embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "c53614f057cd7d9ac6e86aebd1fb6c1a1055d8b6" }
34embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "73208d524843ca451b4cbfdb06e35f1b85290f4c" } 34embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "c53614f057cd7d9ac6e86aebd1fb6c1a1055d8b6" }
35embassy-rp = { git = "https://github.com/embassy-rs/embassy", rev = "73208d524843ca451b4cbfdb06e35f1b85290f4c" } 35embassy-rp = { git = "https://github.com/embassy-rs/embassy", rev = "c53614f057cd7d9ac6e86aebd1fb6c1a1055d8b6" }
36embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "73208d524843ca451b4cbfdb06e35f1b85290f4c" } 36embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "c53614f057cd7d9ac6e86aebd1fb6c1a1055d8b6" }
37 37
38[profile.dev] 38[profile.dev]
39debug = 2 39debug = 2
diff --git a/examples/rpi-pico-w/src/main.rs b/examples/rpi-pico-w/src/main.rs
index dbc7761c8..705c7accb 100644
--- a/examples/rpi-pico-w/src/main.rs
+++ b/examples/rpi-pico-w/src/main.rs
@@ -13,7 +13,7 @@ use embassy_rp::gpio::{Flex, Level, Output};
13use embassy_rp::peripherals::{PIN_23, PIN_24, PIN_25, PIN_29}; 13use embassy_rp::peripherals::{PIN_23, PIN_24, PIN_25, PIN_29};
14use embedded_hal_1::spi::ErrorType; 14use embedded_hal_1::spi::ErrorType;
15use embedded_hal_async::spi::{ExclusiveDevice, SpiBusFlush, SpiBusRead, SpiBusWrite}; 15use embedded_hal_async::spi::{ExclusiveDevice, SpiBusFlush, SpiBusRead, SpiBusWrite};
16use embedded_io::asynch::{Read, Write}; 16use embedded_io::asynch::Write;
17use static_cell::StaticCell; 17use static_cell::StaticCell;
18use {defmt_rtt as _, panic_probe as _}; 18use {defmt_rtt as _, panic_probe as _};
19 19
@@ -165,7 +165,7 @@ impl SpiBusFlush for MySpi {
165} 165}
166 166
167impl SpiBusRead<u32> for MySpi { 167impl SpiBusRead<u32> for MySpi {
168 type ReadFuture<'a> = impl Future<Output = Result<(), Self::Error>> 168 type ReadFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a
169 where 169 where
170 Self: 'a; 170 Self: 'a;
171 171
@@ -195,7 +195,7 @@ impl SpiBusRead<u32> for MySpi {
195} 195}
196 196
197impl SpiBusWrite<u32> for MySpi { 197impl SpiBusWrite<u32> for MySpi {
198 type WriteFuture<'a> = impl Future<Output = Result<(), Self::Error>> 198 type WriteFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a
199 where 199 where
200 Self: 'a; 200 Self: 'a;
201 201