From 142756615b5eb4d985b731eb89b7d2b097f9c609 Mon Sep 17 00:00:00 2001 From: Tian Hao Date: Thu, 12 Jan 2017 14:44:26 +0800 Subject: [PATCH] component/bt : mv demo name 1. mv demo name 2. fix a docs --- components/bt/bluedroid/api/esp_blufi_api.c | 8 ++++---- components/bt/bluedroid/api/include/esp_gatts_api.h | 3 ++- .../Makefile | 2 +- .../README.rst | 0 .../main/component.mk | 0 .../main/gatts_table_creat_demo.c | 0 .../main/gatts_table_creat_demo.h | 0 .../sdkconfig.defaults | 0 8 files changed, 7 insertions(+), 6 deletions(-) rename examples/{30_gatt_server_table_create => 33_gatt_server_service_table}/Makefile (81%) rename examples/{30_gatt_server_table_create => 33_gatt_server_service_table}/README.rst (100%) rename examples/{30_gatt_server_table_create => 33_gatt_server_service_table}/main/component.mk (100%) rename examples/{30_gatt_server_table_create => 33_gatt_server_service_table}/main/gatts_table_creat_demo.c (100%) rename examples/{30_gatt_server_table_create => 33_gatt_server_service_table}/main/gatts_table_creat_demo.h (100%) rename examples/{30_gatt_server_table_create => 33_gatt_server_service_table}/sdkconfig.defaults (100%) diff --git a/components/bt/bluedroid/api/esp_blufi_api.c b/components/bt/bluedroid/api/esp_blufi_api.c index 00fbeffbc9..2fcbbab794 100644 --- a/components/bt/bluedroid/api/esp_blufi_api.c +++ b/components/bt/bluedroid/api/esp_blufi_api.c @@ -27,7 +27,7 @@ esp_err_t esp_blufi_register_callbacks(esp_blufi_callbacks_t *callbacks) if (esp_bluedroid_get_status() == ESP_BLUEDROID_STATUS_UNINITIALIZED) { return ESP_ERR_INVALID_STATE; } - + if (callbacks == NULL) { return ESP_FAIL; } @@ -44,7 +44,7 @@ esp_err_t esp_blufi_send_wifi_conn_report(wifi_mode_t opmode, esp_blufi_sta_conn if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } - + msg.sig = BTC_SIG_API_CALL; msg.pid = BTC_PID_BLUFI; msg.act = BTC_BLUFI_ACT_SEND_CFG_REPORT; @@ -64,7 +64,7 @@ esp_err_t esp_blufi_profile_init(void) if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } - + msg.sig = BTC_SIG_API_CALL; msg.pid = BTC_PID_BLUFI; msg.act = BTC_BLUFI_ACT_INIT; @@ -79,7 +79,7 @@ esp_err_t esp_blufi_profile_deinit(void) if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } - + msg.sig = BTC_SIG_API_CALL; msg.pid = BTC_PID_BLUFI; msg.act = BTC_BLUFI_ACT_DEINIT; diff --git a/components/bt/bluedroid/api/include/esp_gatts_api.h b/components/bt/bluedroid/api/include/esp_gatts_api.h index 8d51ac7375..b18039ce79 100644 --- a/components/bt/bluedroid/api/include/esp_gatts_api.h +++ b/components/bt/bluedroid/api/include/esp_gatts_api.h @@ -441,7 +441,8 @@ esp_err_t esp_ble_gatts_stop_service(uint16_t service_handle); /** - * @brief This function is called to read a characteristics descriptor. + * @brief Send indicate or notify to GATT client. + * Set param need_confirm as false will send notification, otherwise indication. * * @param[in] gatts_if: GATT server access interface * @param[in] conn_id - connection id to indicate. diff --git a/examples/30_gatt_server_table_create/Makefile b/examples/33_gatt_server_service_table/Makefile similarity index 81% rename from examples/30_gatt_server_table_create/Makefile rename to examples/33_gatt_server_service_table/Makefile index a6e41ff33a..2ff9c6eaee 100644 --- a/examples/30_gatt_server_table_create/Makefile +++ b/examples/33_gatt_server_service_table/Makefile @@ -3,7 +3,7 @@ # project subdirectory. # -PROJECT_NAME := gatt_server_table_creat_demo +PROJECT_NAME := gatt_server_service_table_demo COMPONENT_ADD_INCLUDEDIRS := components/include diff --git a/examples/30_gatt_server_table_create/README.rst b/examples/33_gatt_server_service_table/README.rst similarity index 100% rename from examples/30_gatt_server_table_create/README.rst rename to examples/33_gatt_server_service_table/README.rst diff --git a/examples/30_gatt_server_table_create/main/component.mk b/examples/33_gatt_server_service_table/main/component.mk similarity index 100% rename from examples/30_gatt_server_table_create/main/component.mk rename to examples/33_gatt_server_service_table/main/component.mk diff --git a/examples/30_gatt_server_table_create/main/gatts_table_creat_demo.c b/examples/33_gatt_server_service_table/main/gatts_table_creat_demo.c similarity index 100% rename from examples/30_gatt_server_table_create/main/gatts_table_creat_demo.c rename to examples/33_gatt_server_service_table/main/gatts_table_creat_demo.c diff --git a/examples/30_gatt_server_table_create/main/gatts_table_creat_demo.h b/examples/33_gatt_server_service_table/main/gatts_table_creat_demo.h similarity index 100% rename from examples/30_gatt_server_table_create/main/gatts_table_creat_demo.h rename to examples/33_gatt_server_service_table/main/gatts_table_creat_demo.h diff --git a/examples/30_gatt_server_table_create/sdkconfig.defaults b/examples/33_gatt_server_service_table/sdkconfig.defaults similarity index 100% rename from examples/30_gatt_server_table_create/sdkconfig.defaults rename to examples/33_gatt_server_service_table/sdkconfig.defaults