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

Lora: Clear callback ID when timer callback is executed.

pull/14422/head
Vincent Coubard 2021-03-11 21:00:43 +00:00
parent 4885739c4e
commit 9781418e31
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
connectivity/lorawan/lorastack/mac/LoRaMac.cpp
View File

@ -1419,7 +1419,13 @@ void LoRaMac::set_device_class(const device_class_t &device_class,
_device_class = device_class; _device_class = device_class;
_rx2_would_be_closure_for_class_c = rx2_would_be_closure_handler; _rx2_would_be_closure_for_class_c = rx2_would_be_closure_handler;
_lora_time.init(_rx2_closure_timer_for_class_c, _rx2_would_be_closure_for_class_c); _lora_time.init(_rx2_closure_timer_for_class_c, [this] {
{
Lock lock(*this);
_lora_time.clear(_rx2_closure_timer_for_class_c);
}
_rx2_would_be_closure_for_class_c();
});
if (CLASS_A == _device_class) { if (CLASS_A == _device_class) {
tr_debug("Changing device class to -> CLASS_A"); tr_debug("Changing device class to -> CLASS_A");
@ -1805,14 +1811,34 @@ lorawan_status_t LoRaMac::initialize(EventQueue *queue,
_lora_phy->setup_public_network_mode(_params.is_nwk_public); _lora_phy->setup_public_network_mode(_params.is_nwk_public);
_lora_phy->put_radio_to_sleep(); _lora_phy->put_radio_to_sleep();
_lora_time.init(_params.timers.backoff_timer, _lora_time.init(_params.timers.backoff_timer, [this] {
mbed::callback(this, &LoRaMac::on_backoff_timer_expiry)); {
_lora_time.init(_params.timers.rx_window1_timer, Lock lock(*this);
mbed::callback(this, &LoRaMac::open_rx1_window)); _lora_time.clear(_params.timers.backoff_timer);
_lora_time.init(_params.timers.rx_window2_timer, }
mbed::callback(this, &LoRaMac::open_rx2_window)); on_backoff_timer_expiry();
_lora_time.init(_params.timers.ack_timeout_timer, });
mbed::callback(this, &LoRaMac::on_ack_timeout_timer_event)); _lora_time.init(_params.timers.rx_window1_timer, [this] {
{
Lock lock(*this);
_lora_time.clear(_params.timers.rx_window1_timer);
}
open_rx1_window();
});
_lora_time.init(_params.timers.rx_window2_timer, [this] {
{
Lock lock(*this);
_lora_time.clear(_params.timers.rx_window2_timer);
}
open_rx2_window();
});
_lora_time.init(_params.timers.ack_timeout_timer, [this] {
{
Lock lock(*this);
_lora_time.clear(_params.timers.ack_timeout_timer);
}
on_ack_timeout_timer_event();
});
_params.timers.mac_init_time = _lora_time.get_current_time(); _params.timers.mac_init_time = _lora_time.get_current_time();