Use 802.15.4-2015 frame v2 by default
This commit is contained in:
parent
3f6cc0256f
commit
9143729ded
@ -77,7 +77,7 @@
|
||||
#ifdef FRAME802154_CONF_VERSION
|
||||
#define FRAME802154_VERSION FRAME802154_CONF_VERSION
|
||||
#else /* FRAME802154_CONF_VERSION */
|
||||
#define FRAME802154_VERSION FRAME802154_IEEE802154_2006
|
||||
#define FRAME802154_VERSION FRAME802154_IEEE802154_2015
|
||||
#endif /* FRAME802154_CONF_VERSION */
|
||||
|
||||
#ifdef FRAME802154_CONF_SUPPR_SEQNO
|
||||
|
@ -67,10 +67,6 @@
|
||||
#undef NETSTACK_CONF_MAC
|
||||
#define NETSTACK_CONF_MAC tschmac_driver
|
||||
|
||||
/* IEEE802.15.4 frame version */
|
||||
#undef FRAME802154_CONF_VERSION
|
||||
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
|
||||
|
||||
/* TSCH and RPL callbacks */
|
||||
#define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch
|
||||
#define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval
|
||||
|
@ -62,10 +62,6 @@
|
||||
#undef NETSTACK_CONF_MAC
|
||||
#define NETSTACK_CONF_MAC tschmac_driver
|
||||
|
||||
/* IEEE802.15.4 frame version */
|
||||
#undef FRAME802154_CONF_VERSION
|
||||
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
|
||||
|
||||
/* TSCH and RPL callbacks */
|
||||
#define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch
|
||||
#define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval
|
||||
|
@ -58,10 +58,6 @@
|
||||
|
||||
#define NETSTACK_CONF_MAC tschmac_driver
|
||||
|
||||
/* IEEE802.15.4 frame version */
|
||||
#undef FRAME802154_CONF_VERSION
|
||||
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
|
||||
|
||||
/* TSCH and RPL callbacks */
|
||||
#define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch
|
||||
#define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval
|
||||
|
@ -139,9 +139,6 @@
|
||||
|
||||
#if WITH_TSCH
|
||||
|
||||
#undef FRAME802154_CONF_VERSION
|
||||
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
|
||||
|
||||
/* Contiki netstack: MAC */
|
||||
#undef NETSTACK_CONF_MAC
|
||||
#define NETSTACK_CONF_MAC tschmac_driver
|
||||
|
@ -48,9 +48,6 @@
|
||||
#undef NETSTACK_CONF_MAC
|
||||
#define NETSTACK_CONF_MAC tschmac_driver
|
||||
|
||||
#undef FRAME802154_CONF_VERSION
|
||||
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
|
||||
|
||||
#if CONTIKI_TARGET_COOJA
|
||||
#define COOJA_CONF_SIMULATE_TURNAROUND 0
|
||||
#endif /* CONTIKI_TARGET_COOJA */
|
||||
|
@ -32,9 +32,6 @@
|
||||
#ifndef _PROJECT_TSCH_CONF_H
|
||||
#define _PROJECT_TSCH_CONF_H
|
||||
|
||||
#undef FRAME802154_CONF_VERSION
|
||||
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
|
||||
|
||||
#undef NETSTACK_CONF_MAC
|
||||
#define NETSTACK_CONF_MAC tschmac_driver
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user