deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Let RPL examples enable platform RPL

Browse source
This commit is contained in:
David Kopf 2011-08-15 14:45:44 -04:00
parent 50d1086553
commit 83e3b99d54
9 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/ipv6/rpl-border-router/Makefile
View file

@ -4,6 +4,7 @@ CONTIKI=../../..
WITH_UIP6=1 WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL
#Override inclusion of internal webserver with make WITH_WEBSERVER=0 #Override inclusion of internal webserver with make WITH_WEBSERVER=0
WITH_WEBSERVER=1 WITH_WEBSERVER=1

1
examples/ipv6/rpl-collect/Makefile
View file

@ -5,6 +5,7 @@ PROJECT_SOURCEFILES += collect-common.c
WITH_UIP6=1 WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)

1
examples/ipv6/rpl-udp/Makefile
View file

@ -4,5 +4,6 @@ CONTIKI=../../..
WITH_UIP6=1 WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include

1
examples/ipv6/sky-websense/Makefile
View file

@ -4,6 +4,7 @@ CONTIKI=../../..
WITH_UIP6=1 WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL
APPS += webserver webbrowser APPS += webserver webbrowser

16
platform/avr-atmega128rfa1/contiki-conf.h
View file

@ -66,11 +66,11 @@ unsigned long clock_seconds(void);
#define INFINITE_TIME 0xffff #define INFINITE_TIME 0xffff
/* Clock ticks per second */ /* Clock ticks per second */
#define CLOCK_CONF_SECOND 125 #define CLOCK_CONF_SECOND 128
/* Maximum tick interval is 0xffff/125 = 524 seconds */ /* Maximum tick interval is 0xffff/128 = 511 seconds */
#define RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME CLOCK_CONF_SECOND * 524UL /* Default uses 600UL */ #define RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME INFINITE_TIME/CLOCK_CONF_SECOND /* Default uses 600 */
#define COLLECT_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME CLOCK_CONF_SECOND * 524UL /* Default uses 600UL */ #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 */ /* 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. */ /* 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 */ /* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */
#define RADIOSTATS 1 #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) */ /* Network setup. The new NETSTACK interface requires RF230BB (as does ip4) */
#if RF230BB #if RF230BB
#undef PACKETBUF_CONF_HDR_SIZE //Use the packetbuf default for header size #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_ICMP6 1
#define UIP_CONF_UDP 1 #define UIP_CONF_UDP 1
#define UIP_CONF_TCP 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 NETSTACK_CONF_NETWORK sicslowpan_driver
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
#else #else

2
platform/avr-raven/contiki-conf.h
View file

@ -116,7 +116,7 @@ unsigned long clock_seconds(void);
#define UIP_CONF_ICMP6 1 #define UIP_CONF_ICMP6 1
#define UIP_CONF_UDP 1 #define UIP_CONF_UDP 1
#define UIP_CONF_TCP 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 NETSTACK_CONF_NETWORK sicslowpan_driver
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
#else #else

14
platform/avr-ravenusb/contiki-conf.h
View file

@ -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_ICMP6 1
#define UIP_CONF_UDP 1 #define UIP_CONF_UDP 1
#define UIP_CONF_TCP 0 #define UIP_CONF_TCP 0
#define UIP_CONF_IPV6_RPL 0 //#define UIP_CONF_IPV6_RPL 0
#define NETSTACK_CONF_NETWORK sicslowpan_driver #define NETSTACK_CONF_NETWORK sicslowpan_driver
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
#else #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_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 #define RPL_BORDER_ROUTER 1
#endif
#define RPL_CONF_STATS 0 #define RPL_CONF_STATS 0
#define UIP_CONF_BUFFER_SIZE 1300 #define UIP_CONF_BUFFER_SIZE 1300
//#define UIP_CONF_DS6_NBR_NBU 12 //#define UIP_CONF_DS6_NBR_NBU 12
//#define UIP_CONF_DS6_ROUTE_NBU 12 //#define UIP_CONF_DS6_ROUTE_NBU 12
#ifdef RPL_BORDER_ROUTER
#undef UIP_FALLBACK_INTERFACE #undef UIP_FALLBACK_INTERFACE
#define UIP_FALLBACK_INTERFACE rpl_interface #define UIP_FALLBACK_INTERFACE rpl_interface
#define UIP_CONF_ND6_SEND_RA 0 #endif
#define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000
/* Save all the RAM we can */ /* Save all the RAM we can */
#define PROCESS_CONF_NO_PROCESS_NAMES 1 #define PROCESS_CONF_NO_PROCESS_NAMES 1

4
platform/minimal-net/contiki-conf.h
View file

@ -83,8 +83,8 @@ typedef unsigned short uip_stats_t;
#define WEBSERVER_CONF_STATUSPAGE 1 #define WEBSERVER_CONF_STATUSPAGE 1
/* RPL currently works only on Windows. *nix would require converting the tun interface to two pcap tees. */ /* RPL currently works only on Windows. *nix would require converting the tun interface to two pcap tees. */
#define UIP_CONF_IPV6_RPL 0 //#define UIP_CONF_IPV6_RPL 0
#define RPL_BORDER_ROUTER 0 //#define RPL_BORDER_ROUTER 0
#endif #endif
#if UIP_CONF_IPV6_RPL #if UIP_CONF_IPV6_RPL

2
platform/stk500/contiki-conf.h
View file

@ -20,7 +20,7 @@ typedef unsigned short clock_time_t;
#define UIP_CONF_ICMP6 1 #define UIP_CONF_ICMP6 1
#define UIP_CONF_UDP 1 #define UIP_CONF_UDP 1
#define UIP_CONF_TCP 1 #define UIP_CONF_TCP 1
#define UIP_CONF_IPV6_RPL 0 //#define UIP_CONF_IPV6_RPL 0
/* See uip-ds6.h */ /* See uip-ds6.h */
#define UIP_CONF_DS6_NBR_NBU 20 #define UIP_CONF_DS6_NBR_NBU 20