diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2023-03-29 18:13:02 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-03-29 18:13:02 +0000 |
| commit | 56f7c61aa84c6e6967f396a5b38567151e4bedb2 (patch) | |
| tree | 25929628a3bdaaeebb7a0f921ceb6ade75830151 | |
| parent | 3a0e2ac92438c818f7f12d894c576de9af9fcc01 (diff) | |
| parent | ee6e6938f6cf216b55a7a2a6695980fc0ef9a629 (diff) | |
| download | rtic-56f7c61aa84c6e6967f396a5b38567151e4bedb2.tar.gz rtic-56f7c61aa84c6e6967f396a5b38567151e4bedb2.tar.zst rtic-56f7c61aa84c6e6967f396a5b38567151e4bedb2.zip | |
Merge #718
718: Update monotonic token macro names r=AfoHT a=korken89
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
| -rw-r--r-- | rtic-monotonics/src/rp2040.rs | 2 | ||||
| -rw-r--r-- | rtic-monotonics/src/systick.rs | 2 | ||||
| -rw-r--r-- | rtic/examples/async-delay.rs | 2 | ||||
| -rw-r--r-- | rtic/examples/async-timeout.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/rtic-monotonics/src/rp2040.rs b/rtic-monotonics/src/rp2040.rs index 6aa66ce0..9d2f4f35 100644 --- a/rtic-monotonics/src/rp2040.rs +++ b/rtic-monotonics/src/rp2040.rs @@ -138,7 +138,7 @@ impl embedded_hal_async::delay::DelayUs for Timer { /// Register the Timer interrupt for the monotonic. #[macro_export] -macro_rules! make_rp2040_monotonic_handler { +macro_rules! create_rp2040_monotonic_token { () => {{ #[no_mangle] #[allow(non_snake_case)] diff --git a/rtic-monotonics/src/systick.rs b/rtic-monotonics/src/systick.rs index b228e204..f4345d43 100644 --- a/rtic-monotonics/src/systick.rs +++ b/rtic-monotonics/src/systick.rs @@ -156,7 +156,7 @@ impl embedded_hal_async::delay::DelayUs for Systick { /// Register the Systick interrupt for the monotonic. #[macro_export] -macro_rules! make_systick_handler { +macro_rules! create_systick_token { () => {{ #[no_mangle] #[allow(non_snake_case)] diff --git a/rtic/examples/async-delay.rs b/rtic/examples/async-delay.rs index 7b3667b0..cdffa620 100644 --- a/rtic/examples/async-delay.rs +++ b/rtic/examples/async-delay.rs @@ -24,7 +24,7 @@ mod app { fn init(cx: init::Context) -> (Shared, Local) { hprintln!("init"); - let systick_token = rtic_monotonics::make_systick_handler!(); + let systick_token = rtic_monotonics::create_systick_token!(); Systick::start(cx.core.SYST, 12_000_000, systick_token); foo::spawn().ok(); diff --git a/rtic/examples/async-timeout.rs b/rtic/examples/async-timeout.rs index e07e9c6f..7690408e 100644 --- a/rtic/examples/async-timeout.rs +++ b/rtic/examples/async-timeout.rs @@ -27,7 +27,7 @@ mod app { fn init(cx: init::Context) -> (Shared, Local) { hprintln!("init"); - let systick_token = rtic_monotonics::make_systick_handler!(); + let systick_token = rtic_monotonics::create_systick_token!(); Systick::start(cx.core.SYST, 12_000_000, systick_token); foo::spawn().ok(); |