deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make seconds a global variable, add optional radio on time

Browse source
This commit is contained in:
dak664 2010-02-12 14:37:50 +00:00
parent d5f1b0be06
commit eb2ac1a154
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cpu/avr/dev/clock.c
View file

@ -6,8 +6,16 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
/* Experimental: RADIOSTATS should be also be defined in the radio driver and webserver */
#define RADIOSTATS 0
#if RADIOSTATS
static volatile clock_time_t count, scount, rcount;
volatile unsigned long seconds,radioontime;
extern uint8_t RF230_radio_on;
#else
static volatile clock_time_t count, scount; static volatile clock_time_t count, scount;
static volatile unsigned long seconds; volatile unsigned long seconds;
#endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
//SIGNAL(SIG_OUTPUT_COMPARE0) //SIGNAL(SIG_OUTPUT_COMPARE0)
@ -18,6 +26,14 @@ ISR(AVR_OUTPUT_COMPARE_INT)
scount = 0; scount = 0;
seconds++; seconds++;
} }
#if RADIOSTATS
if (RF230_radio_on) {
if (++rcount == CLOCK_SECOND) {
rcount=0;
radioontime++;
}
}
#endif
if(etimer_pending()) { if(etimer_pending()) {
etimer_request_poll(); etimer_request_poll();
} }