component/bt : cleanup the un-necessary include in api.h

1. cleanup the un-necessary include in api.h for "extern c"
2. add UUID define

diff --git a/components/bt/bluedroid/api/include/esp_blufi_api.h b/components/bt/bluedroid/api/include/esp_blufi_api.h
index 492bd1faab80825021872c5f1f3d7c57a33d2c12..609d9c1c595e55ab0e18e73d23ed6b504d404524 100644 (file)
--- a/components/bt/bluedroid/api/include/esp_blufi_api.h
+++ b/components/bt/bluedroid/api/include/esp_blufi_api.h
@@ -15,10 +15,8 @@
 #ifndef __ESP_BLUFI_API_H__
 #define __ESP_BLUFI_API_H__
 
-#include "bt_types.h"
 #include "esp_bt_defs.h"
 #include "esp_gatt_defs.h"
-#include "bta_gatt_api.h"
 #include "esp_err.h"
 
 #ifdef __cplusplus

diff --git a/components/bt/bluedroid/api/include/esp_bt_main.h b/components/bt/bluedroid/api/include/esp_bt_main.h
index ad66a8a4d4ad4e1e3fd10c9c70d5d83e42757f45..859da092dd219cd8d29d09057043d0da77390df6 100644 (file)
--- a/components/bt/bluedroid/api/include/esp_bt_main.h
+++ b/components/bt/bluedroid/api/include/esp_bt_main.h
@@ -15,7 +15,6 @@
 #ifndef __ESP_BT_MAIN_H__
 #define __ESP_BT_MAIN_H__
 
-#include "btc_main.h"
 #include "esp_err.h"
 
 #ifdef __cplusplus

