diff --git a/src/main.rs b/src/main.rs index 9faf11a76fa3bee1be6fcccceea0054b847d9493..1c23e4039674c23a6f4c042089810ec004b68762 100644 --- a/src/main.rs +++ b/src/main.rs @@ -26,8 +26,6 @@ const APP: () = { struct Resources { // late resources GPIOA: stm32::GPIOA, - GPIOC: stm32::GPIOC, - //button: <stm32::GPIOC as int>::PC13, } #[init(schedule = [toggle])] @@ -61,15 +59,9 @@ const APP: () = { // configure PA5 as output, RM0368 8.4.1 device.GPIOA.moder.modify(|_, w| w.moder5().bits(1)); - // Test button thingy. Think I put PC13 to input - device.GPIOC.moder.modify(|_, w| w.moder13().bits(0)); - // device.GPIOC.pupdr.modify(|_, w| w.pupdr13().bits(0)); - // pass on late resources init::LateResources { GPIOA: device.GPIOA, - GPIOC: device.GPIOC, - //button: device.button, } } @@ -84,7 +76,7 @@ const APP: () = { - #[task(resources = [GPIOA,GPIOC], schedule = [toggle])] + #[task(resources = [GPIOA], schedule = [toggle])] fn toggle(cx: toggle::Context) { static mut TOGGLE: bool = false; rprintln!("toggle @ {:?}", Instant::now()); @@ -95,13 +87,19 @@ const APP: () = { cx.resources.GPIOA.bsrr.write(|w| w.br5().set_bit()); } +<<<<<<< HEAD //cx.resources.GPIOC.PullDown; +======= +>>>>>>> 80d2d39 (changed main) *TOGGLE = !*TOGGLE; cx.schedule .toggle(cx.scheduled + 16_000_000.cycles()) .unwrap(); +<<<<<<< HEAD +======= +>>>>>>> 80d2d39 (changed main) } extern "C" {