Skip to content

Commit 09509cd

Browse files
author
Benjamin Aigner
committed
Changed to current GIT esp-idf. (removed bt_trace & LOG_ERROR/LOG_xxx)
1 parent ae191af commit 09509cd

File tree

6 files changed

+52
-40
lines changed

6 files changed

+52
-40
lines changed

‎main/ble_hidd_demo_main.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "esp_gatt_defs.h"
3838
#include "esp_bt_main.h"
3939
#include "esp_bt_device.h"
40-
#include "bt_trace.h"
4140
#include "driver/gpio.h"
4241
#include "driver/uart.h"
4342
#include "hid_dev.h"
@@ -189,17 +188,18 @@ static void hidd_event_callback(esp_hidd_cb_event_t event, esp_hidd_cb_param_t *
189188
case ESP_HIDD_EVENT_BLE_CONNECT: {
190189
hid_conn_id = param->connect.conn_id;
191190
sec_conn = true; //TODO: right here?!?
192-
LOG_ERROR("%s(), ESP_HIDD_EVENT_BLE_CONNECT", __func__);
191+
ESP_LOGE(GATTS_TAG,"%s(), ESP_HIDD_EVENT_BLE_CONNECT", __func__);
193192
break;
194193
}
195194
case ESP_HIDD_EVENT_BLE_DISCONNECT: {
196195
sec_conn = false;
197196
hid_conn_id = 0;
198-
LOG_ERROR("%s(), ESP_HIDD_EVENT_BLE_DISCONNECT", __func__);
197+
ESP_LOGE(GATTS_TAG,"%s(), ESP_HIDD_EVENT_BLE_DISCONNECT", __func__);
199198
esp_ble_gap_start_advertising(&hidd_adv_params);
200199
break;
201200
}
202201
default:
202+
ESP_LOGE(GATTS_TAG,"%s(), unhandled event: %d", __func__,event);
203203
break;
204204
}
205205
return;
@@ -221,9 +221,9 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param
221221
sec_conn = true;
222222
if(param->ble_security.auth_cmpl.success)
223223
{
224-
LOG_INFO("status = success, ESP_GAP_BLE_AUTH_CMPL_EVT");
224+
ESP_LOGI(GATTS_TAG,"status = success, ESP_GAP_BLE_AUTH_CMPL_EVT");
225225
} else {
226-
LOG_INFO("status = fail, ESP_GAP_BLE_AUTH_CMPL_EVT");
226+
ESP_LOGI(GATTS_TAG,"status = fail, ESP_GAP_BLE_AUTH_CMPL_EVT");
227227
}
228228
break;
229229
//unused events
@@ -233,38 +233,38 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param
233233

234234
case ESP_GAP_BLE_PASSKEY_REQ_EVT: /* passkey request event */
235235
//esp_ble_passkey_reply(gl_profile_tab[PROFILE_A_APP_ID].remote_bda, true, 0x00);
236-
LOG_INFO("ESP_GAP_BLE_PASSKEY_REQ_EVT");
236+
ESP_LOGI(GATTS_TAG,"ESP_GAP_BLE_PASSKEY_REQ_EVT");
237237
break;
238238
case ESP_GAP_BLE_OOB_REQ_EVT: /* OOB request event */
239-
LOG_INFO("ESP_GAP_BLE_OOB_REQ_EVT");
239+
ESP_LOGI(GATTS_TAG,"ESP_GAP_BLE_OOB_REQ_EVT");
240240
break;
241241
case ESP_GAP_BLE_LOCAL_IR_EVT: /* BLE local IR event */
242-
LOG_INFO("ESP_GAP_BLE_LOCAL_IR_EVT");
242+
ESP_LOGI(GATTS_TAG,"ESP_GAP_BLE_LOCAL_IR_EVT");
243243
break;
244244
case ESP_GAP_BLE_LOCAL_ER_EVT: /* BLE local ER event */
245-
LOG_INFO("ESP_GAP_BLE_LOCAL_ER_EVT");
245+
ESP_LOGI(GATTS_TAG,"ESP_GAP_BLE_LOCAL_ER_EVT");
246246
break;
247247
case ESP_GAP_BLE_NC_REQ_EVT:
248-
LOG_INFO("ESP_GAP_BLE_NC_REQ_EVT");
248+
ESP_LOGI(GATTS_TAG,"ESP_GAP_BLE_NC_REQ_EVT");
249249
break;
250250
case ESP_GAP_BLE_SEC_REQ_EVT:
251251
/* send the positive(true) security response to the peer device to accept the security request.
252252
If not accept the security request, should sent the security response with negative(false) accept value*/
253253
esp_ble_gap_security_rsp(param->ble_security.ble_req.bd_addr, true);
254-
LOG_INFO("ESP_GAP_BLE_SEC_REQ_EVT");
254+
ESP_LOGI(GATTS_TAG,"ESP_GAP_BLE_SEC_REQ_EVT");
255255
break;
256256

