diff options
| author | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2021-08-27 17:14:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-27 17:14:13 +0200 |
| commit | 71b9e4b3c20ac4fab0d14c4541b365ed48aab58b (patch) | |
| tree | 1aecba3095a25d9e98057afc00fecfd8fce15496 | |
| parent | 15d2549e63d491ef8c6fa8ab4385cedeb48fb496 (diff) | |
| parent | 6da49ebb17fbc4e68f6ace2f364108f08ff75701 (diff) | |
| download | nrf-softdevice-71b9e4b3c20ac4fab0d14c4541b365ed48aab58b.zip | |
Merge pull request #78 from pbert519/fix/examples_cortex-m-rt_version
fix cortex-m-rt version, examples don't work with 6.13
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | examples/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/build.rs | 1 |
3 files changed, 2 insertions, 3 deletions
@@ -573,7 +573,7 @@ version = "0.1.0" dependencies = [ "alloc-cortex-m", "cortex-m 0.7.3", - "cortex-m-rt 0.6.14", + "cortex-m-rt 0.7.0", "defmt", "embassy", "embassy-nrf", diff --git a/examples/Cargo.toml b/examples/Cargo.toml index c07de11..5fac497 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -27,7 +27,7 @@ embassy = { version = "0.1.0", features = ["defmt"]} embassy-traits = { version = "0.1.0", features = ["defmt"]} embassy-nrf = { version = "0.1.0", features = [ "defmt", "nrf52840", "gpiote", "time-driver-rtc1" ]} cortex-m = { version = "0.7.2" } -cortex-m-rt = "0.6.13" +cortex-m-rt = "0.7.0" defmt = { version = "0.2.0", features = ["alloc"] } nrf-softdevice-defmt-rtt = { path = "../nrf-softdevice-defmt-rtt", version = "0.1.0" } panic-probe = { version = "0.2.0", features= ["print-defmt"] } diff --git a/examples/build.rs b/examples/build.rs index 735fa25..30691aa 100644 --- a/examples/build.rs +++ b/examples/build.rs @@ -32,5 +32,4 @@ fn main() { println!("cargo:rustc-link-arg-bins=--nmagic"); println!("cargo:rustc-link-arg-bins=-Tlink.x"); println!("cargo:rustc-link-arg-bins=-Tdefmt.x"); - } |