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

periodic prints configurable

Browse source
This commit is contained in:
Harald Pichler 2013-05-28 09:57:23 +02:00
parent 558184f106
commit b1e1ef1ffd
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
platform/osd-merkur/contiki-main.c
View file

@ -102,7 +102,7 @@ uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
/* Get periodic prints from idle loop, from clock seconds or rtimer interrupts */ /* Get periodic prints from idle loop, from clock seconds or rtimer interrupts */
/* Use of rtimer will conflict with other rtimer interrupts such as contikimac radio cycling */ /* Use of rtimer will conflict with other rtimer interrupts such as contikimac radio cycling */
/* STAMPS will print ENERGEST outputs if that is enabled. */ /* STAMPS will print ENERGEST outputs if that is enabled. */
#define PERIODICPRINTS 1 #define PERIODICPRINTS 0
#if PERIODICPRINTS #if PERIODICPRINTS
//#define PINGS 64 //#define PINGS 64
#define ROUTES 600 #define ROUTES 600
@ -117,7 +117,7 @@ void rtimercycle(void) {rtimerflag=1;}
#endif #endif
#endif #endif
uint16_t ledtimer; //uint16_t ledtimer;
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/*----------------------Configuration of the .elf file---------------------*/ /*----------------------Configuration of the .elf file---------------------*/
@ -148,7 +148,7 @@ FUSES ={.low = 0xC2, .high = 0x99, .extended = 0xfe,};
#include "dev/button-sensor.h" #include "dev/button-sensor.h"
#include "dev/battery-sensor.h" #include "dev/battery-sensor.h"
#include "dev/pir-sensor.h" #include "dev/pir-sensor.h"
SENSORS(&button_sensor, &battery_sensor, &pir_sensor); SENSORS(&button_sensor, &pir_sensor);
uint8_t uint8_t
rng_get_uint8(void) { rng_get_uint8(void) {
@ -200,7 +200,7 @@ void initialize(void)
#endif #endif
/* Second rs232 port for debugging or slip alternative */ /* Second rs232 port for debugging or slip alternative */
rs232_init(RS232_PORT_1, USART_BAUD_57600,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8); // rs232_init(RS232_PORT_1, USART_BAUD_57600,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
/* Redirect stdout */ /* Redirect stdout */
#if RF230BB_CONF_LEDONPORTE1 || defined(RAVEN_LCD_INTERFACE) #if RF230BB_CONF_LEDONPORTE1 || defined(RAVEN_LCD_INTERFACE)
rs232_redirect_stdout(RS232_PORT_1); rs232_redirect_stdout(RS232_PORT_1);
@ -440,6 +440,7 @@ main(void)
process_run(); process_run();
watchdog_periodic(); watchdog_periodic();
#if 0
/* Turn off LED after a while */ /* Turn off LED after a while */
if (ledtimer) { if (ledtimer) {
if (--ledtimer==0) { if (--ledtimer==0) {
@ -447,12 +448,13 @@ main(void)
PORTE&=~(1<<PE1); PORTE&=~(1<<PE1);
#endif #endif
#if defined(RAVEN_LCD_INTERFACE)&&0 #if defined(RAVEN_LCD_INTERFACE)&&0
/* ledtimer can be set by received ping; ping the other way for testing */ // ledtimer can be set by received ping; ping the other way for testing
extern void raven_ping6(void); extern void raven_ping6(void);
raven_ping6(); raven_ping6();
#endif #endif
} }
} }
#endif
#if 0 #if 0
/* Various entry points for debugging in the AVR Studio simulator. /* Various entry points for debugging in the AVR Studio simulator.
@ -587,7 +589,6 @@ if ((clocktime%STACKMONITOR)==3) {
} while (p<RAMEND-10); } while (p<RAMEND-10);
} }
#endif #endif
} }
#endif /* PERIODICPRINTS */ #endif /* PERIODICPRINTS */