Skip to content

Commit db167af

Browse files
author
Antti Kauppila
committed
LoRa: Fixed doxygen error, enabled commented out code
1 parent fa062ff commit db167af

File tree

2 files changed

+43
-29
lines changed

2 files changed

+43
-29
lines changed

features/lorawan/LoRaWANStack.h

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,41 @@
11
/**
2-
/ _____) _ | |
3-
( (____ _____ ____ _| |_ _____ ____| |__
4-
\____ \| ___ | (_ _) ___ |/ ___) _ \
5-
_____) ) ____| | | || |_| ____( (___| | | |
6-
(______/|_____)_|_|_| \__)_____)\____)_| |_|
7-
(C)2013 Semtech
8-
___ _____ _ ___ _ _____ ___ ___ ___ ___
9-
/ __|_ _/_\ / __| |/ / __/ _ \| _ \/ __| __|
10-
\__ \ | |/ _ \ (__| ' <| _| (_) | / (__| _|
11-
|___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
12-
embedded.connectivity.solutions===============
13-
14-
Description: LoRaWAN stack layer that controls both MAC and PHY underneath
15-
16-
License: Revised BSD License, see LICENSE.TXT file include in the project
17-
18-
Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
19-
20-
21-
Copyright (c) 2017, Arm Limited and affiliates.
22-
23-
SPDX-License-Identifier: BSD-3-Clause
24-
*/
2+
* \file LoRaWANStack.h
3+
*
4+
* \brief LoRaWAN stack layer implementation
5+
*
6+
* \copyright Revised BSD License, see LICENSE.TXT file include in the project
7+
*
8+
* \code
9+
* ______ _
10+
* / _____) _ | |
11+
* ( (____ _____ ____ _| |_ _____ ____| |__
12+
* \____ \| ___ | (_ _) ___ |/ ___) _ \
13+
* _____) ) ____| | | || |_| ____( (___| | | |
14+
* (______/|_____)_|_|_| \__)_____)\____)_| |_|
15+
* (C)2013 Semtech
16+
*
17+
* ___ _____ _ ___ _ _____ ___ ___ ___ ___
18+
* / __|_ _/_\ / __| |/ / __/ _ \| _ \/ __| __|
19+
* \__ \ | |/ _ \ (__| ' <| _| (_) | / (__| _|
20+
* |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
21+
* embedded.connectivity.solutions===============
22+
*
23+
* \endcode
24+
*
25+
* \author Miguel Luis ( Semtech )
26+
*
27+
* \author Gregory Cristian ( Semtech )
28+
*
29+
* \author Daniel Jaeckle ( STACKFORCE )
30+
*
31+
* \defgroup LoRaWAN stack layer that controls MAC layer underneath
32+
*
33+
* License: Revised BSD License, see LICENSE.TXT file include in the project
34+
*
35+
* Copyright (c) 2017, Arm Limited and affiliates.
36+
*
37+
* SPDX-License-Identifier: BSD-3-Clause
38+
*/
2539

2640
#ifndef LORAWANSTACK_H_
2741
#define LORAWANSTACK_H_

features/lorawan/lorastack/mac/LoRaMac.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,12 +1421,12 @@ lorawan_status_t LoRaMac::prepare_join(const lorawan_connect_t *params, bool is_
14211421
{
14221422
if (params) {
14231423
if (is_otaa) {
1424-
// if ((params->connection_u.otaa.dev_eui == NULL) ||
1425-
// (params->connection_u.otaa.app_eui == NULL) ||
1426-
// (params->connection_u.otaa.app_key == NULL) ||
1427-
// (params->connection_u.otaa.nb_trials == 0)) {
1428-
// return LORAWAN_STATUS_PARAMETER_INVALID;
1429-
// }
1424+
if ((params->connection_u.otaa.dev_eui == NULL) ||
1425+
(params->connection_u.otaa.app_eui == NULL) ||
1426+
(params->connection_u.otaa.app_key == NULL) ||
1427+
(params->connection_u.otaa.nb_trials == 0)) {
1428+
return LORAWAN_STATUS_PARAMETER_INVALID;
1429+
}
14301430
_params.keys.dev_eui = params->connection_u.otaa.dev_eui;
14311431
_params.keys.app_eui = params->connection_u.otaa.app_eui;
14321432
_params.keys.app_key = params->connection_u.otaa.app_key;

0 commit comments

Comments
 (0)