From aedf4fe8b5d2490ab21e89e121f2ef5632001352 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Fri, 29 Jul 2011 13:05:36 +0200 Subject: [PATCH] Made ContikiMAC/8 default on z1 platform; enabled power profiling by default --- platform/z1/contiki-conf.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/platform/z1/contiki-conf.h b/platform/z1/contiki-conf.h index 6e62e4d3c..9753b54c0 100644 --- a/platform/z1/contiki-conf.h +++ b/platform/z1/contiki-conf.h @@ -62,13 +62,12 @@ /* Network setup for non-IPv6 (rime). */ #define NETSTACK_CONF_NETWORK rime_driver -#define NETSTACK_CONF_MAC nullmac_driver -/* #define NETSTACK_CONF_RDC contikimac_driver */ -#define NETSTACK_CONF_RDC nullrdc_driver -#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 128 +#define NETSTACK_CONF_MAC csma_driver +#define NETSTACK_CONF_RDC contikimac_driver +#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8 #define NETSTACK_CONF_FRAMER framer_802154 -#define CC2420_CONF_AUTOACK 0 +#define CC2420_CONF_AUTOACK 1 #define MAC_CONF_CHANNEL_CHECK_RATE 8 #define COLLECT_CONF_ANNOUNCEMENTS 1 @@ -102,7 +101,7 @@ #define CFS_CONF_OFFSET_TYPE long #define PROFILE_CONF_ON 0 -#define ENERGEST_CONF_ON 0 +#define ENERGEST_CONF_ON 1 #define ELFLOADER_CONF_TEXT_IN_ROM 0 #define ELFLOADER_CONF_DATAMEMORY_SIZE 0x400