mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-26 05:29:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge #701

Browse source 
701: rtic-monotonics: Unmask the RP2040 timer r=AfoHT a=korken89



Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
This commit is contained in:
bors[bot] 2023-03-11 20:12:00 +00:00 committed by GitHub
commit dd899ab77f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rtic-monotonics/CHANGELOG.md
View file

@ -13,4 +13,6 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
### Fixed ### Fixed
- Unmask the `rp2040` interrupt
## [v1.0.0] - 2023-xx-xx ## [v1.0.0] - 2023-xx-xx

4
rtic-monotonics/src/rp2040.rs
View file

@ -4,7 +4,7 @@ use super::Monotonic;
pub use super::{TimeoutError, TimerQueue}; pub use super::{TimeoutError, TimerQueue};
use core::future::Future; use core::future::Future;
pub use fugit::ExtU64; pub use fugit::ExtU64;
use rp2040_pac::{timer, Interrupt, RESETS, TIMER}; use rp2040_pac::{timer, Interrupt, NVIC, RESETS, TIMER};
/// Timer implementing `rtic_monotonic::Monotonic` which runs at 1 MHz. /// Timer implementing `rtic_monotonic::Monotonic` which runs at 1 MHz.
pub struct Timer; pub struct Timer;
@ -17,6 +17,8 @@ impl Timer {
timer.inte.modify(|_, w| w.alarm_0().set_bit()); timer.inte.modify(|_, w| w.alarm_0().set_bit());
TIMER_QUEUE.initialize(Self {}); TIMER_QUEUE.initialize(Self {});
unsafe { NVIC::unmask(Interrupt::TIMER_IRQ_0) };
} }
fn timer() -> &'static timer::RegisterBlock { fn timer() -> &'static timer::RegisterBlock {