espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-06 14:14:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

component/bt ; add notify

Browse Source
This commit is contained in:
Tian Hao
2016-10-25 15:05:08 +08:00
parent 8e247f3b4c
commit 20d33d636b
3 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
components/bt/bluedroid/profiles/esp/blufi/blufi_prf.c
View File

@@ -33,6 +33,9 @@
#define BT_BD_ADDR_STR "%02x:%02x:%02x:%02x:%02x:%02x" #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 BT_BD_ADDR_HEX(addr) addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]
void blufi_config_success(void);
void blufi_config_failed(void);
UINT16 esp32_uuid = SVC_BLUFI_UUID; UINT16 esp32_uuid = SVC_BLUFI_UUID;
UINT8 esp32_manu[17] = {0xff,0x20,0x14,0x07,0x22,0x00,0x02,0x5B,0x00,0x33,0x49,0x31,0x30,0x4a,0x30,0x30,0x31}; UINT8 esp32_manu[17] = {0xff,0x20,0x14,0x07,0x22,0x00,0x02,0x5B,0x00,0x33,0x49,0x31,0x30,0x4a,0x30,0x30,0x31};
tBTA_BLE_MANU p_esp32_manu = {sizeof(esp32_manu),esp32_manu}; /* manufacturer data */ tBTA_BLE_MANU p_esp32_manu = {sizeof(esp32_manu),esp32_manu}; /* manufacturer data */
@@ -180,21 +183,22 @@ static void blufi_profile_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
//add the frist blufi characteristic --> write characteristic //add the frist blufi characteristic --> write characteristic
BTA_GATTS_AddCharacteristic(blufi_cb_env.clcb.cur_srvc_id, &uuid, BTA_GATTS_AddCharacteristic(blufi_cb_env.clcb.cur_srvc_id, &uuid,
(GATT_PERM_WRITE | GATT_PERM_READ), (GATT_PERM_WRITE | GATT_PERM_READ),
(GATT_CHAR_PROP_BIT_READ | GATT_CHAR_PROP_BIT_WRITE)); (GATT_CHAR_PROP_BIT_READ | GATT_CHAR_PROP_BIT_WRITE | GATT_CHAR_PROP_BIT_NOTIFY));
break; break;
case BTA_GATTS_ADD_CHAR_EVT: case BTA_GATTS_ADD_CHAR_EVT:
if(p_data->add_result.char_uuid.uu.uuid16 == CHAR_BLUFI_UUID) if(p_data->add_result.char_uuid.uu.uuid16 == CHAR_BLUFI_UUID)
{ {
uuid.uu.uuid16 = CHAR_BLUFI_UUID;
//save the att handle to the env //save the att handle to the env
blufi_cb_env.blufi_inst.blufi_hdl = p_data->add_result.attr_id; blufi_cb_env.blufi_inst.blufi_hdl = p_data->add_result.attr_id;
uuid.uu.uuid16 = GATT_UUID_CHAR_CLIENT_CONFIG;
BTA_GATTS_AddCharDescriptor (blufi_cb_env.clcb.cur_srvc_id,
(GATT_PERM_WRITE|GATT_PERM_WRITE),
&uuid);
} }
break; break;
case BTA_GATTS_ADD_CHAR_DESCR_EVT: case BTA_GATTS_ADD_CHAR_DESCR_EVT:
if(p_data->add_result.char_uuid.uu.uuid16 == GATT_UUID_CHAR_CLIENT_CONFIG) /* Nothing */
{
blufi_cb_env.blufi_inst.blufi_hdl = p_data->add_result.attr_id;
}
break; break;
case BTA_GATTS_CONNECT_EVT: case BTA_GATTS_CONNECT_EVT:
//set the connection flag to true //set the connection flag to true
@@ -361,7 +365,7 @@ tGATT_STATUS blufi_profile_init (tBLUFI_CBACK *call_back)
return GATT_SUCCESS; return GATT_SUCCESS;
} }
void blufi_msg_notify(UINT8 len, UINT8 *blufi_msg) void blufi_msg_notify(UINT8 *blufi_msg, UINT8 len)
{ {
BOOLEAN conn_status = blufi_cb_env.clcb.connected; BOOLEAN conn_status = blufi_cb_env.clcb.connected;
UINT16 conn_id = blufi_cb_env.clcb.conn_id; UINT16 conn_id = blufi_cb_env.clcb.conn_id;
@@ -377,3 +381,15 @@ void blufi_msg_notify(UINT8 len, UINT8 *blufi_msg)
BTA_GATTS_HandleValueIndication (conn_id, attr_id, len, BTA_GATTS_HandleValueIndication (conn_id, attr_id, len,
blufi_msg, rsp); blufi_msg, rsp);
} }
void blufi_config_success(void)
{
uint8_t *success_msg = "BLUFI_CONFIG_OK";
blufi_msg_notify(success_msg, strlen(success_msg));
}
void blufi_config_failed(void)
{
uint8_t *failed_msg = "BLUFI_CONFIG_FAILED";
blufi_msg_notify(failed_msg, strlen(failed_msg));
}

4
components/bt/bluedroid/profiles/esp/include/blufi_prf.h
View File

@@ -7,7 +7,7 @@
//define the blufi Char uuid //define the blufi Char uuid
#define CHAR_BLUFI_UUID 0xFF01 #define CHAR_BLUFI_UUID 0xFF01
#define BLUFI_HDL_NUM 3 #define BLUFI_HDL_NUM 4
#define BLUFI_VAL_MAX_LEN (20) #define BLUFI_VAL_MAX_LEN (20)
@@ -72,5 +72,5 @@ BOOLEAN blufi_env_clcb_dealloc(UINT16 conn_id);
tGATT_STATUS blufi_profile_init(tBLUFI_CBACK *call_back); tGATT_STATUS blufi_profile_init(tBLUFI_CBACK *call_back);
void blufi_msg_notify(UINT8 len, UINT8 *blufi_msg); void blufi_msg_notify(UINT8 *blufi_msg, UINT8 len);

5
examples/07_blufi/main/demo_main.c
View File

@@ -46,6 +46,8 @@ void wifi_set_blue_config(char *ssid, char *passwd)
printf("confirm true\n"); printf("confirm true\n");
} }
extern void blufi_config_failed(void);
extern void blufi_config_success(void);
static esp_err_t event_handler(void *ctx, system_event_t *event) static esp_err_t event_handler(void *ctx, system_event_t *event)
{ {
switch(event->event_id) { switch(event->event_id) {
@@ -54,6 +56,8 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case SYSTEM_EVENT_STA_GOT_IP:
xEventGroupSetBits(wifi_event_group, CONNECTED_BIT); xEventGroupSetBits(wifi_event_group, CONNECTED_BIT);
blufi_config_success();
BTA_DisableBluetooth();
break; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
/* This is a workaround as ESP32 WiFi libs don't currently /* This is a workaround as ESP32 WiFi libs don't currently
@@ -102,6 +106,7 @@ void wifiTestTask(void *pvParameters)
ret = esp_wifi_connect(); ret = esp_wifi_connect();
if (ret != ESP_OK) { if (ret != ESP_OK) {
printf("esp_wifi connect failed\n"); printf("esp_wifi connect failed\n");
blufi_config_failed();
} }
} }
} }