Skip to content

Commit 8b84f85

Browse files
authored
Use CamelCase for gpio::Edge enum variants (#187)
1 parent 09c6526 commit 8b84f85

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

examples/irq_button.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fn main() -> ! {
4646
.into_pull_up_input(&mut gpioc.moder, &mut gpioc.pupdr);
4747
board_btn.make_interrupt_source(&mut dp.SYSCFG, &mut rcc.apb2);
4848
board_btn.enable_interrupt(&mut dp.EXTI);
49-
board_btn.trigger_on_edge(&mut dp.EXTI, Edge::FALLING);
49+
board_btn.trigger_on_edge(&mut dp.EXTI, Edge::Falling);
5050

5151
// Enable interrupts
5252
unsafe {

src/gpio.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,11 @@ pub struct AF14;
115115
/// Alternate function 15 (type state)
116116
pub struct AF15;
117117

118-
// Using SCREAMING_SNAKE_CASE to be consistent with other HALs
119-
// see 59b2740 and #125 for motivation
120-
#[allow(non_camel_case_types)]
121118
#[derive(Debug, PartialEq)]
122119
pub enum Edge {
123-
RISING,
124-
FALLING,
125-
RISING_FALLING,
120+
Rising,
121+
Falling,
122+
RisingFalling,
126123
}
127124

128125
/// External Interrupt Pin
@@ -354,15 +351,15 @@ macro_rules! gpio {
354351
/// Generate interrupt on rising edge, falling edge or both
355352
fn trigger_on_edge(&mut self, exti: &mut EXTI, edge: Edge) {
356353
match edge {
357-
Edge::RISING => {
354+
Edge::Rising => {
358355
exti.rtsr1.modify(|r, w| unsafe { w.bits(r.bits() | (1 << self.i)) });
359356
exti.ftsr1.modify(|r, w| unsafe { w.bits(r.bits() & !(1 << self.i)) });
360357
},
361-
Edge::FALLING => {
358+
Edge::Falling => {
362359
exti.ftsr1.modify(|r, w| unsafe { w.bits(r.bits() | (1 << self.i)) });
363360
exti.rtsr1.modify(|r, w| unsafe { w.bits(r.bits() & !(1 << self.i)) });
364361
},
365-
Edge::RISING_FALLING => {
362+
Edge::RisingFalling => {
366363
exti.rtsr1.modify(|r, w| unsafe { w.bits(r.bits() | (1 << self.i)) });
367364
exti.ftsr1.modify(|r, w| unsafe { w.bits(r.bits() | (1 << self.i)) });
368365
}
@@ -699,15 +696,15 @@ macro_rules! gpio {
699696
/// Generate interrupt on rising edge, falling edge or both
700697
fn trigger_on_edge(&mut self, exti: &mut EXTI, edge: Edge) {
701698
match edge {
702-
Edge::RISING => {
699+
Edge::Rising => {
703700
exti.rtsr1.modify(|r, w| unsafe { w.bits(r.bits() | (1 << $i)) });
704701
exti.ftsr1.modify(|r, w| unsafe { w.bits(r.bits() & !(1 << $i)) });
705702
},
706-
Edge::FALLING => {
703+
Edge::Falling => {
707704
exti.ftsr1.modify(|r, w| unsafe { w.bits(r.bits() | (1 << $i)) });
708705
exti.rtsr1.modify(|r, w| unsafe { w.bits(r.bits() & !(1 << $i)) });
709706
},
710-
Edge::RISING_FALLING => {
707+
Edge::RisingFalling => {
711708
exti.rtsr1.modify(|r, w| unsafe { w.bits(r.bits() | (1 << $i)) });
712709
exti.ftsr1.modify(|r, w| unsafe { w.bits(r.bits() | (1 << $i)) });
713710
}

0 commit comments

Comments
 (0)