@@ -12,8 +12,8 @@ pub trait GpioExt {
12
12
}
13
13
14
14
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 ;
17
17
fn set_high ( & self , pos : u8 ) ;
18
18
fn set_low ( & self , pos : u8 ) ;
19
19
}
@@ -71,7 +71,7 @@ impl<MODE> StatefulOutputPin for Pin<Output<MODE>> {
71
71
}
72
72
73
73
fn is_set_low ( & self ) -> bool {
74
- unsafe { ( * self . port ) . out_low ( self . i ) }
74
+ unsafe { ( * self . port ) . is_set_low ( self . i ) }
75
75
}
76
76
}
77
77
@@ -93,7 +93,7 @@ impl InputPin for Pin<Output<OpenDrain>> {
93
93
}
94
94
95
95
fn is_low ( & self ) -> bool {
96
- unsafe { ( * self . port ) . in_low ( self . i ) }
96
+ unsafe { ( * self . port ) . is_low ( self . i ) }
97
97
}
98
98
}
99
99
@@ -103,19 +103,19 @@ impl<MODE> InputPin for Pin<Input<MODE>> {
103
103
}
104
104
105
105
fn is_low ( & self ) -> bool {
106
- unsafe { ( * self . port ) . in_low ( self . i ) }
106
+ unsafe { ( * self . port ) . is_low ( self . i ) }
107
107
}
108
108
}
109
109
110
110
macro_rules! gpio_trait {
111
111
( $gpiox: ident) => {
112
112
impl GpioRegExt for crate :: stm32:: $gpiox:: RegisterBlock {
113
- fn in_low ( & self , pos: u8 ) -> bool {
113
+ fn is_low ( & self , pos: u8 ) -> bool {
114
114
// NOTE(unsafe) atomic read with no side effects
115
115
self . idr. read( ) . bits( ) & ( 1 << pos) == 0
116
116
}
117
117
118
- fn out_low ( & self , pos: u8 ) -> bool {
118
+ fn is_set_low ( & self , pos: u8 ) -> bool {
119
119
// NOTE(unsafe) atomic read with no side effects
120
120
self . odr. read( ) . bits( ) & ( 1 << pos) == 0
121
121
}
@@ -443,7 +443,7 @@ macro_rules! gpio {
443
443
}
444
444
445
445
fn is_set_low( & self ) -> bool {
446
- unsafe { ( * $GPIOX:: ptr( ) ) . out_low ( $i) }
446
+ unsafe { ( * $GPIOX:: ptr( ) ) . is_set_low ( $i) }
447
447
}
448
448
}
449
449
@@ -465,7 +465,7 @@ macro_rules! gpio {
465
465
}
466
466
467
467
fn is_low( & self ) -> bool {
468
- unsafe { ( * $GPIOX:: ptr( ) ) . in_low ( $i) }
468
+ unsafe { ( * $GPIOX:: ptr( ) ) . is_low ( $i) }
469
469
}
470
470
}
471
471
@@ -489,7 +489,7 @@ macro_rules! gpio {
489
489
}
490
490
491
491
fn is_low( & self ) -> bool {
492
- unsafe { ( * $GPIOX:: ptr( ) ) . in_low ( $i) }
492
+ unsafe { ( * $GPIOX:: ptr( ) ) . is_low ( $i) }
493
493
}
494
494
}
495
495
) +
0 commit comments