Skip to content

Commit 1c5db27

Browse files
bors[bot]AfoHT
andauthored
Merge #698
698: Release: v1.1.4 r=perlindgren a=AfoHT Co-authored-by: Henrik Tjäder <[email protected]>
2 parents d43c2b6 + e1a0987 commit 1c5db27

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
99

1010
### Added
1111

12+
### Fixed
13+
14+
### Changed
15+
16+
## [v1.1.4] - 2023-02-26
17+
18+
### Added
19+
1220
- CFG: Support #[cfg] on HW task, cleanup for SW tasks
1321
- CFG: Slightly improved support for #[cfg] on Monotonics
1422
- 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
551559

552560
- Initial release
553561

554-
[Unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.3...HEAD
562+
[Unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.4...HEAD
563+
[v1.1.4]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.3...v1.1.4
555564
[v1.1.3]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.2...v1.1.3
556565
[v1.1.2]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.1...v1.1.2
557566
[v1.1.1]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.0...v1.1.1

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ name = "cortex-m-rtic"
1414
readme = "README.md"
1515
repository = "https://github.com/rtic-rs/cortex-m-rtic"
1616

17-
version = "1.1.3"
17+
version = "1.1.4"
1818

1919
[lib]
2020
name = "rtic"
2121

2222
[dependencies]
2323
cortex-m = "0.7.0"
24-
cortex-m-rtic-macros = { path = "macros", version = "1.1.5" }
24+
cortex-m-rtic-macros = { path = "macros", version = "1.1.6" }
2525
rtic-monotonic = "1.0.0"
2626
rtic-core = "1.0.0"
2727
heapless = "0.7.7"

ci/expected/pool.run

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
bar(0x20000088)
2-
foo(0x2000010c)

examples/pool.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pool!(P: [u8; 128]);
2020
#[app(device = lm3s6965, dispatchers = [SSI0, QEI0])]
2121
mod app {
2222
use crate::{Box, Pool};
23-
use cortex_m_semihosting::{debug, hprintln};
23+
use cortex_m_semihosting::debug;
2424
use lm3s6965::Interrupt;
2525

2626
// Import the memory pool into scope
@@ -57,19 +57,15 @@ mod app {
5757
}
5858

5959
#[task]
60-
fn foo(_: foo::Context, x: Box<P>) {
61-
hprintln!("foo({:?})", x.as_ptr());
62-
60+
fn foo(_: foo::Context, _x: Box<P>) {
6361
// explicitly return the block to the pool
64-
drop(x);
62+
drop(_x);
6563

6664
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
6765
}
6866

6967
#[task(priority = 2)]
70-
fn bar(_: bar::Context, x: Box<P>) {
71-
hprintln!("bar({:?})", x.as_ptr());
72-
68+
fn bar(_: bar::Context, _x: Box<P>) {
7369
// this is done automatically so we can omit the call to `drop`
7470
// drop(x);
7571
}

macros/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
1212
name = "cortex-m-rtic-macros"
1313
readme = "../README.md"
1414
repository = "https://github.com/rtic-rs/cortex-m-rtic"
15-
version = "1.1.5"
15+
version = "1.1.6"
1616

1717
[lib]
1818
proc-macro = true
@@ -22,7 +22,7 @@ proc-macro2 = "1"
2222
proc-macro-error = "1"
2323
quote = "1"
2424
syn = "1"
25-
rtic-syntax = "1.0.2"
25+
rtic-syntax = "1.0.3"
2626

2727
[features]
2828
debugprint = []

0 commit comments

Comments
 (0)