mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-28 00:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: remove Attention Timer state from provisioning device, only emit attention timer start/stop events

Browse Source
This commit is contained in:
Matthias Ringwald 2019-07-16 12:28:35 +02:00
parent 75c1e52712
commit cc639358ce
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mesh/provisioning_device.c
View File

@ -50,7 +50,6 @@
#include "mesh/pb_gatt.h" #include "mesh/pb_gatt.h"
#include "mesh/provisioning.h" #include "mesh/provisioning.h"
static void provisioning_attention_timer_set(void);
static void prov_key_generated(void * arg); static void prov_key_generated(void * arg);
// remote ecc // remote ecc
@ -88,7 +87,6 @@ static uint8_t prov_error_code;
static uint8_t prov_waiting_for_outgoing_complete; static uint8_t prov_waiting_for_outgoing_complete;
static uint8_t prov_attention_timer_timeout; static uint8_t prov_attention_timer_timeout;
static btstack_timer_source_t prov_attention_timer;
static btstack_timer_source_t prov_protocol_timer; static btstack_timer_source_t prov_protocol_timer;
@ -214,21 +212,6 @@ static void provisioning_timer_stop(void){
btstack_run_loop_remove_timer(&prov_protocol_timer); btstack_run_loop_remove_timer(&prov_protocol_timer);
} }
static void provisioning_attention_timer_timeout(btstack_timer_source_t * ts){
UNUSED(ts);
if (prov_attention_timer_timeout == 0) return;
prov_attention_timer_timeout--;
provisioning_attention_timer_set();
}
static void provisioning_attention_timer_set(void){
provisioning_emit_attention_timer_event(1, prov_attention_timer_timeout);
if (prov_attention_timer_timeout){
btstack_run_loop_set_timer_handler(&prov_attention_timer, &provisioning_attention_timer_timeout);
btstack_run_loop_set_timer(&prov_attention_timer, 1000);
btstack_run_loop_add_timer(&prov_attention_timer);
}
}
// Outgoing Provisioning PDUs // Outgoing Provisioning PDUs
static void provisioning_send_provisioning_error(void){ static void provisioning_send_provisioning_error(void){
@ -449,7 +432,9 @@ static void provisioning_handle_invite(uint8_t *packet, uint16_t size){
// handle invite message // handle invite message
prov_attention_timer_timeout = packet[0]; prov_attention_timer_timeout = packet[0];
provisioning_attention_timer_set(); if (prov_attention_timer_timeout){
provisioning_emit_attention_timer_event(pb_transport_cid, prov_attention_timer_timeout);
}
device_state = DEVICE_SEND_CAPABILITIES; device_state = DEVICE_SEND_CAPABILITIES;
provisioning_run(); provisioning_run();