Merge pull request #1745 from alignan/pull/z1-contiki-conf

Minor changes to z1/contiki-conf.h

platform/z1/contiki-conf.h

@@ -33,17 +33,33 @@
 
 #include "platform-conf.h"
 
+#ifdef PROJECT_CONF_H
+#include PROJECT_CONF_H
+#endif /* PROJECT_CONF_H */
+
 #define XMAC_CONF_COMPOWER          1
 #define CXMAC_CONF_COMPOWER         1
 
 #if NETSTACK_CONF_WITH_IPV6
 
 /* Network setup for IPv6 */
+#ifndef NETSTACK_CONF_NETWORK
 #define NETSTACK_CONF_NETWORK       sicslowpan_driver
+#endif
+
+#ifndef NETSTACK_CONF_MAC
 #define NETSTACK_CONF_MAC           csma_driver
+#endif
+
+#ifndef NETSTACK_CONF_RDC
 #define NETSTACK_CONF_RDC           contikimac_driver
-#define NETSTACK_CONF_RADIO   cc2420_driver
+#endif
+
+#ifndef NETSTACK_CONF_FRAMER
 #define NETSTACK_CONF_FRAMER        framer_802154
+#endif
+
+#define NETSTACK_CONF_RADIO         cc2420_driver
 
 /* Specify a minimum packet size for 6lowpan compression to be
    enabled. This is needed for ContikiMAC, which needs packets to be
@@ -57,17 +73,32 @@
 #define CXMAC_CONF_ANNOUNCEMENTS              0
 #define XMAC_CONF_ANNOUNCEMENTS               0
 
+#ifndef QUEUEBUF_CONF_NUM
 #define QUEUEBUF_CONF_NUM                     4
+#endif
 
 #else /* NETSTACK_CONF_WITH_IPV6 */
 
 /* Network setup for non-IPv6 (rime). */
-
+#ifndef NETSTACK_CONF_NETWORK
 #define NETSTACK_CONF_NETWORK        rime_driver
+#endif
+
+#ifndef NETSTACK_CONF_MAC
 #define NETSTACK_CONF_MAC            csma_driver
+#endif
+
+#ifndef NETSTACK_CONF_RDC
 #define NETSTACK_CONF_RDC            contikimac_driver
-#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
+#endif
+
+#ifndef NETSTACK_CONF_FRAMER
 #define NETSTACK_CONF_FRAMER         contikimac_framer
+#endif
+
+#ifndef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE
+#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
+#endif
 
 #define CC2420_CONF_AUTOACK                  1
 
@@ -83,7 +114,9 @@
 
 #define COLLECT_NBR_TABLE_CONF_MAX_NEIGHBORS 32
 
+#ifndef QUEUEBUF_CONF_NUM
 #define QUEUEBUF_CONF_NUM                    8
+#endif
 
 #endif /* NETSTACK_CONF_WITH_IPV6 */
 
@@ -101,11 +134,15 @@
 #define CC2420_CONF_CCA_THRESH            -45
 #endif /* CC2420_CONF_CCA_THRESH */
 
+#ifndef IEEE802154_CONF_PANID
 #define IEEE802154_CONF_PANID             0xABCD
+#endif
 
 /* The TSCH default slot length of 10ms is a bit too short for this platform,
  * use 15ms instead. */
+#ifndef TSCH_CONF_DEFAULT_TIMESLOT_LENGTH
 #define TSCH_CONF_DEFAULT_TIMESLOT_LENGTH 15000
+#endif
 
 #define SHELL_VARS_CONF_RAM_BEGIN         0x1100
 #define SHELL_VARS_CONF_RAM_END           0x2000
@@ -142,9 +179,14 @@
 #define UIP_CONF_ROUTER              1
 
 /* Handle 10 neighbors */
+#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
 #define NBR_TABLE_CONF_MAX_NEIGHBORS    15
+#endif
+
 /* Handle 10 routes    */
+#ifndef UIP_CONF_MAX_ROUTES
 #define UIP_CONF_MAX_ROUTES             15
+#endif
 
 #define UIP_CONF_ND6_SEND_RA            0
 #define UIP_CONF_ND6_REACHABLE_TIME     600000
@@ -156,7 +198,10 @@
 #define UIP_CONF_IPV6_REASSEMBLY        0
 #define UIP_CONF_NETIF_MAX_ADDRESSES    3
 #define UIP_CONF_IP_FORWARD             0
+
+#ifndef UIP_CONF_BUFFER_SIZE
 #define UIP_CONF_BUFFER_SIZE            140
+#endif
 
 #define SICSLOWPAN_CONF_COMPRESSION             SICSLOWPAN_COMPRESSION_HC06
 #ifndef SICSLOWPAN_CONF_FRAG
@@ -166,7 +211,11 @@
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS       2
 #else /* NETSTACK_CONF_WITH_IPV6 */
 #define UIP_CONF_IP_FORWARD                     1
+
+#ifndef UIP_CONF_BUFFER_SIZE
 #define UIP_CONF_BUFFER_SIZE                    108
+#endif
+
 #endif /* NETSTACK_CONF_WITH_IPV6 */
 
 #define UIP_CONF_ICMP_DEST_UNREACH              1
@@ -188,8 +237,6 @@
 
 #define UIP_CONF_TCP_SPLIT                      0
 
-#ifdef PROJECT_CONF_H
+#define BOARD_STRING        "Zolertia Z1 platform"
-#include PROJECT_CONF_H
-#endif /* PROJECT_CONF_H */
 
 #endif /* CONTIKI_CONF_H */