diff options
| author | maor1993 <[email protected]> | 2025-10-07 15:05:09 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-10-07 15:05:09 +0300 |
| commit | 04a36e9f62385fb4338908de66045f36fec664ea (patch) | |
| tree | 714fcc21114946e33b2be8eb6037bdc3dd9bb596 /examples/nrf52840-edf | |
| parent | cd91fe3b30dbb3d5b3c9c7d9e7cb151d721fb8d5 (diff) | |
| parent | 07016a4ffbe0b0ea689b83a6ddf19ab1b6a9a79a (diff) | |
Merge branch 'embassy-rs:main' into main
Diffstat (limited to 'examples/nrf52840-edf')
| -rw-r--r-- | examples/nrf52840-edf/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/nrf52840-edf/src/bin/basic.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/nrf52840-edf/Cargo.toml b/examples/nrf52840-edf/Cargo.toml index 67a624d6d..8b1db4652 100644 --- a/examples/nrf52840-edf/Cargo.toml +++ b/examples/nrf52840-edf/Cargo.toml | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | [package] | 1 | [package] |
| 2 | edition = "2021" | 2 | edition = "2024" |
| 3 | name = "embassy-nrf52840-edf-examples" | 3 | name = "embassy-nrf52840-edf-examples" |
| 4 | version = "0.1.0" | 4 | version = "0.1.0" |
| 5 | license = "MIT OR Apache-2.0" | 5 | license = "MIT OR Apache-2.0" |
diff --git a/examples/nrf52840-edf/src/bin/basic.rs b/examples/nrf52840-edf/src/bin/basic.rs index d888e17d1..f7214790d 100644 --- a/examples/nrf52840-edf/src/bin/basic.rs +++ b/examples/nrf52840-edf/src/bin/basic.rs | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #![no_std] | 12 | #![no_std] |
| 13 | #![no_main] | 13 | #![no_main] |
| 14 | 14 | ||
| 15 | use core::sync::atomic::{compiler_fence, Ordering}; | 15 | use core::sync::atomic::{Ordering, compiler_fence}; |
| 16 | 16 | ||
| 17 | use defmt::unwrap; | 17 | use defmt::unwrap; |
| 18 | use embassy_executor::Spawner; | 18 | use embassy_executor::Spawner; |