diff options
-rw-r--r-- | Cargo.lock | 131 | ||||
-rw-r--r-- | examples/src/bin/ble_bas_central.rs | 2 | ||||
-rw-r--r-- | examples/src/bin/ble_bas_peripheral.rs | 2 | ||||
-rw-r--r-- | examples/src/bin/ble_l2cap_central.rs | 2 | ||||
-rw-r--r-- | examples/src/bin/ble_l2cap_peripheral.rs | 2 | ||||
-rw-r--r-- | examples/src/bin/ble_peripheral_onoff.rs | 2 | ||||
-rw-r--r-- | examples/src/bin/ble_scan.rs | 2 | ||||
-rw-r--r-- | examples/src/bin/flash.rs | 2 | ||||
-rw-r--r-- | examples/src/bin/interrupts.rs | 2 | ||||
-rw-r--r-- | examples/src/bin/rtic.rs | 2 | ||||
-rw-r--r-- | nrf-softdevice/src/lib.rs | 2 |
11 files changed, 91 insertions, 60 deletions
@@ -53,6 +53,15 @@ dependencies = [ ] [[package]] +name = "atomic-polyfill" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b56892f5e1c2377f07ed6c7f5ca066d88b5ded79b052c44aa25f7d53c534227" +dependencies = [ + "cortex-m 0.7.2", +] + +[[package]] name = "autocfg" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -75,9 +84,9 @@ checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719" [[package]] name = "byteorder" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cast" @@ -90,12 +99,6 @@ dependencies = [ [[package]] name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" @@ -109,15 +112,15 @@ dependencies = [ "aligned", "bare-metal", "bitfield", - "cortex-m 0.7.1", + "cortex-m 0.7.2", "volatile-register", ] [[package]] name = "cortex-m" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b756a8bffc56025de45218a48ff9b801180440c0ee49a722b32d49dcebc771" +checksum = "643a210c1bdc23d0db511e2a576082f4ff4dcae9d0c37f50b431b8f8439d6d6b" dependencies = [ "bare-metal", "bitfield", @@ -148,14 +151,14 @@ dependencies = [ [[package]] name = "cortex-m-rtic" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30efcb6b7920d9016182c485687f0012487032a14c415d2fce6e9862ef8260e" +checksum = "fa43f63284b363ac64f9ce5221a0f593b54f73258aba8e1a88c1feed8efdb664" dependencies = [ "cortex-m 0.6.7", "cortex-m-rt", "cortex-m-rtic-macros", - "heapless", + "heapless 0.6.1", "rtic-core", "version_check", ] @@ -209,9 +212,9 @@ dependencies = [ [[package]] name = "defmt" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec6bcd26e64f526aa24eb79c0b30e7d7a3f2f9087acaf8e8650bc4e5fc1b54c" +checksum = "735ffd58278b045498da4ca9c5057a52faa6e18472cd63568b059ae592ca7602" dependencies = [ "defmt-macros", "semver 0.11.0", @@ -249,9 +252,10 @@ dependencies = [ [[package]] name = "embassy" version = "0.1.0" -source = "git+https://github.com/akiles/embassy#88946840d1f6fdc924a4f0a9980d17f1d2c456fa" +source = "git+https://github.com/akiles/embassy#f14361835fb81726d71ac85f0f562ede8c1a6472" dependencies = [ - "cortex-m 0.7.1", + "atomic-polyfill", + "cortex-m 0.7.2", "defmt", "embassy-macros", "embassy-traits", @@ -260,9 +264,18 @@ dependencies = [ ] [[package]] +name = "embassy-extras" +version = "0.1.0" +source = "git+https://github.com/akiles/embassy#f14361835fb81726d71ac85f0f562ede8c1a6472" +dependencies = [ + "cortex-m 0.7.2", + "embassy", +] + +[[package]] name = "embassy-macros" version = "0.1.0" -source = "git+https://github.com/akiles/embassy#88946840d1f6fdc924a4f0a9980d17f1d2c456fa" +source = "git+https://github.com/akiles/embassy#f14361835fb81726d71ac85f0f562ede8c1a6472" dependencies = [ "darling", "quote", @@ -272,12 +285,13 @@ dependencies = [ [[package]] name = "embassy-nrf" version = "0.1.0" -source = "git+https://github.com/akiles/embassy#88946840d1f6fdc924a4f0a9980d17f1d2c456fa" +source = "git+https://github.com/akiles/embassy#f14361835fb81726d71ac85f0f562ede8c1a6472" dependencies = [ - "cortex-m 0.7.1", + "cortex-m 0.7.2", "cortex-m-rt", "defmt", "embassy", + "embassy-extras", "embedded-dma", "embedded-hal", "futures", @@ -288,9 +302,10 @@ dependencies = [ [[package]] name = "embassy-traits" version = "0.1.0" -source = "git+https://github.com/akiles/embassy#88946840d1f6fdc924a4f0a9980d17f1d2c456fa" +source = "git+https://github.com/akiles/embassy#f14361835fb81726d71ac85f0f562ede8c1a6472" dependencies = [ "defmt", + "embedded-hal", ] [[package]] @@ -444,6 +459,18 @@ dependencies = [ ] [[package]] +name = "heapless" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634bd4d29cbf24424d0a4bfcbf80c6960129dc24424752a7d1d1390607023422" +dependencies = [ + "as-slice", + "generic-array 0.14.4", + "hash32", + "stable_deref_trait", +] + +[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -451,9 +478,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "indexmap" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" +checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" dependencies = [ "autocfg", "hashbrown", @@ -477,7 +504,7 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -503,12 +530,12 @@ checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" [[package]] name = "nrf-hal-common" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675eee40228591a1991eade1d4adc1a23fd7ff750b5c895ca068b9c2f0878b72" +checksum = "4e3ce1e61f6222645cf43103bb3c2ad2cbf5227496586aaeab299c79b03c5730" dependencies = [ "cast", - "cfg-if 0.1.10", + "cfg-if", "cortex-m 0.6.7", "embedded-dma", "embedded-hal", @@ -528,7 +555,7 @@ dependencies = [ "defmt", "embassy", "fixed", - "heapless", + "heapless 0.5.6", "log", "nrf-softdevice-macro", "nrf-softdevice-s112", @@ -567,7 +594,7 @@ dependencies = [ "embassy-traits", "fixed", "futures", - "heapless", + "heapless 0.5.6", "nrf-softdevice", "nrf-softdevice-defmt-rtt", "nrf-softdevice-s140", @@ -661,9 +688,9 @@ dependencies = [ [[package]] name = "nrf52840-hal" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f9e382ab941f46db0e2f086fa64f54faf3473eddb16a0e350c0a5b37febba2" +checksum = "cc4324000cdeb61b5e95b9cd5a1ce73f1cafa532fcedd63ea8d07685f21b001c" dependencies = [ "embedded-hal", "nrf-hal-common", @@ -704,12 +731,6 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" - -[[package]] name = "panic-probe" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -750,9 +771,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cf491442e4b033ed1c722cb9f0df5fcfcf4de682466c46469c36bc47dc5548a" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" [[package]] name = "pin-utils" @@ -792,21 +813,20 @@ checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" [[package]] name = "regex" -version = "1.4.3" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" +checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] name = "regex-syntax" -version = "0.6.22" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" +checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" [[package]] name = "rtic-core" @@ -881,9 +901,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] name = "syn" -version = "1.0.60" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" dependencies = [ "proc-macro2", "quote", @@ -891,19 +911,10 @@ dependencies = [ ] [[package]] -name = "thread_local" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" -dependencies = [ - "once_cell", -] - -[[package]] name = "typenum" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "ucd-trie" @@ -931,9 +942,9 @@ checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "void" diff --git a/examples/src/bin/ble_bas_central.rs b/examples/src/bin/ble_bas_central.rs index 9ee9a0b..5e56d9d 100644 --- a/examples/src/bin/ble_bas_central.rs +++ b/examples/src/bin/ble_bas_central.rs @@ -1,6 +1,8 @@ #![no_std] #![no_main] #![feature(type_alias_impl_trait)] +#![feature(min_type_alias_impl_trait)] +#![feature(impl_trait_in_bindings)] #![feature(alloc_error_handler)] #[path = "../example_common.rs"] diff --git a/examples/src/bin/ble_bas_peripheral.rs b/examples/src/bin/ble_bas_peripheral.rs index 462dfc9..e2a7846 100644 --- a/examples/src/bin/ble_bas_peripheral.rs +++ b/examples/src/bin/ble_bas_peripheral.rs @@ -1,6 +1,8 @@ #![no_std] #![no_main] #![feature(type_alias_impl_trait)] +#![feature(min_type_alias_impl_trait)] +#![feature(impl_trait_in_bindings)] #![feature(alloc_error_handler)] #[path = "../example_common.rs"] diff --git a/examples/src/bin/ble_l2cap_central.rs b/examples/src/bin/ble_l2cap_central.rs index ff30164..55ff261 100644 --- a/examples/src/bin/ble_l2cap_central.rs +++ b/examples/src/bin/ble_l2cap_central.rs @@ -1,6 +1,8 @@ #![no_std] #![no_main] #![feature(type_alias_impl_trait)] +#![feature(min_type_alias_impl_trait)] +#![feature(impl_trait_in_bindings)] #![feature(alloc_error_handler)] extern crate alloc; diff --git a/examples/src/bin/ble_l2cap_peripheral.rs b/examples/src/bin/ble_l2cap_peripheral.rs index 871cb01..c88869f 100644 --- a/examples/src/bin/ble_l2cap_peripheral.rs +++ b/examples/src/bin/ble_l2cap_peripheral.rs @@ -1,6 +1,8 @@ #![no_std] #![no_main] #![feature(type_alias_impl_trait)] +#![feature(min_type_alias_impl_trait)] +#![feature(impl_trait_in_bindings)] #![feature(alloc_error_handler)] extern crate alloc; diff --git a/examples/src/bin/ble_peripheral_onoff.rs b/examples/src/bin/ble_peripheral_onoff.rs index 9b65597..b8535a0 100644 --- a/examples/src/bin/ble_peripheral_onoff.rs +++ b/examples/src/bin/ble_peripheral_onoff.rs @@ -1,6 +1,8 @@ #![no_std] #![no_main] #![feature(type_alias_impl_trait)] +#![feature(min_type_alias_impl_trait)] +#![feature(impl_trait_in_bindings)] #![feature(alloc_error_handler)] #[path = "../example_common.rs"] diff --git a/examples/src/bin/ble_scan.rs b/examples/src/bin/ble_scan.rs index d49574d..b0b3421 100644 --- a/examples/src/bin/ble_scan.rs +++ b/examples/src/bin/ble_scan.rs @@ -1,6 +1,8 @@ #![no_std] #![no_main] #![feature(type_alias_impl_trait)] +#![feature(min_type_alias_impl_trait)] +#![feature(impl_trait_in_bindings)] #![feature(alloc_error_handler)] #[path = "../example_common.rs"] diff --git a/examples/src/bin/flash.rs b/examples/src/bin/flash.rs index e8407cd..174151d 100644 --- a/examples/src/bin/flash.rs +++ b/examples/src/bin/flash.rs @@ -1,6 +1,8 @@ #![no_std] #![no_main] #![feature(type_alias_impl_trait)] +#![feature(min_type_alias_impl_trait)] +#![feature(impl_trait_in_bindings)] #![feature(alloc_error_handler)] #[path = "../example_common.rs"] diff --git a/examples/src/bin/interrupts.rs b/examples/src/bin/interrupts.rs index baeb3e8..bf9628a 100644 --- a/examples/src/bin/interrupts.rs +++ b/examples/src/bin/interrupts.rs @@ -1,6 +1,8 @@ #![no_std] #![no_main] #![feature(type_alias_impl_trait)] +#![feature(min_type_alias_impl_trait)] +#![feature(impl_trait_in_bindings)] #![feature(alloc_error_handler)] #[path = "../example_common.rs"] diff --git a/examples/src/bin/rtic.rs b/examples/src/bin/rtic.rs index 81745dc..f7511f6 100644 --- a/examples/src/bin/rtic.rs +++ b/examples/src/bin/rtic.rs @@ -12,6 +12,8 @@ #![no_main] #![no_std] #![feature(type_alias_impl_trait)] +#![feature(min_type_alias_impl_trait)] +#![feature(impl_trait_in_bindings)] #![feature(alloc_error_handler)] #[path = "../example_common.rs"] diff --git a/nrf-softdevice/src/lib.rs b/nrf-softdevice/src/lib.rs index dded76e..2451ec5 100644 --- a/nrf-softdevice/src/lib.rs +++ b/nrf-softdevice/src/lib.rs @@ -2,6 +2,8 @@ #![feature(asm)] #![feature(generic_associated_types)] #![feature(type_alias_impl_trait)] +#![feature(min_type_alias_impl_trait)] +#![feature(impl_trait_in_bindings)] #![feature(const_fn)] #![feature(cell_update)] #![allow(incomplete_features)] |