aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar David O'Connor <david.alan.oconnor@gmail.com> 2021-06-12 16:23:25 -0400
committerGravatar David O'Connor <david.alan.oconnor@gmail.com> 2021-06-12 16:23:25 -0400
commit7329f5710843ca70f1fc2f0266c11805e98db870 (patch)
treeeea835884c53fc98e5acd90a3dcafa5b86864271
parentd13ebd2015b7a0326934d75fd04df5a4cba1f0a6 (diff)
downloadcortex-m-7329f5710843ca70f1fc2f0266c11805e98db870.tar.gz
cortex-m-7329f5710843ca70f1fc2f0266c11805e98db870.tar.zst
cortex-m-7329f5710843ca70f1fc2f0266c11805e98db870.zip
remove inline on delay_us, and made u32 conversion syntax consistent
-rw-r--r--src/delay.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/delay.rs b/src/delay.rs
index 6f65363..3785907 100644
--- a/src/delay.rs
+++ b/src/delay.rs
@@ -30,7 +30,6 @@ impl Delay {
}
/// Delay using the Cortex-M systick for a certain duration, in µs.
- #[inline]
pub fn delay_us(&mut self, us: u32) {
let ticks = (us as u64) * (self.ahb_frequency as u64) / 1_000_000;
@@ -88,14 +87,14 @@ impl DelayMs<i32> for Delay {
impl DelayMs<u16> for Delay {
#[inline(always)]
fn delay_ms(&mut self, ms: u16) {
- Delay::delay_ms(self, u32::from(ms));
+ Delay::delay_ms(self, ms as u32);
}
}
impl DelayMs<u8> for Delay {
#[inline(always)]
fn delay_ms(&mut self, ms: u8) {
- Delay::delay_ms(self, u32::from(ms));
+ Delay::delay_ms(self, ms as u32);
}
}
@@ -118,13 +117,13 @@ impl DelayUs<i32> for Delay {
impl DelayUs<u16> for Delay {
#[inline(always)]
fn delay_us(&mut self, us: u16) {
- Delay::delay_us(self, u32::from(us))
+ Delay::delay_us(self, us as u32)
}
}
impl DelayUs<u8> for Delay {
#[inline(always)]
fn delay_us(&mut self, us: u8) {
- Delay::delay_us(self, u32::from(us))
+ Delay::delay_us(self, us as u32)
}
}