aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiondokter <[email protected]>2025-08-29 14:44:32 +0200
committerDario Nieuwenhuis <[email protected]>2025-09-11 14:45:27 +0200
commit99209accb5b37f236691e060474bfc4823d2e123 (patch)
tree835c6f7a179d0fc19816d9c5cd560b68d7f75b55
parent52d178560501a464dba67da89a1570ae9a2cf66c (diff)
Add edf example to CI and fix the example
-rwxr-xr-xci.sh1
-rw-r--r--examples/nrf52840-edf/Cargo.toml12
-rw-r--r--examples/nrf52840-edf/src/bin/basic.rs3
3 files changed, 9 insertions, 7 deletions
diff --git a/ci.sh b/ci.sh
index 50fb3e13d..a25097690 100755
--- a/ci.sh
+++ b/ci.sh
@@ -239,6 +239,7 @@ cargo batch \
239 --- build --release --manifest-path docs/examples/layer-by-layer/blinky-async/Cargo.toml --target thumbv7em-none-eabi \ 239 --- build --release --manifest-path docs/examples/layer-by-layer/blinky-async/Cargo.toml --target thumbv7em-none-eabi \
240 --- build --release --manifest-path examples/nrf52810/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/nrf52810 \ 240 --- build --release --manifest-path examples/nrf52810/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/nrf52810 \
241 --- build --release --manifest-path examples/nrf52840/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/nrf52840 \ 241 --- build --release --manifest-path examples/nrf52840/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/nrf52840 \
242 --- build --release --manifest-path examples/nrf52840-edf/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/nrf52840-edf \
242 --- build --release --manifest-path examples/nrf5340/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/nrf5340 \ 243 --- build --release --manifest-path examples/nrf5340/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/nrf5340 \
243 --- build --release --manifest-path examples/nrf54l15/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/nrf54l15 \ 244 --- build --release --manifest-path examples/nrf54l15/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/nrf54l15 \
244 --- build --release --manifest-path examples/nrf9160/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/nrf9160 \ 245 --- build --release --manifest-path examples/nrf9160/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/nrf9160 \
diff --git a/examples/nrf52840-edf/Cargo.toml b/examples/nrf52840-edf/Cargo.toml
index c7147d1af..9efdff7c4 100644
--- a/examples/nrf52840-edf/Cargo.toml
+++ b/examples/nrf52840-edf/Cargo.toml
@@ -6,16 +6,16 @@ license = "MIT OR Apache-2.0"
6 6
7[dependencies] 7[dependencies]
8# NOTE: "edf-scheduler" feature is enabled 8# NOTE: "edf-scheduler" feature is enabled
9embassy-executor = { version = "0.7.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "edf-scheduler"] } 9embassy-executor = { version = "0.9.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "edf-scheduler"] }
10embassy-time = { version = "0.4.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime"] } 10embassy-time = { version = "0.5.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime"] }
11embassy-nrf = { version = "0.3.1", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } 11embassy-nrf = { version = "0.7.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] }
12 12
13defmt = "0.3" 13defmt = "1.0.1"
14defmt-rtt = "0.4" 14defmt-rtt = "1.0.0"
15 15
16cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } 16cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }
17cortex-m-rt = "0.7.0" 17cortex-m-rt = "0.7.0"
18panic-probe = { version = "0.3", features = ["print-defmt"] } 18panic-probe = { version = "1.0.0", features = ["print-defmt"] }
19 19
20[profile.release] 20[profile.release]
21debug = 2 21debug = 2
diff --git a/examples/nrf52840-edf/src/bin/basic.rs b/examples/nrf52840-edf/src/bin/basic.rs
index c270c67b9..8a8e46449 100644
--- a/examples/nrf52840-edf/src/bin/basic.rs
+++ b/examples/nrf52840-edf/src/bin/basic.rs
@@ -14,6 +14,7 @@
14 14
15use core::sync::atomic::{compiler_fence, Ordering}; 15use core::sync::atomic::{compiler_fence, Ordering};
16 16
17use defmt::unwrap;
17use embassy_executor::raw::Deadline; 18use embassy_executor::raw::Deadline;
18use embassy_executor::Spawner; 19use embassy_executor::Spawner;
19use embassy_time::{Duration, Instant, Timer}; 20use embassy_time::{Duration, Instant, Timer};
@@ -57,7 +58,7 @@ async fn main(spawner: Spawner) {
57 58
58 // Spawn all of our load workers! 59 // Spawn all of our load workers!
59 for i in 0..tasks { 60 for i in 0..tasks {
60 spawner.must_spawn(load_task(i, work_time_ticks, time_window)); 61 spawner.spawn(unwrap!(load_task(i, work_time_ticks, time_window)));
61 } 62 }
62 63
63 // Let all the tasks spin up 64 // Let all the tasks spin up