giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into develop

This commit is contained in:
Afonso Oliveira 2018-09-08 00:13:41 +01:00 committed by GitHub
parent 57f1042bf3 52871d7e5f
commit c58774c612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/cpu/cc26xx-cc13xx/cc13xx-cc26xx-conf.h
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