Skip to content

Commit 305db99

Browse files
redchenjsredchenjs
committed
ble_app: update gatts profiles
1 parent 80232d1 commit 305db99

File tree

5 files changed

+49
-45
lines changed

5 files changed

+49
-45
lines changed

‎main/inc/user/ble_app.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
#ifndef INC_USER_BLE_APP_H_
99
#define INC_USER_BLE_APP_H_
1010

11-
#include "esp_gap_ble_api.h"
12-
13-
extern esp_ble_adv_params_t *ble_app_get_adv_params(void);
11+
extern void *ble_app_get_adv_params(void);
12+
extern void ble_app_config_adv_data(void);
1413

1514
extern void ble_app_init(void);
1615

‎main/inc/user/ble_gatts.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
enum gatts_profile_idx {
1414
PROFILE_IDX_OTA = 0x00,
15-
PROFILE_IDX_FAN = 0x01,
15+
PROFILE_IDX_CFG = 0x01,
1616

1717
PROFILE_IDX_MAX
1818
};

‎main/src/user/ble_app.c‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "core/os.h"
1717
#include "chip/bt.h"
1818

19+
#include "user/ble_app.h"
1920
#include "user/ble_gatts.h"
2021

2122
#define BLE_APP_TAG "ble_app"
@@ -55,30 +56,34 @@ static void ble_gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_p
5556
ESP_LOGE(BLE_GAP_TAG, "failed to stop advertising");
5657
}
5758
break;
58-
case ESP_GAP_BLE_SET_LOCAL_PRIVACY_COMPLETE_EVT:
59-
strcpy((char *)adv_data_raw + 5, CONFIG_BLE_NAME);
60-
esp_ble_gap_config_adv_data_raw(adv_data_raw, sizeof(adv_data_raw));
61-
break;
6259
default:
6360
break;
6461
}
6562
}
6663

67-
esp_ble_adv_params_t *ble_app_get_adv_params(void)
64+
void *ble_app_get_adv_params(void)
6865
{
6966
return &adv_params;
7067
}
7168

69+
void ble_app_config_adv_data(void)
70+
{
71+
strcpy((char *)adv_data_raw + 5, CONFIG_BLE_NAME);
72+
esp_ble_gap_config_adv_data_raw(adv_data_raw, sizeof(adv_data_raw));
73+
}
74+
7275
void ble_app_init(void)
7376
{
7477
xEventGroupSetBits(user_event_group, BLE_GATTS_IDLE_BIT);
7578

7679
esp_ble_gap_register_callback(ble_gap_event_handler);
77-
esp_ble_gap_config_local_privacy(true);
80+
esp_ble_gap_set_rand_addr(ble_get_mac_address());
81+
82+
ble_app_config_adv_data();
7883

7984
esp_ble_gatts_register_callback(ble_gatts_event_handler);
8085
esp_ble_gatts_app_register(PROFILE_IDX_OTA);
81-
esp_ble_gatts_app_register(PROFILE_IDX_FAN);
86+
esp_ble_gatts_app_register(PROFILE_IDX_CFG);
8287

8388
esp_ble_gatt_set_local_mtu(ESP_GATT_MAX_MTU_SIZE);
8489

‎main/src/user/ble_gatts.c‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@
2424
#define BLE_GATTS_TAG "ble_gatts"
2525

2626
#define GATTS_OTA_TAG "gatts_ota"
27-
#define GATTS_FAN_TAG "gatts_fan"
27+
#define GATTS_CFG_TAG "gatts_cfg"
2828

2929
#define GATTS_SRV_UUID_OTA 0xFF52
3030
#define GATTS_CHAR_UUID_OTA 0x5201
3131
#define GATTS_NUM_HANDLE_OTA 4
3232

33-
#define GATTS_SRV_UUID_FAN 0xFF53
34-
#define GATTS_CHAR_UUID_FAN 0x5301
35-
#define GATTS_NUM_HANDLE_FAN 4
33+
#define GATTS_SRV_UUID_CFG 0xFF53
34+
#define GATTS_CHAR_UUID_CFG 0x5301
35+
#define GATTS_NUM_HANDLE_CFG 4
3636

3737
static uint16_t desc_val_ota = 0x0000;
3838
static uint16_t desc_val_fan = 0x0000;
3939

4040
static const char *s_gatts_conn_state_str[] = {"disconnected", "connected"};
4141

4242
static void profile_ota_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param);
43-
static void profile_fan_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param);
43+
static void profile_cfg_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param);
4444

4545
gatts_profile_inst_t gatts_profile_tbl[PROFILE_IDX_MAX] = {
4646
[PROFILE_IDX_OTA] = { .gatts_cb = profile_ota_event_handler, .gatts_if = ESP_GATT_IF_NONE },
47-
[PROFILE_IDX_FAN] = { .gatts_cb = profile_fan_event_handler, .gatts_if = ESP_GATT_IF_NONE }
47+
[PROFILE_IDX_CFG] = { .gatts_cb = profile_cfg_event_handler, .gatts_if = ESP_GATT_IF_NONE }
4848
};
4949

