Skip to content

Fix NRPA logic in bttester #2202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
szymon-czapracki wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix NRPA logic in bttester #2202

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
222f995
nimble/bttester: Fix NRPA logic in bttester
szymon-czapracki Apr 8, 2026
a827d47
nimble/bttester: Report connectable state in controller info
szymon-czapracki Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 29 additions & 15 deletions apps/bttester/src/btp_gap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,20 @@ controller_index_list(const void *cmd, uint16_t cmd_len,
return BTP_STATUS_SUCCESS;
}

#if MYNEWT_VAL(BLE_EXT_ADV)
static struct ble_gap_ext_adv_params adv_params = {
.primary_phy = BLE_HCI_LE_PHY_1M,
.secondary_phy = BLE_HCI_LE_PHY_1M,
.sid = 1,
.legacy_pdu = 1,
};
#else
static struct ble_gap_adv_params adv_params = {
.conn_mode = BLE_GAP_CONN_MODE_NON,
.disc_mode = BLE_GAP_DISC_MODE_NON,
};
#endif

static uint8_t
controller_info(const void *cmd, uint16_t cmd_len,
void *rsp, uint16_t *rsp_len)
Expand Down Expand Up @@ -202,6 +216,20 @@ controller_info(const void *cmd, uint16_t cmd_len,
supported_settings |= BIT(BTP_GAP_SETTINGS_ADVERTISING);
supported_settings |= BIT(BTP_GAP_SETTINGS_SC);

#if MYNEWT_VAL(BLE_EXT_ADV)
if (adv_params.connectable) {
current_settings |= BIT(BTP_GAP_SETTINGS_CONNECTABLE);
} else {
current_settings &= ~BIT(BTP_GAP_SETTINGS_CONNECTABLE);
}
#else
if (adv_params.conn_mode != BLE_GAP_CONN_MODE_NON) {
current_settings |= BIT(BTP_GAP_SETTINGS_CONNECTABLE);
} else {
current_settings &= ~BIT(BTP_GAP_SETTINGS_CONNECTABLE);
}
#endif

if (ble_hs_cfg.sm_bonding) {
current_settings |= BIT(BTP_GAP_SETTINGS_BONDABLE);
}
Expand All @@ -219,20 +247,6 @@ controller_info(const void *cmd, uint16_t cmd_len,
return BTP_STATUS_SUCCESS;
}

#if MYNEWT_VAL(BLE_EXT_ADV)
static struct ble_gap_ext_adv_params adv_params = {
.primary_phy = BLE_HCI_LE_PHY_1M,
.secondary_phy = BLE_HCI_LE_PHY_1M,
.sid = 1,
.legacy_pdu = 1,
};
#else
static struct ble_gap_adv_params adv_params = {
.conn_mode = BLE_GAP_CONN_MODE_NON,
.disc_mode = BLE_GAP_DISC_MODE_NON,
};
#endif

static uint8_t ad_flags = BLE_HS_ADV_F_BREDR_UNSUP;

#if MYNEWT_VAL(BTTESTER_PRIVACY_MODE) && MYNEWT_VAL(BTTESTER_USE_NRPA)
Expand Down Expand Up @@ -547,7 +561,7 @@ start_advertising(const void *cmd, uint16_t cmd_len,
break;
case 0x02:
/* NRPA is used only for non-connectable advertising */
if (!(current_settings & BIT(BTP_GAP_SETTINGS_CONNECTABLE))) {
if ((current_settings & BIT(BTP_GAP_SETTINGS_CONNECTABLE))) {
return BTP_STATUS_FAILED;
}
break;
Expand Down
Loading