Skip to content

Commit 27b5a9e

Browse files
committed
Change trait functions to line up with digital traits
1 parent 9ac5866 commit 27b5a9e

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/gpio.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ pub trait GpioExt {
1212
}
1313

1414
trait GpioRegExt {
15-
fn in_low(&self, pos: u8) -> bool;
16-
fn out_low(&self, pos: u8) -> bool;
15+
fn is_low(&self, pos: u8) -> bool;
16+
fn is_set_low(&self, pos: u8) -> bool;
1717
fn set_high(&self, pos: u8);
1818
fn set_low(&self, pos: u8);
1919
}
@@ -71,7 +71,7 @@ impl<MODE> StatefulOutputPin for Pin<Output<MODE>> {
7171
}
7272

7373
fn is_set_low(&self) -> bool {
74-
unsafe { (*self.port).out_low(self.i) }
74+
unsafe { (*self.port).is_set_low(self.i) }
7575
}
7676
}
7777

@@ -93,7 +93,7 @@ impl InputPin for Pin<Output<OpenDrain>> {
9393
}
9494

9595
fn is_low(&self) -> bool {
96-
unsafe { (*self.port).in_low(self.i) }
96+
unsafe { (*self.port).is_low(self.i) }
9797
}
9898
}
9999

@@ -103,19 +103,19 @@ impl<MODE> InputPin for Pin<Input<MODE>> {
103103
}
104104

105105
fn is_low(&self) -> bool {
106-
unsafe { (*self.port).in_low(self.i) }
106+
unsafe { (*self.port).is_low(self.i) }
107107
}
108108
}
109109

110110
macro_rules! gpio_trait {
111111
($gpiox:ident) => {
112112
impl GpioRegExt for crate::stm32::$gpiox::RegisterBlock {
113-
fn in_low(&self, pos: u8) -> bool {
113+
fn is_low(&self, pos: u8) -> bool {
114114
// NOTE(unsafe) atomic read with no side effects
115115
self.idr.read().bits() & (1 << pos) == 0
116116
}
117117

118-
fn out_low(&self, pos: u8) -> bool {
118+
fn is_set_low(&self, pos: u8) -> bool {
119119
// NOTE(unsafe) atomic read with no side effects
120120
self.odr.read().bits() & (1 << pos) == 0
121121
}
@@ -443,7 +443,7 @@ macro_rules! gpio {
443443
}
444444

445445
fn is_set_low(&self) -> bool {
446-
unsafe { (*$GPIOX::ptr()).out_low($i) }
446+
unsafe { (*$GPIOX::ptr()).is_set_low($i) }
447447
}
448448
}
449449

@@ -465,7 +465,7 @@ macro_rules! gpio {
465465
}
466466

467467
fn is_low(&self) -> bool {
468-
unsafe { (*$GPIOX::ptr()).in_low($i) }
468+
unsafe { (*$GPIOX::ptr()).is_low($i) }
469469
}
470470
}
471471

@@ -489,7 +489,7 @@ macro_rules! gpio {
489489
}
490490

491491
fn is_low(&self) -> bool {
492-
unsafe { (*$GPIOX::ptr()).in_low($i) }
492+
unsafe { (*$GPIOX::ptr()).is_low($i) }
493493
}
494494
}
495495
)+

0 commit comments

Comments
 (0)