257257
case ESP_GAP_BLE_PASSKEY_NOTIF_EVT: ///the app will receive this evt when the IO has Output capability and the peer device IO has Input capability.
258258
///show the passkey number to the user to input it in the peer deivce.
259-
LOG_INFO("The passkey Notify number:%d", param->ble_security.key_notif.passkey);
259+
ESP_LOGI(GATTS_TAG,"The passkey Notify number:%d", param->ble_security.key_notif.passkey);
260260
break;
261261
case ESP_GAP_BLE_KEY_EVT:
262262
//shows the ble key info share with peer device to the user.
263-
LOG_INFO("key type = %d", param->ble_security.ble_key.key_type);
263+
ESP_LOGI(GATTS_TAG,"key type = %d", param->ble_security.ble_key.key_type);
264264
break;
265265

266266
default:
267-
LOG_WARN("unhandled event: %d",event);
267+
ESP_LOGW(GATTS_TAG,"unhandled event: %d",event);
268268
break;
269269
}
270270
}
@@ -682,21 +682,21 @@ void app_main()
682682

683683
ret = esp_bluedroid_init();
684684
if (ret) {
685-
LOG_ERROR("%s init bluedroid failed\n", __func__);
685+
ESP_LOGE(GATTS_TAG,"%s init bluedroid failed\n", __func__);
686686
return;
687687
}
688688

689689
ret = esp_bluedroid_enable();
690690
if (ret) {
691-
LOG_ERROR("%s init bluedroid failed\n", __func__);
691+
ESP_LOGE(GATTS_TAG,"%s init bluedroid failed\n", __func__);
692692
return;
693693
}
694694

695695
//load HID country code for locale before initialising HID
696696
hidd_set_countrycode(get_hid_country_code(config.locale));
697697

698698
if((ret = esp_hidd_profile_init()) != ESP_OK) {
699-
LOG_ERROR("%s init bluedroid failed\n", __func__);
699+
ESP_LOGE(GATTS_TAG,"%s init bluedroid failed\n", __func__);
700700
}
701701

702702
///register the callback function to the gap module

‎main/esp_hidd_prf_api.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "hid_dev.h"
1818
#include <stdlib.h>
1919
#include <string.h>
20-
#include "bt_trace.h"
20+
//#include "bt_trace.h"
2121

