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

Minor cleanup

Browse source
This commit is contained in:
Emil Fresk 2021-05-23 14:11:51 +02:00
parent b4509bdbfe
commit 6155f1366a
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Cargo.toml
View file

@ -14,7 +14,7 @@ name = "cortex-m-rtic"
readme = "README.md" readme = "README.md"
repository = "https://github.com/rtic-rs/cortex-m-rtic" repository = "https://github.com/rtic-rs/cortex-m-rtic"
version = "0.6.0-alpha.2" version = "0.6.0-alpha.3"
[lib] [lib]
name = "rtic" name = "rtic"
@ -53,15 +53,17 @@ required-features = ["__v7"]
[dependencies] [dependencies]
cortex-m = "0.7.0" cortex-m = "0.7.0"
cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.2" } cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.3" }
rtic-monotonic = "0.1.0-alpha.0" # rtic-monotonic = "0.1.0-alpha.1"
rtic-monotonic = { path = "../rtic-monotonic" }
rtic-core = "0.3.1" rtic-core = "0.3.1"
heapless = "0.6.1" heapless = "0.6.1"
bare-metal = "1.0.0" bare-metal = "1.0.0"
generic-array = "0.14" generic-array = "0.14"
[dependencies.dwt-systick-monotonic] [dependencies.dwt-systick-monotonic]
version = "0.1.0-alpha.0" # version = "0.1.0-alpha.2"
path = "../dwt-systick-monotonic"
optional = true optional = true
[build-dependencies] [build-dependencies]
@ -110,3 +112,4 @@ overflow-checks = false
[patch.crates-io] [patch.crates-io]
lm3s6965 = { git = "https://github.com/japaric/lm3s6965" } lm3s6965 = { git = "https://github.com/japaric/lm3s6965" }
# embedded-time = { path = "../../embedded-time" }

14
examples/schedule.rs
View file

@ -14,8 +14,10 @@ mod app {
use dwt_systick_monotonic::DwtSystick; use dwt_systick_monotonic::DwtSystick;
use rtic::time::duration::Seconds; use rtic::time::duration::Seconds;
const MONO_HZ: u32 = 8_000_000; // 8 MHz
#[monotonic(binds = SysTick, default = true)] #[monotonic(binds = SysTick, default = true)]
type MyMono = DwtSystick<8_000_000>; // 8 MHz type MyMono = DwtSystick<MONO_HZ>;
#[init()] #[init()]
fn init(cx: init::Context) -> (init::LateResources, init::Monotonics) { fn init(cx: init::Context) -> (init::LateResources, init::Monotonics) {
@ -25,24 +27,24 @@ mod app {
let mono = DwtSystick::new(&mut dcb, dwt, systick, 8_000_000); let mono = DwtSystick::new(&mut dcb, dwt, systick, 8_000_000);
hprintln!("init").unwrap(); hprintln!("init").ok();
// Schedule `foo` to run 1 second in the future // Schedule `foo` to run 1 second in the future
foo::spawn_after(Seconds(1_u32)).unwrap(); foo::spawn_after(Seconds(1_u32)).ok();
// Schedule `bar` to run 2 seconds in the future // Schedule `bar` to run 2 seconds in the future
bar::spawn_after(Seconds(2_u32)).unwrap(); bar::spawn_after(Seconds(2_u32)).ok();
(init::LateResources {}, init::Monotonics(mono)) (init::LateResources {}, init::Monotonics(mono))
} }
#[task] #[task]
fn foo(_: foo::Context) { fn foo(_: foo::Context) {
hprintln!("foo").unwrap(); hprintln!("foo").ok();
} }
#[task] #[task]
fn bar(_: bar::Context) { fn bar(_: bar::Context) {
hprintln!("bar").unwrap(); hprintln!("bar").ok();
} }
} }

2
macros/Cargo.toml
View file

@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
name = "cortex-m-rtic-macros" name = "cortex-m-rtic-macros"
readme = "../README.md" readme = "../README.md"
repository = "https://github.com/rtic-rs/cortex-m-rtic" repository = "https://github.com/rtic-rs/cortex-m-rtic"
version = "0.6.0-alpha.2" version = "0.6.0-alpha.3"
[lib] [lib]
proc-macro = true proc-macro = true