djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf5/bluetooth: Cleaning up stack enable function, to not set device name twice. Also, adding support for setting custom advertisment data.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-04-02 15:45:02 +02:00
parent 5f645b6c8e
commit 52c07e7cb2
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
nrf5/bluetooth/ble_drv.c
View File

@ -189,16 +189,11 @@ uint32_t ble_drv_stack_enable(void) {
const char device_name[] = "micr"; const char device_name[] = "micr";
err_code = sd_ble_gap_device_name_set(&sec_mode, if ((err_code = sd_ble_gap_device_name_set(&sec_mode,
(const uint8_t *)device_name, (const uint8_t *)device_name,
strlen(device_name)); strlen(device_name))) != 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
if (sd_ble_gap_device_name_set(&sec_mode, "Cannot apply GAP parameters."));
(const uint8_t *)device_name,
strlen(device_name)) != 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
"Cannot set GAP parameters."));
} }
// set connection parameters // set connection parameters
@ -447,13 +442,16 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
byte_pos += p_adv_params->device_name_len; byte_pos += p_adv_params->device_name_len;
} }
// set flags, default to disc mode // Add FLAGS only if manually controlled data has not been used.
adv_data[byte_pos] = (BLE_ADV_AD_TYPE_FIELD_SIZE + BLE_AD_TYPE_FLAGS_DATA_SIZE); if (p_adv_params->data_len == 0) {
byte_pos += BLE_ADV_LENGTH_FIELD_SIZE; // set flags, default to disc mode
adv_data[byte_pos] = BLE_GAP_AD_TYPE_FLAGS; adv_data[byte_pos] = (BLE_ADV_AD_TYPE_FIELD_SIZE + BLE_AD_TYPE_FLAGS_DATA_SIZE);
byte_pos += BLE_AD_TYPE_FLAGS_DATA_SIZE; byte_pos += BLE_ADV_LENGTH_FIELD_SIZE;
adv_data[byte_pos] = BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE; adv_data[byte_pos] = BLE_GAP_AD_TYPE_FLAGS;
byte_pos += 1; byte_pos += BLE_AD_TYPE_FLAGS_DATA_SIZE;
adv_data[byte_pos] = BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE;
byte_pos += 1;
}
if (p_adv_params->num_of_services > 0) { if (p_adv_params->num_of_services > 0) {
@ -571,10 +569,21 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
} }
} }
if ((p_adv_params->data_len > 0) && (p_adv_params->p_data != NULL)) {
if (p_adv_params->data_len + byte_pos > BLE_GAP_ADV_MAX_SIZE) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
"Can not fit data into the advertisment packet."));
}
memcpy(adv_data, p_adv_params->p_data, p_adv_params->data_len);
byte_pos += p_adv_params->data_len;
}
// scan response data not set // scan response data not set
if (sd_ble_gap_adv_data_set(adv_data, byte_pos, NULL, 0) != 0) { uint32_t err_code;
if ((err_code = sd_ble_gap_adv_data_set(adv_data, byte_pos, NULL, 0)) != 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
"Can not apply advertisment data.")); "Can not apply advertisment data. status: 0x" HEX2_FMT, (uint16_t)err_code));
} }
BLE_DRIVER_LOG("Set Adv data size: " UINT_FMT "\n", byte_pos); BLE_DRIVER_LOG("Set Adv data size: " UINT_FMT "\n", byte_pos);
@ -598,7 +607,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
#endif #endif
m_adv_in_progress = false; m_adv_in_progress = false;
uint32_t err_code = sd_ble_gap_adv_start(&m_adv_params); err_code = sd_ble_gap_adv_start(&m_adv_params);
if (err_code != 0) { if (err_code != 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
"Can not start advertisment. status: 0x" HEX2_FMT, (uint16_t)err_code)); "Can not start advertisment. status: 0x" HEX2_FMT, (uint16_t)err_code));