From f117213b6ee80c224e781d7bf4e750df49c345a6 Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Thu, 25 Jan 2024 21:47:49 +0100 Subject: [PATCH] fix: use nrf51-dk chip variant --- ci.sh | 2 +- examples/nrf51/.cargo/config.toml | 4 ++-- tests/{nrf51822 => nrf51422}/.cargo/config.toml | 2 +- tests/{nrf51822 => nrf51422}/Cargo.toml | 2 +- tests/{nrf51822 => nrf51422}/build.rs | 0 tests/{nrf51822 => nrf51422}/memory.x | 0 tests/{nrf51822 => nrf51422}/src/bin/gpio.rs | 0 tests/{nrf51822 => nrf51422}/src/bin/timer.rs | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename tests/{nrf51822 => nrf51422}/.cargo/config.toml (75%) rename tests/{nrf51822 => nrf51422}/Cargo.toml (96%) rename tests/{nrf51822 => nrf51422}/build.rs (100%) rename tests/{nrf51822 => nrf51422}/memory.x (100%) rename tests/{nrf51822 => nrf51422}/src/bin/gpio.rs (100%) rename tests/{nrf51822 => nrf51422}/src/bin/timer.rs (100%) diff --git a/ci.sh b/ci.sh index d29a686af..6a5e6e3f5 100755 --- a/ci.sh +++ b/ci.sh @@ -216,7 +216,7 @@ cargo batch \ --- build --release --manifest-path tests/stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32wl55jc --out-dir out/tests/stm32wl55jc \ --- build --release --manifest-path tests/rp/Cargo.toml --target thumbv6m-none-eabi --out-dir out/tests/rpi-pico \ --- build --release --manifest-path tests/nrf52840/Cargo.toml --target thumbv7em-none-eabi --out-dir out/tests/nrf52840-dk \ - --- build --release --manifest-path tests/nrf51822/Cargo.toml --target thumbv6m-none-eabi --out-dir out/tests/nrf51-dk \ + --- build --release --manifest-path tests/nrf51422/Cargo.toml --target thumbv6m-none-eabi --out-dir out/tests/nrf51-dk \ --- build --release --manifest-path tests/riscv32/Cargo.toml --target riscv32imac-unknown-none-elf \ $BUILD_EXTRA diff --git a/examples/nrf51/.cargo/config.toml b/examples/nrf51/.cargo/config.toml index 29d35a9b4..1671f5db1 100644 --- a/examples/nrf51/.cargo/config.toml +++ b/examples/nrf51/.cargo/config.toml @@ -1,6 +1,6 @@ [target.'cfg(all(target_arch = "arm", target_os = "none"))'] -# replace nRF51822_xxAA with your chip as listed in `probe-rs chip list` -runner = "probe-rs run --chip nRF51822_xxAA" +# replace nRF51422_xxAA with your chip as listed in `probe-rs chip list` +runner = "probe-rs run --chip nRF51422_xxAA" [build] target = "thumbv6m-none-eabi" diff --git a/tests/nrf51822/.cargo/config.toml b/tests/nrf51422/.cargo/config.toml similarity index 75% rename from tests/nrf51822/.cargo/config.toml rename to tests/nrf51422/.cargo/config.toml index 3d0c71092..634805633 100644 --- a/tests/nrf51822/.cargo/config.toml +++ b/tests/nrf51422/.cargo/config.toml @@ -1,5 +1,5 @@ [target.'cfg(all(target_arch = "arm", target_os = "none"))'] -#runner = "teleprobe local run --chip nRF51822_xxAA --elf" +#runner = "teleprobe local run --chip nRF51422_xxAA --elf" runner = "teleprobe client run" [build] diff --git a/tests/nrf51822/Cargo.toml b/tests/nrf51422/Cargo.toml similarity index 96% rename from tests/nrf51822/Cargo.toml rename to tests/nrf51422/Cargo.toml index 468fa03fa..d95f122b0 100644 --- a/tests/nrf51822/Cargo.toml +++ b/tests/nrf51422/Cargo.toml @@ -1,6 +1,6 @@ [package] edition = "2021" -name = "embassy-nrf51822-tests" +name = "embassy-nrf51-tests" version = "0.1.0" license = "MIT OR Apache-2.0" diff --git a/tests/nrf51822/build.rs b/tests/nrf51422/build.rs similarity index 100% rename from tests/nrf51822/build.rs rename to tests/nrf51422/build.rs diff --git a/tests/nrf51822/memory.x b/tests/nrf51422/memory.x similarity index 100% rename from tests/nrf51822/memory.x rename to tests/nrf51422/memory.x diff --git a/tests/nrf51822/src/bin/gpio.rs b/tests/nrf51422/src/bin/gpio.rs similarity index 100% rename from tests/nrf51822/src/bin/gpio.rs rename to tests/nrf51422/src/bin/gpio.rs diff --git a/tests/nrf51822/src/bin/timer.rs b/tests/nrf51422/src/bin/timer.rs similarity index 100% rename from tests/nrf51822/src/bin/timer.rs rename to tests/nrf51422/src/bin/timer.rs