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) --- rtic-monotonics/Cargo.toml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 rtic-monotonics/Cargo.toml (limited to 'rtic-monotonics/Cargo.toml') diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml new file mode 100644 index 0000000..24448fb --- /dev/null +++ b/rtic-monotonics/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "rtic-timer" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +cortex-m = { version = "0.7.6" } +embedded-hal-async = "0.2.0-alpha.0" +fugit = { version = "0.3.6", features = ["defmt"] } +rtic-timer = { version = "1.0.0", path = "../rtic-timer" } -- cgit v1.2.3 From 71b5f9438e1beb5fe12b90415d9d6307e79c0cdf Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Mon, 23 Jan 2023 20:57:56 +0100 Subject: Fixed systick monotonic --- rtic-monotonics/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rtic-monotonics/Cargo.toml') diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index 24448fb..68daba4 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "rtic-timer" +name = "rtic-monotonics" version = "0.1.0" edition = "2021" @@ -9,4 +9,4 @@ edition = "2021" cortex-m = { version = "0.7.6" } embedded-hal-async = "0.2.0-alpha.0" fugit = { version = "0.3.6", features = ["defmt"] } -rtic-timer = { version = "1.0.0", path = "../rtic-timer" } +rtic-time = { version = "1.0.0", path = "../rtic-time" } -- cgit v1.2.3 From 922f1ad0eb56d362e527ff28e456b6fa133e212b Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Fri, 27 Jan 2023 20:20:14 +0100 Subject: Added examples for async crates + fixed codegen for non-Copy arguments --- rtic-monotonics/Cargo.toml | 1 + 1 file changed, 1 insertion(+) (limited to 'rtic-monotonics/Cargo.toml') diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index 68daba4..9d364c8 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -10,3 +10,4 @@ cortex-m = { version = "0.7.6" } embedded-hal-async = "0.2.0-alpha.0" fugit = { version = "0.3.6", features = ["defmt"] } rtic-time = { version = "1.0.0", path = "../rtic-time" } +atomic-polyfill = "1" -- cgit v1.2.3 From fe77b4538d6cd506d1a18bdc9e17216dc61881db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Wed, 1 Feb 2023 21:55:05 +0100 Subject: Add alpha.0 and required Cargo fields --- rtic-monotonics/Cargo.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'rtic-monotonics/Cargo.toml') diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index 9d364c8..bb8ff6d 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -1,7 +1,10 @@ [package] name = "rtic-monotonics" -version = "0.1.0" +version = "1.0.0-alpha.0" edition = "2021" +categories = ["concurrency", "embedded", "no-std", "asynchronous"] +description = "rtic-monotonics lib TODO" +license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -9,5 +12,5 @@ edition = "2021" cortex-m = { version = "0.7.6" } embedded-hal-async = "0.2.0-alpha.0" fugit = { version = "0.3.6", features = ["defmt"] } -rtic-time = { version = "1.0.0", path = "../rtic-time" } +rtic-time = { version = "1.0.0-alpha.0", path = "../rtic-time" } atomic-polyfill = "1" -- cgit v1.2.3 From c2d2b1ba38dd291cfcd7e32f11d725db0ec1cf85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Wed, 1 Feb 2023 22:11:50 +0100 Subject: Add authors to each Cargo.toml Copy-paste the default one used for the project --- rtic-monotonics/Cargo.toml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'rtic-monotonics/Cargo.toml') diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index bb8ff6d..5e6586e 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -1,7 +1,15 @@ [package] name = "rtic-monotonics" version = "1.0.0-alpha.0" + edition = "2021" +authors = [ + "The Real-Time Interrupt-driven Concurrency developers", + "Emil Fresk ", + "Henrik Tjäder ", + "Jorge Aparicio ", + "Per Lindgren ", +] categories = ["concurrency", "embedded", "no-std", "asynchronous"] description = "rtic-monotonics lib TODO" license = "MIT OR Apache-2.0" -- cgit v1.2.3 From 82f2f0834943cd7f69130f30904f4372d39f92e7 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Thu, 2 Feb 2023 20:14:41 +0100 Subject: Make xtask pass, clean up rtic Cargo.toml --- rtic-monotonics/Cargo.toml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'rtic-monotonics/Cargo.toml') diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index 5e6586e..f94a78b 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -22,3 +22,10 @@ embedded-hal-async = "0.2.0-alpha.0" fugit = { version = "0.3.6", features = ["defmt"] } rtic-time = { version = "1.0.0-alpha.0", path = "../rtic-time" } atomic-polyfill = "1" + +[features] +default = ["systick_1khz"] + +systick_100hz = [] +systick_1khz = [] +systick_10khz = [] -- cgit v1.2.3 From 858160a55d839bb4064006aa55ddb581259a3074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Sat, 4 Feb 2023 10:14:12 +0100 Subject: rtic-monotonics: Simplify features, default is 1kHz Make 100 Hz or 10 kHz opt in through features, which are meant for testing primarily. --- rtic-monotonics/Cargo.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'rtic-monotonics/Cargo.toml') diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index f94a78b..4014fe7 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -22,10 +22,8 @@ embedded-hal-async = "0.2.0-alpha.0" fugit = { version = "0.3.6", features = ["defmt"] } rtic-time = { version = "1.0.0-alpha.0", path = "../rtic-time" } atomic-polyfill = "1" +cfg-if = "1.0.0" [features] -default = ["systick_1khz"] - systick_100hz = [] -systick_1khz = [] systick_10khz = [] -- cgit v1.2.3 From 8963e0e27ae57f7a8c3a666fe9e5a993cdd09275 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Fri, 10 Feb 2023 07:52:50 +0100 Subject: RP2040 monotonic, rename systick monotonic to not have double name --- rtic-monotonics/Cargo.toml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'rtic-monotonics/Cargo.toml') diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index 4014fe7..2e75bdb 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -23,7 +23,12 @@ fugit = { version = "0.3.6", features = ["defmt"] } rtic-time = { version = "1.0.0-alpha.0", path = "../rtic-time" } atomic-polyfill = "1" cfg-if = "1.0.0" +rp2040-pac = { version = ">=0.2.0,<0.5", optional = true } [features] +default = [] + systick_100hz = [] systick_10khz = [] + +rp2040 = ["dep:rp2040-pac"] -- cgit v1.2.3 From b566a893930f36cb4ee9a03743a04de34e8f0445 Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Sat, 11 Feb 2023 07:55:08 +0100 Subject: rtic-monotonics: Feature gate monotonics correctly to support multiple MCUs --- rtic-monotonics/Cargo.toml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'rtic-monotonics/Cargo.toml') diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index 2e75bdb..0c942a2 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -17,18 +17,22 @@ license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -cortex-m = { version = "0.7.6" } -embedded-hal-async = "0.2.0-alpha.0" -fugit = { version = "0.3.6", features = ["defmt"] } rtic-time = { version = "1.0.0-alpha.0", path = "../rtic-time" } +embedded-hal-async = "0.2.0-alpha.0" +fugit = { version = "0.3.6" } atomic-polyfill = "1" cfg-if = "1.0.0" +cortex-m = { version = "0.7.6", optional = true } rp2040-pac = { version = ">=0.2.0,<0.5", optional = true } [features] default = [] +defmt = ["fugit/defmt"] +# Systick on Cortex-M, default 1 kHz +cortex_m_systick = ["dep:cortex-m"] systick_100hz = [] systick_10khz = [] +# Timer peripheral on the RP2040 rp2040 = ["dep:rp2040-pac"] -- cgit v1.2.3 From 002d0b0d1685473f0f81cd17346d119fc671ad9c Mon Sep 17 00:00:00 2001 From: datdenkikniet Date: Wed, 15 Feb 2023 23:21:52 +0100 Subject: Make embedded-hal-async dependency optional for better compatibility with HALs Some hals implement traits for embedded-hal version `=1.0.0.alpha.`, which is explicitly incompatible with the version `=1.0.0.alpha.9` which embedded-hal-async depends on. Making the dependency optional allows downstream projects to include rtic-monotonic without requiring that all of their other libraries also implement that specific version of embedded-hal 1.0 --- rtic-monotonics/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rtic-monotonics/Cargo.toml') diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index 0c942a2..d60b68c 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -18,7 +18,7 @@ license = "MIT OR Apache-2.0" [dependencies] rtic-time = { version = "1.0.0-alpha.0", path = "../rtic-time" } -embedded-hal-async = "0.2.0-alpha.0" +embedded-hal-async = { version = "0.2.0-alpha.0", optional = true } fugit = { version = "0.3.6" } atomic-polyfill = "1" cfg-if = "1.0.0" -- cgit v1.2.3 From 44af1366056a06247b3ee0f153d5274cb4658c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Sat, 4 Mar 2023 02:26:34 +0100 Subject: CFG: Align all crates to use hyphen --- rtic-monotonics/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rtic-monotonics/Cargo.toml') diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index d60b68c..c961c05 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -30,9 +30,9 @@ default = [] defmt = ["fugit/defmt"] # Systick on Cortex-M, default 1 kHz -cortex_m_systick = ["dep:cortex-m"] -systick_100hz = [] -systick_10khz = [] +cortex-m-systick = ["dep:cortex-m"] +systick-100hz = [] +systick-10khz = [] # Timer peripheral on the RP2040 rp2040 = ["dep:rp2040-pac"] -- cgit v1.2.3