From e9d17831507dab3a0121bcadf77d711f809cb571 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:06:41 +0000 Subject: [PATCH 1/3] Update rtt-target requirement in /examples/twis-dma-demo Updates the requirements on [rtt-target](https://github.com/probe-rs/rtt-target) to permit the latest version. - [Release notes](https://github.com/probe-rs/rtt-target/releases) - [Commits](https://github.com/probe-rs/rtt-target/compare/v0.3.1...v0.3.1) --- updated-dependencies: - dependency-name: rtt-target dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- examples/twis-dma-demo/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/twis-dma-demo/Cargo.toml b/examples/twis-dma-demo/Cargo.toml index cf43895a..0ced1518 100644 --- a/examples/twis-dma-demo/Cargo.toml +++ b/examples/twis-dma-demo/Cargo.toml @@ -10,5 +10,5 @@ edition = "2018" cortex-m = "0.7.3" cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = { version = "0.5.0", features = ["cortex-m"] } nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } From 520ecc64b3c8e866e3467cfcb899943645d3ef94 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 18 Apr 2024 15:28:07 +0100 Subject: [PATCH 2/3] Critical section implementation is now provided by cortex-m crate. --- examples/twis-dma-demo/Cargo.toml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/twis-dma-demo/Cargo.toml b/examples/twis-dma-demo/Cargo.toml index 0ced1518..f0b328d8 100644 --- a/examples/twis-dma-demo/Cargo.toml +++ b/examples/twis-dma-demo/Cargo.toml @@ -4,11 +4,9 @@ version = "0.1.0" authors = ["Henrik Alsér"] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } -rtt-target = { version = "0.5.0", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } From 4cc285f47f2ade52d88c038cccb785bc4712218e Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 18 Apr 2024 15:34:38 +0100 Subject: [PATCH 3/3] Update other examples to latest rtt-target too. --- examples/blinky-button-demo/Cargo.toml | 6 ++---- examples/ccm-demo/Cargo.toml | 4 ++-- examples/comp-demo/Cargo.toml | 6 ++---- examples/ecb-demo/Cargo.toml | 4 ++-- examples/gpiote-demo/Cargo.toml | 6 ++---- examples/i2s-controller-demo/Cargo.toml | 6 ++---- examples/i2s-peripheral-demo/Cargo.toml | 6 ++---- examples/lpcomp-demo/Cargo.toml | 6 ++---- examples/nvmc-demo/Cargo.toml | 6 ++---- examples/ppi-demo/Cargo.toml | 4 ++-- examples/pwm-blinky-demo/Cargo.toml | 4 ++-- examples/pwm-demo/Cargo.toml | 6 ++---- examples/qdec-demo/Cargo.toml | 4 ++-- examples/rtc-demo/Cargo.toml | 6 ++---- examples/spis-demo/Cargo.toml | 6 ++---- examples/twim-demo/Cargo.toml | 6 ++---- examples/twis-demo/Cargo.toml | 6 ++---- examples/wdt-demo/Cargo.toml | 4 ++-- 18 files changed, 36 insertions(+), 60 deletions(-) diff --git a/examples/blinky-button-demo/Cargo.toml b/examples/blinky-button-demo/Cargo.toml index 7aa39b91..0b323e2b 100644 --- a/examples/blinky-button-demo/Cargo.toml +++ b/examples/blinky-button-demo/Cargo.toml @@ -4,11 +4,9 @@ version = "0.1.0" authors = ["Andres O. Vela"] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = "0.7.0" embedded-hal = "1.0.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52832-hal = { features = ["rt"], path = "../../nrf52832-hal" } diff --git a/examples/ccm-demo/Cargo.toml b/examples/ccm-demo/Cargo.toml index 76340438..dddfc479 100644 --- a/examples/ccm-demo/Cargo.toml +++ b/examples/ccm-demo/Cargo.toml @@ -6,9 +6,9 @@ authors = [ "Thales Fragoso "] publish = false [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = "0.7.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" rand_core = "0.6.3" nrf52810-hal = { path = "../../nrf52810-hal", features = ["rt"], optional = true } diff --git a/examples/comp-demo/Cargo.toml b/examples/comp-demo/Cargo.toml index b742aca8..4610d730 100644 --- a/examples/comp-demo/Cargo.toml +++ b/examples/comp-demo/Cargo.toml @@ -5,12 +5,10 @@ authors = ["Henrik Alsér"] edition = "2018" publish = false -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } embedded-hal = "1.0.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } diff --git a/examples/ecb-demo/Cargo.toml b/examples/ecb-demo/Cargo.toml index 7917a041..4c6b1d89 100644 --- a/examples/ecb-demo/Cargo.toml +++ b/examples/ecb-demo/Cargo.toml @@ -6,9 +6,9 @@ authors = [ "Thales Fragoso "] publish = false [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = "0.7.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52810-hal = { path = "../../nrf52810-hal", features = ["rt"], optional = true } nrf52811-hal = { path = "../../nrf52811-hal", features = ["rt"], optional = true } diff --git a/examples/gpiote-demo/Cargo.toml b/examples/gpiote-demo/Cargo.toml index 91dba0fc..a6f05ba6 100644 --- a/examples/gpiote-demo/Cargo.toml +++ b/examples/gpiote-demo/Cargo.toml @@ -4,13 +4,11 @@ version = "0.1.0" authors = ["Henrik Alsér"] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } embedded-hal = "1.0.0" systick-monotonic = "1.0.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } diff --git a/examples/i2s-controller-demo/Cargo.toml b/examples/i2s-controller-demo/Cargo.toml index 021af392..ae695896 100644 --- a/examples/i2s-controller-demo/Cargo.toml +++ b/examples/i2s-controller-demo/Cargo.toml @@ -5,15 +5,13 @@ authors = ["Henrik Alsér"] edition = "2018" publish = false -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } embedded-hal = "1.0.0" systick-monotonic = "1.0.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } heapless = "0.8.0" small_morse = "0.1.0" diff --git a/examples/i2s-peripheral-demo/Cargo.toml b/examples/i2s-peripheral-demo/Cargo.toml index 81f55aad..2f562248 100644 --- a/examples/i2s-peripheral-demo/Cargo.toml +++ b/examples/i2s-peripheral-demo/Cargo.toml @@ -5,12 +5,10 @@ authors = ["Henrik Alsér"] edition = "2018" publish = false -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } embedded-hal = "1.0.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } diff --git a/examples/lpcomp-demo/Cargo.toml b/examples/lpcomp-demo/Cargo.toml index 0f212125..a176ecaf 100644 --- a/examples/lpcomp-demo/Cargo.toml +++ b/examples/lpcomp-demo/Cargo.toml @@ -4,12 +4,10 @@ version = "0.1.0" authors = ["Henrik Alsér"] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } embedded-hal = "1.0.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } diff --git a/examples/nvmc-demo/Cargo.toml b/examples/nvmc-demo/Cargo.toml index 4f6302dc..40387ad8 100644 --- a/examples/nvmc-demo/Cargo.toml +++ b/examples/nvmc-demo/Cargo.toml @@ -5,13 +5,11 @@ authors = ["Christopher Hunt"] edition = "2018" publish = false -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = "0.7.0" embedded-storage = "0.3.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" panic-probe = { version = "0.3.0", features = ["print-rtt"] } [dependencies.nrf52840-hal] diff --git a/examples/ppi-demo/Cargo.toml b/examples/ppi-demo/Cargo.toml index ac40c497..bda13099 100644 --- a/examples/ppi-demo/Cargo.toml +++ b/examples/ppi-demo/Cargo.toml @@ -6,9 +6,9 @@ authors = [ "Thales Fragoso "] publish = false [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = "0.7.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52810-hal = { path = "../../nrf52810-hal", features = ["rt"], optional = true } nrf52811-hal = { path = "../../nrf52811-hal", features = ["rt"], optional = true } diff --git a/examples/pwm-blinky-demo/Cargo.toml b/examples/pwm-blinky-demo/Cargo.toml index 8df30124..144a7edc 100644 --- a/examples/pwm-blinky-demo/Cargo.toml +++ b/examples/pwm-blinky-demo/Cargo.toml @@ -5,9 +5,9 @@ authors = ["Christopher Hunt "] edition = "2018" [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = "0.7.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nb = "1.0.0" [dependencies.nrf9160-hal] diff --git a/examples/pwm-demo/Cargo.toml b/examples/pwm-demo/Cargo.toml index bd8b1636..7efb247f 100644 --- a/examples/pwm-demo/Cargo.toml +++ b/examples/pwm-demo/Cargo.toml @@ -4,15 +4,13 @@ version = "0.1.0" authors = ["Henrik Alsér"] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } embedded-hal = "1.0" systick-monotonic = "1.0.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" [dependencies.nrf52840-hal] features = ["rt"] diff --git a/examples/qdec-demo/Cargo.toml b/examples/qdec-demo/Cargo.toml index cf0e76fb..a67f4347 100644 --- a/examples/qdec-demo/Cargo.toml +++ b/examples/qdec-demo/Cargo.toml @@ -5,8 +5,8 @@ authors = ["Henrik Alsér"] edition = "2018" [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } diff --git a/examples/rtc-demo/Cargo.toml b/examples/rtc-demo/Cargo.toml index d7cce7ef..442dbbcf 100644 --- a/examples/rtc-demo/Cargo.toml +++ b/examples/rtc-demo/Cargo.toml @@ -4,10 +4,8 @@ version = "0.1.0" authors = ["Timo Kröger"] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = "0.7.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } diff --git a/examples/spis-demo/Cargo.toml b/examples/spis-demo/Cargo.toml index 24b4f200..1b747aac 100644 --- a/examples/spis-demo/Cargo.toml +++ b/examples/spis-demo/Cargo.toml @@ -4,11 +4,9 @@ version = "0.1.0" authors = ["Henrik Alsér"] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } diff --git a/examples/twim-demo/Cargo.toml b/examples/twim-demo/Cargo.toml index 98a4724f..0696cc76 100644 --- a/examples/twim-demo/Cargo.toml +++ b/examples/twim-demo/Cargo.toml @@ -4,13 +4,11 @@ version = "0.1.0" authors = ["Henrik Alsér"] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } embedded-hal = "1.0.0" systick-monotonic = "1.0.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } diff --git a/examples/twis-demo/Cargo.toml b/examples/twis-demo/Cargo.toml index 5d61f9fb..9814de9f 100644 --- a/examples/twis-demo/Cargo.toml +++ b/examples/twis-demo/Cargo.toml @@ -4,12 +4,10 @@ version = "0.1.0" authors = ["Henrik Alsér"] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } cortex-m-rtic = { version = "1.0.0", default-features = false } embedded-hal = "1.0.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" } diff --git a/examples/wdt-demo/Cargo.toml b/examples/wdt-demo/Cargo.toml index 05ef3cdc..7a58051e 100644 --- a/examples/wdt-demo/Cargo.toml +++ b/examples/wdt-demo/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" publish = false [dependencies] -cortex-m = "0.7.3" +cortex-m = { version = "0.7.3", features = ["critical-section-single-core"] } cortex-m-rt = { version = "0.7.0", features = ["device"] } embedded-hal = "1.0.0" -rtt-target = { version = "0.3.1", features = ["cortex-m"] } +rtt-target = "0.5.0" nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }