From 5b589af24fd0e36debbca7b048cf526ee5ffca82 Mon Sep 17 00:00:00 2001 From: Johann Hemmann Date: Mon, 26 Jun 2023 16:48:55 +0200 Subject: [PATCH 1/2] Add `--erase-all` to `probe-run` invocation Newer models of the nrf52840 need this in order to flash. --- advanced/firmware/.cargo/config.toml | 2 +- beginner/apps/.cargo/config.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/advanced/firmware/.cargo/config.toml b/advanced/firmware/.cargo/config.toml index 4c4601e..cb69dd2 100644 --- a/advanced/firmware/.cargo/config.toml +++ b/advanced/firmware/.cargo/config.toml @@ -7,7 +7,7 @@ rustflags = [ ] [target.thumbv7em-none-eabihf] -runner = "probe-run --chip nRF52840_xxAA" +runner = "probe-run --chip nRF52840_xxAA --erase-all" rustflags = [ "-C", "link-arg=-Tlink.x", ] diff --git a/beginner/apps/.cargo/config.toml b/beginner/apps/.cargo/config.toml index abfd4b6..3b17a22 100644 --- a/beginner/apps/.cargo/config.toml +++ b/beginner/apps/.cargo/config.toml @@ -9,7 +9,7 @@ rustflags = [ [target.thumbv7em-none-eabihf] # set custom cargo runner to flash & run on embedded target when we call `cargo run` # for more information, check out https://github.com/knurling-rs/probe-run -runner = "probe-run --chip nRF52840_xxAA" +runner = "probe-run --chip nRF52840_xxAA --erase-all" rustflags = [ "-C", "link-arg=-Tlink.x", ] From 9358dc6599c481a4f3083b646336c4c4facd7c94 Mon Sep 17 00:00:00 2001 From: Johann Hemmann Date: Mon, 26 Jun 2023 16:54:33 +0200 Subject: [PATCH 2/2] Fix CI --- .github/workflows/rust.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index fd0a6dd..e3fb16e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,13 +18,8 @@ jobs: - name: check out repository uses: actions/checkout@v2 - - name: set up rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: set up actions.rs - uses: actions-rs/cargo@v1 + - name: Use the latest stable release + run: rustup update stable && rustup default stable - name: cache rust dependencies uses: actions/cache@v2