diff --git a/components/bt/bluedroid/api/include/esp_gatt_defs.h b/components/bt/bluedroid/api/include/esp_gatt_defs.h
index 352a1de96574cb6eb5823e3447a759bf1b607f1f..9ebe464e26c21eda7c93c4cb31a600fae9ddaf9a 100644 (file)
--- a/components/bt/bluedroid/api/include/esp_gatt_defs.h
+++ b/components/bt/bluedroid/api/include/esp_gatt_defs.h
@@ -21,6 +21,100 @@
 extern "C" {
 #endif
 
+/// GATT INVALID UUID
+#define ESP_GATT_ILLEGAL_UUID                0
+
+/**
+ * @brief GATT attribute types
+*/
+#define ESP_GATT_UUID_PRI_SERVICE            0x2800
+#define ESP_GATT_UUID_SEC_SERVICE            0x2801
+#define ESP_GATT_UUID_INCLUDE_SERVICE        0x2802
+#define ESP_GATT_UUID_CHAR_DECLARE           0x2803      /*  Characteristic Declaration*/
+
+#define ESP_GATT_UUID_CHAR_EXT_PROP          0x2900      /*  Characteristic Extended Properties */
+#define ESP_GATT_UUID_CHAR_DESCRIPTION       0x2901      /*  Characteristic User Description*/
+#define ESP_GATT_UUID_CHAR_CLIENT_CONFIG     0x2902      /*  Client Characteristic Configuration */
+#define ESP_GATT_UUID_CHAR_SRVR_CONFIG       0x2903      /*  Server Characteristic Configuration */
+#define ESP_GATT_UUID_CHAR_PRESENT_FORMAT    0x2904      /*  Characteristic Presentation Format*/
+#define ESP_GATT_UUID_CHAR_AGG_FORMAT        0x2905      /*  Characteristic Aggregate Format*/
+#define ESP_GATT_UUID_CHAR_VALID_RANGE       0x2906      /*  Characteristic Valid Range */
+#define ESP_GATT_UUID_EXT_RPT_REF_DESCR      0x2907
+#define ESP_GATT_UUID_RPT_REF_DESCR          0x2908
+
+/* GAP Profile Attributes */
+#define ESP_GATT_UUID_GAP_DEVICE_NAME        0x2A00
+#define ESP_GATT_UUID_GAP_ICON               0x2A01
+#define ESP_GATT_UUID_GAP_PREF_CONN_PARAM    0x2A04
+#define ESP_GATT_UUID_GAP_CENTRAL_ADDR_RESOL 0x2AA6
+
+/* Attribute Profile Attribute UUID */
+#define ESP_GATT_UUID_GATT_SRV_CHGD          0x2A05
+
+/* Link ESP_Loss Service */
+#define ESP_GATT_UUID_ALERT_LEVEL            0x2A06      /* Alert Level */
+#define ESP_GATT_UUID_TX_POWER_LEVEL         0x2A07      /* TX power level */
+
+/* Current Time Service */
+#define ESP_GATT_UUID_CURRENT_TIME           0x2A2B      /* Current Time */
+#define ESP_GATT_UUID_LOCAL_TIME_INFO        0x2A0F      /* Local time info */
+#define ESP_GATT_UUID_REF_TIME_INFO          0x2A14      /* reference time information */
+
+/* Network availability Profile */
+#define ESP_GATT_UUID_NW_STATUS              0x2A18      /* network availability status */
+#define ESP_GATT_UUID_NW_TRIGGER             0x2A1A      /* Network availability trigger */
+
+/* Phone alert */
+#define ESP_GATT_UUID_ALERT_STATUS           0x2A3F    /* alert status */
+#define ESP_GATT_UUID_RINGER_CP              0x2A40    /* ringer control point */
+#define ESP_GATT_UUID_RINGER_SETTING         0x2A41    /* ringer setting */
+
+/* Glucose Service */
+#define ESP_GATT_UUID_GM_MEASUREMENT         0x2A18
+#define ESP_GATT_UUID_GM_CONTEXT             0x2A34
+#define ESP_GATT_UUID_GM_CONTROL_POINT       0x2A52
+#define ESP_GATT_UUID_GM_FEATURE             0x2A51
+
+/* device information characteristic */
+#define ESP_GATT_UUID_SYSTEM_ID              0x2A23
+#define ESP_GATT_UUID_MODEL_NUMBER_STR       0x2A24
+#define ESP_GATT_UUID_SERIAL_NUMBER_STR      0x2A25
+#define ESP_GATT_UUID_FW_VERSION_STR         0x2A26
+#define ESP_GATT_UUID_HW_VERSION_STR         0x2A27
+#define ESP_GATT_UUID_SW_VERSION_STR         0x2A28
+#define ESP_GATT_UUID_MANU_NAME              0x2A29
+#define ESP_GATT_UUID_IEEE_DATA              0x2A2A
+#define ESP_GATT_UUID_PNP_ID                 0x2A50
+
+/* HID characteristics */
+#define ESP_GATT_UUID_HID_INFORMATION        0x2A4A
+#define ESP_GATT_UUID_HID_REPORT_MAP         0x2A4B
+#define ESP_GATT_UUID_HID_CONTROL_POINT      0x2A4C
+#define ESP_GATT_UUID_HID_REPORT             0x2A4D
+#define ESP_GATT_UUID_HID_PROTO_MODE         0x2A4E
+#define ESP_GATT_UUID_HID_BT_KB_INPUT        0x2A22
+#define ESP_GATT_UUID_HID_BT_KB_OUTPUT       0x2A32
+#define ESP_GATT_UUID_HID_BT_MOUSE_INPUT     0x2A33
+
+/* Battery Service characteristics */
+#define ESP_GATT_UUID_BATTERY_LEVEL          0x2A19
+
+/* Sensor Service */
+#define ESP_GATT_UUID_SC_CONTROL_POINT       0x2A55
+#define ESP_GATT_UUID_SENSOR_LOCATION        0x2A5D
+
+/* Runners speed and cadence service */
+#define ESP_GATT_UUID_RSC_MEASUREMENT        0x2A53
+#define ESP_GATT_UUID_RSC_FEATURE            0x2A54
+
+/* Cycling speed and cadence service */
+#define ESP_GATT_UUID_CSC_MEASUREMENT        0x2A5B
+#define ESP_GATT_UUID_CSC_FEATURE            0x2A5C
+
+/* Scan ESP_Parameter characteristics */
+#define ESP_GATT_UUID_SCAN_INT_WINDOW        0x2A4F
+#define ESP_GATT_UUID_SCAN_REFRESH           0x2A31
+
 /// Attribute write data type from the client
 typedef enum {
        ESP_GATT_PREP_WRITE_CANCEL    = 0x00,           /*!< Prepare write cancel */

diff --git a/components/bt/bluedroid/api/include/esp_gattc_api.h b/components/bt/bluedroid/api/include/esp_gattc_api.h
index e1a9593ab13cad0499680b561c0a9c54ebc2eca1..4407975a0d0d98d56cc5f98801acbfa8100b28b2 100644 (file)
--- a/components/bt/bluedroid/api/include/esp_gattc_api.h
+++ b/components/bt/bluedroid/api/include/esp_gattc_api.h
@@ -15,7 +15,6 @@
 #ifndef __ESP_GATTC_API_H__
 #define __ESP_GATTC_API_H__
 
-#include "bt_types.h"
 #include "esp_bt_defs.h"
 #include "esp_gatt_defs.h"
 #include "esp_err.h"

diff --git a/components/bt/bluedroid/api/include/esp_gatts_api.h b/components/bt/bluedroid/api/include/esp_gatts_api.h
index 42f97d1ac00c4dac03307e05b7d1e1249e171fb6..30aa3ecf5665e8ebebb2b8d06f02f5a0fe21f848 100644 (file)
--- a/components/bt/bluedroid/api/include/esp_gatts_api.h
+++ b/components/bt/bluedroid/api/include/esp_gatts_api.h
@@ -15,10 +15,8 @@
 #ifndef __ESP_GATTS_API_H__
 #define __ESP_GATTS_API_H__
 
-#include "bt_types.h"
 #include "esp_bt_defs.h"
 #include "esp_gatt_defs.h"
-#include "bta_gatt_api.h"
 #include "esp_err.h"
 
 #ifdef __cplusplus

diff --git a/examples/14_gatt_server/main/gatts_demo.c b/examples/14_gatt_server/main/gatts_demo.c
index 0f4c996158a7ba82004dead66bcae0a62bc3fec2..48576d362f1d7f7f531d86c75ca2ff3d7aced3ac 100644 (file)
--- a/examples/14_gatt_server/main/gatts_demo.c
+++ b/examples/14_gatt_server/main/gatts_demo.c
@@ -165,7 +165,7 @@ static void gatts_event_handler(uint32_t event, void *param)
 
         gl_test.char_handle = p->add_char.attr_handle;
         gl_test.descr_uuid.len = ESP_UUID_LEN_16;
-        gl_test.descr_uuid.uuid.uuid16 = GATT_UUID_CHAR_CLIENT_CONFIG;
+        gl_test.descr_uuid.uuid.uuid16 = ESP_GATT_UUID_CHAR_CLIENT_CONFIG;
         esp_ble_gatts_add_char_descr(gl_test.service_handle, &gl_test.descr_uuid,
                                      ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE);
         break;