From 5bf47035e732f83fd2dff1589eef13c019cf0b0b Mon Sep 17 00:00:00 2001 From: c_oflynn Date: Fri, 26 Feb 2010 10:55:00 +0000 Subject: [PATCH] Use new HC06 --- platform/avr-raven/contiki-conf.h | 9 ++------- platform/avr-ravenusb/contiki-conf.h | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/platform/avr-raven/contiki-conf.h b/platform/avr-raven/contiki-conf.h index b947fb5c..621e6856 100644 --- a/platform/avr-raven/contiki-conf.h +++ b/platform/avr-raven/contiki-conf.h @@ -73,12 +73,7 @@ typedef int32_t s32_t; #define RIMEADDR_CONF_SIZE 8 #define PACKETBUF_CONF_HDR_SIZE 0 //RF230 handles headers internally -/* 0 for IPv6, or 1 for HC1, 2 for HC01 */ -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 - -#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_CONF_COMPRESSION_HC01 +#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2 #define SICSLOWPAN_CONF_FRAG 1 @@ -146,7 +141,7 @@ typedef int32_t s32_t; #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 +#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ICMP6 1 diff --git a/platform/avr-ravenusb/contiki-conf.h b/platform/avr-ravenusb/contiki-conf.h index b511fdd3..3c5e0dd5 100644 --- a/platform/avr-ravenusb/contiki-conf.h +++ b/platform/avr-ravenusb/contiki-conf.h @@ -78,14 +78,9 @@ typedef int32_t s32_t; #define RIMEADDR_CONF_SIZE 8 -/* 0 for IPv6, or 1 for HC1, 2 for HC01 */ -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 - -#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_CONF_COMPRESSION_HC01 +#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2 -#define SICSLOWPAN_CONF_FRAG 1 +#define SICSLOWPAN_CONF_FRAG 1 #define SICSLOWPAN_CONF_MAXAGE 3 -- 2.11.4.GIT