From 7781bbea581b69d1707fdbac8478e2692a57cd2a Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Sat, 14 Feb 2009 22:52:24 +0000
Subject: [PATCH] Enabled X-MAC announcements by default, disabled polite
 broadcast announcements by default

---
 platform/sky/contiki-conf.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index 9ebb594f0..b8217cf6e 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -1,9 +1,12 @@
 /* -*- C -*- */
-/* @(#)$Id: contiki-conf.h,v 1.33 2009/02/04 19:32:20 joxe Exp $ */
+/* @(#)$Id: contiki-conf.h,v 1.34 2009/02/14 22:52:24 adamdunkels Exp $ */
 
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
 
+#define XMAC_CONF_ANNOUNCEMENTS 1
+#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1
+
 #define RIMEBUF_CONF_ATTRS_INLINE 1
 
 #define SHELL_VARS_CONF_RAM_BEGIN 0x1100
@@ -221,5 +224,10 @@ typedef unsigned long off_t;
 #define SPI_ENABLE()    ( P4OUT &= ~BV(CSN) ) /* ENABLE CSn (active low) */
 #define SPI_DISABLE()   ( P4OUT |=  BV(CSN) ) /* DISABLE CSn (active low) */
 
+#ifdef PROJECT_CONF_H
+#include PROJECT_CONF_H
+#endif /* PROJECT_CONF_H */
+
+
 
 #endif /* CONTIKI_CONF_H */