From ef50aeb2e8245b69843280fabb62589c0716ffdd Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Thu, 3 Dec 2020 21:04:06 +0100 Subject: Save, init generation fixed --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 9a10ec2..679dcc0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,8 @@ required-features = ["__v7"] [dependencies] cortex-m = "0.6.2" cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" } -rtic-core = "0.3.1" +rtic-core = { git = "https://github.com/rtic-rs/rtic-core", branch = "new_monotonic" } +#rtic-core = "0.3.1" heapless = "0.5.0" bare-metal = "1.0.0" -- cgit v1.2.3 From ebf2f058a4d2a1fcf118144b9893dc3038939bad Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Thu, 18 Feb 2021 19:30:59 +0100 Subject: Now with new monotonic trait and crate --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 2063135..3729038 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,6 +58,7 @@ required-features = ["__v7"] cortex-m = "0.7.0" cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" } rtic-core = { git = "https://github.com/rtic-rs/rtic-core", branch = "new_monotonic" } +rtic-monotonic = { git = "https://github.com/rtic-rs/rtic-monotonic", branch = "master" } #rtic-core = "0.3.1" heapless = "0.5.0" bare-metal = "1.0.0" -- cgit v1.2.3 From 555f36857ec93bed26ff4249593992f500b7c4ab Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Sat, 20 Feb 2021 19:22:45 +0100 Subject: Test fixes --- Cargo.toml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 3729038..550141f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,10 +18,6 @@ version = "0.6.0-alpha.0" [lib] name = "rtic" -[[example]] -name = "baseline" -required-features = ["__v7"] - [[example]] name = "periodic" required-features = ["__v7"] -- cgit v1.2.3 From 210197d07955e760c031e05d1cc79689290335dc Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Tue, 23 Feb 2021 19:29:15 +0100 Subject: Remove flags, updates UI tests --- Cargo.toml | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 550141f..98bed66 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 -- cgit v1.2.3 From cd3484cbab3c4cd7e483e8de19bcdd9498443412 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Tue, 23 Feb 2021 19:35:26 +0100 Subject: GHA update Fmt fixes Spawn_after did not work with parameters Examples working again Revert "GHA update" This reverts commit e0a71d4859966a6c5cf2629d3cb27e88acada9c0. Readd flags Only add DWT based dep with __v7 flag --- Cargo.toml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 98bed66..2b3528b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,38 @@ 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" } @@ -27,6 +59,11 @@ rtic-monotonic = { git = "https://github.com/rtic-rs/rtic-monotonic", branch = " heapless = "0.5.0" bare-metal = "1.0.0" +[dependencies.dwt-systick-monotonic] +git = "https://github.com/rtic-rs/dwt-systick-monotonic" +branch = "master" +optional = true + [build-dependencies] version_check = "0.9" @@ -42,6 +79,11 @@ 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 = ["dwt-systick-monotonic"] +__min_r1_43 = [] + [profile.release] codegen-units = 1 lto = true -- cgit v1.2.3 From 70ea278f86fb9ca30ff496fb6235d171520eeafc Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Tue, 23 Feb 2021 21:20:21 +0100 Subject: No need for new rtic-core --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 2b3528b..5589aa6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,9 +53,9 @@ required-features = ["__v7"] [dependencies] cortex-m = "0.7.0" cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" } -rtic-core = { git = "https://github.com/rtic-rs/rtic-core", branch = "new_monotonic" } +# rtic-core = { git = "https://github.com/rtic-rs/rtic-core", branch = "new_monotonic" } rtic-monotonic = { git = "https://github.com/rtic-rs/rtic-monotonic", branch = "master" } -#rtic-core = "0.3.1" +rtic-core = "0.3.1" heapless = "0.5.0" bare-metal = "1.0.0" -- cgit v1.2.3 From 767d46e05bbc88eb3c236cf468f9432c7fe0ce05 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Thu, 25 Feb 2021 17:32:12 +0100 Subject: Review fixes --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 5589aa6..0a96451 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,7 +53,6 @@ required-features = ["__v7"] [dependencies] cortex-m = "0.7.0" cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" } -# rtic-core = { git = "https://github.com/rtic-rs/rtic-core", branch = "new_monotonic" } rtic-monotonic = { git = "https://github.com/rtic-rs/rtic-monotonic", branch = "master" } rtic-core = "0.3.1" heapless = "0.5.0" -- cgit v1.2.3 From 3a64a3e276aebfd65cadf418eea76b2cf55eef06 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Tue, 2 Mar 2021 16:30:59 +0100 Subject: Bump heapless --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 0a96451..12b25c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ cortex-m = "0.7.0" cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" } rtic-monotonic = { git = "https://github.com/rtic-rs/rtic-monotonic", branch = "master" } rtic-core = "0.3.1" -heapless = "0.5.0" +heapless = "0.6.1" bare-metal = "1.0.0" [dependencies.dwt-systick-monotonic] -- cgit v1.2.3 From 612efaf0c436489e1cf09c2e87b329a7318f71b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Wed, 3 Mar 2021 08:53:03 +0100 Subject: Use panic_semihosting for all examples --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 12b25c4..dd4633b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,7 +68,6 @@ version_check = "0.9" [dev-dependencies] lm3s6965 = "0.1.3" -panic-halt = "0.2.0" cortex-m-semihosting = "0.3.3" [dev-dependencies.panic-semihosting] -- cgit v1.2.3 From 2e4a4ffd87c8a031f27635c060042019511523dc Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Thu, 4 Mar 2021 20:00:03 +0100 Subject: Preparing release 0.6.0-alpha.1 --- Cargo.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index dd4633b..d7c2056 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ license = "MIT OR Apache-2.0" name = "cortex-m-rtic" readme = "README.md" repository = "https://github.com/rtic-rs/cortex-m-rtic" -version = "0.6.0-alpha.0" +version = "0.6.0-alpha.1" [lib] name = "rtic" @@ -53,14 +53,13 @@ required-features = ["__v7"] [dependencies] cortex-m = "0.7.0" cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" } -rtic-monotonic = { git = "https://github.com/rtic-rs/rtic-monotonic", branch = "master" } +rtic-monotonic = "0.1.0-alpha.0" rtic-core = "0.3.1" heapless = "0.6.1" bare-metal = "1.0.0" [dependencies.dwt-systick-monotonic] -git = "https://github.com/rtic-rs/dwt-systick-monotonic" -branch = "master" +version = "0.1.0-alpha.0" optional = true [build-dependencies] -- cgit v1.2.3