Made configuration parameters easily overridable to be consistent with Travis CI tests

platform/z1/contiki-conf.h

@@ -43,11 +43,23 @@
 #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
@@ -61,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
 
@@ -87,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 */
 
@@ -111,7 +140,9 @@
 
 /* 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