5050
static void profile_ota_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param)
@@ -160,22 +160,22 @@ static void profile_ota_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t
160160
}
161161
}
162162

163-
static void profile_fan_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param)
163+
static void profile_cfg_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param)
164164
{
165165
switch (event) {
166166
case ESP_GATTS_REG_EVT:
167-
gatts_profile_tbl[PROFILE_IDX_FAN].service_id.is_primary = true;
168-
gatts_profile_tbl[PROFILE_IDX_FAN].service_id.id.inst_id = 0x00;
169-
gatts_profile_tbl[PROFILE_IDX_FAN].service_id.id.uuid.len = ESP_UUID_LEN_16;
170-
gatts_profile_tbl[PROFILE_IDX_FAN].service_id.id.uuid.uuid.uuid16 = GATTS_SRV_UUID_FAN;
167+
gatts_profile_tbl[PROFILE_IDX_CFG].service_id.is_primary = true;
168+
gatts_profile_tbl[PROFILE_IDX_CFG].service_id.id.inst_id = 0x00;
169+
gatts_profile_tbl[PROFILE_IDX_CFG].service_id.id.uuid.len = ESP_UUID_LEN_16;
170+
gatts_profile_tbl[PROFILE_IDX_CFG].service_id.id.uuid.uuid.uuid16 = GATTS_SRV_UUID_CFG;
171171

172-
esp_ble_gatts_create_service(gatts_if, &gatts_profile_tbl[PROFILE_IDX_FAN].service_id, GATTS_NUM_HANDLE_FAN);
172+
esp_ble_gatts_create_service(gatts_if, &gatts_profile_tbl[PROFILE_IDX_CFG].service_id, GATTS_NUM_HANDLE_CFG);
173173

174174
break;
175175
case ESP_GATTS_READ_EVT: {
176176
esp_gatt_rsp_t rsp = {0};
177177

178-
if (param->read.handle == gatts_profile_tbl[PROFILE_IDX_FAN].descr_handle) {
178+
if (param->read.handle == gatts_profile_tbl[PROFILE_IDX_CFG].descr_handle) {
179179
rsp.attr_value.len = 2;
180180
memcpy(rsp.attr_value.value, &desc_val_fan, sizeof(desc_val_fan));
181181
} else {
@@ -196,7 +196,7 @@ static void profile_fan_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t
196196
}
197197
case ESP_GATTS_WRITE_EVT:
198198
if (!param->write.is_prep) {
199-
if (param->write.handle == gatts_profile_tbl[PROFILE_IDX_FAN].descr_handle) {
199+
if (param->write.handle == gatts_profile_tbl[PROFILE_IDX_CFG].descr_handle) {
200200
desc_val_fan = param->write.value[1] << 8 | param->write.value[0];
201201
} else {
202202
switch (param->write.value[0]) {
@@ -206,11 +206,11 @@ static void profile_fan_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t
206206
} else if (param->write.len == 8) { // apply new configuration
207207
fan_set_duty(param->write.value[6]);
208208
} else {
209-
ESP_LOGE(GATTS_FAN_TAG, "invalid command: 0x%02X", param->write.value[0]);
209+
ESP_LOGE(GATTS_CFG_TAG, "invalid command: 0x%02X", param->write.value[0]);
210210
}
211211
break;
212212
default:
213-
ESP_LOGW(GATTS_FAN_TAG, "unknown command: 0x%02X", param->write.value[0]);
213+
ESP_LOGW(GATTS_CFG_TAG, "unknown command: 0x%02X", param->write.value[0]);
214214
break;
215215
}
216216
}
@@ -222,53 +222,53 @@ static void profile_fan_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t
222222

223223
break;
224224
case ESP_GATTS_CREATE_EVT:
225-
gatts_profile_tbl[PROFILE_IDX_FAN].service_handle = param->create.service_handle;
226-
gatts_profile_tbl[PROFILE_IDX_FAN].char_uuid.len = ESP_UUID_LEN_16;
227-
gatts_profile_tbl[PROFILE_IDX_FAN].char_uuid.uuid.uuid16 = GATTS_CHAR_UUID_FAN;
225+
gatts_profile_tbl[PROFILE_IDX_CFG].service_handle = param->create.service_handle;
226+
gatts_profile_tbl[PROFILE_IDX_CFG].char_uuid.len = ESP_UUID_LEN_16;
227+
gatts_profile_tbl[PROFILE_IDX_CFG].char_uuid.uuid.uuid16 = GATTS_CHAR_UUID_CFG;
228228

229-
esp_ble_gatts_start_service(gatts_profile_tbl[PROFILE_IDX_FAN].service_handle);
229+
esp_ble_gatts_start_service(gatts_profile_tbl[PROFILE_IDX_CFG].service_handle);
230230

231-
esp_err_t add_char_ret = esp_ble_gatts_add_char(gatts_profile_tbl[PROFILE_IDX_FAN].service_handle,
232-
&gatts_profile_tbl[PROFILE_IDX_FAN].char_uuid,
231+
esp_err_t add_char_ret = esp_ble_gatts_add_char(gatts_profile_tbl[PROFILE_IDX_CFG].service_handle,
232+
&gatts_profile_tbl[PROFILE_IDX_CFG].char_uuid,
233233
ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE,
234234
ESP_GATT_CHAR_PROP_BIT_READ | ESP_GATT_CHAR_PROP_BIT_WRITE,
235235
NULL,
236236
NULL);
237237
if (add_char_ret) {
238-
ESP_LOGE(GATTS_FAN_TAG, "failed to add char: %d", add_char_ret);
238+
ESP_LOGE(GATTS_CFG_TAG, "failed to add char: %d", add_char_ret);
239239
}
240240

241241
break;
242242
case ESP_GATTS_ADD_CHAR_EVT:
243-
gatts_profile_tbl[PROFILE_IDX_FAN].char_handle = param->add_char.attr_handle;
244-
gatts_profile_tbl[PROFILE_IDX_FAN].descr_uuid.len = ESP_UUID_LEN_16;
245-
gatts_profile_tbl[PROFILE_IDX_FAN].descr_uuid.uuid.uuid16 = ESP_GATT_UUID_CHAR_CLIENT_CONFIG;
243+
gatts_profile_tbl[PROFILE_IDX_CFG].char_handle = param->add_char.attr_handle;
244+
gatts_profile_tbl[PROFILE_IDX_CFG].descr_uuid.len = ESP_UUID_LEN_16;
245+
gatts_profile_tbl[PROFILE_IDX_CFG].descr_uuid.uuid.uuid16 = ESP_GATT_UUID_CHAR_CLIENT_CONFIG;
246246

247-
esp_err_t add_descr_ret = esp_ble_gatts_add_char_descr(gatts_profile_tbl[PROFILE_IDX_FAN].service_handle,
248-
&gatts_profile_tbl[PROFILE_IDX_FAN].descr_uuid,
247+
esp_err_t add_descr_ret = esp_ble_gatts_add_char_descr(gatts_profile_tbl[PROFILE_IDX_CFG].service_handle,
248+
&gatts_profile_tbl[PROFILE_IDX_CFG].descr_uuid,
249249
ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE,
250250
NULL,
251251
NULL);
252252
if (add_descr_ret) {
253-
ESP_LOGE(GATTS_FAN_TAG, "failed to add char descr: %d", add_descr_ret);
253+
ESP_LOGE(GATTS_CFG_TAG, "failed to add char descr: %d", add_descr_ret);
254254
}
255255

256256
break;
257257
case ESP_GATTS_ADD_CHAR_DESCR_EVT:
258-
gatts_profile_tbl[PROFILE_IDX_FAN].descr_handle = param->add_char_descr.attr_handle;
258+
gatts_profile_tbl[PROFILE_IDX_CFG].descr_handle = param->add_char_descr.attr_handle;
259259
break;
260260
case ESP_GATTS_CONNECT_EVT:
261-
ESP_LOGI(GATTS_FAN_TAG, "connection state: %s, [%02x:%02x:%02x:%02x:%02x:%02x]",
261+
ESP_LOGI(GATTS_CFG_TAG, "connection state: %s, [%02x:%02x:%02x:%02x:%02x:%02x]",
262262
s_gatts_conn_state_str[1],
263263
param->connect.remote_bda[0], param->connect.remote_bda[1],
264264
param->connect.remote_bda[2], param->connect.remote_bda[3],
265265
param->connect.remote_bda[4], param->connect.remote_bda[5]);
266266

267-
gatts_profile_tbl[PROFILE_IDX_FAN].conn_id = param->connect.conn_id;
267+
gatts_profile_tbl[PROFILE_IDX_CFG].conn_id = param->connect.conn_id;
268268

269269
break;
270270
case ESP_GATTS_DISCONNECT_EVT:
271-
ESP_LOGI(GATTS_FAN_TAG, "connection state: %s, [%02x:%02x:%02x:%02x:%02x:%02x]",
271+
ESP_LOGI(GATTS_CFG_TAG, "connection state: %s, [%02x:%02x:%02x:%02x:%02x:%02x]",
272272
s_gatts_conn_state_str[0],
273273
param->connect.remote_bda[0], param->connect.remote_bda[1],
274274
param->connect.remote_bda[2], param->connect.remote_bda[3],

‎sdkconfig.defaults‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CONFIG_BT_ACL_CONNECTIONS=1
3434
#
3535
# Compiler options
3636
#
37-
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
37+
CONFIG_COMPILER_OPTIMIZATION_PERF=y
3838

3939
#
4040
# ESP32-specific

0 commit comments

Comments
 (0)