aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md11
-rw-r--r--Cargo.toml4
-rw-r--r--ci/expected/pool.run2
-rw-r--r--examples/pool.rs12
-rw-r--r--macros/Cargo.toml4
5 files changed, 18 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9432cab7..d1722781 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,14 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
### Added
+### Fixed
+
+### Changed
+
+## [v1.1.4] - 2023-02-26
+
+### Added
+
- CFG: Support #[cfg] on HW task, cleanup for SW tasks
- CFG: Slightly improved support for #[cfg] on Monotonics
- CI: Check examples also for thumbv8.{base,main}
@@ -551,7 +559,8 @@ Yanked due to a soundness issue in `init`; the issue has been mostly fixed in v0
- Initial release
-[Unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.3...HEAD
+[Unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.4...HEAD
+[v1.1.4]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.3...v1.1.4
[v1.1.3]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.2...v1.1.3
[v1.1.2]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.1...v1.1.2
[v1.1.1]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.0...v1.1.1
diff --git a/Cargo.toml b/Cargo.toml
index 4dbc2431..68fea4cb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,14 +14,14 @@ name = "cortex-m-rtic"
readme = "README.md"
repository = "https://github.com/rtic-rs/cortex-m-rtic"
-version = "1.1.3"
+version = "1.1.4"
[lib]
name = "rtic"
[dependencies]
cortex-m = "0.7.0"
-cortex-m-rtic-macros = { path = "macros", version = "1.1.5" }
+cortex-m-rtic-macros = { path = "macros", version = "1.1.6" }
rtic-monotonic = "1.0.0"
rtic-core = "1.0.0"
heapless = "0.7.7"
diff --git a/ci/expected/pool.run b/ci/expected/pool.run
index 81f79d41..e69de29b 100644
--- a/ci/expected/pool.run
+++ b/ci/expected/pool.run
@@ -1,2 +0,0 @@
-bar(0x20000088)
-foo(0x2000010c)
diff --git a/examples/pool.rs b/examples/pool.rs
index ab76370e..4c551bef 100644
--- a/examples/pool.rs
+++ b/examples/pool.rs
@@ -20,7 +20,7 @@ pool!(P: [u8; 128]);
#[app(device = lm3s6965, dispatchers = [SSI0, QEI0])]
mod app {
use crate::{Box, Pool};
- use cortex_m_semihosting::{debug, hprintln};
+ use cortex_m_semihosting::debug;
use lm3s6965::Interrupt;
// Import the memory pool into scope
@@ -57,19 +57,15 @@ mod app {
}
#[task]
- fn foo(_: foo::Context, x: Box<P>) {
- hprintln!("foo({:?})", x.as_ptr());
-
+ fn foo(_: foo::Context, _x: Box<P>) {
// explicitly return the block to the pool
- drop(x);
+ drop(_x);
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
#[task(priority = 2)]
- fn bar(_: bar::Context, x: Box<P>) {
- hprintln!("bar({:?})", x.as_ptr());
-
+ fn bar(_: bar::Context, _x: Box<P>) {
// this is done automatically so we can omit the call to `drop`
// drop(x);
}
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
index f1111e6c..c3f05614 100644
--- a/macros/Cargo.toml
+++ b/macros/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
name = "cortex-m-rtic-macros"
readme = "../README.md"
repository = "https://github.com/rtic-rs/cortex-m-rtic"
-version = "1.1.5"
+version = "1.1.6"
[lib]
proc-macro = true
@@ -22,7 +22,7 @@ proc-macro2 = "1"
proc-macro-error = "1"
quote = "1"
syn = "1"
-rtic-syntax = "1.0.2"
+rtic-syntax = "1.0.3"
[features]
debugprint = []