mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-23 20:22:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge #437

Browse source 
437: Bump cortex-m to 0.7.0 r=korken89 a=nickray



Co-authored-by: Nicolas Stalder <n@stalder.io>
This commit is contained in:
bors[bot] 2021-01-19 19:28:15 +00:00 committed by GitHub
commit 6cbf98ff70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cargo.toml
View file

@ -55,7 +55,7 @@ name = "double_schedule"
required-features = ["__v7"] required-features = ["__v7"]
[dependencies] [dependencies]
cortex-m = "0.6.2" cortex-m = "0.7.0"
cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" } cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" }
rtic-core = "0.3.1" rtic-core = "0.3.1"
heapless = "0.5.0" heapless = "0.5.0"
@ -105,3 +105,6 @@ debug = false
debug-assertions = false debug-assertions = false
opt-level = 0 opt-level = 0
overflow-checks = false overflow-checks = false
[patch.crates-io]
lm3s6965 = { git = "https://github.com/japaric/lm3s6965" }

4
src/lib.rs
View file

@ -38,7 +38,7 @@
use core::ops::Sub; use core::ops::Sub;
use cortex_m::{ use cortex_m::{
interrupt::Nr, interrupt::InterruptNumber,
peripheral::{CBP, CPUID, DCB, DWT, FPB, FPU, ITM, MPU, NVIC, SCB, TPIU}, peripheral::{CBP, CPUID, DCB, DWT, FPB, FPU, ITM, MPU, NVIC, SCB, TPIU},
}; };
pub use cortex_m_rtic_macros::app; pub use cortex_m_rtic_macros::app;
@ -158,7 +158,7 @@ pub trait Monotonic {
/// [`NVIC::pend`](../cortex_m/peripheral/struct.NVIC.html#method.pend) /// [`NVIC::pend`](../cortex_m/peripheral/struct.NVIC.html#method.pend)
pub fn pend<I>(interrupt: I) pub fn pend<I>(interrupt: I)
where where
I: Nr, I: InterruptNumber,
{ {
NVIC::pend(interrupt) NVIC::pend(interrupt)
} }