diff --git a/examples/ipv6/rpl-border-router/Makefile b/examples/ipv6/rpl-border-router/Makefile index 3fd4c82b4..53b0d878e 100644 --- a/examples/ipv6/rpl-border-router/Makefile +++ b/examples/ipv6/rpl-border-router/Makefile @@ -4,6 +4,7 @@ CONTIKI=../../.. WITH_UIP6=1 UIP_CONF_IPV6=1 +CFLAGS+= -DUIP_CONF_IPV6_RPL #Override inclusion of internal webserver with make WITH_WEBSERVER=0 WITH_WEBSERVER=1 diff --git a/examples/ipv6/rpl-collect/Makefile b/examples/ipv6/rpl-collect/Makefile index bca710a1a..c2e7875ef 100644 --- a/examples/ipv6/rpl-collect/Makefile +++ b/examples/ipv6/rpl-collect/Makefile @@ -5,6 +5,7 @@ PROJECT_SOURCEFILES += collect-common.c WITH_UIP6=1 UIP_CONF_IPV6=1 +CFLAGS+= -DUIP_CONF_IPV6_RPL all: $(CONTIKI_PROJECT) diff --git a/examples/ipv6/rpl-udp/Makefile b/examples/ipv6/rpl-udp/Makefile index 746da1f60..77d33d7f4 100644 --- a/examples/ipv6/rpl-udp/Makefile +++ b/examples/ipv6/rpl-udp/Makefile @@ -4,5 +4,6 @@ CONTIKI=../../.. WITH_UIP6=1 UIP_CONF_IPV6=1 +CFLAGS+= -DUIP_CONF_IPV6_RPL include $(CONTIKI)/Makefile.include diff --git a/examples/ipv6/sky-websense/Makefile b/examples/ipv6/sky-websense/Makefile index cefb94f5d..9030b290d 100644 --- a/examples/ipv6/sky-websense/Makefile +++ b/examples/ipv6/sky-websense/Makefile @@ -4,6 +4,7 @@ CONTIKI=../../.. WITH_UIP6=1 UIP_CONF_IPV6=1 +CFLAGS+= -DUIP_CONF_IPV6_RPL APPS += webserver webbrowser diff --git a/platform/avr-atmega128rfa1/contiki-conf.h b/platform/avr-atmega128rfa1/contiki-conf.h index 1c1aa8510..d38ae8d28 100644 --- a/platform/avr-atmega128rfa1/contiki-conf.h +++ b/platform/avr-atmega128rfa1/contiki-conf.h @@ -66,11 +66,11 @@ unsigned long clock_seconds(void); #define INFINITE_TIME 0xffff /* Clock ticks per second */ -#define CLOCK_CONF_SECOND 125 +#define CLOCK_CONF_SECOND 128 -/* Maximum tick interval is 0xffff/125 = 524 seconds */ -#define RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME CLOCK_CONF_SECOND * 524UL /* Default uses 600UL */ -#define COLLECT_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME CLOCK_CONF_SECOND * 524UL /* Default uses 600UL */ +/* Maximum tick interval is 0xffff/128 = 511 seconds */ +#define RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME INFINITE_TIME/CLOCK_CONF_SECOND /* Default uses 600 */ +#define COLLECT_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME INFINITE_TIME/CLOCK_CONF_SECOND /* Default uses 600 */ /* Michael Hartman's atmega128rfa1 board has an external 32768Hz crystal connected to TOSC1 and 2 pins similar to the Raven 1284p */ /* and theoretically can use TIMER2 with it to keep time. Else TIMER0 is used. */ @@ -91,6 +91,12 @@ unsigned long clock_seconds(void); /* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */ #define RADIOSTATS 1 +/* More extensive stats */ +#define ENERGEST_CONF_ON 1 + +/* Debugflow macro, useful for tracing path through mac and radio interrupts */ +#define DEBUGFLOWSIZE 128 + /* Network setup. The new NETSTACK interface requires RF230BB (as does ip4) */ #if RF230BB #undef PACKETBUF_CONF_HDR_SIZE //Use the packetbuf default for header size @@ -103,7 +109,7 @@ unsigned long clock_seconds(void); #define UIP_CONF_ICMP6 1 #define UIP_CONF_UDP 1 #define UIP_CONF_TCP 1 -#define UIP_CONF_IPV6_RPL 0 +//#define UIP_CONF_IPV6_RPL 0 #define NETSTACK_CONF_NETWORK sicslowpan_driver #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #else diff --git a/platform/avr-raven/contiki-conf.h b/platform/avr-raven/contiki-conf.h index e229e3896..b9e72fedb 100644 --- a/platform/avr-raven/contiki-conf.h +++ b/platform/avr-raven/contiki-conf.h @@ -116,7 +116,7 @@ unsigned long clock_seconds(void); #define UIP_CONF_ICMP6 1 #define UIP_CONF_UDP 1 #define UIP_CONF_TCP 1 -#define UIP_CONF_IPV6_RPL 0 +//#define UIP_CONF_IPV6_RPL 0 #define NETSTACK_CONF_NETWORK sicslowpan_driver #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #else diff --git a/platform/avr-ravenusb/contiki-conf.h b/platform/avr-ravenusb/contiki-conf.h index 8dec5eed6..9986e2adc 100644 --- a/platform/avr-ravenusb/contiki-conf.h +++ b/platform/avr-ravenusb/contiki-conf.h @@ -216,7 +216,7 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len); #define UIP_CONF_ICMP6 1 #define UIP_CONF_UDP 1 #define UIP_CONF_TCP 0 -#define UIP_CONF_IPV6_RPL 0 +//#define UIP_CONF_IPV6_RPL 0 #define NETSTACK_CONF_NETWORK sicslowpan_driver #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #else @@ -393,16 +393,22 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len); */ #define UIP_CONF_ROUTER 1 +#define UIP_CONF_ND6_SEND_RA........0 +#define UIP_CONF_ND6_REACHABLE_TIME 600000 +#define UIP_CONF_ND6_RETRANS_TIMER 10000 + +#ifndef RPL_BORDER_ROUTER #define RPL_BORDER_ROUTER 1 +#endif #define RPL_CONF_STATS 0 #define UIP_CONF_BUFFER_SIZE 1300 //#define UIP_CONF_DS6_NBR_NBU 12 //#define UIP_CONF_DS6_ROUTE_NBU 12 + +#ifdef RPL_BORDER_ROUTER #undef UIP_FALLBACK_INTERFACE #define UIP_FALLBACK_INTERFACE rpl_interface -#define UIP_CONF_ND6_SEND_RA 0 -#define UIP_CONF_ND6_REACHABLE_TIME 600000 -#define UIP_CONF_ND6_RETRANS_TIMER 10000 +#endif /* Save all the RAM we can */ #define PROCESS_CONF_NO_PROCESS_NAMES 1 diff --git a/platform/minimal-net/contiki-conf.h b/platform/minimal-net/contiki-conf.h index bd2f5b098..02ac073f9 100644 --- a/platform/minimal-net/contiki-conf.h +++ b/platform/minimal-net/contiki-conf.h @@ -83,8 +83,8 @@ typedef unsigned short uip_stats_t; #define WEBSERVER_CONF_STATUSPAGE 1 /* RPL currently works only on Windows. *nix would require converting the tun interface to two pcap tees. */ -#define UIP_CONF_IPV6_RPL 0 -#define RPL_BORDER_ROUTER 0 +//#define UIP_CONF_IPV6_RPL 0 +//#define RPL_BORDER_ROUTER 0 #endif #if UIP_CONF_IPV6_RPL diff --git a/platform/stk500/contiki-conf.h b/platform/stk500/contiki-conf.h index 2fb20e93d..ca0b85295 100644 --- a/platform/stk500/contiki-conf.h +++ b/platform/stk500/contiki-conf.h @@ -20,7 +20,7 @@ typedef unsigned short clock_time_t; #define UIP_CONF_ICMP6 1 #define UIP_CONF_UDP 1 #define UIP_CONF_TCP 1 -#define UIP_CONF_IPV6_RPL 0 +//#define UIP_CONF_IPV6_RPL 0 /* See uip-ds6.h */ #define UIP_CONF_DS6_NBR_NBU 20