From 210197d07955e760c031e05d1cc79689290335dc Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Tue, 23 Feb 2021 19:29:15 +0100 Subject: [PATCH] Remove flags, updates UI tests --- Cargo.toml | 37 ------------------------- ui/single/exception-systick-used.rs | 7 ----- ui/single/exception-systick-used.stderr | 5 ---- ui/single/local-cfg-task-local-err.rs | 17 +++++++----- ui/single/local-err.rs | 4 +-- ui/single/locals-cfg.rs | 4 +-- ui/single/resources-cfg.rs | 4 +-- ui/single/task-priority-too-high.rs | 4 +-- 8 files changed, 18 insertions(+), 64 deletions(-) delete mode 100644 ui/single/exception-systick-used.rs delete mode 100644 ui/single/exception-systick-used.stderr diff --git a/Cargo.toml b/Cargo.toml index 550141f67c..98bed66006 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,38 +18,6 @@ version = "0.6.0-alpha.0" [lib] name = "rtic" -[[example]] -name = "periodic" -required-features = ["__v7"] - -[[example]] -name = "pool" -required-features = ["__v7"] - -[[example]] -name = "schedule" -required-features = ["__v7"] - -[[example]] -name = "t-cfg" -required-features = ["__v7"] - -[[example]] -name = "t-cfg-resources" -required-features = ["__min_r1_43"] - -[[example]] -name = "t-schedule" -required-features = ["__v7"] - -[[example]] -name = "types" -required-features = ["__v7"] - -[[example]] -name = "double_schedule" -required-features = ["__v7"] - [dependencies] cortex-m = "0.7.0" cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" } @@ -74,11 +42,6 @@ version = "0.5.2" [target.x86_64-unknown-linux-gnu.dev-dependencies] trybuild = "1" -[features] -# used for testing this crate; do not use in applications -__v7 =[] -__min_r1_43 =[] - [profile.release] codegen-units = 1 lto = true diff --git a/ui/single/exception-systick-used.rs b/ui/single/exception-systick-used.rs deleted file mode 100644 index 9e94c739ba..0000000000 --- a/ui/single/exception-systick-used.rs +++ /dev/null @@ -1,7 +0,0 @@ -#![no_main] - -#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)] -mod app { - #[task(binds = SysTick)] - fn sys_tick(_: sys_tick::Context) {} -} diff --git a/ui/single/exception-systick-used.stderr b/ui/single/exception-systick-used.stderr deleted file mode 100644 index 23b6dc4a10..0000000000 --- a/ui/single/exception-systick-used.stderr +++ /dev/null @@ -1,5 +0,0 @@ -error: this exception can't be used because it's being used by the runtime - --> $DIR/exception-systick-used.rs:6:8 - | -6 | fn sys_tick(_: sys_tick::Context) {} - | ^^^^^^^^ diff --git a/ui/single/local-cfg-task-local-err.rs b/ui/single/local-cfg-task-local-err.rs index 412f614226..d4752edf5d 100644 --- a/ui/single/local-cfg-task-local-err.rs +++ b/ui/single/local-cfg-task-local-err.rs @@ -26,15 +26,18 @@ mod app { } #[init] - fn init(_: init::Context) -> init::LateResources { + fn init(_: init::Context) -> (init::LateResources, init::Monotonics) { rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART1); - init::LateResources { - #[cfg(feature = "feature_l2")] - l2: 2, - #[cfg(not(feature = "feature_l2"))] - l2: 5, - } + ( + init::LateResources { + #[cfg(feature = "feature_l2")] + l2: 2, + #[cfg(not(feature = "feature_l2"))] + l2: 5, + }, + init::Monotonics(), + ) } // l1 ok (task_local) diff --git a/ui/single/local-err.rs b/ui/single/local-err.rs index 0fe98a4b0c..7ebfc0699a 100644 --- a/ui/single/local-err.rs +++ b/ui/single/local-err.rs @@ -39,10 +39,10 @@ mod app { } #[init] - fn init(_: init::Context) -> init::LateResources { + fn init(_: init::Context) -> (init::LateResources, init::Monotonics) { rtic::pend(Interrupt::UART0); rtic::pend(Interrupt::UART1); - init::LateResources { e2: 2, l2: 2 } + (init::LateResources { e2: 2, l2: 2 }, init::Monotonics()) } // `shared` cannot be accessed from this context diff --git a/ui/single/locals-cfg.rs b/ui/single/locals-cfg.rs index 3bfdaa1e0c..72e2acae53 100644 --- a/ui/single/locals-cfg.rs +++ b/ui/single/locals-cfg.rs @@ -4,13 +4,13 @@ use panic_halt as _; #[rtic::app(device = lm3s6965, dispatchers = [SSI0])] mod app { #[init] - fn init(_: init::Context) -> init::LateResources { + fn init(_: init::Context) -> (init::LateResources, init::Monotonics) { #[cfg(never)] static mut FOO: u32 = 0; FOO; - init::LateResources {} + (init::LateResources {}, init::Monotonics()) } #[idle] diff --git a/ui/single/resources-cfg.rs b/ui/single/resources-cfg.rs index 2ba65a048a..c11d2ba45d 100644 --- a/ui/single/resources-cfg.rs +++ b/ui/single/resources-cfg.rs @@ -43,14 +43,14 @@ mod app { } #[init(resources = [o1, o4, o5, o6, s3])] - fn init(c: init::Context) -> init::LateResources { + fn init(c: init::Context) -> (init::LateResources, init::Monotonics) { c.resources.o1; c.resources.o4; c.resources.o5; c.resources.o6; c.resources.s3; - init::LateResources {} + (init::LateResources {}, init::Monotonics()) } #[idle(resources = [o2, &o4, s1, &s3])] diff --git a/ui/single/task-priority-too-high.rs b/ui/single/task-priority-too-high.rs index caa7b8ee24..b1cbfa94ff 100644 --- a/ui/single/task-priority-too-high.rs +++ b/ui/single/task-priority-too-high.rs @@ -3,8 +3,8 @@ #[rtic::app(device = lm3s6965)] mod app { #[init] - fn init(_: init::Context) -> init::LateResources { - init::LateResources {} + fn init(_: init::Context) -> (init::LateResources, init::Monotonics) { + (init::LateResources {}, init::Monotonics()) } #[task(binds = GPIOA, priority = 1)]