2222
// HID keyboard input report length
2323
#define HID_KEYBOARD_IN_RPT_LEN 8
@@ -58,7 +58,7 @@ esp_err_t esp_hidd_register_callbacks(esp_hidd_event_cb_t callbacks)
5858
esp_err_t esp_hidd_profile_init(void)
5959
{
6060
if (hidd_le_env.enabled) {
61-
LOG_ERROR("HID device profile already initialized");
61+
ESP_LOGE(LOG_TAG,"HID device profile already initialized");
6262
return ESP_FAIL;
6363
}
6464
// Reset the hid device target environment
@@ -71,7 +71,7 @@ esp_err_t esp_hidd_profile_deinit(void)
7171
{
7272
uint16_t hidd_svc_hdl = hidd_le_env.hidd_inst.att_tbl[HIDD_LE_IDX_SVC];
7373
if (!hidd_le_env.enabled) {
74-
LOG_ERROR("HID device profile already initialized");
74+
ESP_LOGE(LOG_TAG,"HID device profile already initialized");
7575
return ESP_OK;
7676
}
7777

@@ -97,10 +97,10 @@ void esp_hidd_send_consumer_value(uint16_t conn_id, uint8_t key_cmd, bool key_pr
9797
{
9898
uint8_t buffer[HID_CC_IN_RPT_LEN] = {0, 0};
9999
if (key_pressed) {
100-
LOG_DEBUG("hid_consumer_build_report");
100+
ESP_LOGD(LOG_TAG,"hid_consumer_build_report");
101101
hid_consumer_build_report(buffer, key_cmd);
102102
}
103-
LOG_DEBUG("buffer[0] = %x, buffer[1] = %x", buffer[0], buffer[1]);
103+
ESP_LOGD(LOG_TAG,"buffer[0] = %x, buffer[1] = %x", buffer[0], buffer[1]);
104104
hid_dev_send_report(hidd_le_env.gatt_if, conn_id,
105105
HID_RPT_ID_CC_IN, HID_REPORT_TYPE_INPUT, HID_CC_IN_RPT_LEN, buffer);
106106
return;
@@ -109,7 +109,7 @@ void esp_hidd_send_consumer_value(uint16_t conn_id, uint8_t key_cmd, bool key_pr
109109
void esp_hidd_send_keyboard_value(uint16_t conn_id, key_mask_t special_key_mask, uint8_t *keyboard_cmd, uint8_t num_key)
110110
{
111111
if (num_key > HID_KEYBOARD_IN_RPT_LEN - 2) {
112-
LOG_ERROR("%s(), the number key should not be more than %d", __func__, HID_KEYBOARD_IN_RPT_LEN);
112+
ESP_LOGE(LOG_TAG,"%s(), the number key should not be more than %d", __func__, HID_KEYBOARD_IN_RPT_LEN);
113113
return;
114114
}
115115

@@ -121,7 +121,7 @@ void esp_hidd_send_keyboard_value(uint16_t conn_id, key_mask_t special_key_mask,
121121
buffer[i+2] = keyboard_cmd[i];
122122
}
123123

124-
LOG_DEBUG("the key vaule = %d,%d,%d, %d, %d, %d,%d, %d", buffer[0], buffer[1], buffer[2], buffer[3], buffer[4], buffer[5], buffer[6], buffer[7]);
124+
ESP_LOGD(LOG_TAG,"the key vaule = %d,%d,%d, %d, %d, %d,%d, %d", buffer[0], buffer[1], buffer[2], buffer[3], buffer[4], buffer[5], buffer[6], buffer[7]);
125125
hid_dev_send_report(hidd_le_env.gatt_if, conn_id,
126126
HID_RPT_ID_KEY_IN, HID_REPORT_TYPE_INPUT, HID_KEYBOARD_IN_RPT_LEN, buffer);
127127
return;

‎main/esp_hidd_prf_api.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@
1818
#include "esp_bt_defs.h"
1919
#include "esp_gatt_defs.h"
2020
#include "esp_err.h"
21+
#include "esp_log.h"
2122

2223
#ifdef __cplusplus
2324
extern "C" {
2425
#endif
2526

27+
#define LOG_TAG "HIDD"
28+
2629
typedef enum {
2730
ESP_HIDD_EVENT_REG_FINISH = 0,
2831
ESP_BAT_EVENT_REG,

‎main/hid_dev.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
#include "hid_dev.h"
16-
#include "bt_trace.h"
16+
#include "esp_log.h"
1717
#include <stdint.h>
1818
#include <string.h>
1919
#include <stdbool.h>
@@ -55,7 +55,7 @@ void hid_dev_send_report(esp_gatt_if_t gatts_if, uint16_t conn_id,
5555
// get att handle for report
5656
if ((p_rpt = hid_dev_rpt_by_id(id, type)) != NULL) {
5757
// if notifications are enabled
58-
LOG_ERROR("%s(), send the report, handle = %d", __func__, p_rpt->handle);
58+
ESP_LOGI("hid_dev","%s(), send the report, handle = %d", __func__, p_rpt->handle);
5959
esp_ble_gatts_send_indicate(gatts_if, conn_id, p_rpt->handle, length, data, false);
6060
}
6161

@@ -65,7 +65,7 @@ void hid_dev_send_report(esp_gatt_if_t gatts_if, uint16_t conn_id,
6565
void hid_consumer_build_report(uint8_t *buffer, consumer_cmd_t cmd)
6666
{
6767
if (!buffer) {
68-
LOG_ERROR("%s(), the buffer is NULL, hid build report failed.", __func__);
68+
ESP_LOGE("hid_dev","%s(), the buffer is NULL, hid build report failed.", __func__);
6969
return;
7070
}
7171

‎main/hid_device_le_prf.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

1515
#include "hidd_le_prf_int.h"
1616
#include <string.h>
17-
#include "bt_types.h"
18-
#include "bt_trace.h"
17+
#include "esp_log.h"
1918
//#include "esp_gap_ble_api.h"
2019

2120

@@ -535,7 +534,7 @@ void esp_hidd_prf_cb_hdl(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
535534
//if(param->connect.is_connected) {
536535
if(param->connect.conn_id != 0) {
537536
esp_hidd_cb_param_t cb_param = {0};
538-
LOG_ERROR("the connection establish, conn_id = %x",param->connect.conn_id);
537+
ESP_LOGE("HID_DEVICE","the connection establish, conn_id = %x",param->connect.conn_id);
539538
memcpy(cb_param.connect.remote_bda, param->connect.remote_bda, sizeof(esp_bd_addr_t));
540539
cb_param.connect.conn_id = param->connect.conn_id;
541540
hidd_clcb_alloc(param->connect.conn_id, param->connect.remote_bda);
@@ -563,15 +562,15 @@ void esp_hidd_prf_cb_hdl(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
563562
param->add_attr_tab.status == ESP_GATT_OK) {
564563
incl_svc.start_hdl = param->add_attr_tab.handles[BAS_IDX_SVC];
565564
incl_svc.end_hdl = incl_svc.start_hdl + BAS_IDX_NB -1;
566-
LOG_ERROR("%s(), start added the hid service to the stack database. incl_handle = %d",
565+
ESP_LOGI("HID_DEVICE","%s(), start added the hid service to the stack database. incl_handle = %d",
567566
__func__, incl_svc.start_hdl);
568567
esp_ble_gatts_create_attr_tab(hidd_le_gatt_db, gatts_if, HIDD_LE_IDX_NB, 0);
569568
}
570569
if (param->add_attr_tab.num_handle == HIDD_LE_IDX_NB &&
571570
param->add_attr_tab.status == ESP_GATT_OK) {
572571
memcpy(hidd_le_env.hidd_inst.att_tbl, param->add_attr_tab.handles,
573572
HIDD_LE_IDX_NB*sizeof(uint16_t));
574-
LOG_ERROR("hid svc handle = %x",hidd_le_env.hidd_inst.att_tbl[HIDD_LE_IDX_SVC]);
573+
ESP_LOGI("HID_DEVICE","hid svc handle = %x",hidd_le_env.hidd_inst.att_tbl[HIDD_LE_IDX_SVC]);
575574
hid_add_id_tbl();
576575
esp_ble_gatts_start_service(hidd_le_env.hidd_inst.att_tbl[HIDD_LE_IDX_SVC]);
577576
} else {
@@ -615,9 +614,9 @@ void hidd_clcb_alloc (uint16_t conn_id, esp_bd_addr_t bda)
615614

616615
for (i_clcb = 0, p_clcb= hidd_le_env.hidd_clcb; i_clcb < HID_MAX_APPS; i_clcb++, p_clcb++) {
617616
if (!p_clcb->in_use) {
618-
p_clcb->in_use = TRUE;
617+
p_clcb->in_use = true;
619618
p_clcb->conn_id = conn_id;
620-
p_clcb->connected = TRUE;
619+
p_clcb->connected = true;
621620
memcpy (p_clcb->remote_bda, bda, ESP_BD_ADDR_LEN);
622621
break;
623622
}
@@ -632,10 +631,10 @@ bool hidd_clcb_dealloc (uint16_t conn_id)
632631

633632
for (i_clcb = 0, p_clcb= hidd_le_env.hidd_clcb; i_clcb < HID_MAX_APPS; i_clcb++, p_clcb++) {
634633
memset(p_clcb, 0, sizeof(hidd_clcb_t));
635-
return TRUE;
634+
return true;
636635
}
637636

638-
return FALSE;
637+
return false;
639638
}
640639

641640
esp_err_t hidd_register_cb(void)
@@ -652,7 +651,7 @@ void hidd_set_attr_value(uint16_t handle, uint16_t val_len, const uint8_t *value
652651
hidd_inst->att_tbl[HIDD_LE_IDX_REPORT_REP_REF] >= handle) {
653652
esp_ble_gatts_set_attr_value(handle, val_len, value);
654653
} else {
655-
LOG_ERROR("%s error:Invalid handle value.",__func__);
654+
ESP_LOGE("HID_DEVICE","%s error:Invalid handle value.",__func__);
656655
}
657656
return;
658657
}
@@ -664,7 +663,7 @@ void hidd_get_attr_value(uint16_t handle, uint16_t *length, uint8_t **value)
664663
hidd_inst->att_tbl[HIDD_LE_IDX_REPORT_REP_REF] >= handle){
665664
esp_ble_gatts_get_attr_value(handle, length, (const uint8_t **)value);
666665
} else {
667-
LOG_ERROR("%s error:Invalid handle value.", __func__);
666+
ESP_LOGE("HID_DEVICE","%s error:Invalid handle value.", __func__);
668667
}
669668

670669
return;

‎sdkconfig

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y
2020
CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG=
2121
CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE=
2222
CONFIG_LOG_BOOTLOADER_LEVEL=3
23-
CONFIG_BOOTLOADER_VDDSDIO_BOOST=y
23+
CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V=
24+
CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
2425

2526
#
2627
# Security features
@@ -99,6 +100,7 @@ CONFIG_STACK_CHECK_NORM=
99100
CONFIG_STACK_CHECK_STRONG=
100101
CONFIG_STACK_CHECK_ALL=
101102
CONFIG_STACK_CHECK=
103+
CONFIG_WARN_WRITE_STRINGS=
102104

103105
#
104106
# Component config
@@ -138,21 +140,27 @@ CONFIG_BT_SPP_ENABLED=
138140
CONFIG_GATTS_ENABLE=y
139141
CONFIG_GATTC_ENABLE=y
140142
CONFIG_BLE_SMP_ENABLE=y
143+
CONFIG_BLE_ENABLE_SRVCHG_REG=y
141144
CONFIG_BT_STACK_NO_LOG=
142145
CONFIG_BT_ACL_CONNECTIONS=4
143146
CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=
144147
CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=
145148
CONFIG_SMP_ENABLE=y
146149
CONFIG_BT_RESERVE_DRAM=0x10000
147150

151+
#
152+
# ADC configuration
153+
#
154+
CONFIG_ADC_FORCE_XPD_FSM=
155+
CONFIG_ADC2_DISABLE_DAC=y
156+
148157
#
149158
# ESP32-specific
150159
#
151160
CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
152161
CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y
153162
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=
154163
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=160
155-
CONFIG_MEMMAP_SMP=y
156164
CONFIG_SPIRAM_SUPPORT=
157165
CONFIG_MEMMAP_TRACEMEM=
158166
CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
@@ -214,6 +222,7 @@ CONFIG_ESP32_TIME_SYSCALL_USE_NONE=
214222
CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
215223
CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL=
216224
CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
225+
CONFIG_ESP32_RTC_XTAL_BOOTSTRAP_CYCLES=100
217226
CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
218227
CONFIG_ESP32_XTAL_FREQ_40=
219228
CONFIG_ESP32_XTAL_FREQ_26=
@@ -222,6 +231,7 @@ CONFIG_ESP32_XTAL_FREQ=0
222231
CONFIG_DISABLE_BASIC_ROM_CONSOLE=
223232
CONFIG_ESP_TIMER_PROFILING=
224233
CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS=
234+
CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
225235

226236
#
227237
# Wi-Fi

0 commit comments

Comments
 (0)