Merge branch 'develop' of https://github.com/contiki-ng/contiki-ng into develop

This commit is contained in:
Afonso Oliveira 2018-09-08 00:14:23 +01:00
commit a3ccbbe994

View File

@ -71,7 +71,9 @@
#endif /* CPU_FAMILY_CC13XX */
#if CC13XX_CONF_PROP_MODE
#ifndef NETSTACK_CONF_RADIO
#define NETSTACK_CONF_RADIO prop_mode_driver
#endif /* NETSTACK_CONF_RADIO */
/* Channels count from 0 upwards in IEEE 802.15.4g */
#ifndef IEEE802154_CONF_DEFAULT_CHANNEL