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

Moved project-conf.h inclusion to the top of contiki-conf.h

Browse source
This commit is contained in:
Antonio Lignan 2016-06-24 23:34:23 +02:00
parent 4fd8f67053
commit 442e1be391
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,10 @@
#include "platform-conf.h" #include "platform-conf.h"
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#define XMAC_CONF_COMPOWER 1 #define XMAC_CONF_COMPOWER 1
#define CXMAC_CONF_COMPOWER 1 #define CXMAC_CONF_COMPOWER 1
@ -94,11 +98,11 @@
#endif #endif
#ifndef CC2420_CONF_CHANNEL #ifndef CC2420_CONF_CHANNEL
#define CC2420_CONF_CHANNEL 26 #define CC2420_CONF_CHANNEL 26
#endif /* CC2420_CONF_CHANNEL */ #endif /* CC2420_CONF_CHANNEL */
#ifndef CC2420_CONF_CCA_THRESH #ifndef CC2420_CONF_CCA_THRESH
#define CC2420_CONF_CCA_THRESH -45 #define CC2420_CONF_CCA_THRESH -45
#endif /* CC2420_CONF_CCA_THRESH */ #endif /* CC2420_CONF_CCA_THRESH */
#define IEEE802154_CONF_PANID 0xABCD #define IEEE802154_CONF_PANID 0xABCD
@ -142,15 +146,15 @@
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
/* Handle 10 neighbors */ /* Handle 10 neighbors */
#define NBR_TABLE_CONF_MAX_NEIGHBORS 15 #define NBR_TABLE_CONF_MAX_NEIGHBORS 15
/* Handle 10 routes */ /* Handle 10 routes */
#define UIP_CONF_MAX_ROUTES 15 #define UIP_CONF_MAX_ROUTES 15
#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
#define UIP_CONF_ND6_RETRANS_TIMER 10000 #define UIP_CONF_ND6_RETRANS_TIMER 10000
#define NETSTACK_CONF_WITH_IPV6 1 #define NETSTACK_CONF_WITH_IPV6 1
#define UIP_CONF_IPV6_QUEUE_PKT 0 #define UIP_CONF_IPV6_QUEUE_PKT 0
#define UIP_CONF_IPV6_CHECKS 1 #define UIP_CONF_IPV6_CHECKS 1
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
@ -165,8 +169,8 @@
#endif /* SICSLOWPAN_CONF_FRAG */ #endif /* SICSLOWPAN_CONF_FRAG */
#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
#define UIP_CONF_BUFFER_SIZE 108 #define UIP_CONF_BUFFER_SIZE 108
#endif /* NETSTACK_CONF_WITH_IPV6 */ #endif /* NETSTACK_CONF_WITH_IPV6 */
#define UIP_CONF_ICMP_DEST_UNREACH 1 #define UIP_CONF_ICMP_DEST_UNREACH 1
@ -188,8 +192,4 @@
#define UIP_CONF_TCP_SPLIT 0 #define UIP_CONF_TCP_SPLIT 0
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#endif /* CONTIKI_CONF_H */ #endif /* CONTIKI_CONF_H */