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

Made configuration parameters easily overridable from project-conf.h (without having to undef first)

Browse source
This commit is contained in:
Antonio Lignan 2016-06-24 23:43:15 +02:00
parent 1002b7ffee
commit 0034322fe0
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
platform/z1/contiki-conf.h
View file

@ -105,7 +105,9 @@
#define CC2420_CONF_CCA_THRESH -45 #define CC2420_CONF_CCA_THRESH -45
#endif /* CC2420_CONF_CCA_THRESH */ #endif /* CC2420_CONF_CCA_THRESH */
#ifndef IEEE802154_CONF_PANID
#define IEEE802154_CONF_PANID 0xABCD #define IEEE802154_CONF_PANID 0xABCD
#endif
/* The TSCH default slot length of 10ms is a bit too short for this platform, /* The TSCH default slot length of 10ms is a bit too short for this platform,
* use 15ms instead. */ * use 15ms instead. */
@ -146,9 +148,14 @@
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
/* Handle 10 neighbors */ /* Handle 10 neighbors */
#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
#define NBR_TABLE_CONF_MAX_NEIGHBORS 15 #define NBR_TABLE_CONF_MAX_NEIGHBORS 15
#endif
/* Handle 10 routes */ /* Handle 10 routes */
#ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 15 #define UIP_CONF_MAX_ROUTES 15
#endif
#define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_REACHABLE_TIME 600000
@ -160,7 +167,10 @@
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#ifndef UIP_CONF_BUFFER_SIZE
#define UIP_CONF_BUFFER_SIZE 140 #define UIP_CONF_BUFFER_SIZE 140
#endif
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
#ifndef SICSLOWPAN_CONF_FRAG #ifndef SICSLOWPAN_CONF_FRAG
@ -170,7 +180,11 @@
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
#else /* NETSTACK_CONF_WITH_IPV6 */ #else /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_IP_FORWARD 1 #define UIP_CONF_IP_FORWARD 1
#ifndef UIP_CONF_BUFFER_SIZE
#define UIP_CONF_BUFFER_SIZE 108 #define UIP_CONF_BUFFER_SIZE 108
#endif
#endif /* NETSTACK_CONF_WITH_IPV6 */ #endif /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_ICMP_DEST_UNREACH 1 #define UIP_CONF_ICMP_DEST_UNREACH 1