diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-08-17 20:27:42 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-08-17 20:27:42 +0000 |
| commit | 1c5b54a4823d596db730eb476c3ab78110557214 (patch) | |
| tree | 1d22c32eae26435677df89083d71f50fc298a09f /examples/nrf/src/bin/timer.rs | |
| parent | d881f3ad9186cf3279aa1ba27093bad94035c186 (diff) | |
| parent | 2e85eaf7d5f4dcf6d84f426542b8ec87aa51c429 (diff) | |
Merge #908
908: Remove HAL initialization from #[embassy_executor::main] macro. r=Dirbaio a=Dirbaio
Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'examples/nrf/src/bin/timer.rs')
| -rw-r--r-- | examples/nrf/src/bin/timer.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/nrf/src/bin/timer.rs b/examples/nrf/src/bin/timer.rs index 61ff1d6db..de7902336 100644 --- a/examples/nrf/src/bin/timer.rs +++ b/examples/nrf/src/bin/timer.rs | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | use defmt::{info, unwrap}; | 5 | use defmt::{info, unwrap}; |
| 6 | use embassy_executor::executor::Spawner; | 6 | use embassy_executor::executor::Spawner; |
| 7 | use embassy_executor::time::{Duration, Timer}; | 7 | use embassy_executor::time::{Duration, Timer}; |
| 8 | use embassy_nrf::Peripherals; | ||
| 9 | use {defmt_rtt as _, panic_probe as _}; | 8 | use {defmt_rtt as _, panic_probe as _}; |
| 10 | 9 | ||
| 11 | #[embassy_executor::task] | 10 | #[embassy_executor::task] |
| @@ -25,7 +24,8 @@ async fn run2() { | |||
| 25 | } | 24 | } |
| 26 | 25 | ||
| 27 | #[embassy_executor::main] | 26 | #[embassy_executor::main] |
| 28 | async fn main(spawner: Spawner, _p: Peripherals) { | 27 | async fn main(spawner: Spawner) { |
| 28 | let _p = embassy_nrf::init(Default::default()); | ||
| 29 | unwrap!(spawner.spawn(run1())); | 29 | unwrap!(spawner.spawn(run1())); |
| 30 | unwrap!(spawner.spawn(run2())); | 30 | unwrap!(spawner.spawn(run2())); |
| 31 | } | 31 | } |
