From bcb0ed38ffd2c16d9e5763da14ca067eaa72aef5 Mon Sep 17 00:00:00 2001 From: Akshai M Date: Wed, 18 Nov 2020 19:23:04 +0100 Subject: [PATCH] net/lorawan : Move 'LORAMAC_APP_EUI_DEFAULT' to 'CONFIG_' --- examples/gnrc_lorawan/Makefile | 2 +- examples/gnrc_lorawan/README.md | 2 +- sys/include/net/loramac.h | 4 ++-- sys/net/gnrc/netif/lorawan/gnrc_netif_lorawan.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/gnrc_lorawan/Makefile b/examples/gnrc_lorawan/Makefile index d7f836bccb..7cd56513e3 100644 --- a/examples/gnrc_lorawan/Makefile +++ b/examples/gnrc_lorawan/Makefile @@ -26,7 +26,7 @@ USEMODULE += $(DRIVER) # OTAA compile time configuration keys CFLAGS += -DLORAMAC_APP_KEY_DEFAULT=\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\" -CFLAGS += -DLORAMAC_APP_EUI_DEFAULT=\"BBBBBBBBBBBBBBBB\" +CFLAGS += -DCONFIG_LORAMAC_APP_EUI_DEFAULT=\"BBBBBBBBBBBBBBBB\" CFLAGS += -DCONFIG_LORAMAC_DEV_EUI_DEFAULT=\"CCCCCCCCCCCCCCCC\" # Uncomment and replace with proper keys for joining with ABP diff --git a/examples/gnrc_lorawan/README.md b/examples/gnrc_lorawan/README.md index 2a3426b4b9..9d5f5a6511 100644 --- a/examples/gnrc_lorawan/README.md +++ b/examples/gnrc_lorawan/README.md @@ -64,7 +64,7 @@ E.g in the application Makefile: ``` CFLAGS += -DCONFIG_LORAMAC_DEV_EUI_DEFAULT=\"AAAAAAAAAAAAAAAA\" -CFLAGS += -DLORAMAC_APP_EUI_DEFAULT=\"BBBBBBBBBBBBBBBB\" +CFLAGS += -DCONFIG_LORAMAC_APP_EUI_DEFAULT=\"BBBBBBBBBBBBBBBB\" CFLAGS += -DLORAMAC_APP_KEY_DEFAULT=\"CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\" CFLAGS += -DLORAMAC_APP_SKEY_DEFAULT=\"DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\" CFLAGS += -DLORAMAC_NWK_SKEY_DEFAULT=\"EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\" diff --git a/sys/include/net/loramac.h b/sys/include/net/loramac.h index 7cb26519d3..aa4e751332 100644 --- a/sys/include/net/loramac.h +++ b/sys/include/net/loramac.h @@ -50,8 +50,8 @@ extern "C" { * * 8 bytes key, required for join procedure */ -#ifndef LORAMAC_APP_EUI_DEFAULT -#define LORAMAC_APP_EUI_DEFAULT "0000000000000000" +#ifndef CONFIG_LORAMAC_APP_EUI_DEFAULT +#define CONFIG_LORAMAC_APP_EUI_DEFAULT "0000000000000000" #endif /** diff --git a/sys/net/gnrc/netif/lorawan/gnrc_netif_lorawan.c b/sys/net/gnrc/netif/lorawan/gnrc_netif_lorawan.c index fb84932f0a..24d3d54996 100644 --- a/sys/net/gnrc/netif/lorawan/gnrc_netif_lorawan.c +++ b/sys/net/gnrc/netif/lorawan/gnrc_netif_lorawan.c @@ -212,7 +212,7 @@ static void _init(gnrc_netif_t *netif) fmt_hex_bytes(_appskey, LORAMAC_APP_SKEY_DEFAULT); fmt_hex_bytes(_appkey, LORAMAC_APP_KEY_DEFAULT); fmt_hex_bytes(_deveui, CONFIG_LORAMAC_DEV_EUI_DEFAULT); - fmt_hex_bytes(_appeui, LORAMAC_APP_EUI_DEFAULT); + fmt_hex_bytes(_appeui, CONFIG_LORAMAC_APP_EUI_DEFAULT); fmt_hex_bytes(_devaddr, LORAMAC_DEV_ADDR_DEFAULT); /* Initialize default keys, address and EUIs */