From 81275bfa4f41e2066770087f3a33cad4227eab41 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 13 Jun 2019 23:56:59 +0200 Subject: rtfm-syntax refactor + heterogeneous multi-core support --- Cargo.toml | 58 +++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 21 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index ef6ac65..81ca256 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,56 +17,72 @@ version = "0.5.0-alpha.1" [lib] name = "rtfm" +[[test]] +required-features = ["heterogeneous"] +name = "multi" + [[example]] name = "baseline" -required-features = ["timer-queue"] +required-features = ["__v7"] [[example]] name = "periodic" -required-features = ["timer-queue"] +required-features = ["__v7"] [[example]] name = "pool" -# this example doesn't need this feature but only works on ARMv7-M -# specifying the feature here avoids compiling this for ARMv6-M -required-features = ["timer-queue"] +required-features = ["__v7"] [[example]] name = "schedule" -required-features = ["timer-queue"] +required-features = ["__v7"] + +[[example]] +name = "t-cfg" +required-features = ["__v7"] + +[[example]] +name = "t-schedule" +required-features = ["__v7"] [[example]] name = "types" -required-features = ["timer-queue"] +required-features = ["__v7"] [dependencies] -cortex-m = "0.5.8" -cortex-m-rt = "0.6.7" -cortex-m-rtfm-macros = { path = "macros", version = "0.5.0-alpha.1" } -heapless = "0.5.0-alpha.1" +cortex-m = "0.6.0" +cortex-m-rtfm-macros = { path = "macros" } +rtfm-core = { git = "https://github.com/japaric/rtfm-core" } +cortex-m-rt = "0.6.8" +heapless = "0.5.0-alpha.2" + +[dependencies.microamp] +optional = true +version = "0.1.0-alpha.1" [dev-dependencies] -cortex-m-semihosting = "0.3.2" lm3s6965 = "0.1.3" panic-halt = "0.2.0" +cortex-m-semihosting = "0.3.3" [dev-dependencies.panic-semihosting] features = ["exit"] -version = "0.5.1" - -[features] -timer-queue = ["cortex-m-rtfm-macros/timer-queue"] +version = "0.5.2" [target.x86_64-unknown-linux-gnu.dev-dependencies] -compiletest_rs = "0.3.21" -tempdir = "0.3.7" +compiletest_rs = "0.3.22" -[package.metadata.docs.rs] -features = ["timer-queue"] +[features] +heterogeneous = ["cortex-m-rtfm-macros/heterogeneous", "microamp"] +# used for testing this crate; do not use in applications +__v7 =[] [profile.release] codegen-units = 1 lto = true [workspace] -members = ["macros"] \ No newline at end of file +members = [ + "macros", + "mc", +] -- cgit v1.2.3 From 9897728709528a02545523bea72576abce89dc4c Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 18 Jun 2019 10:31:31 +0200 Subject: add homogeneous multi-core support --- Cargo.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 81ca256..ef45be8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,6 +74,7 @@ compiletest_rs = "0.3.22" [features] heterogeneous = ["cortex-m-rtfm-macros/heterogeneous", "microamp"] +homogeneous = ["cortex-m-rtfm-macros/homogeneous", "microamp"] # used for testing this crate; do not use in applications __v7 =[] @@ -83,6 +84,7 @@ lto = true [workspace] members = [ + "heterogeneous", + "homogeneous", "macros", - "mc", ] -- cgit v1.2.3 From b150ab29e25637e41ba5de81f6cbbdfe24834a3f Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 18 Jun 2019 10:40:43 +0200 Subject: homogeneous mode doesn't depend on microamp --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index ef45be8..72bf337 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,7 +74,7 @@ compiletest_rs = "0.3.22" [features] heterogeneous = ["cortex-m-rtfm-macros/heterogeneous", "microamp"] -homogeneous = ["cortex-m-rtfm-macros/homogeneous", "microamp"] +homogeneous = ["cortex-m-rtfm-macros/homogeneous"] # used for testing this crate; do not use in applications __v7 =[] -- cgit v1.2.3 From e2323dd37086a08401ccb08f4d705a0b5cae73b3 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 11 Jul 2019 13:46:49 +0200 Subject: bump dependencies --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 72bf337..c514c8f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,12 +53,12 @@ required-features = ["__v7"] cortex-m = "0.6.0" cortex-m-rtfm-macros = { path = "macros" } rtfm-core = { git = "https://github.com/japaric/rtfm-core" } -cortex-m-rt = "0.6.8" +cortex-m-rt = "0.6.9" heapless = "0.5.0-alpha.2" [dependencies.microamp] optional = true -version = "0.1.0-alpha.1" +version = "0.1.0-alpha.2" [dev-dependencies] lm3s6965 = "0.1.3" -- cgit v1.2.3 From 2f4f1857788a3c2c5e8b97a5b7cc2c39c26c659f Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 12 Jul 2019 01:41:57 +0200 Subject: use a stable heapless release --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index c514c8f..7cc3886 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,7 +54,7 @@ cortex-m = "0.6.0" cortex-m-rtfm-macros = { path = "macros" } rtfm-core = { git = "https://github.com/japaric/rtfm-core" } cortex-m-rt = "0.6.9" -heapless = "0.5.0-alpha.2" +heapless = "0.5.0" [dependencies.microamp] optional = true -- cgit v1.2.3 From bd942e983500cfb60d6301d366e9f78a42b50b06 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 21 Aug 2019 11:03:12 +0200 Subject: fix Cargo.toml --- Cargo.toml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 7cc3886..5541717 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,10 +17,6 @@ version = "0.5.0-alpha.1" [lib] name = "rtfm" -[[test]] -required-features = ["heterogeneous"] -name = "multi" - [[example]] name = "baseline" required-features = ["__v7"] -- cgit v1.2.3 From 45f9faae9c51c8d84c939a9e00985388fc1d2cdf Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 21 Aug 2019 12:19:38 +0200 Subject: document #[app] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 5541717..1449d6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0" name = "cortex-m-rtfm" readme = "README.md" repository = "https://github.com/japaric/cortex-m-rtfm" -version = "0.5.0-alpha.1" +version = "0.5.0-beta.1" [lib] name = "rtfm" -- cgit v1.2.3