Skip to content
Snippets Groups Projects
Commit f67ce472 authored by Jonas Jacobsson's avatar Jonas Jacobsson
Browse files

This will be removed

parent cddc31ff
No related branches found
No related tags found
No related merge requests found
...@@ -26,11 +26,8 @@ const APP: () = { ...@@ -26,11 +26,8 @@ const APP: () = {
struct Resources { struct Resources {
// late resources // late resources
GPIOA: stm32::GPIOA, GPIOA: stm32::GPIOA,
<<<<<<< HEAD
GPIOC: stm32::GPIOC, GPIOC: stm32::GPIOC,
//button: <stm32::GPIOC as int>::PC13, //button: <stm32::GPIOC as int>::PC13,
=======
>>>>>>> 9be3604 (changed main)
} }
#[init(schedule = [toggle])] #[init(schedule = [toggle])]
...@@ -64,21 +61,9 @@ const APP: () = { ...@@ -64,21 +61,9 @@ const APP: () = {
// configure PA5 as output, RM0368 8.4.1 // configure PA5 as output, RM0368 8.4.1
device.GPIOA.moder.modify(|_, w| w.moder5().bits(1)); device.GPIOA.moder.modify(|_, w| w.moder5().bits(1));
<<<<<<< HEAD
// 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,
=======
// pass on late resources // pass on late resources
init::LateResources { init::LateResources {
GPIOA: device.GPIOA, GPIOA: device.GPIOA,
>>>>>>> 9be3604 (changed main)
} }
} }
...@@ -93,11 +78,7 @@ const APP: () = { ...@@ -93,11 +78,7 @@ const APP: () = {
<<<<<<< HEAD
#[task(resources = [GPIOA,GPIOC], schedule = [toggle])]
=======
#[task(resources = [GPIOA], schedule = [toggle])] #[task(resources = [GPIOA], schedule = [toggle])]
>>>>>>> 9be3604 (changed main)
fn toggle(cx: toggle::Context) { fn toggle(cx: toggle::Context) {
static mut TOGGLE: bool = false; static mut TOGGLE: bool = false;
rprintln!("toggle @ {:?}", Instant::now()); rprintln!("toggle @ {:?}", Instant::now());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment