Skip to content

Commit

Permalink
Merge branch 'feat/add_sdkconfig_for_ci_in_bt_example' into 'master'
Browse files Browse the repository at this point in the history
Feat/add sdkconfig for ci in bt example

See merge request espressif/esp-idf!32474
  • Loading branch information
wmy-espressif committed Aug 5, 2024
2 parents d16bb64 + 6e2804c commit ef3d063
Show file tree
Hide file tree
Showing 38 changed files with 164 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,9 @@ menu "A2DP Example Configuration"
help
GPIO number to use for I2S Data Driver.

config EXAMPLE_LOCAL_DEVICE_NAME
string "Local Device Name"
default "ESP_SPEAKER"
help
Use this option to set local device name.
endmenu
4 changes: 2 additions & 2 deletions examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "esp_avrc_api.h"

/* device name */
#define LOCAL_DEVICE_NAME "ESP_SPEAKER"
static const char local_device_name[] = CONFIG_EXAMPLE_LOCAL_DEVICE_NAME;

/* event for stack up */
enum {
Expand Down Expand Up @@ -148,7 +148,7 @@ static void bt_av_hdl_stack_evt(uint16_t event, void *p_param)
switch (event) {
/* when do the stack up, this event comes */
case BT_APP_EVT_STACK_UP: {
esp_bt_gap_set_device_name(LOCAL_DEVICE_NAME);
esp_bt_gap_set_device_name(local_device_name);
esp_bt_dev_register_callback(bt_app_dev_cb);
esp_bt_gap_register_callback(bt_app_gap_cb);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_EXAMPLE_LOCAL_DEVICE_NAME="${CI_PIPELINE_ID}_A2DP_SINK"
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ menu "A2DP Example Configuration"
help
This enables the Secure Simple Pairing. If disable this option,
Bluedroid will only support Legacy Pairing

config EXAMPLE_PEER_DEVICE_NAME
string "Target Device Name"
default "ESP_SPEAKER"
help
Use this option to set target device name to connect.
endmenu
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#define BT_RC_CT_TAG "RC_CT"

/* device name */
#define TARGET_DEVICE_NAME "ESP_SPEAKER"
#define LOCAL_DEVICE_NAME "ESP_A2DP_SRC"

/* AVRCP used transaction label */
Expand Down Expand Up @@ -112,6 +111,8 @@ static uint32_t s_pkt_cnt = 0; /* count of packet
static esp_avrc_rn_evt_cap_mask_t s_avrc_peer_rn_cap; /* AVRC target notification event capability bit mask */
static TimerHandle_t s_tmr; /* handle of heart beat timer */

static const char remote_device_name[] = CONFIG_EXAMPLE_PEER_DEVICE_NAME;

/*********************************
* STATIC FUNCTION DEFINITIONS
********************************/
Expand Down Expand Up @@ -199,7 +200,7 @@ static void filter_inquiry_scan_result(esp_bt_gap_cb_param_t *param)
/* search for target device in its Extended Inqury Response */
if (eir) {
get_name_from_eir(eir, s_peer_bdname, NULL);
if (strcmp((char *)s_peer_bdname, TARGET_DEVICE_NAME) == 0) {
if (strcmp((char *)s_peer_bdname, remote_device_name) == 0) {
ESP_LOGI(BT_AV_TAG, "Found a target device, address %s, name %s", bda_str, s_peer_bdname);
s_a2d_state = APP_AV_STATE_DISCOVERED;
memcpy(s_peer_bda, param->disc_res.bda, ESP_BD_ADDR_LEN);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_EXAMPLE_PEER_DEVICE_NAME="${CI_PIPELINE_ID}_A2DP_SINK"
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ menu "HID Example Configuration"
help
This enables the Secure Simple Pairing. If disable this option,
Bluedroid will only support Legacy Pairing

config EXAMPLE_LOCAL_DEVICE_NAME
string "Local Device Name"
default "HID Mouse Example"
help
Use this option to set local device name.
endmenu
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#define REPORT_PROTOCOL_MOUSE_REPORT_SIZE (4)
#define REPORT_BUFFER_SIZE REPORT_PROTOCOL_MOUSE_REPORT_SIZE

static const char local_device_name[] = CONFIG_EXAMPLE_LOCAL_DEVICE_NAME;

typedef struct {
esp_hidd_app_param_t app_param;
esp_hidd_qos_param_t both_qos;
Expand Down Expand Up @@ -434,7 +436,7 @@ void app_main(void)
}

ESP_LOGI(TAG, "setting device name");
esp_bt_gap_set_device_name("HID Mouse Example");
esp_bt_gap_set_device_name(local_device_name);

ESP_LOGI(TAG, "setting cod major, peripheral");
esp_bt_cod_t cod;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_EXAMPLE_LOCAL_DEVICE_NAME="${CI_PIPELINE_ID}_HID_MOUSE_DEVICE"
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ menu "L2CAP Example Configuration"
help
This enables the Secure Simple Pairing. If disable this option,
Bluedroid will only support Legacy Pairing

config EXAMPLE_PEER_DEVICE_NAME
string "Target Device Name"
default "ESP_BT_L2CAP_SERVER"
help
Use this option to set target device name to connect.
endmenu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
Expand Down Expand Up @@ -30,12 +30,12 @@
#define L2CAP_TAG "L2CAP_TAG"
#define SDP_TAG "SDP_TAG"
#define EXAMPLE_DEVICE_NAME "ESP_BT_L2CAP_CLIENT"
#define TARGET_DEVICE_NAME "ESP_BT_L2CAP_SERVER"
#define L2CAP_DATA_LEN 100
#define BT_L2CAP_DYNMIC_PSM 0x1001
#define BT_UNUSED_RFCOMM -1
#define BT_UNKONWN_PROFILE_VERSION 0x0102

static const char remote_device_name[] = CONFIG_EXAMPLE_PEER_DEVICE_NAME;
static esp_bt_l2cap_cntl_flags_t sec_mask = ESP_BT_L2CAP_SEC_AUTHENTICATE;
static char *sdp_service_name = "Unknown_profile";
static const uint8_t UUID_UNKNOWN[] = {0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x10, 0x00,
Expand Down Expand Up @@ -125,7 +125,7 @@ static void filter_inquiry_scan_result(esp_bt_gap_cb_param_t *param)
/* search for target device in its Extended Inqury Response */
if (eir) {
get_name_from_eir(eir, peer_bdname, NULL);
if (strcmp((char *)peer_bdname, TARGET_DEVICE_NAME) == 0) {
if (strcmp((char *)peer_bdname, remote_device_name) == 0) {
ESP_LOGI(L2CAP_TAG, "Found a target device, address %s, name %s", bda_str, peer_bdname);
ESP_LOGI(L2CAP_TAG, "Cancel device discovery ...");
esp_bt_gap_cancel_discovery();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_EXAMPLE_PEER_DEVICE_NAME="${CI_PIPELINE_ID}_L2CAP_SERVER"
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ menu "L2CAP Example Configuration"
help
This enables the Secure Simple Pairing. If disable this option,
Bluedroid will only support Legacy Pairing

config EXAMPLE_LOCAL_DEVICE_NAME
string "Local Device Name"
default "ESP_BT_L2CAP_SERVER"
help
Use this option to set local device name.
endmenu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
Expand Down Expand Up @@ -29,12 +29,12 @@

#define L2CAP_TAG "L2CAP_TAG"
#define SDP_TAG "SDP_TAG"
#define EXAMPLE_DEVICE_NAME "ESP_BT_L2CAP_SERVER"
#define L2CAP_DATA_LEN 100
#define BT_UNUSED_RFCOMM -1
#define BT_L2CAP_DYNMIC_PSM 0x1001
#define BT_UNKONWN_PROFILE_VERSION 0x0102

static const char local_device_name[] = CONFIG_EXAMPLE_LOCAL_DEVICE_NAME;
static esp_bt_l2cap_cntl_flags_t sec_mask = ESP_BT_L2CAP_SEC_AUTHENTICATE;
static char *sdp_service_name = "Unknown_profile";
static const uint8_t UUID_UNKNOWN[] = {0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x10, 0x00,
Expand Down Expand Up @@ -269,7 +269,7 @@ static void esp_hdl_sdp_cb_evt(uint16_t event, void *p_param)
case ESP_SDP_CREATE_RECORD_COMP_EVT:
ESP_LOGI(SDP_TAG, "ESP_SDP_CREATE_RECORD_COMP_EVT: status:%d", sdp_param->create_record.status);
if (sdp_param->create_record.status == ESP_SDP_SUCCESS) {
esp_bt_gap_set_device_name(EXAMPLE_DEVICE_NAME);
esp_bt_gap_set_device_name(local_device_name);
esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
}
break;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_EXAMPLE_LOCAL_DEVICE_NAME="${CI_PIPELINE_ID}_L2CAP_SERVER"
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ menu "SPP Example Configuration"
help
This enables the Secure Simple Pairing. If disable this option,
Bluedroid will only support Legacy Pairing

config EXAMPLE_LOCAL_DEVICE_NAME
string "Local Device Name"
default "ESP_SPP_ACCEPTOR"
help
Use this option to set local device name.
endmenu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
Expand All @@ -25,11 +25,11 @@

#define SPP_TAG "SPP_ACCEPTOR_DEMO"
#define SPP_SERVER_NAME "SPP_SERVER"
#define EXAMPLE_DEVICE_NAME "ESP_SPP_ACCEPTOR"
#define SPP_SHOW_DATA 0
#define SPP_SHOW_SPEED 1
#define SPP_SHOW_MODE SPP_SHOW_SPEED /*Choose show mode: show data or speed*/

static const char local_device_name[] = CONFIG_EXAMPLE_LOCAL_DEVICE_NAME;
static const esp_spp_mode_t esp_spp_mode = ESP_SPP_MODE_CB;
static const bool esp_spp_enable_l2cap_ertm = true;

Expand Down Expand Up @@ -90,7 +90,7 @@ static void esp_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param)
if (param->start.status == ESP_SPP_SUCCESS) {
ESP_LOGI(SPP_TAG, "ESP_SPP_START_EVT handle:%"PRIu32" sec_id:%d scn:%d", param->start.handle, param->start.sec_id,
param->start.scn);
esp_bt_gap_set_device_name(EXAMPLE_DEVICE_NAME);
esp_bt_gap_set_device_name(local_device_name);
esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
} else {
ESP_LOGE(SPP_TAG, "ESP_SPP_START_EVT status:%d", param->start.status);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_EXAMPLE_LOCAL_DEVICE_NAME="${CI_PIPELINE_ID}_SPP_ACCEPTOR"
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ menu "SPP Example Configuration"
help
This enables the Secure Simple Pairing. If disable this option,
Bluedroid will only support Legacy Pairing

config EXAMPLE_PEER_DEVICE_NAME
string "Target Device Name"
default "ESP_SPP_ACCEPTOR"
help
Use this option to set target device name to connect.
endmenu
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ static const esp_spp_role_t role_master = ESP_SPP_ROLE_MASTER;
esp_bd_addr_t peer_bd_addr = {0};
static uint8_t peer_bdname_len;
static char peer_bdname[ESP_BT_GAP_MAX_BDNAME_LEN + 1];
static const char remote_device_name[] = "ESP_SPP_ACCEPTOR";
static const char remote_device_name[] = CONFIG_EXAMPLE_PEER_DEVICE_NAME;

static const esp_bt_inq_mode_t inq_mode = ESP_BT_INQ_MODE_GENERAL_INQUIRY;
static const uint8_t inq_len = 30;
static const uint8_t inq_num_rsps = 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_EXAMPLE_PEER_DEVICE_NAME="${CI_PIPELINE_ID}_SPP_ACCEPTOR"
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ menu "SPP Example Configuration"
help
This enables the Secure Simple Pairing. If disable this option,
Bluedroid will only support Legacy Pairing

config EXAMPLE_LOCAL_DEVICE_NAME
string "Local Device Name"
default "ESP_SPP_ACCEPTOR"
help
Use this option to set local device name.
endmenu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
Expand Down Expand Up @@ -37,8 +37,8 @@

#define SPP_TAG "SPP_ACCEPTOR_DEMO"
#define SPP_SERVER_NAME "SPP_SERVER"
#define EXAMPLE_DEVICE_NAME "ESP_SPP_ACCEPTOR"

static const char local_device_name[] = CONFIG_EXAMPLE_LOCAL_DEVICE_NAME;
static const esp_spp_sec_t sec_mask = ESP_SPP_SEC_AUTHENTICATE;
static const esp_spp_role_t role_slave = ESP_SPP_ROLE_SLAVE;

Expand Down Expand Up @@ -121,7 +121,7 @@ static void esp_spp_cb(uint16_t e, void *p)
if (param->start.status == ESP_SPP_SUCCESS) {
ESP_LOGI(SPP_TAG, "ESP_SPP_START_EVT handle:%"PRIu32" sec_id:%d scn:%d", param->start.handle, param->start.sec_id,
param->start.scn);
esp_bt_gap_set_device_name(EXAMPLE_DEVICE_NAME);
esp_bt_gap_set_device_name(local_device_name);
esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
} else {
ESP_LOGE(SPP_TAG, "ESP_SPP_START_EVT status:%d", param->start.status);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_EXAMPLE_LOCAL_DEVICE_NAME="${CI_PIPELINE_ID}_SPP_VFS_ACCEPTOR"
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ menu "SPP Example Configuration"
help
This enables the Secure Simple Pairing. If disable this option,
Bluedroid will only support Legacy Pairing

config EXAMPLE_PEER_DEVICE_NAME
string "Target Device Name"
default "ESP_SPP_ACCEPTOR"
help
Use this option to set target device name to connect.
endmenu
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ static const esp_spp_role_t role_master = ESP_SPP_ROLE_MASTER;
static esp_bd_addr_t peer_bd_addr;
static uint8_t peer_bdname_len;
static char peer_bdname[ESP_BT_GAP_MAX_BDNAME_LEN + 1];
static const char remote_device_name[] = "ESP_SPP_ACCEPTOR";
static const char remote_device_name[] = CONFIG_EXAMPLE_PEER_DEVICE_NAME;

static const esp_bt_inq_mode_t inq_mode = ESP_BT_INQ_MODE_GENERAL_INQUIRY;
static const uint8_t inq_len = 30;
static const uint8_t inq_num_rsps = 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_EXAMPLE_PEER_DEVICE_NAME="${CI_PIPELINE_ID}_SPP_VFS_ACCEPTOR"
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
menu "HFP Example Configuration"
config EXAMPLE_LOCAL_DEVICE_NAME
string "Local Device Name"
default "ESP_HFP_AG"
help
Use this option to set local device name.
endmenu
6 changes: 3 additions & 3 deletions examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@

#define BT_HF_AG_TAG "HF_AG_DEMO_MAIN"

static const char local_device_name[] = CONFIG_EXAMPLE_LOCAL_DEVICE_NAME;

/* event for handler "hf_ag_hdl_stack_up */
enum {
BT_APP_EVT_STACK_UP = 0,
Expand All @@ -52,9 +54,7 @@ static void bt_hf_hdl_stack_evt(uint16_t event, void *p_param)
{
case BT_APP_EVT_STACK_UP:
{
/* set up device name */
char *dev_name = "ESP_HFP_AG";
esp_bt_gap_set_device_name(dev_name);
esp_bt_gap_set_device_name(local_device_name);

esp_hf_ag_register_callback(bt_app_hf_cb);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI=y
CONFIG_EXAMPLE_LOCAL_DEVICE_NAME="${CI_PIPELINE_ID}_HFP"
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ menu "HFP Example Configuration"
help
This enables the Secure Simple Pairing. If disable this option,
Bluedroid will only support Legacy Pairing

config EXAMPLE_PEER_DEVICE_NAME
string "Target Device Name"
default "ESP_HFP_AG"
help
Use this option to set target device name to connect.
endmenu
3 changes: 1 addition & 2 deletions examples/bluetooth/bluedroid/classic_bt/hfp_hf/main/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
esp_bd_addr_t peer_addr = {0};
static char peer_bdname[ESP_BT_GAP_MAX_BDNAME_LEN + 1];
static uint8_t peer_bdname_len;

static const char remote_device_name[] = "ESP_HFP_AG";
static const char remote_device_name[] = CONFIG_EXAMPLE_PEER_DEVICE_NAME;

static char *bda2str(esp_bd_addr_t bda, char *str, size_t size)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI=y
CONFIG_EXAMPLE_PEER_DEVICE_NAME="${CI_PIPELINE_ID}_HFP"
Loading

0 comments on commit ef3d063

Please sign in to comment.