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

LoRa: Small fixes 

- changed few static variables to have const
pull/6411/head
Antti Kauppila 2018-04-03 14:58:01 +03:00
parent fd9a6af93b
commit 10ad173091
4 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/lorawan/LoRaWANBase.h
View File

@ -342,7 +342,7 @@ public:
* LORAWAN_STATUS_UNSUPPORTED is requested class is not supported, * LORAWAN_STATUS_UNSUPPORTED is requested class is not supported,
* or other negative error code if request failed. * or other negative error code if request failed.
*/ */
virtual lorawan_status_t set_device_class(const device_class_t device_class) = 0; virtual lorawan_status_t set_device_class(device_class_t device_class) = 0;
}; };
#endif /* LORAWAN_BASE_H_ */ #endif /* LORAWAN_BASE_H_ */

30
features/lorawan/LoRaWANStack.cpp
View File

@ -131,29 +131,29 @@ lorawan_status_t LoRaWANStack::connect()
lorawan_connect_t connection_params; lorawan_connect_t connection_params;
//TODO: LoRaWANStack don't need to know these values, move to LoRaMac (or below) //TODO: LoRaWANStack don't need to know these values, move to LoRaMac (or below)
#if (1 == MBED_CONF_LORA_OVER_THE_AIR_ACTIVATION) #if MBED_CONF_LORA_OVER_THE_AIR_ACTIVATION
static uint8_t dev_eui[] = MBED_CONF_LORA_DEVICE_EUI; const static uint8_t dev_eui[] = MBED_CONF_LORA_DEVICE_EUI;
static uint8_t app_eui[] = MBED_CONF_LORA_APPLICATION_EUI; const static uint8_t app_eui[] = MBED_CONF_LORA_APPLICATION_EUI;
static uint8_t app_key[] = MBED_CONF_LORA_APPLICATION_KEY; const static uint8_t app_key[] = MBED_CONF_LORA_APPLICATION_KEY;
connection_params.connect_type = LORAWAN_CONNECTION_OTAA; connection_params.connect_type = LORAWAN_CONNECTION_OTAA;
connection_params.connection_u.otaa.app_eui = app_eui; connection_params.connection_u.otaa.app_eui = const_cast<uint8_t *>(app_eui);
connection_params.connection_u.otaa.dev_eui = dev_eui; connection_params.connection_u.otaa.dev_eui = const_cast<uint8_t *>(dev_eui);
connection_params.connection_u.otaa.app_key = app_key; connection_params.connection_u.otaa.app_key = const_cast<uint8_t *>(app_key);
connection_params.connection_u.otaa.nb_trials = MBED_CONF_LORA_NB_TRIALS; connection_params.connection_u.otaa.nb_trials = MBED_CONF_LORA_NB_TRIALS;
return join_request_by_otaa(connection_params); return join_request_by_otaa(connection_params);
#else #else
static uint8_t nwk_skey[] = MBED_CONF_LORA_NWKSKEY; const static uint8_t nwk_skey[] = MBED_CONF_LORA_NWKSKEY;
static uint8_t app_skey[] = MBED_CONF_LORA_APPSKEY; const static uint8_t app_skey[] = MBED_CONF_LORA_APPSKEY;
static uint32_t dev_addr = MBED_CONF_LORA_DEVICE_ADDRESS; const static uint32_t dev_addr = MBED_CONF_LORA_DEVICE_ADDRESS;
static uint32_t nwk_id = (MBED_CONF_LORA_DEVICE_ADDRESS & LORAWAN_NETWORK_ID_MASK); const static uint32_t nwk_id = (MBED_CONF_LORA_DEVICE_ADDRESS & LORAWAN_NETWORK_ID_MASK);
connection_params.connect_type = LORAWAN_CONNECTION_ABP; connection_params.connect_type = LORAWAN_CONNECTION_ABP;
connection_params.connection_u.abp.nwk_id = nwk_id; connection_params.connection_u.abp.nwk_id = const_cast<uint8_t *>(nwk_id);
connection_params.connection_u.abp.dev_addr = dev_addr; connection_params.connection_u.abp.dev_addr = const_cast<uint8_t *>(dev_addr);
connection_params.connection_u.abp.nwk_skey = nwk_skey; connection_params.connection_u.abp.nwk_skey = const_cast<uint8_t *>(nwk_skey);
connection_params.connection_u.abp.app_skey = app_skey; connection_params.connection_u.abp.app_skey = const_cast<uint8_t *>(app_skey);
return activation_by_personalization(connection_params); return activation_by_personalization(connection_params);
#endif #endif

7
features/lorawan/lorastack/phy/LoRaPHY.cpp
View File

@ -651,7 +651,10 @@ bool LoRaPHY::verify_rx_datarate(uint8_t datarate)
bool LoRaPHY::verify_tx_datarate(uint8_t datarate, bool use_default) bool LoRaPHY::verify_tx_datarate(uint8_t datarate, bool use_default)
{ {
if (is_datarate_supported(datarate)) { if (!is_datarate_supported(datarate)) {
return false;
}
if (use_default) { if (use_default) {
return val_in_range(datarate, phy_params.default_datarate, return val_in_range(datarate, phy_params.default_datarate,
phy_params.default_max_datarate); phy_params.default_max_datarate);
@ -663,8 +666,6 @@ bool LoRaPHY::verify_tx_datarate(uint8_t datarate, bool use_default)
phy_params.max_tx_datarate); phy_params.max_tx_datarate);
} }
} }
return false;
}
bool LoRaPHY::verify_tx_power(uint8_t tx_power) bool LoRaPHY::verify_tx_power(uint8_t tx_power)
{ {

2
features/lorawan/system/lorawan_data_structures.h
View File

@ -1744,7 +1744,7 @@ typedef struct {
typedef struct { typedef struct {
/*! /*!
* Compiliance test request * Compliance test request
*/ */
mcps_type_t type; mcps_type_t type;