diff --git a/features/lorawan/lorastack/mac/LoRaMac.cpp b/features/lorawan/lorastack/mac/LoRaMac.cpp index 6d7ed946bd7..c5abe8ab2a5 100644 --- a/features/lorawan/lorastack/mac/LoRaMac.cpp +++ b/features/lorawan/lorastack/mac/LoRaMac.cpp @@ -65,12 +65,6 @@ using namespace mbed; */ #define DOWN_LINK 1 -/** - * A mask for the network ID. - */ -#define LORAWAN_NETWORK_ID_MASK ( uint32_t )0xFE000000 - - LoRaMac::LoRaMac() : _lora_time(), _lora_phy(NULL), @@ -1434,7 +1428,7 @@ lorawan_status_t LoRaMac::prepare_join(const lorawan_connect_t *params, bool is_ const static uint8_t nwk_skey[] = MBED_CONF_LORA_NWKSKEY; const static uint8_t app_skey[] = MBED_CONF_LORA_APPSKEY; - _params.net_id = (MBED_CONF_LORA_DEVICE_ADDRESS & LORAWAN_NETWORK_ID_MASK); + _params.net_id = (MBED_CONF_LORA_DEVICE_ADDRESS & LORAWAN_NETWORK_ID_MASK) >> 25; _params.dev_addr = MBED_CONF_LORA_DEVICE_ADDRESS; memcpy(_params.keys.nwk_skey, nwk_skey, sizeof(_params.keys.nwk_skey)); diff --git a/features/lorawan/lorawan_types.h b/features/lorawan/lorawan_types.h index 72fb199fdd8..eef09f2d625 100644 --- a/features/lorawan/lorawan_types.h +++ b/features/lorawan/lorawan_types.h @@ -34,6 +34,11 @@ #include "platform/Callback.h" +/** + * A mask for the network ID. + */ +#define LORAWAN_NETWORK_ID_MASK (uint32_t) 0xFE000000 + /** * Option Flags for send(), receive() APIs *