Added missing mac_cmd_buf_idx_to_repeat to LoRaMacCommand class

- Reordered LoRaWANStack internal variables for more compact code
pull/6279/head
Antti Kauppila 2018-03-08 14:34:01 +02:00
parent 488cf03d1e
commit 32257858d0
3 changed files with 5 additions and 6 deletions

View File

@ -87,8 +87,8 @@ lorawan_status_t LoRaWANStack::set_application_port(uint8_t port)
LoRaWANStack::LoRaWANStack()
: _loramac(_lora_time), _lora_phy(_lora_time),
_device_current_state(DEVICE_STATE_NOT_INITIALIZED), _mac_handlers(NULL),
_num_retry(1), _queue(NULL), _duty_cycle_on(MBED_CONF_LORA_DUTY_CYCLE_ON),
_app_port(INVALID_PORT)
_num_retry(1), _app_port(INVALID_PORT), _duty_cycle_on(MBED_CONF_LORA_DUTY_CYCLE_ON),
_queue(NULL)
{
#ifdef MBED_CONF_LORA_APP_PORT
if (is_port_valid(MBED_CONF_LORA_APP_PORT)) {

View File

@ -456,10 +456,9 @@ private:
loramac_tx_message_t _tx_msg;
loramac_rx_message_t _rx_msg;
uint8_t _num_retry;
events::EventQueue *_queue;
bool _duty_cycle_on;
uint8_t _app_port;
bool _duty_cycle_on;
events::EventQueue *_queue;
#if defined(LORAWAN_COMPLIANCE_TEST)
/**

View File

@ -209,6 +209,7 @@ void LoRaMacCommand::parse_mac_commands_to_repeat()
} else {
mac_cmd_in_next_tx = false;
}
mac_cmd_buf_idx_to_repeat = cmd_cnt;
}
@ -426,7 +427,6 @@ lorawan_status_t LoRaMacCommand::process_mac_commands(uint8_t *payload, uint8_t
bool LoRaMacCommand::is_sticky_mac_command_pending()
{
//DEAD CODE: mac_cmd_buf_idx_to_repeat is never set
if (mac_cmd_buf_idx_to_repeat > 0) {
return true;
}