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

Use EventQueue for timers 

Instead of initiating own timer objects we can use EventQueue::call_in() method
as we already have handle to EventQueue object.

Also setting timeout and starting timer has been combined to TimerStart method.
pull/6059/head
Kimmo Vaisanen 2018-01-24 14:30:22 +02:00 committed by Hasnain Virk
parent f2bdef8543
commit 44bca596c5
4 changed files with 50 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
features/lorawan/lorastack/mac/LoRaMac.cpp
View File

@ -214,19 +214,16 @@ void LoRaMac::OnRadioTxDone( void )
// Setup timers // Setup timers
if( _params.is_rx_window_enabled == true ) if( _params.is_rx_window_enabled == true )
{ {
_lora_time.TimerSetValue( &_params.timers.rx_window1_timer, _params.rx_window1_delay ); _lora_time.TimerStart( _params.timers.rx_window1_timer, _params.rx_window1_delay );
_lora_time.TimerStart( &_params.timers.rx_window1_timer );
if( _params.dev_class != CLASS_C ) if( _params.dev_class != CLASS_C )
{ {
_lora_time.TimerSetValue( &_params.timers.rx_window2_timer, _params.rx_window2_delay ); _lora_time.TimerStart( _params.timers.rx_window2_timer, _params.rx_window2_delay );
_lora_time.TimerStart( &_params.timers.rx_window2_timer );
} }
if( ( _params.dev_class == CLASS_C ) || ( _params.is_node_ack_requested == true ) ) if( ( _params.dev_class == CLASS_C ) || ( _params.is_node_ack_requested == true ) )
{ {
getPhy.Attribute = PHY_ACK_TIMEOUT; getPhy.Attribute = PHY_ACK_TIMEOUT;
phyParam = lora_phy->get_phy_params(&getPhy); phyParam = lora_phy->get_phy_params(&getPhy);
_lora_time.TimerSetValue( &_params.timers.ack_timeout_timer, _params.rx_window2_delay + phyParam.Value ); _lora_time.TimerStart( _params.timers.ack_timeout_timer, _params.rx_window2_delay + phyParam.Value );
_lora_time.TimerStart( &_params.timers.ack_timeout_timer );
} }
} }
else else
@ -281,8 +278,7 @@ void LoRaMac::PrepareRxDoneAbort( void )
_params.flags.bits.mac_done = 1; _params.flags.bits.mac_done = 1;
// Trig OnMacCheckTimerEvent call as soon as possible // Trig OnMacCheckTimerEvent call as soon as possible
_lora_time.TimerSetValue( &_params.timers.mac_state_check_timer, 1 ); _lora_time.TimerStart( _params.timers.mac_state_check_timer, 1 );
_lora_time.TimerStart( &_params.timers.mac_state_check_timer );
} }
void LoRaMac::OnRadioRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr ) void LoRaMac::OnRadioRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
@ -331,7 +327,7 @@ void LoRaMac::OnRadioRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8
lora_phy->put_radio_to_sleep(); lora_phy->put_radio_to_sleep();
_lora_time.TimerStop( &_params.timers.rx_window2_timer ); _lora_time.TimerStop( _params.timers.rx_window2_timer );
macHdr.value = payload[pktHeaderLen++]; macHdr.value = payload[pktHeaderLen++];
@ -679,7 +675,7 @@ void LoRaMac::OnRadioRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8
// Stop the AckTimeout timer as no more retransmissions // Stop the AckTimeout timer as no more retransmissions
// are needed. // are needed.
_lora_time.TimerStop( &_params.timers.ack_timeout_timer ); _lora_time.TimerStop( _params.timers.ack_timeout_timer );
} }
else else
{ {
@ -689,7 +685,7 @@ void LoRaMac::OnRadioRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8
{ {
// Stop the AckTimeout timer as no more retransmissions // Stop the AckTimeout timer as no more retransmissions
// are needed. // are needed.
_lora_time.TimerStop( &_params.timers.ack_timeout_timer ); _lora_time.TimerStop( _params.timers.ack_timeout_timer );
} }
} }
} }
@ -727,8 +723,7 @@ void LoRaMac::OnRadioRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8
_params.flags.bits.mac_done = 1; _params.flags.bits.mac_done = 1;
// Trig OnMacCheckTimerEvent call as soon as possible // Trig OnMacCheckTimerEvent call as soon as possible
_lora_time.TimerSetValue( &_params.timers.mac_state_check_timer, 1 ); _lora_time.TimerStart( _params.timers.mac_state_check_timer, 1 );
_lora_time.TimerStart( &_params.timers.mac_state_check_timer );
} }
void LoRaMac::OnRadioTxTimeout( void ) void LoRaMac::OnRadioTxTimeout( void )
@ -771,7 +766,7 @@ void LoRaMac::OnRadioRxError( void )
if( _lora_time.TimerGetElapsedTime( _params.timers.aggregated_last_tx_time ) >= _params.rx_window2_delay ) if( _lora_time.TimerGetElapsedTime( _params.timers.aggregated_last_tx_time ) >= _params.rx_window2_delay )
{ {
_lora_time.TimerStop( &_params.timers.rx_window2_timer ); _lora_time.TimerStop( _params.timers.rx_window2_timer );
_params.flags.bits.mac_done = 1; _params.flags.bits.mac_done = 1;
} }
} }
@ -809,7 +804,7 @@ void LoRaMac::OnRadioRxTimeout( void )
if( _lora_time.TimerGetElapsedTime( _params.timers.aggregated_last_tx_time ) >= _params.rx_window2_delay ) if( _lora_time.TimerGetElapsedTime( _params.timers.aggregated_last_tx_time ) >= _params.rx_window2_delay )
{ {
_lora_time.TimerStop( &_params.timers.rx_window2_timer ); _lora_time.TimerStop( _params.timers.rx_window2_timer );
_params.flags.bits.mac_done = 1; _params.flags.bits.mac_done = 1;
} }
} }
@ -838,7 +833,7 @@ void LoRaMac::OnMacStateCheckTimerEvent( void )
PhyParam_t phyParam; PhyParam_t phyParam;
bool txTimeout = false; bool txTimeout = false;
_lora_time.TimerStop( &_params.timers.mac_state_check_timer ); _lora_time.TimerStop( _params.timers.mac_state_check_timer );
if( _params.flags.bits.mac_done == 1 ) if( _params.flags.bits.mac_done == 1 )
{ {
@ -1024,9 +1019,7 @@ void LoRaMac::OnMacStateCheckTimerEvent( void )
else else
{ {
// Operation not finished restart timer // Operation not finished restart timer
_lora_time.TimerSetValue( &_params.timers.mac_state_check_timer, _lora_time.TimerStart( _params.timers.mac_state_check_timer, MAC_STATE_CHECK_TIMEOUT );
MAC_STATE_CHECK_TIMEOUT );
_lora_time.TimerStart( &_params.timers.mac_state_check_timer );
} }
// Handle MCPS indication // Handle MCPS indication
@ -1058,7 +1051,7 @@ void LoRaMac::OnTxDelayedTimerEvent( void )
loramac_frame_ctrl_t fCtrl; loramac_frame_ctrl_t fCtrl;
AlternateDrParams_t altDr; AlternateDrParams_t altDr;
_lora_time.TimerStop( &_params.timers.tx_delayed_timer ); _lora_time.TimerStop( _params.timers.tx_delayed_timer );
_params.mac_state &= ~LORAMAC_TX_DELAYED; _params.mac_state &= ~LORAMAC_TX_DELAYED;
if( ( _params.flags.bits.mlme_req == 1 ) && ( mlme.get_confirmation().req_type == MLME_JOIN ) ) if( ( _params.flags.bits.mlme_req == 1 ) && ( mlme.get_confirmation().req_type == MLME_JOIN ) )
@ -1085,7 +1078,7 @@ void LoRaMac::OnTxDelayedTimerEvent( void )
void LoRaMac::OnRxWindow1TimerEvent( void ) void LoRaMac::OnRxWindow1TimerEvent( void )
{ {
_lora_time.TimerStop( &_params.timers.rx_window1_timer ); _lora_time.TimerStop( _params.timers.rx_window1_timer );
_params.rx_slot= RX_SLOT_WIN_1; _params.rx_slot= RX_SLOT_WIN_1;
_params.rx_window1_config.channel = _params.channel; _params.rx_window1_config.channel = _params.channel;
@ -1106,7 +1099,7 @@ void LoRaMac::OnRxWindow1TimerEvent( void )
void LoRaMac::OnRxWindow2TimerEvent( void ) void LoRaMac::OnRxWindow2TimerEvent( void )
{ {
_lora_time.TimerStop( &_params.timers.rx_window2_timer ); _lora_time.TimerStop( _params.timers.rx_window2_timer );
_params.rx_window2_config.channel = _params.channel; _params.rx_window2_config.channel = _params.channel;
_params.rx_window2_config.frequency = _params.sys_params.rx2_channel.frequency; _params.rx_window2_config.frequency = _params.sys_params.rx2_channel.frequency;
@ -1133,7 +1126,7 @@ void LoRaMac::OnRxWindow2TimerEvent( void )
void LoRaMac::OnAckTimeoutTimerEvent( void ) void LoRaMac::OnAckTimeoutTimerEvent( void )
{ {
_lora_time.TimerStop( &_params.timers.ack_timeout_timer ); _lora_time.TimerStop( _params.timers.ack_timeout_timer );
if( _params.is_node_ack_requested == true ) if( _params.is_node_ack_requested == true )
{ {
@ -1305,8 +1298,7 @@ lorawan_status_t LoRaMac::ScheduleTx( void )
_params.mac_state |= LORAMAC_TX_DELAYED; _params.mac_state |= LORAMAC_TX_DELAYED;
tr_debug("Next Transmission in %lu ms", dutyCycleTimeOff); tr_debug("Next Transmission in %lu ms", dutyCycleTimeOff);
_lora_time.TimerSetValue( &_params.timers.tx_delayed_timer, dutyCycleTimeOff ); _lora_time.TimerStart( _params.timers.tx_delayed_timer, dutyCycleTimeOff );
_lora_time.TimerStart( &_params.timers.tx_delayed_timer );
return LORAWAN_STATUS_OK; return LORAWAN_STATUS_OK;
} }
@ -1654,8 +1646,7 @@ lorawan_status_t LoRaMac::SendFrameOnChannel( uint8_t channel )
mlme.get_confirmation().tx_toa = _params.timers.tx_toa; mlme.get_confirmation().tx_toa = _params.timers.tx_toa;
// Starts the MAC layer status check timer // Starts the MAC layer status check timer
_lora_time.TimerSetValue( &_params.timers.mac_state_check_timer, MAC_STATE_CHECK_TIMEOUT ); _lora_time.TimerStart( _params.timers.mac_state_check_timer, MAC_STATE_CHECK_TIMEOUT );
_lora_time.TimerStart( &_params.timers.mac_state_check_timer );
if( _params.is_nwk_joined == false ) if( _params.is_nwk_joined == false )
{ {
@ -1684,8 +1675,7 @@ lorawan_status_t LoRaMac::SetTxContinuousWave( uint16_t timeout )
lora_phy->set_tx_cont_mode(&continuousWave); lora_phy->set_tx_cont_mode(&continuousWave);
// Starts the MAC layer status check timer // Starts the MAC layer status check timer
_lora_time.TimerSetValue( &_params.timers.mac_state_check_timer, MAC_STATE_CHECK_TIMEOUT ); _lora_time.TimerStart( _params.timers.mac_state_check_timer, MAC_STATE_CHECK_TIMEOUT );
_lora_time.TimerStart( &_params.timers.mac_state_check_timer );
_params.mac_state |= LORAMAC_TX_RUNNING; _params.mac_state |= LORAMAC_TX_RUNNING;
@ -1697,8 +1687,7 @@ lorawan_status_t LoRaMac::SetTxContinuousWave1( uint16_t timeout, uint32_t frequ
lora_phy->setup_tx_cont_wave_mode(frequency, power, timeout); lora_phy->setup_tx_cont_wave_mode(frequency, power, timeout);
// Starts the MAC layer status check timer // Starts the MAC layer status check timer
_lora_time.TimerSetValue( &_params.timers.mac_state_check_timer, MAC_STATE_CHECK_TIMEOUT ); _lora_time.TimerStart( _params.timers.mac_state_check_timer, MAC_STATE_CHECK_TIMEOUT );
_lora_time.TimerStart( &_params.timers.mac_state_check_timer );
_params.mac_state |= LORAMAC_TX_RUNNING; _params.mac_state |= LORAMAC_TX_RUNNING;
@ -1828,17 +1817,15 @@ lorawan_status_t LoRaMac::LoRaMacInitialization(loramac_primitives_t *primitives
lora_phy->put_radio_to_sleep(); lora_phy->put_radio_to_sleep();
// Initialize timers // Initialize timers
_lora_time.TimerInit(&_params.timers.mac_state_check_timer, _lora_time.TimerInit(_params.timers.mac_state_check_timer,
mbed::callback(this, &LoRaMac::handle_mac_state_check_timer_event)); mbed::callback(this, &LoRaMac::handle_mac_state_check_timer_event));
_lora_time.TimerSetValue(&_params.timers.mac_state_check_timer, MAC_STATE_CHECK_TIMEOUT); _lora_time.TimerInit(_params.timers.tx_delayed_timer,
_lora_time.TimerInit(&_params.timers.tx_delayed_timer,
mbed::callback(this, &LoRaMac::handle_delayed_tx_timer_event)); mbed::callback(this, &LoRaMac::handle_delayed_tx_timer_event));
_lora_time.TimerInit(&_params.timers.rx_window1_timer, _lora_time.TimerInit(_params.timers.rx_window1_timer,
mbed::callback(this, &LoRaMac::handle_rx1_timer_event)); mbed::callback(this, &LoRaMac::handle_rx1_timer_event));
_lora_time.TimerInit(&_params.timers.rx_window2_timer, _lora_time.TimerInit(_params.timers.rx_window2_timer,
mbed::callback(this, &LoRaMac::handle_rx2_timer_event)); mbed::callback(this, &LoRaMac::handle_rx2_timer_event));
_lora_time.TimerInit(&_params.timers.ack_timeout_timer, _lora_time.TimerInit(_params.timers.ack_timeout_timer,
mbed::callback(this, &LoRaMac::handle_ack_timeout)); mbed::callback(this, &LoRaMac::handle_ack_timeout));
// Store the current initialization time // Store the current initialization time
@ -2071,16 +2058,13 @@ radio_events_t *LoRaMac::GetPhyEventHandlers()
lorawan_status_t LoRaMac::LoRaMacSetTxTimer( uint32_t TxDutyCycleTime ) lorawan_status_t LoRaMac::LoRaMacSetTxTimer( uint32_t TxDutyCycleTime )
{ {
_lora_time.TimerSetValue(&tx_next_packet_timer, TxDutyCycleTime); _lora_time.TimerStart(tx_next_packet_timer, TxDutyCycleTime);
_lora_time.TimerStart(&tx_next_packet_timer);
return LORAWAN_STATUS_OK; return LORAWAN_STATUS_OK;
} }
lorawan_status_t LoRaMac::LoRaMacStopTxTimer( ) lorawan_status_t LoRaMac::LoRaMacStopTxTimer( )
{ {
_lora_time.TimerStop(&tx_next_packet_timer); _lora_time.TimerStop(tx_next_packet_timer);
return LORAWAN_STATUS_OK; return LORAWAN_STATUS_OK;
} }

21
features/lorawan/system/LoRaWANTimer.cpp
View File

@ -45,23 +45,20 @@ lorawan_time_t LoRaWANTimeHandler::TimerGetElapsedTime( lorawan_time_t savedTime
return TimerGetCurrentTime() - savedTime; return TimerGetCurrentTime() - savedTime;
} }
void LoRaWANTimeHandler::TimerInit( timer_event_t *obj, mbed::Callback<void()> callback) void LoRaWANTimeHandler::TimerInit( timer_event_t &obj, mbed::Callback<void()> callback)
{ {
obj->value = 0; obj.callback = callback;
obj->callback = callback; obj.timer_id = 0;
} }
void LoRaWANTimeHandler::TimerStart( timer_event_t *obj ) void LoRaWANTimeHandler::TimerStart( timer_event_t &obj, const uint32_t timeout )
{ {
obj->timer.get()->attach_us(obj->callback, obj->value * 1000 ); obj.timer_id = _queue->call_in(timeout, obj.callback);
MBED_ASSERT(obj.timer_id != 0);
} }
void LoRaWANTimeHandler::TimerStop( timer_event_t *obj ) void LoRaWANTimeHandler::TimerStop( timer_event_t &obj )
{ {
obj->timer.get()->detach( ); _queue->cancel(obj.timer_id);
} obj.timer_id = 0;
void LoRaWANTimeHandler::TimerSetValue( timer_event_t *obj, uint32_t value )
{
obj->value = value;
} }

35
features/lorawan/system/LoRaWANTimer.h
View File

@ -40,17 +40,6 @@ public:
*/ */
void TimerTimeCounterInit(events::EventQueue *queue); void TimerTimeCounterInit(events::EventQueue *queue);
/*!
* \brief Initializes the timer object.
*
* \remark The TimerSetValue function must be called before starting the timer.
* This function initializes the timestamp and reloads the value at 0.
*
* \param [in] obj The structure containing the timer object parameters.
* \param [in] callback The function callback called at the end of the timeout.
*/
void TimerInit( timer_event_t *obj, mbed::Callback<void()> callback);
/*! /*!
* \brief Read the current time. * \brief Read the current time.
* *
@ -66,29 +55,31 @@ public:
*/ */
lorawan_time_t TimerGetElapsedTime( lorawan_time_t savedTime ); lorawan_time_t TimerGetElapsedTime( lorawan_time_t savedTime );
/*!
* \brief Initializes the timer object.
*
* \remark The TimerSetValue function must be called before starting the timer.
* This function initializes the timestamp and reloads the value at 0.
*
* \param [in] obj The structure containing the timer object parameters.
* \param [in] callback The function callback called at the end of the timeout.
*/
void TimerInit( timer_event_t &obj, mbed::Callback<void()> callback);
/*! /*!
* \brief Starts and adds the timer object to the list of timer events. * \brief Starts and adds the timer object to the list of timer events.
* *
* \param [in] obj The structure containing the timer object parameters. * \param [in] obj The structure containing the timer object parameters.
* \param [in] value The new timeout value.
*/ */
void TimerStart( timer_event_t *obj ); void TimerStart( timer_event_t &obj, const uint32_t timeout );
/*! /*!
* \brief Stops and removes the timer object from the list of timer events. * \brief Stops and removes the timer object from the list of timer events.
* *
* \param [in] obj The structure containing the timer object parameters. * \param [in] obj The structure containing the timer object parameters.
*/ */
void TimerStop( timer_event_t *obj ); void TimerStop( timer_event_t &obj );
/*!
* \brief Set a new timeout value.
*
* \param [in] obj The structure containing the timer object parameters.
* \param [in] value The new timeout value.
*/
void TimerSetValue( timer_event_t *obj, uint32_t value );
private: private:
events::EventQueue *_queue; events::EventQueue *_queue;

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

@ -24,9 +24,7 @@
#define LORAWAN_SYSTEM_LORAWAN_DATA_STRUCTURES_H_ #define LORAWAN_SYSTEM_LORAWAN_DATA_STRUCTURES_H_
#include <inttypes.h> #include <inttypes.h>
#include "drivers/Ticker.h"
#include "platform/Callback.h" #include "platform/Callback.h"
#include "platform/SingletonPtr.h"
/*! /*!
* \brief Timer time variable definition * \brief Timer time variable definition
@ -2052,9 +2050,8 @@ typedef struct {
* \brief Timer object description * \brief Timer object description
*/ */
typedef struct { typedef struct {
uint32_t value;
mbed::Callback<void()> callback; mbed::Callback<void()> callback;
SingletonPtr<mbed::Ticker> timer; int timer_id;
} timer_event_t; } timer_event_t;
/*! /*!