From 199967e9d70b9680491f45b4383d7e114f27c7f5 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Wed, 26 Jan 2011 22:22:40 +0100 Subject: [PATCH 1/2] now exporting timertmp - hopefully --- firmware/slavechip/main.c | 10 +++++----- firmware/slavechip/spi_pointers.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/slavechip/main.c b/firmware/slavechip/main.c index 358adc5..f402268 100644 --- a/firmware/slavechip/main.c +++ b/firmware/slavechip/main.c @@ -3,6 +3,7 @@ uint8_t foo; uint16_t bar; +uint16_t timertmp; void baz() { foo++; @@ -35,7 +36,7 @@ int __attribute__((noreturn)) main(void) { for(;;){ - SOFTTIMER(1,500) { + SOFTTIMER(1,500) { // do_stuff(); } @@ -45,16 +46,15 @@ int __attribute__((noreturn)) main(void) { ISR(TIMER1_OVF_vect,ISR_NOBLOCK){ - uint16_t tmp; - tmp=timer1_acc; - tmp++; + timertmp=timer1_acc; + timertmp++; /* the ATOMIC is acutally only needed if timer1_acc is never read from an ISR, which * is probably the case. * ATOMIC_FORCEON: the ISR_NOBLOCK sets sei() a few cycles before. */ ATOMIC_BLOCK(ATOMIC_FORCEON){ - timer1_acc=tmp; + timer1_acc=timertmp; } } diff --git a/firmware/slavechip/spi_pointers.c b/firmware/slavechip/spi_pointers.c index c5331dc..f081a5a 100644 --- a/firmware/slavechip/spi_pointers.c +++ b/firmware/slavechip/spi_pointers.c @@ -12,7 +12,7 @@ uint8_t *spi_proto_globals8[] = { &foo }; uint16_t *spi_proto_globals16[] = { - &bar, + &timertmp, &bar, &bar, &bar, From ea9e02e1ce3a2a988f255ddf6839ce892c4b0483 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Wed, 26 Jan 2011 22:25:46 +0100 Subject: [PATCH 2/2] oops, fixed --- firmware/slavechip/main.h | 1 + 1 file changed, 1 insertion(+) diff --git a/firmware/slavechip/main.h b/firmware/slavechip/main.h index 6dc28c2..4aa595d 100644 --- a/firmware/slavechip/main.h +++ b/firmware/slavechip/main.h @@ -15,6 +15,7 @@ extern uint8_t foo; extern uint16_t bar; +extern uint16_t timertmp; void baz();