From: xiewenxiang Date: Thu, 28 Sep 2017 09:11:43 +0000 (+0800) Subject: component/bt: refactor spp client demo X-Git-Tag: v3.0~92^2~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d57901cd54bcf43f3b1df5a45f3a1a1aa6927554;p=esp-idf component/bt: refactor spp client demo - because the GATTC API was modified, the spp client demo was refactored --- diff --git a/examples/bluetooth/ble_spp_client/main/spp_client_demo.c b/examples/bluetooth/ble_spp_client/main/spp_client_demo.c index 7b570eaf40..cd944dca08 100644 --- a/examples/bluetooth/ble_spp_client/main/spp_client_demo.c +++ b/examples/bluetooth/ble_spp_client/main/spp_client_demo.c @@ -3,7 +3,6 @@ // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at - // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software @@ -12,8 +11,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - - /**************************************************************************** * * This file is for ble spp client demo. @@ -39,76 +36,46 @@ #include "esp_gatt_common_api.h" #define GATTC_TAG "GATTC_SPP_DEMO" -#ifdef SUPPORT_NEW_GATTC_API #define PROFILE_NUM 1 #define PROFILE_APP_ID 0 #define BT_BD_ADDR_STR "%02x:%02x:%02x:%02x:%02x:%02x" #define BT_BD_ADDR_HEX(addr) addr[0],addr[1],addr[2],addr[3],addr[4],addr[5] - -#define SPP_SRV_INDEX 1 -#define SPP_DATA_RECV_CHAR_INDEX 1 -#define SPP_DATA_NTFY_CHAR_INDEX 2 -#define SPP_CMD_CHAR_INDEX 3 -#define SPP_STATUS_CHAR_INDEX 4 -#define SPP_HEARTBEAT_CHAR_INDEX 5 -#define SPP_NO_DESC 0 -#define SPP_IS_DESC 1 - +#define ESP_GATT_SPP_SERVICE_UUID 0xABF0 //#define SUPPORT_HEARTBEAT //#define DEBUG_MODE -typedef struct spp_ble_gattc_char_descr { - int char_descr_index; - uint16_t conn_id; - esp_gatt_id_t descr_id; - struct spp_ble_gattc_char_descr *next; -} spp_ble_gattc_char_descr_t; - -typedef struct spp_ble_gattc_char { - int srv_index; - int index; - uint16_t conn_id; - esp_gatt_srvc_id_t srvc_id; - esp_gatt_id_t char_id; - esp_gatt_char_prop_t char_prop; - spp_ble_gattc_char_descr_t * char_descr; - struct spp_ble_gattc_char *next; -} spp_ble_gattc_char_t; - -typedef struct { - int32_t len; - spp_ble_gattc_char_t * pfirst; - spp_ble_gattc_char_t * plast; -} spp_ble_gattc_char_head; - -typedef struct at_ble_gattc_srv { - int index; - uint16_t conn_id; - esp_gatt_srvc_id_t srvc_id; - spp_ble_gattc_char_head * gattc_srv_char_head; - struct at_ble_gattc_srv *next; -} spp_ble_gattc_srv_t; - -typedef struct { - int32_t len; - spp_ble_gattc_srv_t * pfirst; - spp_ble_gattc_srv_t * plast; -} spp_ble_gattc_srv_head; - -static spp_ble_gattc_srv_head pAtGattcSrvHead = { - .len = 0, - .pfirst = NULL, - .plast = NULL -}; - struct gattc_profile_inst { esp_gattc_cb_t gattc_cb; uint16_t gattc_if; uint16_t app_id; uint16_t conn_id; + uint16_t service_start_handle; + uint16_t service_end_handle; + uint16_t char_handle; esp_bd_addr_t remote_bda; }; +enum{ + SPP_IDX_SVC, + + SPP_IDX_SPP_DATA_RECV_VAL, + + SPP_IDX_SPP_DATA_NTY_VAL, + SPP_IDX_SPP_DATA_NTF_CFG, + + SPP_IDX_SPP_COMMAND_VAL, + + SPP_IDX_SPP_STATUS_VAL, + SPP_IDX_SPP_STATUS_CFG, + +#ifdef SUPPORT_HEARTBEAT + SPP_IDX_SPP_HEARTBEAT_VAL, + SPP_IDX_SPP_HEARTBEAT_CFG, +#endif + + SPP_IDX_NB, +}; + ///Declare static functions static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param); static void esp_gattc_cb(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp_ble_gattc_cb_param_t *param); @@ -130,307 +97,44 @@ static esp_ble_scan_params_t ble_scan_params = { .scan_window = 0x30 }; - static const char device_name[] = "ESP_SPP_SERVER"; static bool is_connect = false; static uint16_t spp_conn_id = 0; static uint16_t spp_mtu_size = 23; static uint16_t cmd = 0; -static uint16_t wr_descr_ccc_num = 0; +static uint16_t spp_srv_start_handle = 0; +static uint16_t spp_srv_end_handle = 0; static uint16_t spp_gattc_if = 0xff; -static int need_notify_number = 0; -static int char_descr_index_count = 0; static char * notify_value_p = NULL; static int notify_value_offset = 0; static int notify_value_count = 0; -static spp_ble_gattc_srv_t * temp_srv_p = NULL; -static spp_ble_gattc_char_t * notify_char_pp = NULL; -static spp_ble_gattc_char_t notify_char_p[3] ; -static spp_ble_gattc_char_t * temp_gattc_char_p1 = NULL; -static spp_ble_gattc_char_descr_t * notify_char_descr_p[2] = {NULL,NULL}; -static spp_ble_gattc_char_descr_t * temp_char_descr_p = NULL; -static spp_ble_gattc_char_head * pGattcCharHead = NULL; +static uint16_t count = SPP_IDX_NB; +static esp_gattc_db_elem_t *db = NULL; static esp_ble_gap_cb_param_t scan_rst; static xQueueHandle cmd_reg_queue = NULL; -static xQueueHandle cmd_read_queue = NULL; QueueHandle_t spp_uart_queue = NULL; + #ifdef SUPPORT_HEARTBEAT static uint8_t heartbeat_s[9] = {'E','s','p','r','e','s','s','i','f'}; static xQueueHandle cmd_heartbeat_queue = NULL; #endif -static void print_srv_node(void) -{ - temp_srv_p = pAtGattcSrvHead.pfirst; - - if(temp_srv_p == NULL){ - ESP_LOGE(GATTC_TAG, "temp_srv_p == NULL,%s L#%d\n",__func__,__LINE__); - } - temp_srv_p = pAtGattcSrvHead.pfirst; - while(temp_srv_p != NULL){ - ESP_LOGI(GATTC_TAG,"+SRV:No.%d,UUID:0x%04x\n", temp_srv_p->index,temp_srv_p->srvc_id.id.uuid.uuid.uuid16); - temp_srv_p = temp_srv_p->next; - } -} - -static void get_char_and_descr(void) -{ - pGattcCharHead = (spp_ble_gattc_char_head *)malloc(sizeof(spp_ble_gattc_char_head)); - if(pGattcCharHead == NULL){ - ESP_LOGE(GATTC_TAG, "malloc failed,%s L#%d\n",__func__,__LINE__); - return; - } - - pGattcCharHead->len = 0; - pGattcCharHead->pfirst = NULL; - pGattcCharHead->plast = NULL; - pAtGattcSrvHead.pfirst->gattc_srv_char_head = pGattcCharHead; - temp_srv_p = pAtGattcSrvHead.pfirst; - - esp_ble_gattc_get_characteristic(spp_gattc_if, temp_srv_p->conn_id, &temp_srv_p->srvc_id, NULL); -} - -static void Characteristic_Rd(int32_t srv_index,int32_t char_index) -{ - spp_ble_gattc_char_t * pGattc_char_node = NULL; - - temp_srv_p = pAtGattcSrvHead.pfirst; - if(temp_srv_p == NULL) { - ESP_LOGE(GATTC_TAG, "temp_srv_p == NULL,%s L#%d\n",__func__,__LINE__); - return ; - } - while(--srv_index) { - temp_srv_p = temp_srv_p->next; - if (temp_srv_p == NULL) { - ESP_LOGE(GATTC_TAG, "temp_srv_p == NULL,%s L#%d\n",__func__,__LINE__); - return ; - } - } - pGattcCharHead = temp_srv_p->gattc_srv_char_head; - if(pGattcCharHead == NULL){ - ESP_LOGE(GATTC_TAG, "pGattcCharHead == NULL,%s L#%d\n",__func__,__LINE__); - return; - } - - pGattc_char_node = pGattcCharHead->pfirst; - if(pGattc_char_node == NULL) { - ESP_LOGE(GATTC_TAG, "pGattc_char_node == NULL,%s L#%d\n",__func__,__LINE__); - return ; - } - while(--char_index){ - pGattc_char_node = pGattc_char_node->next; - if(pGattc_char_node == NULL){ - ESP_LOGE(GATTC_TAG, "pGattc_char_node == NULL,%s L#%d\n",__func__,__LINE__); - return ; - } - } - - esp_ble_gattc_read_char(spp_gattc_if, pGattc_char_node->conn_id, &pGattc_char_node->srvc_id, &pGattc_char_node->char_id, ESP_GATT_AUTH_REQ_NONE); -} - -static void Characteristic_Wr(int32_t srv_index,int32_t char_index,char * s ,size_t length) -{ - future_t **future_p = NULL; - int32_t len = 0; - spp_ble_gattc_char_t * pGattc_char_node; - uint8_t * spp_gattc_wr_buffer = NULL; - - if(length == 0) { - return ; - } - len = length; - - temp_srv_p = pAtGattcSrvHead.pfirst; - if(temp_srv_p == NULL) { - ESP_LOGE(GATTC_TAG, "temp_srv_p == NULL,%s L#%d\n",__func__,__LINE__); - return ; - } - while(--srv_index) { - temp_srv_p = temp_srv_p->next; - if (temp_srv_p == NULL) { - ESP_LOGE(GATTC_TAG, "temp_srv_p == NULL,%s L#%d\n",__func__,__LINE__); - return ; - } - } - - pGattcCharHead = temp_srv_p->gattc_srv_char_head; - if(pGattcCharHead == NULL){ - ESP_LOGE(GATTC_TAG, "pGattcCharHead == NULL,%s L#%d\n",__func__,__LINE__); - return ; - } - pGattc_char_node = pGattcCharHead->pfirst; - if (pGattc_char_node == NULL) { - ESP_LOGE(GATTC_TAG, "pGattc_char_node == NULL,%s L#%d\n",__func__,__LINE__); - return ; - } - while(--char_index){ - pGattc_char_node = pGattc_char_node->next; - if(pGattc_char_node == NULL){ - ESP_LOGE(GATTC_TAG, "pGattc_char_node == NULL,%s L#%d\n",__func__,__LINE__); - return ; - } - } - - spp_gattc_wr_buffer = (uint8_t *)malloc(sizeof(uint8_t)*(len)); - if(spp_gattc_wr_buffer == NULL){ - ESP_LOGE(GATTC_TAG, "malloc failed,%s L#%d\n",__func__,__LINE__); - return; - } - memcpy(spp_gattc_wr_buffer,s,len); - - if((pGattc_char_node->char_prop & (ESP_GATT_CHAR_PROP_BIT_WRITE_NR|ESP_GATT_CHAR_PROP_BIT_WRITE)) == 0){ - ESP_LOGE(GATTC_TAG,"char_prop do not allow write\n"); - free(spp_gattc_wr_buffer); - return ; - } - - future_p = btc_main_get_future_p(BTC_MAIN_ENABLE_FUTURE); - *future_p = future_new(); - if (*future_p == NULL) { - ESP_LOGE(GATTC_TAG,"%s failed\n", __func__); - return; - } - esp_ble_gattc_write_char(spp_gattc_if, pGattc_char_node->conn_id, &pGattc_char_node->srvc_id, &pGattc_char_node->char_id, len,spp_gattc_wr_buffer, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE); - free(spp_gattc_wr_buffer); - if(future_await(*future_p) == FUTURE_FAIL) { - ESP_LOGE(GATTC_TAG,"%s failed\n", __func__); - return; - } - - return ; -} - -static void store_srv_info(esp_ble_gattc_cb_param_t * p_data) -{ - spp_ble_gattc_srv_t * pGattc_srv_node = NULL; - - pGattc_srv_node = (spp_ble_gattc_srv_t *)malloc(sizeof(spp_ble_gattc_srv_t)); - if (pGattc_srv_node == NULL) { - ESP_LOGE(GATTC_TAG, "malloc failed,%s L#%d\n",__func__,__LINE__); - return; - } - pGattc_srv_node->conn_id = p_data->search_res.conn_id; - pGattc_srv_node->next = NULL; - pGattc_srv_node->gattc_srv_char_head = NULL; - pGattc_srv_node->index = pAtGattcSrvHead.len + 1; - pGattc_srv_node->srvc_id.is_primary = p_data->search_res.srvc_id.is_primary; - pGattc_srv_node->srvc_id.id.inst_id = p_data->search_res.srvc_id.id.inst_id; - pGattc_srv_node->srvc_id.id.uuid.len = p_data->search_res.srvc_id.id.uuid.len; - pGattc_srv_node->srvc_id.id.uuid.uuid.uuid16 = p_data->search_res.srvc_id.id.uuid.uuid.uuid16; - - if (pAtGattcSrvHead.len == 0) { - pAtGattcSrvHead.len++; - pAtGattcSrvHead.pfirst = pGattc_srv_node; - pAtGattcSrvHead.plast = pGattc_srv_node; - } else { - pAtGattcSrvHead.len++; - pAtGattcSrvHead.plast->next = pGattc_srv_node; - pAtGattcSrvHead.plast = pGattc_srv_node; - } -} - -static void store_char_info(esp_ble_gattc_cb_param_t * p_data) -{ - spp_ble_gattc_char_t * pGattc_char_node = NULL; - - pGattc_char_node = (spp_ble_gattc_char_t *)malloc(sizeof(spp_ble_gattc_char_t)); - if(pGattc_char_node == NULL){ - ESP_LOGE(GATTC_TAG, "malloc failed,%s L#%d\n",__func__,__LINE__); - return; - } - pGattc_char_node->srv_index = temp_srv_p->index; - pGattc_char_node->char_descr = NULL; - pGattc_char_node->conn_id = p_data->get_char.conn_id; - pGattc_char_node->next = NULL; - pGattc_char_node->index = pGattcCharHead->len + 1; - pGattc_char_node->srvc_id.is_primary = p_data->get_char.srvc_id.is_primary; - pGattc_char_node->srvc_id.id.inst_id = p_data->get_char.srvc_id.id.inst_id; - pGattc_char_node->srvc_id.id.uuid.len = p_data->get_char.srvc_id.id.uuid.len; - pGattc_char_node->srvc_id.id.uuid.uuid.uuid16 = p_data->get_char.srvc_id.id.uuid.uuid.uuid16; - - pGattc_char_node->char_id.inst_id = p_data->get_char.char_id.inst_id; - pGattc_char_node->char_id.uuid.len = p_data->get_char.char_id.uuid.len; - pGattc_char_node->char_prop = p_data->get_char.char_prop; - pGattc_char_node->char_id.uuid.uuid.uuid16 = p_data->get_char.char_id.uuid.uuid.uuid16; - - temp_gattc_char_p1 = pGattc_char_node; - - if (pGattcCharHead->len == 0) { - pGattcCharHead->len++; - pGattcCharHead->pfirst = pGattc_char_node; - pGattcCharHead->plast = pGattc_char_node; - } else { - pGattcCharHead->len++; - pGattcCharHead->plast->next = pGattc_char_node; - pGattcCharHead->plast = pGattc_char_node; - } - esp_ble_gattc_get_descriptor(spp_gattc_if, pGattc_char_node->conn_id, &pGattc_char_node->srvc_id, &pGattc_char_node->char_id, NULL); -} - -static void store_desc_info(esp_ble_gattc_cb_param_t * p_data) -{ - spp_ble_gattc_char_descr_t * pGattc_char_node_descr = NULL; - - temp_char_descr_p = temp_gattc_char_p1->char_descr; - pGattc_char_node_descr = (spp_ble_gattc_char_descr_t *)malloc(sizeof(spp_ble_gattc_char_descr_t)); - if(pGattc_char_node_descr == NULL){ - ESP_LOGE(GATTC_TAG, "malloc failed,%s L#%d\n",__func__,__LINE__); - return; - } - pGattc_char_node_descr->conn_id = p_data->get_descr.conn_id; - pGattc_char_node_descr->char_descr_index = ++char_descr_index_count; - if (temp_char_descr_p == NULL) - temp_gattc_char_p1->char_descr = pGattc_char_node_descr; - else { - while (temp_char_descr_p->next != NULL) { - temp_char_descr_p = temp_char_descr_p->next; - } - temp_char_descr_p->next = pGattc_char_node_descr; - } - pGattc_char_node_descr->next = NULL; - pGattc_char_node_descr->descr_id.inst_id = p_data->get_descr.descr_id.inst_id; - pGattc_char_node_descr->descr_id.uuid.len = p_data->get_descr.descr_id.uuid.len; - - pGattc_char_node_descr->descr_id.uuid.uuid.uuid16 = p_data->get_descr.descr_id.uuid.uuid.uuid16; - if((p_data->get_descr.descr_id.uuid.uuid.uuid16 == 0x2902)&&(need_notify_number<3)){ - memset(&(notify_char_p[need_notify_number]),0x0,sizeof(spp_ble_gattc_char_t)); - memcpy(&(notify_char_p[need_notify_number]),temp_gattc_char_p1,sizeof(spp_ble_gattc_char_t)); - notify_char_descr_p[need_notify_number] = pGattc_char_node_descr; - ESP_LOGI(GATTC_TAG,"need_notify_number=%d\n",need_notify_number); - ESP_LOGI(GATTC_TAG,"- srvc_id = 0x%04x, char_id = 0x%04x \n", notify_char_p[need_notify_number].srvc_id.id.uuid.uuid.uuid16, notify_char_p[need_notify_number].char_id.uuid.uuid.uuid16); - need_notify_number++; - } - esp_ble_gattc_get_descriptor(spp_gattc_if, temp_gattc_char_p1->conn_id, &temp_gattc_char_p1->srvc_id, &temp_gattc_char_p1->char_id, &pGattc_char_node_descr->descr_id); -} +static esp_bt_uuid_t spp_service_uuid = { + .len = ESP_UUID_LEN_16, + .uuid = {.uuid16 = ESP_GATT_SPP_SERVICE_UUID,}, +}; static void notify_event_handler(esp_ble_gattc_cb_param_t * p_data) { - uint8_t gattc_srv_index_for_port = 0; - uint8_t gattc_char_index_for_port = 0; - - temp_srv_p = pAtGattcSrvHead.pfirst; - while(temp_srv_p != NULL){ - if(temp_srv_p->srvc_id.id.uuid.uuid.uuid16 == p_data->notify.srvc_id.id.uuid.uuid.uuid16){ - gattc_srv_index_for_port = temp_srv_p->index; - pGattcCharHead = temp_srv_p->gattc_srv_char_head; - if(pGattcCharHead != NULL){ - notify_char_pp = pGattcCharHead->pfirst; - while(notify_char_pp != NULL){ - if(notify_char_pp->char_id.uuid.uuid.uuid16== p_data->notify.char_id.uuid.uuid.uuid16){ - gattc_char_index_for_port = notify_char_pp->index; - } - notify_char_pp = notify_char_pp->next; - } - } - } - temp_srv_p = temp_srv_p->next; - } + uint8_t handle = 0; + if(p_data->notify.is_notify == true){ - ESP_LOGI(GATTC_TAG,"+NOTIFY:%d,%d,%d,",gattc_srv_index_for_port,gattc_char_index_for_port,p_data->notify.value_len); + ESP_LOGI(GATTC_TAG,"+NOTIFY:handle = %d,length = %d ",p_data->notify.handle,p_data->notify.value_len); }else{ - ESP_LOGI(GATTC_TAG,"+INDICATE:%d,%d,%d,",gattc_srv_index_for_port,gattc_char_index_for_port,p_data->notify.value_len); + ESP_LOGI(GATTC_TAG,"+INDICATE:handle = %d,length = %d ",p_data->notify.handle,p_data->notify.value_len); } - if((gattc_srv_index_for_port == SPP_SRV_INDEX)&&(gattc_char_index_for_port == SPP_DATA_NTFY_CHAR_INDEX)){ + handle = p_data->notify.handle; + if(handle == ((db+SPP_IDX_SPP_DATA_NTY_VAL)->attribute_handle)){ #ifdef SPP_DEBUG_MODE esp_log_buffer_char(GATTC_TAG, (char *)p_data->notify.value, p_data->notify.value_len); #else @@ -477,7 +181,7 @@ static void notify_event_handler(esp_ble_gattc_cb_param_t * p_data) uart_write_bytes(UART_NUM_0, (char *)(p_data->notify.value), p_data->notify.value_len); } #endif - }else if((gattc_srv_index_for_port == SPP_SRV_INDEX)&&(gattc_char_index_for_port == SPP_STATUS_CHAR_INDEX)){ + }else if(handle == ((db+SPP_IDX_SPP_STATUS_VAL)->attribute_handle)){ esp_log_buffer_char(GATTC_TAG, (char *)p_data->notify.value, p_data->notify.value_len); //TODO:server notify status characteristic }else{ @@ -485,107 +189,22 @@ static void notify_event_handler(esp_ble_gattc_cb_param_t * p_data) } } -static void read_event_handler(esp_ble_gattc_cb_param_t * p_data) -{ - uint8_t gattc_srv_index_for_port = 0; - uint8_t gattc_char_index_for_port = 0; - - temp_srv_p = pAtGattcSrvHead.pfirst; - while(temp_srv_p != NULL){ - if(temp_srv_p->srvc_id.id.uuid.uuid.uuid16 == p_data->notify.srvc_id.id.uuid.uuid.uuid16){ - gattc_srv_index_for_port = temp_srv_p->index; - pGattcCharHead = temp_srv_p->gattc_srv_char_head; - if(pGattcCharHead != NULL){ - notify_char_pp = pGattcCharHead->pfirst; - while(notify_char_pp != NULL){ - if(notify_char_pp->char_id.uuid.uuid.uuid16== p_data->notify.char_id.uuid.uuid.uuid16){ - gattc_char_index_for_port = notify_char_pp->index; - } - notify_char_pp = notify_char_pp->next; - } - } - } - temp_srv_p = temp_srv_p->next; - } - - if((gattc_srv_index_for_port == SPP_SRV_INDEX)&&(gattc_char_index_for_port == SPP_STATUS_CHAR_INDEX)){ - //TODO: read status characteristic - } -} - -static void printf_char_and_descr(uint8_t srv_index) -{ - spp_ble_gattc_char_t * temp_gattc_char_p = NULL; - spp_ble_gattc_char_descr_t * temp_gattc_char_descr_p = NULL; - - temp_srv_p = pAtGattcSrvHead.pfirst; - - if(temp_srv_p == NULL){ - ESP_LOGE(GATTC_TAG, "srv = NULL\n"); - } - while(--srv_index){ - temp_srv_p = temp_srv_p->next; - if(temp_srv_p == NULL){ - ESP_LOGE(GATTC_TAG, "srv = NULL\n"); - } - } - - temp_gattc_char_p = temp_srv_p->gattc_srv_char_head->pfirst; - while(temp_gattc_char_p != NULL){ - ESP_LOGI(GATTC_TAG,"+CHAR:%d,%d,UUID:0x%04x",temp_srv_p->index, temp_gattc_char_p->index,temp_gattc_char_p->char_id.uuid.uuid.uuid16); - - temp_gattc_char_descr_p = temp_gattc_char_p->char_descr; - while(temp_gattc_char_descr_p != NULL){ - ESP_LOGI(GATTC_TAG,"+DESC:%d,%d,%d,UUID:0x%04x",temp_srv_p->index, temp_gattc_char_p->index,temp_gattc_char_descr_p->char_descr_index,temp_gattc_char_descr_p->descr_id.uuid.uuid.uuid16); - temp_gattc_char_descr_p = temp_gattc_char_descr_p->next; - } - temp_gattc_char_p = temp_gattc_char_p->next; - } - return ; -} - static void free_gattc_srv_db(void) { - spp_ble_gattc_srv_t * temp_service_p = NULL , * temp_service_pp = NULL; - spp_ble_gattc_char_head * temp_srv_char_head_p = NULL; - spp_ble_gattc_char_t * temp_gattc_char_node_p = NULL , *temp_gattc_char_node_pp =NULL; - spp_ble_gattc_char_descr_t * temp_gattc_char_descr_node_p = NULL,* temp_gattc_char_descr_node_pp = NULL; - - temp_service_p = pAtGattcSrvHead.pfirst; - while(temp_service_p != NULL){ - temp_srv_char_head_p = temp_service_p->gattc_srv_char_head; - temp_gattc_char_node_p = temp_srv_char_head_p->pfirst; - while(temp_gattc_char_node_p != NULL){ - temp_gattc_char_node_pp = temp_gattc_char_node_p; - temp_gattc_char_descr_node_p = temp_gattc_char_node_pp->char_descr; - while(temp_gattc_char_descr_node_p != NULL){ - temp_gattc_char_descr_node_pp = temp_gattc_char_descr_node_p; - temp_gattc_char_descr_node_p = temp_gattc_char_descr_node_p->next; - free(temp_gattc_char_descr_node_pp); - } - temp_gattc_char_node_p = temp_gattc_char_node_p->next; - free(temp_gattc_char_node_pp); - } - free(temp_srv_char_head_p); - - temp_service_pp = temp_service_p; - temp_service_p = temp_service_p->next; - free(temp_service_pp); - } - pAtGattcSrvHead.len = 0; - pAtGattcSrvHead.pfirst = NULL; - pAtGattcSrvHead.plast = NULL; + db = NULL; is_connect = false; + spp_gattc_if = 0xff; spp_conn_id = 0; spp_mtu_size = 23; cmd = 0; - wr_descr_ccc_num = 0; - spp_gattc_if = 0xff; - need_notify_number = 0; - char_descr_index_count = 0; + spp_srv_start_handle = 0; + spp_srv_end_handle = 0; notify_value_p = NULL; notify_value_offset = 0; notify_value_count = 0; + if(db){ + free(db); + } } static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) @@ -699,17 +318,17 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ break; case ESP_GATTC_CONNECT_EVT: if(p_data->connect.status != ESP_GATT_OK){ - ESP_LOGI(GATTC_TAG, "connect fail, status = %d", p_data->connect.status); + ESP_LOGE(GATTC_TAG, "connect fail, status = %d", p_data->connect.status); break; } + ESP_LOGI(GATTC_TAG, "ESP_GATTC_CONNECT_EVT: conn_id=%d, gatt_if = %d, status =%d", spp_conn_id, gattc_if, p_data->connect.status); + ESP_LOGI(GATTC_TAG, "REMOTE BDA:"); + esp_log_buffer_hex(GATTC_TAG, gl_profile_tab[PROFILE_APP_ID].remote_bda, sizeof(esp_bd_addr_t)); spp_gattc_if = gattc_if; is_connect = true; spp_conn_id = p_data->connect.conn_id; memcpy(gl_profile_tab[PROFILE_APP_ID].remote_bda, p_data->connect.remote_bda, sizeof(esp_bd_addr_t)); - ESP_LOGI(GATTC_TAG, "ESP_GATTC_CONNECT_EVT: conn_id=%d, gatt_if = %d, status =%d", spp_conn_id, gattc_if, p_data->connect.status); - ESP_LOGI(GATTC_TAG, "REMOTE BDA:"); - esp_log_buffer_hex(GATTC_TAG, gl_profile_tab[PROFILE_APP_ID].remote_bda, sizeof(esp_bd_addr_t)); - esp_ble_gattc_search_service(gattc_if, spp_conn_id, NULL); + esp_ble_gattc_search_service(spp_gattc_if, spp_conn_id, &spp_service_uuid); break; case ESP_GATTC_DISCONNECT_EVT: ESP_LOGI(GATTC_TAG, "disconnect , status = %d", p_data->disconnect.status); @@ -717,53 +336,30 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ esp_ble_gap_start_scanning(0xffff); break; case ESP_GATTC_SEARCH_RES_EVT: - if((p_data->search_res.srvc_id.id.uuid.len == ESP_UUID_LEN_16)&&(p_data->search_res.srvc_id.id.uuid.uuid.uuid16 == 0x1800)){ - ESP_LOGI(GATTC_TAG, "uuid == 0x1800\n"); - break; - } - if((p_data->search_res.srvc_id.id.uuid.len == ESP_UUID_LEN_16)&&(p_data->search_res.srvc_id.id.uuid.uuid.uuid16 == 0x1801)){ - ESP_LOGI(GATTC_TAG, "uuid == 0x1801\n"); - break; - } - store_srv_info(p_data); + ESP_LOGI(GATTC_TAG, "ESP_GATTC_SEARCH_RES_EVT: start_handle = %d, end_handle = %d, UUID:0x%04x",p_data->search_res.start_handle,p_data->search_res.end_handle,p_data->search_res.srvc_id.uuid.uuid.uuid16); + spp_srv_start_handle = p_data->search_res.start_handle; + spp_srv_end_handle = p_data->search_res.end_handle; break; case ESP_GATTC_SEARCH_CMPL_EVT: ESP_LOGI(GATTC_TAG, "SEARCH_CMPL: conn_id = %x, status %d", spp_conn_id, p_data->search_cmpl.status); esp_ble_gattc_send_mtu_req(gattc_if,spp_conn_id); break; - case ESP_GATTC_GET_CHAR_EVT: - if (p_data->get_char.status != ESP_GATT_OK) { - printf_char_and_descr(SPP_SRV_INDEX); - xQueueSend(cmd_reg_queue,&cmd,10/portTICK_PERIOD_MS); - cmd++; - break; - } - store_char_info(p_data); - break; - case ESP_GATTC_GET_DESCR_EVT: - if (p_data->get_descr.status != ESP_GATT_OK) { - char_descr_index_count = 0; - esp_ble_gattc_get_characteristic(spp_gattc_if, temp_srv_p->conn_id, &temp_srv_p->srvc_id, &temp_gattc_char_p1->char_id); + case ESP_GATTC_REG_FOR_NOTIFY_EVT: { + ESP_LOGI(GATTC_TAG,"Index = %d,status = %d,handle = %d\n",cmd,p_data->reg_for_notify.status,p_data->reg_for_notify.handle); + if(p_data->reg_for_notify.status != ESP_GATT_OK){ + ESP_LOGE(GATTC_TAG, "ESP_GATTC_REG_FOR_NOTIFY_EVT, status = %d", p_data->connect.status); break; } - store_desc_info(p_data); - break; - case ESP_GATTC_REG_FOR_NOTIFY_EVT: { - ESP_LOGI(GATTC_TAG,"\nwr_descr_cmd = %d-- srvc_id = 0x%04x, char_id = 0x%04x, descr_id = 0x%04x \n",wr_descr_ccc_num , notify_char_p[wr_descr_ccc_num].srvc_id.id.uuid.uuid.uuid16, notify_char_p[wr_descr_ccc_num].char_id.uuid.uuid.uuid16,notify_char_descr_p[wr_descr_ccc_num]->descr_id.uuid.uuid.uuid16); - uint16_t notify_en = 1; esp_ble_gattc_write_char_descr( spp_gattc_if, - notify_char_p[wr_descr_ccc_num].conn_id, - &(notify_char_p[wr_descr_ccc_num].srvc_id), - &(notify_char_p[wr_descr_ccc_num].char_id), - ¬ify_char_descr_p[wr_descr_ccc_num]->descr_id, + spp_conn_id, + (db+cmd+1)->attribute_handle, sizeof(notify_en), (uint8_t *)¬ify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE); - wr_descr_ccc_num++; break; } case ESP_GATTC_NOTIFY_EVT: @@ -772,14 +368,12 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ break; case ESP_GATTC_READ_CHAR_EVT: ESP_LOGI(GATTC_TAG,"ESP_GATTC_READ_CHAR_EVT\n"); - read_event_handler(p_data); break; case ESP_GATTC_WRITE_CHAR_EVT: - ESP_LOGI(GATTC_TAG,"ESP_GATTC_WRITE_CHAR_EVT:status=%d,srvc_uuid = 0x%04x, char_uuid = 0x%04x, descr_uuid=0x%04x \n",p_data->write.status , p_data->write.srvc_id.id.uuid.uuid.uuid16, p_data->write.char_id.uuid.uuid.uuid16, p_data->write.descr_id.uuid.uuid.uuid16); - if(param->write.status == ESP_GATT_OK){ - if(param->write.char_id.uuid.uuid.uuid16 == 0xABF1){ - future_ready(*btc_main_get_future_p(BTC_MAIN_ENABLE_FUTURE), FUTURE_SUCCESS); - } + ESP_LOGI(GATTC_TAG,"ESP_GATTC_WRITE_CHAR_EVT:status = %d,handle = %d",param->write.status,param->write.handle); + if(param->write.status != ESP_GATT_OK){ + ESP_LOGE(GATTC_TAG, "ESP_GATTC_WRITE_CHAR_EVT, error status = %d", p_data->write.status); + break; } break; case ESP_GATTC_PREP_WRITE_EVT: @@ -787,9 +381,30 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ case ESP_GATTC_EXEC_EVT: break; case ESP_GATTC_WRITE_DESCR_EVT: - ESP_LOGI(GATTC_TAG,"ESP_GATTC_WRITE_DESCR_EVT: status =%d,srvc_uuid = 0x%04x, char_uuid = 0x%04x, descr_uuid=0x%04x \n",p_data->write.status,p_data->write.srvc_id.id.uuid.uuid.uuid16, p_data->write.char_id.uuid.uuid.uuid16, p_data->write.descr_id.uuid.uuid.uuid16); - xQueueSend(cmd_reg_queue,&cmd,10/portTICK_PERIOD_MS); - cmd++; + ESP_LOGI(GATTC_TAG,"ESP_GATTC_WRITE_DESCR_EVT: status =%d,handle = %d \n",p_data->write.status,p_data->write.handle); + if(p_data->write.status != ESP_GATT_OK){ + ESP_LOGE(GATTC_TAG, "ESP_GATTC_WRITE_DESCR_EVT, error status = %d", p_data->write.status); + break; + } + switch(cmd){ + case SPP_IDX_SPP_DATA_NTY_VAL: + cmd = SPP_IDX_SPP_STATUS_VAL; + xQueueSend(cmd_reg_queue,&cmd,10/portTICK_PERIOD_MS); + break; + case SPP_IDX_SPP_STATUS_VAL: +#ifdef SUPPORT_HEARTBEAT + cmd = SPP_IDX_SPP_HEARTBEAT_VAL; + xQueueSend(cmd_reg_queue,&cmd,10/portTICK_PERIOD_MS); +#endif + break; +#ifdef SUPPORT_HEARTBEAT + case SPP_IDX_SPP_HEARTBEAT_VAL: + xQueueSend(cmd_heartbeat_queue,&cmd,10/portTICK_PERIOD_MS); + break; +#endif + default: + break; + }; break; case ESP_GATTC_CFG_MTU_EVT: if(p_data->cfg_mtu.status != ESP_OK){ @@ -797,8 +412,22 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ } ESP_LOGI(GATTC_TAG,"+MTU:%d\n", p_data->cfg_mtu.mtu); spp_mtu_size = p_data->cfg_mtu.mtu; - print_srv_node(); - get_char_and_descr(); + + db = (esp_gattc_db_elem_t *)malloc(count*sizeof(esp_gattc_db_elem_t)); + if(db == NULL){ + ESP_LOGE(GATTC_TAG,"%s:malloc db falied\n",__func__); + break; + } + if(esp_ble_gattc_get_db(spp_gattc_if, spp_conn_id, spp_srv_start_handle, spp_srv_end_handle,db, &count) != ESP_GATT_OK){ + ESP_LOGE(GATTC_TAG,"%s:get db falied\n",__func__); + break; + } + for(int i = 0;i < SPP_IDX_NB;i++){ + ESP_LOGI(GATTC_TAG,"attr_type=%d,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x\n",\ + (db+i)->type,(db+i)->attribute_handle,(db+i)->start_handle,(db+i)->end_handle,(db+i)->properties,(db+i)->uuid.uuid.uuid16); + } + cmd = SPP_IDX_SPP_DATA_NTY_VAL; + xQueueSend(cmd_reg_queue,&cmd,10/portTICK_PERIOD_MS); break; case ESP_GATTC_SRVC_CHG_EVT: break; @@ -813,19 +442,17 @@ void spp_client_reg_task(void* arg) for(;;) { vTaskDelay(100 / portTICK_PERIOD_MS); if(xQueueReceive(cmd_reg_queue, &cmd_id, portMAX_DELAY)) { - if(0 == cmd_id){ - esp_ble_gattc_register_for_notify(spp_gattc_if, gl_profile_tab[PROFILE_APP_ID].remote_bda ,&(notify_char_p[cmd_id].srvc_id), &(notify_char_p[cmd_id].char_id)); - ESP_LOGI(GATTC_TAG,"No.%d-- srvc_id = 0x%04x, char_id = 0x%04x \n",cmd_id, notify_char_p[cmd_id].srvc_id.id.uuid.uuid.uuid16, notify_char_p[cmd_id].char_id.uuid.uuid.uuid16); - }else if(1 == cmd_id){ - esp_ble_gattc_register_for_notify(spp_gattc_if, gl_profile_tab[PROFILE_APP_ID].remote_bda ,&(notify_char_p[cmd_id].srvc_id), &(notify_char_p[cmd_id].char_id)); - ESP_LOGI(GATTC_TAG,"No.%d-- srvc_id = 0x%04x, char_id = 0x%04x \n",cmd_id, notify_char_p[cmd_id].srvc_id.id.uuid.uuid.uuid16, notify_char_p[cmd_id].char_id.uuid.uuid.uuid16); - }else if(2 == cmd_id){ - esp_ble_gattc_register_for_notify(spp_gattc_if, gl_profile_tab[PROFILE_APP_ID].remote_bda ,&(notify_char_p[cmd_id].srvc_id), &(notify_char_p[cmd_id].char_id)); - ESP_LOGI(GATTC_TAG,"No.%d-- srvc_id = 0x%04x, char_id = 0x%04x \n",cmd_id, notify_char_p[cmd_id].srvc_id.id.uuid.uuid.uuid16, notify_char_p[cmd_id].char_id.uuid.uuid.uuid16); + if(cmd_id == SPP_IDX_SPP_DATA_NTY_VAL){ + ESP_LOGI(GATTC_TAG,"Index = %d,UUID = 0x%04x, handle = %d \n",cmd_id,(db+SPP_IDX_SPP_DATA_NTY_VAL)->uuid.uuid.uuid16,(db+SPP_IDX_SPP_DATA_NTY_VAL)->attribute_handle); + esp_ble_gattc_register_for_notify(spp_gattc_if, gl_profile_tab[PROFILE_APP_ID].remote_bda ,(db+SPP_IDX_SPP_DATA_NTY_VAL)->attribute_handle); + }else if(cmd_id == SPP_IDX_SPP_STATUS_VAL){ + ESP_LOGI(GATTC_TAG,"Index = %d,UUID = 0x%04x, handle = %d \n",cmd_id,(db+SPP_IDX_SPP_STATUS_VAL)->uuid.uuid.uuid16,(db+SPP_IDX_SPP_STATUS_VAL)->attribute_handle); + esp_ble_gattc_register_for_notify(spp_gattc_if, gl_profile_tab[PROFILE_APP_ID].remote_bda ,(db+SPP_IDX_SPP_STATUS_VAL)->attribute_handle); } #ifdef SUPPORT_HEARTBEAT - else if(3 == cmd_id){ - xQueueSend(cmd_heartbeat_queue,&cmd,10/portTICK_PERIOD_MS); + else if(cmd_id == SPP_IDX_SPP_HEARTBEAT_VAL){ + ESP_LOGI(GATTC_TAG,"Index = %d,UUID = 0x%04x, handle = %d \n",cmd_id,(db+SPP_IDX_SPP_HEARTBEAT_VAL)->uuid.uuid.uuid16,(db+SPP_IDX_SPP_HEARTBEAT_VAL)->attribute_handle); + esp_ble_gattc_register_for_notify(spp_gattc_if, gl_profile_tab[PROFILE_APP_ID].remote_bda ,(db+SPP_IDX_SPP_HEARTBEAT_VAL)->attribute_handle); } #endif } @@ -842,7 +469,13 @@ void spp_heart_beat_task(void * arg) if(xQueueReceive(cmd_heartbeat_queue, &cmd_id, portMAX_DELAY)) { while(1){ if(is_connect == true){ - Characteristic_Wr(SPP_SRV_INDEX,SPP_HEARTBEAT_CHAR_INDEX,(char *)heartbeat_s,sizeof(heartbeat_s)); + esp_ble_gattc_write_char( spp_gattc_if, + spp_conn_id, + (db+SPP_IDX_SPP_HEARTBEAT_VAL)->attribute_handle, + sizeof(heartbeat_s), + (char *)heartbeat_s, + ESP_GATT_WRITE_TYPE_RSP, + ESP_GATT_AUTH_REQ_NONE); vTaskDelay(5000 / portTICK_PERIOD_MS); }else{ ESP_LOGI(GATTC_TAG,"disconnect\n"); @@ -854,23 +487,6 @@ void spp_heart_beat_task(void * arg) } #endif -void spp_client_read_task(void * arg) -{ - uint16_t cmd_id; - int32_t srv_index = SPP_SRV_INDEX, char_index = SPP_STATUS_CHAR_INDEX; - - for(;;) { - vTaskDelay(50 / portTICK_PERIOD_MS); - if(xQueueReceive(cmd_read_queue, &cmd_id, portMAX_DELAY)) { - if(is_connect == true){ - Characteristic_Rd(srv_index,char_index); - }else{ - ESP_LOGI(GATTC_TAG,"disconnect\n"); - } - } - } -} - void ble_client_appRegister(void) { esp_err_t status; @@ -901,9 +517,6 @@ void ble_client_appRegister(void) cmd_heartbeat_queue = xQueueCreate(10, sizeof(uint32_t)); xTaskCreate(spp_heart_beat_task, "spp_heart_beat_task", 2048, NULL, 10, NULL); #endif - - cmd_read_queue = xQueueCreate(10, sizeof(uint32_t)); - xTaskCreate(spp_client_read_task, "spp_client_read_task", 2048, NULL, 10, NULL); } void uart_task(void *pvParameters) @@ -924,7 +537,13 @@ void uart_task(void *pvParameters) } memset(temp,0x0,event.size); uart_read_bytes(UART_NUM_0,temp,event.size,portMAX_DELAY); - Characteristic_Wr(SPP_SRV_INDEX,SPP_DATA_RECV_CHAR_INDEX,(char *)temp,event.size); + esp_ble_gattc_write_char( spp_gattc_if, + spp_conn_id, + (db+SPP_IDX_SPP_DATA_RECV_VAL)->attribute_handle, + event.size, + temp, + ESP_GATT_WRITE_TYPE_RSP, + ESP_GATT_AUTH_REQ_NONE); free(temp); } break; @@ -955,7 +574,6 @@ static void spp_uart_init(void) uart_driver_install(UART_NUM_0, 4096, 8192, 10,&spp_uart_queue,0); xTaskCreate(uart_task, "uTask", 2048, (void*)UART_NUM_0, 8, NULL); } -#endif void app_main() { @@ -987,9 +605,7 @@ void app_main() return; } -#ifdef SUPPORT_NEW_GATTC_API ble_client_appRegister(); spp_uart_init(); -#endif }