Skip to content

Commit dfced18

Browse files
committed
Added missing definitions.
Cosmetic updates.
1 parent b4b37db commit dfced18

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

src/apps/LoRaMac/common/Commissioning.h

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* \file Commissioning.h
33
*
4-
* \brief End device commissioning parameters
4+
* \brief End-device commissioning parameters
55
*
66
* \copyright Revised BSD License, see section \ref LICENSE.
77
*
@@ -12,22 +12,18 @@
1212
* \____ \| ___ | (_ _) ___ |/ ___) _ \
1313
* _____) ) ____| | | || |_| ____( (___| | | |
1414
* (______/|_____)_|_|_| \__)_____)\____)_| |_|
15-
* (C)2013-2017 Semtech
15+
* (C)2013-2020 Semtech
1616
*
1717
* \endcode
18-
*
19-
* \author Miguel Luis ( Semtech )
20-
*
21-
* \author Gregory Cristian ( Semtech )
2218
*/
23-
#ifndef __LORA_COMMISSIONING_H__
24-
#define __LORA_COMMISSIONING_H__
19+
#ifndef __COMMISSIONING_H__
20+
#define __COMMISSIONING_H__
2521

2622
/*!
2723
******************************************************************************
2824
********************************** WARNING ***********************************
2925
******************************************************************************
30-
The crypto-element implementation supports both 1.0.x and 1.1.x LoRaWAN
26+
The secure-element implementation supports both 1.0.x and 1.1.x LoRaWAN
3127
versions of the specification.
3228
Thus it has been decided to use the 1.1.x keys and EUI name definitions.
3329
The below table shows the names equivalence between versions:
@@ -75,18 +71,19 @@
7571
#define LORAWAN_PUBLIC_NETWORK true
7672

7773
/*!
78-
* IEEE Organizationally Unique Identifier ( OUI ) (big endian)
79-
* \remark This is unique to a company or organization
74+
* When set to 1 DevEui is LORAWAN_DEVICE_EUI
75+
* When set to 0 DevEui is automatically generated by calling
76+
* BoardGetUniqueId function
8077
*/
81-
#define IEEE_OUI 0x00, 0x00, 0x00
78+
#define STATIC_DEVICE_EUI 0
8279

8380
/*!
84-
* Mote device IEEE EUI (big endian)
81+
* end-device IEEE EUI (big endian)
8582
*
8683
* \remark In this application the value is automatically generated by calling
8784
* BoardGetUniqueId function
8885
*/
89-
#define LORAWAN_DEVICE_EUI { IEEE_OUI, 0x00, 0x00, 0x00, 0x00, 0x00 }
86+
#define LORAWAN_DEVICE_EUI { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
9087

9188
/*!
9289
* App/Join server IEEE EUI (big endian)
@@ -116,6 +113,14 @@
116113
*/
117114
#define LORAWAN_NETWORK_ID ( uint32_t )0
118115

116+
/*!
117+
* When set to 1 DevAdd is LORAWAN_DEVICE_ADDRESS
118+
* When set to 0 DevAdd is automatically generated using
119+
* a pseudo random generator seeded with a value derived from
120+
* BoardUniqueId value
121+
*/
122+
#define STATIC_DEVICE_ADDRESS 0
123+
119124
/*!
120125
* Device address on the network (big endian)
121126
*
@@ -148,4 +153,4 @@
148153
*/
149154
#define LORAWAN_APP_S_KEY { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C }
150155

151-
#endif // __LORA_COMMISSIONING_H__
156+
#endif // __COMMISSIONING_H__

0 commit comments

Comments
 (0)