Merge branch 'rtic-rs:master' into master

rtic-rs · Jan 10, 2024 · 4ee01cc · 4ee01cc
2 parents 15fa83d + 53a7bca
commit 4ee01cc
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 40 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -380,7 +380,7 @@ jobs:
           tar -cf apidocs.tar apidocs
 
       - name: Store the API docs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apidocs
           path: apidocs.tar
@@ -436,7 +436,7 @@ jobs:
           tar -cf book.tar bookroot
 
       - name: Store the Book + API docs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: book
           path: book.tar
@@ -512,7 +512,7 @@ jobs:
           tar -cf mdbookold.tar mdbookold
 
       - name: Store the old API docs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mdbookold
           path: mdbookold.tar
@@ -695,7 +695,7 @@ jobs:
           tar -cf bookstodeploy.tar bookstodeploy
 
       - name: Store the books
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bookstodeploy
           path: bookstodeploy.tar

diff --git a/examples/hifive1/Cargo.lock b/examples/hifive1/Cargo.lock
diff --git a/rtic-monotonics/CHANGELOG.md b/rtic-monotonics/CHANGELOG.md
@@ -7,6 +7,12 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
 
 ## Unreleased
 
+## v1.5.0 - 2024-01-10
+
+### Changed
+
+- Using `embedded-hal` 1.0.
+
 ## v1.4.1 - 2023-12-06
 
 ### Fixed

diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rtic-monotonics"
-version = "1.4.1"
+version = "1.5.0"
 
 edition = "2021"
 authors = [
@@ -29,8 +29,8 @@ rustdoc-flags = ["--cfg", "docsrs"]
 
 [dependencies]
 rtic-time = { version = "1.1.0", path = "../rtic-time" }
-embedded-hal = { version = "1.0.0-rc.2" }
-embedded-hal-async = { version = "1.0.0-rc.2", optional = true }
+embedded-hal = { version = "1.0" }
+embedded-hal-async = { version = "1.0", optional = true }
 fugit = { version = "0.3.6" }
 atomic-polyfill = "1"
 cfg-if = "1.0.0"

diff --git a/rtic-sync/CHANGELOG.md b/rtic-sync/CHANGELOG.md
@@ -7,12 +7,16 @@ For each category, _Added_, _Changed_, _Fixed_ add new entries at the top!
 
 ## [Unreleased]
 
-### Added
+## v1.2.0 - 2024-01-10
 
 ### Changed
 
+- Using `embedded-hal` 1.0.
+
 ### Fixed
 
+- `make_channel` now accepts `Type` expressions instead of only `TypePath` expressions.
+
 ## v1.1.1 - 2023-12-04
 
 ### Fixed

diff --git a/rtic-sync/Cargo.toml b/rtic-sync/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rtic-sync"
-version = "1.1.1"
+version = "1.2.0"
 
 edition = "2021"
 authors = [
@@ -25,9 +25,9 @@ heapless = "0.8"
 critical-section = "1"
 rtic-common = { version = "1.0.0", path = "../rtic-common" }
 portable-atomic = { version = "1", default-features = false }
-embedded-hal = { version = "1.0.0-rc.2", optional = true }
-embedded-hal-async = { version = "1.0.0-rc.2", optional = true }
-embedded-hal-bus = { version = "0.1.0-rc.2", optional = true, features = ["async"] }
+embedded-hal = { version = "1.0", optional = true }
+embedded-hal-async = { version = "1.0", optional = true }
+embedded-hal-bus = { version = "0.1.0", optional = true, features = ["async"] }
 
 [dev-dependencies]
 tokio = { version = "1", features = ["rt", "macros", "time"] }

diff --git a/rtic-sync/src/channel.rs b/rtic-sync/src/channel.rs
@@ -104,7 +104,7 @@ impl<T, const N: usize> Channel<T, N> {
 /// Creates a split channel with `'static` lifetime.
 #[macro_export]
 macro_rules! make_channel {
-    ($type:path, $size:expr) => {{
+    ($type:ty, $size:expr) => {{
         static mut CHANNEL: $crate::channel::Channel<$type, $size> =
             $crate::channel::Channel::new();
 
@@ -596,4 +596,9 @@ mod tests {
         make();
         make();
     }
+
+    #[test]
+    fn tuple_channel() {
+        let _ = make_channel!((i32, u32), 10);
+    }
 }
diff --git a/rtic-time/CHANGELOG.md b/rtic-time/CHANGELOG.md
@@ -13,6 +13,12 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
 
 ### Fixed
 
+## v1.3.0 - 2024-01-10
+
+### Changed
+
+- Using `embedded-hal` 1.0.
+
 ## v1.2.0 - 2023-12-06
 
 ### Changed

diff --git a/rtic-time/Cargo.toml b/rtic-time/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rtic-time"
-version = "1.2.0"
+version = "1.3.0"
 
 edition = "2021"
 authors = [
@@ -23,8 +23,8 @@ futures-util = { version = "0.3.25", default-features = false }
 rtic-common = { version = "1.0.0", path = "../rtic-common" }
 
 [dev-dependencies]
-embedded-hal = { version = "1.0.0-rc.2" }
-embedded-hal-async = { version = "1.0.0-rc.2" }
+embedded-hal = { version = "1.0" }
+embedded-hal-async = { version = "1.0" }
 fugit = "0.3.7"
 parking_lot = "0.12"
 cassette = "0.2"