ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7641 from hasnainvirk/abp_armc6_fix 

LoRaWAN: Fixing incorrect NetID causing ABP Failures
pull/7664/head
Cruz Monrreal 2018-07-31 11:41:34 -05:00 committed by GitHub
parent 4e6942fef1 31aaea6749
commit 4e0a076612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/lorawan/lorastack/mac/LoRaMac.cpp
View File

@ -65,12 +65,6 @@ using namespace mbed;
*/ */
#define DOWN_LINK 1 #define DOWN_LINK 1
/**
* A mask for the network ID.
*/
#define LORAWAN_NETWORK_ID_MASK ( uint32_t )0xFE000000
LoRaMac::LoRaMac() LoRaMac::LoRaMac()
: _lora_time(), : _lora_time(),
_lora_phy(NULL), _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 nwk_skey[] = MBED_CONF_LORA_NWKSKEY;
const static uint8_t app_skey[] = MBED_CONF_LORA_APPSKEY; 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; _params.dev_addr = MBED_CONF_LORA_DEVICE_ADDRESS;
memcpy(_params.keys.nwk_skey, nwk_skey, sizeof(_params.keys.nwk_skey)); memcpy(_params.keys.nwk_skey, nwk_skey, sizeof(_params.keys.nwk_skey));

5
features/lorawan/lorawan_types.h
View File

@ -34,6 +34,11 @@
#include "platform/Callback.h" #include "platform/Callback.h"
/**
* A mask for the network ID.
*/
#define LORAWAN_NETWORK_ID_MASK (uint32_t) 0xFE000000
/** /**
* Option Flags for send(), receive() APIs * Option Flags for send(), receive() APIs
* *