Skip to content

Commit c38e828

Browse files
authored
Merge branch 'master' into master
2 parents 63334e2 + f5ce983 commit c38e828

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1313

1414
- `DCB::enable_trace()` and `DCB::disable_trace()`
1515

16+
### Changed
17+
18+
- `iprintln!` no longer depends on `iprint!`. `cortex_m::iprintln!` will work
19+
even if `cortex_m::iprint` has not been imported.
20+
1621
## [v0.5.6] - 2018-08-27
1722

1823
### Fixed

src/macros.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ macro_rules! iprint {
1313
#[macro_export]
1414
macro_rules! iprintln {
1515
($channel:expr) => {
16-
iprint!($channel, "\n");
16+
$crate::itm::write_str($channel, "\n");
1717
};
1818
($channel:expr, $fmt:expr) => {
19-
iprint!($channel, concat!($fmt, "\n"));
19+
$crate::itm::write_str($channel, concat!($fmt, "\n"));
2020
};
2121
($channel:expr, $fmt:expr, $($arg:tt)*) => {
22-
iprint!($channel, concat!($fmt, "\n"), $($arg)*);
22+
$crate::itm::write_fmt($channel, format_args!(concat!($fmt, "\n"), $($arg)*));
2323
};
2424
}
2525

0 commit comments

Comments
 (0)