|
@ -87,11 +87,6 @@ static void onScanEvent(scan_evt_t const* p_scan_evt) { |
|
|
case NRF_BLE_SCAN_EVT_CONNECTED: { |
|
|
case NRF_BLE_SCAN_EVT_CONNECTED: { |
|
|
ble_gap_evt_connected_t const* p_connected = p_scan_evt->params.connected.p_connected; |
|
|
ble_gap_evt_connected_t const* p_connected = p_scan_evt->params.connected.p_connected; |
|
|
{ |
|
|
{ |
|
|
connectEventCache.event = kevent_connected; |
|
|
|
|
|
strcpy(connectEventCache.data.on_connect.blename, ble_find_name(p_adv->data.p_data, p_adv->data.len)); |
|
|
|
|
|
connectEventCache.data.on_connect.rssi = p_adv->rssi; |
|
|
|
|
|
connectEventCache.data.on_connect.tx_power = p_adv->tx_power; |
|
|
|
|
|
memcpy(connectEventCache.data.on_connect.peeradd, p_adv->peer_addr.addr, BLE_GAP_ADDR_LEN); |
|
|
|
|
|
// ÑÓºóÉϱ¨ |
|
|
// ÑÓºóÉϱ¨ |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -119,6 +114,13 @@ static void onScanEvent(scan_evt_t const* p_scan_evt) { |
|
|
if (err_code != NRF_SUCCESS) { |
|
|
if (err_code != NRF_SUCCESS) { |
|
|
NRF_LOG_ERROR("sd_ble_gap_connect() failed: 0x%x.", err_code); |
|
|
NRF_LOG_ERROR("sd_ble_gap_connect() failed: 0x%x.", err_code); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
connectEventCache.event = kevent_connected; |
|
|
|
|
|
strcpy(connectEventCache.data.on_connect.blename, ble_find_name(p_adv->data.p_data, p_adv->data.len)); |
|
|
|
|
|
connectEventCache.data.on_connect.rssi = p_adv->rssi; |
|
|
|
|
|
connectEventCache.data.on_connect.tx_power = p_adv->tx_power; |
|
|
|
|
|
memcpy(connectEventCache.data.on_connect.peeradd, p_adv->peer_addr.addr, BLE_GAP_ADDR_LEN); |
|
|
|
|
|
// ÑÓºóÉϱ¨ |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} break; |
|
|
} break; |
|
|