LoRa: Fixed doxygen error, enabled commented out code

pull/6566/head
Antti Kauppila 2018-04-09 11:48:03 +03:00
parent fa062fff76
commit db167af3c1
2 changed files with 43 additions and 29 deletions

View File

@ -1,27 +1,41 @@
/** /**
/ _____) _ | | * \file LoRaWANStack.h
( (____ _____ ____ _| |_ _____ ____| |__ *
\____ \| ___ | (_ _) ___ |/ ___) _ \ * \brief LoRaWAN stack layer implementation
_____) ) ____| | | || |_| ____( (___| | | | *
(______/|_____)_|_|_| \__)_____)\____)_| |_| * \copyright Revised BSD License, see LICENSE.TXT file include in the project
(C)2013 Semtech *
___ _____ _ ___ _ _____ ___ ___ ___ ___ * \code
/ __|_ _/_\ / __| |/ / __/ _ \| _ \/ __| __| * ______ _
\__ \ | |/ _ \ (__| ' <| _| (_) | / (__| _| * / _____) _ | |
|___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___| * ( (____ _____ ____ _| |_ _____ ____| |__
embedded.connectivity.solutions=============== * \____ \| ___ | (_ _) ___ |/ ___) _ \
* _____) ) ____| | | || |_| ____( (___| | | |
Description: LoRaWAN stack layer that controls both MAC and PHY underneath * (______/|_____)_|_|_| \__)_____)\____)_| |_|
* (C)2013 Semtech
License: Revised BSD License, see LICENSE.TXT file include in the project *
* ___ _____ _ ___ _ _____ ___ ___ ___ ___
Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE ) * / __|_ _/_\ / __| |/ / __/ _ \| _ \/ __| __|
* \__ \ | |/ _ \ (__| ' <| _| (_) | / (__| _|
* |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
Copyright (c) 2017, Arm Limited and affiliates. * embedded.connectivity.solutions===============
*
SPDX-License-Identifier: BSD-3-Clause * \endcode
*/ *
* \author Miguel Luis ( Semtech )
*
* \author Gregory Cristian ( Semtech )
*
* \author Daniel Jaeckle ( STACKFORCE )
*
* \defgroup LoRaWAN stack layer that controls MAC layer underneath
*
* License: Revised BSD License, see LICENSE.TXT file include in the project
*
* Copyright (c) 2017, Arm Limited and affiliates.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef LORAWANSTACK_H_ #ifndef LORAWANSTACK_H_
#define LORAWANSTACK_H_ #define LORAWANSTACK_H_

View File

@ -1421,12 +1421,12 @@ lorawan_status_t LoRaMac::prepare_join(const lorawan_connect_t *params, bool is_
{ {
if (params) { if (params) {
if (is_otaa) { if (is_otaa) {
// if ((params->connection_u.otaa.dev_eui == NULL) || if ((params->connection_u.otaa.dev_eui == NULL) ||
// (params->connection_u.otaa.app_eui == NULL) || (params->connection_u.otaa.app_eui == NULL) ||
// (params->connection_u.otaa.app_key == NULL) || (params->connection_u.otaa.app_key == NULL) ||
// (params->connection_u.otaa.nb_trials == 0)) { (params->connection_u.otaa.nb_trials == 0)) {
// return LORAWAN_STATUS_PARAMETER_INVALID; return LORAWAN_STATUS_PARAMETER_INVALID;
// } }
_params.keys.dev_eui = params->connection_u.otaa.dev_eui; _params.keys.dev_eui = params->connection_u.otaa.dev_eui;
_params.keys.app_eui = params->connection_u.otaa.app_eui; _params.keys.app_eui = params->connection_u.otaa.app_eui;
_params.keys.app_key = params->connection_u.otaa.app_key; _params.keys.app_key = params->connection_u.otaa.app_key;