RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

net/lorawan : Move 'LORAMAC_NWK_SKEY_DEFAULT' to 'CONFIG_'

Browse Source
This commit is contained in:
Akshai M 2020-11-18 19:31:23 +01:00
parent 43d7f28e63
commit 50e979c600
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/gnrc_lorawan/Makefile
View File

@ -33,7 +33,7 @@ CFLAGS += -DCONFIG_LORAMAC_DEV_EUI_DEFAULT=\"CCCCCCCCCCCCCCCC\"
# For TTN, It's necessary to set the RX2 DR to 3 # For TTN, It's necessary to set the RX2 DR to 3
# NOTE: This values will be overriten in case of OTAA. # NOTE: This values will be overriten in case of OTAA.
#CFLAGS += -DLORAMAC_DEV_ADDR_DEFAULT=\"00000000\" #CFLAGS += -DLORAMAC_DEV_ADDR_DEFAULT=\"00000000\"
#CFLAGS += -DLORAMAC_NWK_SKEY_DEFAULT=\"00000000000000000000000000000000\" #CFLAGS += -DCONFIG_LORAMAC_NWK_SKEY_DEFAULT=\"00000000000000000000000000000000\"
#CFLAGS += -DCONFIG_LORAMAC_APP_SKEY_DEFAULT=\"00000000000000000000000000000000\" #CFLAGS += -DCONFIG_LORAMAC_APP_SKEY_DEFAULT=\"00000000000000000000000000000000\"
#CFLAGS += -DLORAMAC_DEFAULT_RX2_DR=LORAMAC_DR_3 #CFLAGS += -DLORAMAC_DEFAULT_RX2_DR=LORAMAC_DR_3

2
examples/gnrc_lorawan/README.md
View File

@ -67,7 +67,7 @@ CFLAGS += -DCONFIG_LORAMAC_DEV_EUI_DEFAULT=\"AAAAAAAAAAAAAAAA\"
CFLAGS += -DCONFIG_LORAMAC_APP_EUI_DEFAULT=\"BBBBBBBBBBBBBBBB\" CFLAGS += -DCONFIG_LORAMAC_APP_EUI_DEFAULT=\"BBBBBBBBBBBBBBBB\"
CFLAGS += -DCONFIG_LORAMAC_APP_KEY_DEFAULT=\"CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\" CFLAGS += -DCONFIG_LORAMAC_APP_KEY_DEFAULT=\"CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\"
CFLAGS += -DCONFIG_LORAMAC_APP_SKEY_DEFAULT=\"DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\" CFLAGS += -DCONFIG_LORAMAC_APP_SKEY_DEFAULT=\"DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\"
CFLAGS += -DLORAMAC_NWK_SKEY_DEFAULT=\"EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\" CFLAGS += -DCONFIG_LORAMAC_NWK_SKEY_DEFAULT=\"EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\"
CFLAGS += -DLORAMAC_DEV_ADDR_DEFAULT=\"FFFFFFFF\" CFLAGS += -DLORAMAC_DEV_ADDR_DEFAULT=\"FFFFFFFF\"
``` ```

6
sys/include/net/loramac.h
View File

@ -69,7 +69,7 @@ extern "C" {
* 16 bytes key, only required for ABP join procedure type * 16 bytes key, only required for ABP join procedure type
*/ */
#ifndef CONFIG_LORAMAC_APP_SKEY_DEFAULT #ifndef CONFIG_LORAMAC_APP_SKEY_DEFAULT
#define CONFIG_LORAMAC_APP_SKEY_DEFAULT "00000000000000000000000000000000" #define CONFIG_LORAMAC_APP_SKEY_DEFAULT "00000000000000000000000000000000"
#endif #endif
/** /**
@ -77,8 +77,8 @@ extern "C" {
* *
* 16 bytes key, only required for ABP join procedure type. * 16 bytes key, only required for ABP join procedure type.
*/ */
#ifndef LORAMAC_NWK_SKEY_DEFAULT #ifndef CONFIG_LORAMAC_NWK_SKEY_DEFAULT
#define LORAMAC_NWK_SKEY_DEFAULT "00000000000000000000000000000000" #define CONFIG_LORAMAC_NWK_SKEY_DEFAULT "00000000000000000000000000000000"
#endif #endif
/** /**

2
sys/net/gnrc/netif/lorawan/gnrc_netif_lorawan.c
View File

@ -208,7 +208,7 @@ static void _init(gnrc_netif_t *netif)
_reset(netif); _reset(netif);
/* Convert default keys, address and EUIs to hex */ /* Convert default keys, address and EUIs to hex */
fmt_hex_bytes(_nwkskey, LORAMAC_NWK_SKEY_DEFAULT); fmt_hex_bytes(_nwkskey, CONFIG_LORAMAC_NWK_SKEY_DEFAULT);
fmt_hex_bytes(_appskey, CONFIG_LORAMAC_APP_SKEY_DEFAULT); fmt_hex_bytes(_appskey, CONFIG_LORAMAC_APP_SKEY_DEFAULT);
fmt_hex_bytes(_appkey, CONFIG_LORAMAC_APP_KEY_DEFAULT); fmt_hex_bytes(_appkey, CONFIG_LORAMAC_APP_KEY_DEFAULT);
fmt_hex_bytes(_deveui, CONFIG_LORAMAC_DEV_EUI_DEFAULT); fmt_hex_bytes(_deveui, CONFIG_LORAMAC_DEV_EUI_DEFAULT);