Skip to content

Commit a8496fc

Browse files
committed
refactor AdaCallback
- use BLEGap connect_callback_t as adacb_1arg_t
1 parent 37d53cb commit a8496fc

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

libraries/Bluefruit52Lib/src/BLECentral.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void BLECentral::_event_handler(ble_evt_t* evt)
151151
if ( Bluefruit.Gap.getRole(evt_conn_hdl) == BLE_GAP_ROLE_CENTRAL)
152152
{
153153
// Invoke callback
154-
if ( _connect_cb) ada_callback(NULL, _connect_cb, evt_conn_hdl);
154+
if ( _connect_cb) ada_callback_defer(NULL, _connect_cb, evt_conn_hdl);
155155
}
156156
break;
157157

libraries/Bluefruit52Lib/src/bluefruit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ void AdafruitBluefruit::_ble_handler(ble_evt_t* evt)
590590
VERIFY_STATUS( sd_ble_gap_conn_param_update(_conn_hdl, NULL), );
591591
}
592592

593-
if (_connect_cb) ada_callback(NULL, _connect_cb, _conn_hdl);
593+
if (_connect_cb) ada_callback_defer(NULL, _connect_cb, _conn_hdl);
594594
}
595595
}
596596
break;

libraries/Bluefruit52Lib/src/utility/AdaCallback.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ void adafruit_callback_task(void* arg)
5757
switch(cb_data->callback_type)
5858
{
5959
/*------------- BLEGap -------------*/
60-
case BLEGap_connect_callback_t:
61-
((BLEGap::connect_callback_t) func) ( (uint16_t) args[0] );
62-
break;
63-
6460
case BLEGap_disconnect_callback_t:
6561
((BLEGap::disconnect_callback_t) func) ( (uint16_t) args[0], (uint8_t) args[1] );
6662
break;

libraries/Bluefruit52Lib/src/utility/AdaCallback.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ typedef void (*adacb_5arg_t) (uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
7171
*------------------------------------------------------------------*/
7272
#define ADA_CB_LOOKUP(XPAND) \
7373
/* BLEGap */ \
74-
XPAND(BLEGap , connect_callback_t ) \
74+
/*XPAND(BLEGap , connect_callback_t ) */\
7575
XPAND(BLEGap , disconnect_callback_t ) \
7676
/* Client Characteristic */ \
7777
XPAND(BLEClientCharacteristic , notify_cb_t ) \

0 commit comments

Comments
 (0)