From 22f1e425875236295b463e1302759260041bd00e Mon Sep 17 00:00:00 2001 From: Lotte Steenbrink Date: Wed, 20 Jan 2021 10:12:20 +0100 Subject: [PATCH 1/3] ump tooling versions --- embedded-workshop-book/src/installation.md | 10 +++++----- embedded-workshop-book/src/tooling-check.md | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/embedded-workshop-book/src/installation.md b/embedded-workshop-book/src/installation.md index 0d53101..a427739 100644 --- a/embedded-workshop-book/src/installation.md +++ b/embedded-workshop-book/src/installation.md @@ -133,20 +133,20 @@ $ cargo install cargo-binutils ### Cargo subcommands -Install version v0.8.0 of the [`cargo-flash`](https://crates.io/crates/cargo-flash) and [`cargo-embed`](https://crates.io/crates/cargo-embed) subcommands, as well as the [`cargo-binutils`](https://crates.io/crates/cargo-binutils) set of subcommands and the [`cargo-bloat`](https://crates.io/crates/cargo-bloat) subcommand using the following Cargo commands: +Install version v0.10.2 of the [`cargo-flash`](https://crates.io/crates/cargo-flash) and [`cargo-embed`](https://crates.io/crates/cargo-embed) subcommands, as well as the [`cargo-binutils`](https://crates.io/crates/cargo-binutils) set of subcommands and the [`cargo-bloat`](https://crates.io/crates/cargo-bloat) subcommand using the following Cargo commands: ``` console -$ cargo install cargo-flash --version 0.8.0 -f +$ cargo install cargo-flash --version 0.10.2 -f (..) Installed package `cargo-flash v0.8.0` (..) -$ cargo install cargo-embed --version 0.8.0 -f +$ cargo install cargo-embed --version 0.10.1 -f (..) -Installed package `cargo-embed v0.8.0` (..) +Installed package `cargo-embed v0.10.1` (..) $ cargo install cargo-binutils (..) -Installed package `cargo-binutils v0.3.0` (..) +Installed package `cargo-binutils v0.3.3` (..) $ cargo install cargo-bloat (..) diff --git a/embedded-workshop-book/src/tooling-check.md b/embedded-workshop-book/src/tooling-check.md index 7066391..366d7b5 100644 --- a/embedded-workshop-book/src/tooling-check.md +++ b/embedded-workshop-book/src/tooling-check.md @@ -8,13 +8,13 @@ ``` console $ cargo flash --version -0.8.0 +0.10.2 $ cargo embed --version -0.8.0 +0.10.1 $ cargo size --version -cargo-size 0.3.0 +cargo-size 0.3.3 $ nrfutil version nrfutil version 6.1.0 From 4a811d27e16196387706c73df2551d3c9ddfc110 Mon Sep 17 00:00:00 2001 From: Lotte Steenbrink Date: Wed, 20 Jan 2021 14:06:25 +0100 Subject: [PATCH 2/3] rm nrf-recover --- embedded-workshop-book/src/installation.md | 14 -------------- .../src/troubleshoot-cargo-flash.md | 9 +++++++-- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/embedded-workshop-book/src/installation.md b/embedded-workshop-book/src/installation.md index a427739..629e990 100644 --- a/embedded-workshop-book/src/installation.md +++ b/embedded-workshop-book/src/installation.md @@ -299,17 +299,3 @@ nrfutil version 6.1.0 ``` *end of nrfutil python 3.9 workaround* - -### `nrf-recover` - -Some nRF52840 devices, specially older revisions, may have parts of their Flash memory locked. To unlock the memory use the [`nrf-recover`](https://crates.io/crates/nrf-recover) tool. - -This is only relevant to the nRF52840 Development Kit. First connect the nRF52840 DK to your PC using micro-USB J2 (as done before) then run the following commands: - -``` console -$ cargo install nrf-recover - -$ nrf-recover -y -Starting mass erase... -Mass erase completed, chip unlocked -``` diff --git a/embedded-workshop-book/src/troubleshoot-cargo-flash.md b/embedded-workshop-book/src/troubleshoot-cargo-flash.md index 1b2f44c..bf0888e 100644 --- a/embedded-workshop-book/src/troubleshoot-cargo-flash.md +++ b/embedded-workshop-book/src/troubleshoot-cargo-flash.md @@ -18,10 +18,15 @@ $ cargo flash --chip nRF52840_xxAA --bin hello Error failed to flash app: The execution of 'erase_sector' failed with code 1 ``` -flash write protection is enabled in the device. To disable it use the `nrf-recover` tool. Instructions can be found in the [`nrf-recover` section of the Installation Instructions]. +Ensure that you've installed version 0.10 or higher of `cargo-flash` and `cargo-embed` -[`nrf-recover` section of the Installation Instructions]: ./installation.md#nrf-recover +``` console +$ cargo flash --version +0.10.2 +$ cargo embed --version +0.10.2 +```` ## Linux permissions From aa4533359cc6de170ccada03bd83d4dd431b0cbd Mon Sep 17 00:00:00 2001 From: Lotte Steenbrink Date: Wed, 20 Jan 2021 15:37:23 +0100 Subject: [PATCH 3/3] fix CI --- .github/workflows/rust.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5c21856..2764f9a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -46,6 +46,7 @@ jobs: - name: install all dependencies run: | + sudo apt update sudo apt-get install libudev-dev libusb-1.0-0-dev rustup +stable target add thumbv7em-none-eabihf