pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature/btdm_arch

Browse Source 
1. merge to fix gap modify
This commit is contained in:
Tian Hao
2016-11-17 11:28:10 +08:00
parent 94f26af17d a63383dd19
commit a35e2d42f0
6 changed files with 75 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/bluedroid/api/include/esp_bt_defs.h
+2
View File
@@ -14,6 +14,8 @@ typedef enum {
ESP_BT_STATUS_WRONG_MODE = 5,
} esp_bt_status_t;
#define ESP_DEFAULT_GATT_IF 0xff
#define ESP_BLE_CONN_PARAM_UNDEF 0xffff /* use this value when a specific value not to be overwritten */
#define ESP_BLE_IS_VALID_PARAM(x, min, max) (((x) >= (min) && (x) <= (max)) || ((x) == ESP_BLE_CONN_PARAM_UNDEF))
components/bt/bluedroid/api/include/esp_gap_ble_api.h
+7 -6
View File
@@ -62,15 +62,16 @@ typedef struct {
bool set_scan_rsp;
bool include_name;
bool include_txpower;
int min_interval;
int max_interval;
int appearance;
int min_interval;
int max_interval;
int appearance;
uint16_t manufacturer_len;
uint8_t *p_manufacturer_data;
uint8_t *p_manufacturer_data;
uint16_t service_data_len;
uint8_t *p_service_data;
uint8_t *p_service_data;
uint16_t service_uuid_len;
uint8_t *p_service_uuid;
uint8_t *p_service_uuid;
uint8_t flag;
} esp_ble_adv_data_t;
typedef enum {