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_APP_SKEY_DEFAULT' to 'CONFIG_'

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

2
examples/gnrc_lorawan/Makefile
View File

@ -34,7 +34,7 @@ CFLAGS += -DCONFIG_LORAMAC_DEV_EUI_DEFAULT=\"CCCCCCCCCCCCCCCC\"
# 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 += -DLORAMAC_NWK_SKEY_DEFAULT=\"00000000000000000000000000000000\"
#CFLAGS += -DLORAMAC_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
# Comment/uncomment as necessary # Comment/uncomment as necessary

2
examples/gnrc_lorawan/README.md
View File

@ -66,7 +66,7 @@ E.g in the application Makefile:
CFLAGS += -DCONFIG_LORAMAC_DEV_EUI_DEFAULT=\"AAAAAAAAAAAAAAAA\" 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 += -DLORAMAC_APP_SKEY_DEFAULT=\"DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\" CFLAGS += -DCONFIG_LORAMAC_APP_SKEY_DEFAULT=\"DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\"
CFLAGS += -DLORAMAC_NWK_SKEY_DEFAULT=\"EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\" CFLAGS += -DLORAMAC_NWK_SKEY_DEFAULT=\"EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\"
CFLAGS += -DLORAMAC_DEV_ADDR_DEFAULT=\"FFFFFFFF\" CFLAGS += -DLORAMAC_DEV_ADDR_DEFAULT=\"FFFFFFFF\"
``` ```

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

@ -68,8 +68,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_APP_SKEY_DEFAULT #ifndef CONFIG_LORAMAC_APP_SKEY_DEFAULT
#define LORAMAC_APP_SKEY_DEFAULT "00000000000000000000000000000000" #define CONFIG_LORAMAC_APP_SKEY_DEFAULT "00000000000000000000000000000000"
#endif #endif
/** /**

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

@ -209,7 +209,7 @@ static void _init(gnrc_netif_t *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, LORAMAC_NWK_SKEY_DEFAULT);
fmt_hex_bytes(_appskey, 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);
fmt_hex_bytes(_appeui, CONFIG_LORAMAC_APP_EUI_DEFAULT); fmt_hex_bytes(_appeui, CONFIG_LORAMAC_APP_EUI_DEFAULT);