From 7614b96fe45240dafe91ae549e712b560e2d4c10 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Sat, 31 Dec 2022 14:45:13 +0100 Subject: RTIC v2: Initial commit rtic-syntax is now part of RTIC repository --- Cargo.toml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 68fea4c..d995de4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,27 +1,29 @@ [package] authors = [ "The Real-Time Interrupt-driven Concurrency developers", + "Emil Fresk ", + "Henrik Tjäder ", "Jorge Aparicio ", "Per Lindgren ", ] -categories = ["concurrency", "embedded", "no-std"] +categories = ["concurrency", "embedded", "no-std", "asynchronous"] description = "Real-Time Interrupt-driven Concurrency (RTIC): a concurrency framework for building real-time systems" documentation = "https://rtic.rs/" edition = "2021" -keywords = ["arm", "cortex-m"] +keywords = ["arm", "cortex-m", "risc-v", "embedded", "async", "runtime", "futures", "await", "no-std", "rtos", "bare-metal"] license = "MIT OR Apache-2.0" -name = "cortex-m-rtic" +name = "rtic" readme = "README.md" -repository = "https://github.com/rtic-rs/cortex-m-rtic" +repository = "https://github.com/rtic-rs/rtic" -version = "1.1.4" +version = "2.0.0-alpha.0" [lib] name = "rtic" [dependencies] cortex-m = "0.7.0" -cortex-m-rtic-macros = { path = "macros", version = "1.1.6" } +rtic-macros = { path = "macros", version = "2.0.0-alpha.0" } rtic-monotonic = "1.0.0" rtic-core = "1.0.0" heapless = "0.7.7" -- cgit v1.2.3 From 9a4f97ca5ebf19e6612115db5c763d0d61dd28a1 Mon Sep 17 00:00:00 2001 From: Per Lindgren Date: Sat, 7 Jan 2023 17:59:39 +0100 Subject: more examples --- Cargo.toml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index d995de4..cad9291 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,10 +49,7 @@ codegen-units = 1 lto = true [workspace] -members = [ - "macros", - "xtask", -] +members = ["macros", "xtask"] # do not optimize proc-macro deps or build scripts [profile.dev.build-override] @@ -76,6 +73,6 @@ lm3s6965 = { git = "https://github.com/japaric/lm3s6965" } [features] test-critical-section = ["cortex-m/critical-section-single-core"] -[[example]] -name = "pool" -required-features = ["test-critical-section"] +# [[example]] +# name = "pool" +# required-features = ["test-critical-section"] -- cgit v1.2.3 From cd790a94286cdc307d399b7f7a43e305e90de5bf Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Mon, 9 Jan 2023 21:02:53 +0100 Subject: More work on new spawn/executor --- Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index cad9291..6eb691d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,6 +28,8 @@ rtic-monotonic = "1.0.0" rtic-core = "1.0.0" heapless = "0.7.7" bare-metal = "1.0.0" +#portable-atomic = { version = "0.3.19" } +atomic-polyfill = "1" [build-dependencies] version_check = "0.9" -- cgit v1.2.3 From 4601782466c518d313ba79d9437bf7a3f8dbbf76 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Sat, 14 Jan 2023 21:11:55 +0100 Subject: monotonic experiments --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 6eb691d..c22d023 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ codegen-units = 1 lto = true [workspace] -members = ["macros", "xtask"] +members = ["macros", "xtask", "rtic-timer"] # do not optimize proc-macro deps or build scripts [profile.dev.build-override] -- cgit v1.2.3 From 306aa47170fd59369b7a184924e287dc3706d64d Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Mon, 23 Jan 2023 20:05:47 +0100 Subject: Add rtic-timer (timerqueue + monotonic) and rtic-monotonics (systick-monotonic) --- Cargo.toml | 80 -------------------------------------------------------------- 1 file changed, 80 deletions(-) delete mode 100644 Cargo.toml (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml deleted file mode 100644 index c22d023..0000000 --- a/Cargo.toml +++ /dev/null @@ -1,80 +0,0 @@ -[package] -authors = [ - "The Real-Time Interrupt-driven Concurrency developers", - "Emil Fresk ", - "Henrik Tjäder ", - "Jorge Aparicio ", - "Per Lindgren ", -] -categories = ["concurrency", "embedded", "no-std", "asynchronous"] -description = "Real-Time Interrupt-driven Concurrency (RTIC): a concurrency framework for building real-time systems" -documentation = "https://rtic.rs/" -edition = "2021" -keywords = ["arm", "cortex-m", "risc-v", "embedded", "async", "runtime", "futures", "await", "no-std", "rtos", "bare-metal"] -license = "MIT OR Apache-2.0" -name = "rtic" -readme = "README.md" -repository = "https://github.com/rtic-rs/rtic" - -version = "2.0.0-alpha.0" - -[lib] -name = "rtic" - -[dependencies] -cortex-m = "0.7.0" -rtic-macros = { path = "macros", version = "2.0.0-alpha.0" } -rtic-monotonic = "1.0.0" -rtic-core = "1.0.0" -heapless = "0.7.7" -bare-metal = "1.0.0" -#portable-atomic = { version = "0.3.19" } -atomic-polyfill = "1" - -[build-dependencies] -version_check = "0.9" - -[dev-dependencies] -lm3s6965 = "0.1.3" -cortex-m-semihosting = "0.5.0" -systick-monotonic = "1.0.0" - -[dev-dependencies.panic-semihosting] -features = ["exit"] -version = "0.6.0" - -[target.x86_64-unknown-linux-gnu.dev-dependencies] -trybuild = "1" - -[profile.release] -codegen-units = 1 -lto = true - -[workspace] -members = ["macros", "xtask", "rtic-timer"] - -# do not optimize proc-macro deps or build scripts -[profile.dev.build-override] -codegen-units = 16 -debug = false -debug-assertions = false -opt-level = 0 -overflow-checks = false - - -[profile.release.build-override] -codegen-units = 16 -debug = false -debug-assertions = false -opt-level = 0 -overflow-checks = false - -[patch.crates-io] -lm3s6965 = { git = "https://github.com/japaric/lm3s6965" } - -[features] -test-critical-section = ["cortex-m/critical-section-single-core"] - -# [[example]] -# name = "pool" -# required-features = ["test-critical-section"] -- cgit v1.2.3 From 9e445b3583c15c7701f3167eaa8dfe4afd541691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Sat, 4 Feb 2023 16:47:17 +0100 Subject: Move rtic macros to repo root, tune xtask --- Cargo.toml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Cargo.toml (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..820d4aa --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,28 @@ +[workspace] +members = [ + "rtic", + "xtask", +] + +[profile.release] +codegen-units = 1 +lto = true + +# do not optimize proc-macro deps or build scripts +[profile.dev.build-override] +codegen-units = 16 +debug = false +debug-assertions = false +opt-level = 0 +overflow-checks = false + + +[profile.release.build-override] +codegen-units = 16 +debug = false +debug-assertions = false +opt-level = 0 +overflow-checks = false + +[patch.crates-io] +lm3s6965 = { git = "https://github.com/japaric/lm3s6965" } -- cgit v1.2.3 From 9fb7559a86be9fc16689a32c60883920654f45f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Sun, 5 Feb 2023 23:43:57 +0100 Subject: Add other crates to workspace --- Cargo.toml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 820d4aa..ec7a8c3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,12 @@ [workspace] members = [ "rtic", + "rtic-macros", + "rtic-channel", + "rtic-common", + "rtic-macros", + "rtic-monotonics", + "rtic-time", "xtask", ] -- cgit v1.2.3 From 748ab7de9539722861094fefc6299ef061919f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Mon, 6 Feb 2023 13:50:46 +0100 Subject: Add rtic-arbiter to workspace --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index ec7a8c3..c049e54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ "rtic", - "rtic-macros", + "rtic-arbiter", "rtic-channel", "rtic-common", "rtic-macros", -- cgit v1.2.3 From 32b537aef63a2f69c5abc83b0af3fd88205ce0ce Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Wed, 1 Mar 2023 20:11:00 +0100 Subject: Merge arbiter and channel into sync --- Cargo.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index c049e54..888a6ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,7 @@ [workspace] members = [ "rtic", - "rtic-arbiter", - "rtic-channel", + "rtic-sync", "rtic-common", "rtic-macros", "rtic-monotonics", -- cgit v1.2.3