aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jorge Aparicio <jorge@japaric.io> 2018-09-06 21:38:27 +0200
committerGravatar GitHub <noreply@github.com> 2018-09-06 21:38:27 +0200
commitc38e828bc11dbc5a4e35e7ac5cf89ca5831d1e0b (patch)
tree8dcb39081a4975474aabdc93b0df5f0c520e13f7
parent63334e29e22fb18ca42e7611dd8364fa588c4d5c (diff)
parentf5ce9839664bd5723cc0f7f934e9c0a38de25c41 (diff)
downloadcortex-m-c38e828bc11dbc5a4e35e7ac5cf89ca5831d1e0b.tar.gz
cortex-m-c38e828bc11dbc5a4e35e7ac5cf89ca5831d1e0b.tar.zst
cortex-m-c38e828bc11dbc5a4e35e7ac5cf89ca5831d1e0b.zip
Merge branch 'master' into master
-rw-r--r--CHANGELOG.md5
-rw-r--r--src/macros.rs6
2 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66ce1c1..8680ed8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- `DCB::enable_trace()` and `DCB::disable_trace()`
+### Changed
+
+- `iprintln!` no longer depends on `iprint!`. `cortex_m::iprintln!` will work
+ even if `cortex_m::iprint` has not been imported.
+
## [v0.5.6] - 2018-08-27
### Fixed
diff --git a/src/macros.rs b/src/macros.rs
index e41cdc5..813552f 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -13,13 +13,13 @@ macro_rules! iprint {
#[macro_export]
macro_rules! iprintln {
($channel:expr) => {
- iprint!($channel, "\n");
+ $crate::itm::write_str($channel, "\n");
};
($channel:expr, $fmt:expr) => {
- iprint!($channel, concat!($fmt, "\n"));
+ $crate::itm::write_str($channel, concat!($fmt, "\n"));
};
($channel:expr, $fmt:expr, $($arg:tt)*) => {
- iprint!($channel, concat!($fmt, "\n"), $($arg)*);
+ $crate::itm::write_fmt($channel, format_args!(concat!($fmt, "\n"), $($arg)*));
};
}