diff options
| author | Emil Fresk <emil.fresk@gmail.com> | 2021-02-06 21:34:16 +0100 |
|---|---|---|
| committer | Emil Fresk <emil.fresk@gmail.com> | 2021-02-06 21:34:16 +0100 |
| commit | b57ef0bf9d836ad031e4a4f7930162003128dc74 (patch) | |
| tree | 655a84dad87f3601c71d1353fd14365e9be5cc63 /src | |
| parent | 6fb43fa97be75f00553e0026ac06f107ee832dc2 (diff) | |
| parent | 81a8a591353b1ea0208c68b28ee81286629039cc (diff) | |
Merge branch 'master' into new_monotonic
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -35,7 +35,7 @@ // #![deny(warnings)] #![no_std] -use cortex_m::{interrupt::Nr, peripheral::NVIC}; +use cortex_m::{interrupt::InterruptNumber, peripheral::NVIC}; pub use cortex_m_rtic_macros::app; pub use rtic_core::{ monotonic::{self, embedded_time as time, Monotonic}, @@ -53,7 +53,7 @@ mod tq; /// [`NVIC::pend`](../cortex_m/peripheral/struct.NVIC.html#method.pend) pub fn pend<I>(interrupt: I) where - I: Nr, + I: InterruptNumber, { NVIC::pend(interrupt) } |
