aboutsummaryrefslogtreecommitdiff
path: root/embassy-nrf-examples/src
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2021-02-26 01:55:27 +0100
committerDario Nieuwenhuis <[email protected]>2021-02-26 01:55:27 +0100
commit11be9170ec018dcc9284b413c5313ce7bb07159f (patch)
treeb9a1663a24af2dc0a1c860667d2db00f03d391a7 /embassy-nrf-examples/src
parent90476ef9005e391e9a9c9e5c4f0d82ceccdf7c11 (diff)
Cleanup interrupt package naming. Fixes #40
The `interrupt` package previously tried to be drop-in compatible with the `interrupt` package from PACs. THis meant that there was both a PAC-style enum value `UARTE0` and an embassy-style owned `UARTE0Interrupt` type. This made things VERY confusing. This drops compatibility with the PAC, improving the names for embassy interrupts.
Diffstat (limited to 'embassy-nrf-examples/src')
-rw-r--r--embassy-nrf-examples/src/bin/multiprio.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/embassy-nrf-examples/src/bin/multiprio.rs b/embassy-nrf-examples/src/bin/multiprio.rs
index 1791a85e6..850ef8fc0 100644
--- a/embassy-nrf-examples/src/bin/multiprio.rs
+++ b/embassy-nrf-examples/src/bin/multiprio.rs
@@ -68,7 +68,7 @@ use nrf52840_hal::clocks;
68use embassy::executor::{task, Executor, IrqExecutor}; 68use embassy::executor::{task, Executor, IrqExecutor};
69use embassy::time::{Duration, Instant, Timer}; 69use embassy::time::{Duration, Instant, Timer};
70use embassy::util::Forever; 70use embassy::util::Forever;
71use embassy_nrf::interrupt::OwnedInterrupt; 71use embassy_nrf::interrupt::Interrupt;
72use embassy_nrf::{interrupt, pac, rtc}; 72use embassy_nrf::{interrupt, pac, rtc};
73 73
74#[task] 74#[task]
@@ -115,9 +115,9 @@ async fn run_low() {
115 115
116static RTC: Forever<rtc::RTC<pac::RTC1>> = Forever::new(); 116static RTC: Forever<rtc::RTC<pac::RTC1>> = Forever::new();
117static ALARM_HIGH: Forever<rtc::Alarm<pac::RTC1>> = Forever::new(); 117static ALARM_HIGH: Forever<rtc::Alarm<pac::RTC1>> = Forever::new();
118static EXECUTOR_HIGH: Forever<IrqExecutor<interrupt::SWI1_EGU1Interrupt>> = Forever::new(); 118static EXECUTOR_HIGH: Forever<IrqExecutor<interrupt::SWI1_EGU1>> = Forever::new();
119static ALARM_MED: Forever<rtc::Alarm<pac::RTC1>> = Forever::new(); 119static ALARM_MED: Forever<rtc::Alarm<pac::RTC1>> = Forever::new();
120static EXECUTOR_MED: Forever<IrqExecutor<interrupt::SWI0_EGU0Interrupt>> = Forever::new(); 120static EXECUTOR_MED: Forever<IrqExecutor<interrupt::SWI0_EGU0>> = Forever::new();
121static ALARM_LOW: Forever<rtc::Alarm<pac::RTC1>> = Forever::new(); 121static ALARM_LOW: Forever<rtc::Alarm<pac::RTC1>> = Forever::new();
122static EXECUTOR_LOW: Forever<Executor> = Forever::new(); 122static EXECUTOR_LOW: Forever<Executor> = Forever::new();
123 123