From 52feb47d5e0f21d6b2b419e176e47d700d4fb013 Mon Sep 17 00:00:00 2001 From: dak664 Date: Tue, 3 Aug 2010 19:58:35 +0000 Subject: [PATCH] Change RIME max time to fit in 16 bit timer --- platform/avr-zigbit/contiki-conf.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/platform/avr-zigbit/contiki-conf.h b/platform/avr-zigbit/contiki-conf.h index c2993b83a..369c9b52c 100644 --- a/platform/avr-zigbit/contiki-conf.h +++ b/platform/avr-zigbit/contiki-conf.h @@ -33,29 +33,26 @@ /** * \file - * Configuration for sample STK 501 Contiki kernel + * Configuration for AVR Zigbit Contiki kernel * * \author - * Simon Barner */ #ifndef __CONTIKI_CONF_H__ #define __CONTIKI_CONF_H__ -#include - -typedef int32_t s32_t; - -/* - * MCU and clock rate - */ +/* MCU and clock rate */ #define MCU_MHZ 8 #define PLATFORM PLATFORM_AVR -#define HARWARE_REVISION ZIGBIT +#define RAVEN_REVISION RAVENUSB_C /* Clock ticks per second */ #define CLOCK_CONF_SECOND 125 +/* Since clock_time_t is 16 bits, maximum interval is 524 seconds */ +#define RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME CLOCK_CONF_SECOND * 524UL /*Default uses 600*/ + /* Maximum time interval (used for timers) */ #define INFINITE_TIME 0xffff @@ -146,6 +143,9 @@ typedef int32_t s32_t; #define UIP_CONF_TCP_SPLIT 1 +#include + +typedef int32_t s32_t; typedef unsigned short clock_time_t; typedef unsigned char u8_t; typedef unsigned short u16_t;