ContikiMAC: Default to contikimac_framer when using Rime over ContikiMAC
This commit is contained in:
parent
6ecbf8af34
commit
7b63217a32
@ -243,7 +243,13 @@ typedef unsigned short uip_stats_t;
|
||||
#define WITH_PHASE_OPTIMIZATION 0
|
||||
#define CONTIKIMAC_CONF_COMPOWER 1
|
||||
#define RIMESTATS_CONF_ENABLED 1
|
||||
#define NETSTACK_CONF_FRAMER framer_802154
|
||||
|
||||
#if UIP_CONF_IPV6
|
||||
#define NETSTACK_CONF_FRAMER framer802154
|
||||
#else /* UIP_CONF_IPV6 */
|
||||
#define NETSTACK_CONF_FRAMER contikimac_framer
|
||||
#endif /* UIP_CONF_IPV6 */
|
||||
|
||||
#define NETSTACK_CONF_RADIO rf230_driver
|
||||
#define CHANNEL_802_15_4 26
|
||||
/* The radio needs to interrupt during an rtimer interrupt */
|
||||
|
@ -259,7 +259,13 @@ typedef unsigned short uip_stats_t;
|
||||
#define WITH_PHASE_OPTIMIZATION 0
|
||||
#define CONTIKIMAC_CONF_COMPOWER 1
|
||||
#define RIMESTATS_CONF_ENABLED 1
|
||||
#define NETSTACK_CONF_FRAMER framer_802154
|
||||
|
||||
#if UIP_CONF_IPV6
|
||||
#define NETSTACK_CONF_FRAMER framer802154
|
||||
#else /* UIP_CONF_IPV6 */
|
||||
#define NETSTACK_CONF_FRAMER contikimac_framer
|
||||
#endif /* UIP_CONF_IPV6 */
|
||||
|
||||
#define NETSTACK_CONF_RADIO rf230_driver
|
||||
#define CHANNEL_802_15_4 26
|
||||
/* The radio needs to interrupt during an rtimer interrupt */
|
||||
|
@ -312,7 +312,13 @@ typedef unsigned short uip_stats_t;
|
||||
#define NETSTACK_CONF_MAC nullmac_driver
|
||||
//#define NETSTACK_CONF_MAC csma_driver
|
||||
#define NETSTACK_CONF_RDC contikimac_driver
|
||||
#define NETSTACK_CONF_FRAMER framer_802154
|
||||
|
||||
#if UIP_CONF_IPV6
|
||||
#define NETSTACK_CONF_FRAMER framer802154
|
||||
#else /* UIP_CONF_IPV6 */
|
||||
#define NETSTACK_CONF_FRAMER contikimac_framer
|
||||
#endif /* UIP_CONF_IPV6 */
|
||||
|
||||
#define NETSTACK_CONF_RADIO rf230_driver
|
||||
#define CHANNEL_802_15_4 26
|
||||
/* Enable extended mode with autoack, but no csma/autoretry */
|
||||
|
@ -316,8 +316,12 @@ typedef uint32_t rtimer_clock_t;
|
||||
#endif
|
||||
|
||||
#ifndef NETSTACK_CONF_FRAMER
|
||||
#if UIP_CONF_IPV6
|
||||
#define NETSTACK_CONF_FRAMER framer_802154
|
||||
#endif
|
||||
#else /* UIP_CONF_IPV6 */
|
||||
#define NETSTACK_CONF_FRAMER contikimac_framer
|
||||
#endif /* UIP_CONF_IPV6 */
|
||||
#endif /* NETSTACK_CONF_FRAMER */
|
||||
|
||||
#define NETSTACK_CONF_RADIO cc2538_rf_driver
|
||||
/** @} */
|
||||
|
@ -26,7 +26,11 @@
|
||||
#endif /* NETSTACK_CONF_RADIO */
|
||||
|
||||
#ifndef NETSTACK_CONF_FRAMER
|
||||
#if WITH_UIP6
|
||||
#define NETSTACK_CONF_FRAMER framer_802154
|
||||
#else /* WITH_UIP6 */
|
||||
#define NETSTACK_CONF_FRAMER contikimac_framer
|
||||
#endif /* WITH_UIP6 */
|
||||
#endif /* NETSTACK_CONF_FRAMER */
|
||||
|
||||
#ifndef CC2420_CONF_AUTOACK
|
||||
|
@ -26,7 +26,11 @@
|
||||
#endif /* NETSTACK_CONF_RADIO */
|
||||
|
||||
#ifndef NETSTACK_CONF_FRAMER
|
||||
#if WITH_UIP6
|
||||
#define NETSTACK_CONF_FRAMER framer_802154
|
||||
#else /* WITH_UIP6 */
|
||||
#define NETSTACK_CONF_FRAMER contikimac_framer
|
||||
#endif /* WITH_UIP6 */
|
||||
#endif /* NETSTACK_CONF_FRAMER */
|
||||
|
||||
#ifndef CC2420_CONF_AUTOACK
|
||||
|
@ -69,7 +69,7 @@
|
||||
#define NETSTACK_CONF_MAC csma_driver
|
||||
#define NETSTACK_CONF_RDC contikimac_driver
|
||||
#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
|
||||
#define NETSTACK_CONF_FRAMER framer_802154
|
||||
#define NETSTACK_CONF_FRAMER contikimac_framer
|
||||
|
||||
#define CC2420_CONF_AUTOACK 1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user