Skip to content

Commit 0e3d80e

Browse files
committed
Use CamelCase for gpio::Edge enum variants
1 parent f6ccb4d commit 0e3d80e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

examples/exti_button.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fn main() -> ! {
4141
let gpioc = pac_periph.GPIOC.split();
4242
let mut button = gpioc.pc13.into_floating_input();
4343
button.make_interrupt_source(&mut syscfg, &mut rcc);
44-
button.trigger_on_edge(&mut exti, Edge::RISING);
44+
button.trigger_on_edge(&mut exti, Edge::Rising);
4545
button.enable_interrupt(&mut exti);
4646

4747
// Freeze clocks

src/gpio.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ pub enum Speed {
7373

7474
#[derive(Debug, PartialEq)]
7575
pub enum Edge {
76-
RISING,
77-
FALLING,
78-
RISING_FALLING,
76+
Rising,
77+
Falling,
78+
RisingFalling,
7979
}
8080

8181
/// External Interrupt Pin
@@ -232,15 +232,15 @@ macro_rules! gpio {
232232
/// Generate interrupt on rising edge, falling edge or both
233233
fn trigger_on_edge(&mut self, exti: &mut EXTI, edge: Edge) {
234234
match edge {
235-
Edge::RISING => {
235+
Edge::Rising => {
236236
exti.rtsr.modify(|r, w| unsafe { w.bits(r.bits() | (1 << self.i)) });
237237
exti.ftsr.modify(|r, w| unsafe { w.bits(r.bits() & !(1 << self.i)) });
238238
},
239-
Edge::FALLING => {
239+
Edge::Falling => {
240240
exti.ftsr.modify(|r, w| unsafe { w.bits(r.bits() | (1 << self.i)) });
241241
exti.rtsr.modify(|r, w| unsafe { w.bits(r.bits() & !(1 << self.i)) });
242242
},
243-
Edge::RISING_FALLING => {
243+
Edge::RisingFalling => {
244244
exti.rtsr.modify(|r, w| unsafe { w.bits(r.bits() | (1 << self.i)) });
245245
exti.ftsr.modify(|r, w| unsafe { w.bits(r.bits() | (1 << self.i)) });
246246
}
@@ -641,15 +641,15 @@ macro_rules! gpio {
641641
/// Generate interrupt on rising edge, falling edge or both
642642
fn trigger_on_edge(&mut self, exti: &mut EXTI, edge: Edge) {
643643
match edge {
644-
Edge::RISING => {
644+
Edge::Rising => {
645645
exti.rtsr.modify(|r, w| unsafe { w.bits(r.bits() | (1 << $i)) });
646646
exti.ftsr.modify(|r, w| unsafe { w.bits(r.bits() & !(1 << $i)) });
647647
},
648-
Edge::FALLING => {
648+
Edge::Falling => {
649649
exti.ftsr.modify(|r, w| unsafe { w.bits(r.bits() | (1 << $i)) });
650650
exti.rtsr.modify(|r, w| unsafe { w.bits(r.bits() & !(1 << $i)) });
651651
},
652-
Edge::RISING_FALLING => {
652+
Edge::RisingFalling => {
653653
exti.rtsr.modify(|r, w| unsafe { w.bits(r.bits() | (1 << $i)) });
654654
exti.ftsr.modify(|r, w| unsafe { w.bits(r.bits() | (1 << $i)) });
655655
}

0 commit comments

Comments
 (0)