mirror of
https://github.com/0xFEEDC0DE64/arduino-esp32.git
synced 2025-07-03 05:46:32 +02:00
Refactored use of LOG_X(LOG_TAG, ...) to log_x(...) (#2672)
* Replaced ARDUINO_VARIANT with const char * Fixed missing return value * Added quotes around defined value in macro (Issue #2193) * Change logging from Error to Verbose when not found and default available * Move Enter and Exit logging to Verbose Level * Refactored LOG_X() into log_x()
This commit is contained in:
Bascy
Me No Dev
@ -23,14 +23,7 @@
|
||||
#include <sstream>
|
||||
#include <iomanip>
|
||||
|
||||
#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
|
||||
#include "esp32-hal-log.h"
|
||||
#define LOG_TAG ""
|
||||
#else
|
||||
#include "esp_log.h"
|
||||
static const char* LOG_TAG = "BLEUtils"; // Tag for logging.
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
static std::map<std::string, BLEClient*> g_addressMap;
|
||||
@ -744,7 +737,7 @@ const char* BLEUtils::advTypeToString(uint8_t advType) {
|
||||
return "ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE";
|
||||
#endif
|
||||
default:
|
||||
ESP_LOGV(LOG_TAG, " adv data type: 0x%x", advType);
|
||||
log_v(" adv data type: 0x%x", advType);
|
||||
return "";
|
||||
} // End switch
|
||||
} // advTypeToString
|
||||
@ -779,7 +772,7 @@ char* BLEUtils::buildHexData(uint8_t* target, uint8_t* source, uint8_t length) {
|
||||
if (target == nullptr) {
|
||||
target = (uint8_t*) malloc(length * 2 + 1);
|
||||
if (target == nullptr) {
|
||||
ESP_LOGE(LOG_TAG, "buildHexData: malloc failed");
|
||||
log_e("buildHexData: malloc failed");
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
@ -949,7 +942,7 @@ std::string BLEUtils::gattClientEventTypeToString(esp_gattc_cb_event_t eventType
|
||||
return "ESP_GATTC_WRITE_DESCR_EVT";
|
||||
#endif
|
||||
default:
|
||||
ESP_LOGV(LOG_TAG, "Unknown GATT Client event type: %d", eventType);
|
||||
log_v("Unknown GATT Client event type: %d", eventType);
|
||||
return "Unknown";
|
||||
}
|
||||
} // gattClientEventTypeToString
|
||||
@ -1047,14 +1040,14 @@ const char* BLEUtils::devTypeToString(esp_bt_dev_type_t type) {
|
||||
void BLEUtils::dumpGapEvent(
|
||||
esp_gap_ble_cb_event_t event,
|
||||
esp_ble_gap_cb_param_t* param) {
|
||||
ESP_LOGV(LOG_TAG, "Received a GAP event: %s", gapEventToString(event));
|
||||
log_v("Received a GAP event: %s", gapEventToString(event));
|
||||
switch (event) {
|
||||
#if CONFIG_LOG_DEFAULT_LEVEL > 4
|
||||
// ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT
|
||||
// adv_data_cmpl
|
||||
// - esp_bt_status_t
|
||||
case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d]", param->adv_data_cmpl.status);
|
||||
log_v("[status: %d]", param->adv_data_cmpl.status);
|
||||
break;
|
||||
} // ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT
|
||||
|
||||
@ -1063,7 +1056,7 @@ void BLEUtils::dumpGapEvent(
|
||||
// adv_data_raw_cmpl
|
||||
// - esp_bt_status_t status
|
||||
case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d]", param->adv_data_raw_cmpl.status);
|
||||
log_v("[status: %d]", param->adv_data_raw_cmpl.status);
|
||||
break;
|
||||
} // ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT
|
||||
|
||||
@ -1072,7 +1065,7 @@ void BLEUtils::dumpGapEvent(
|
||||
// adv_start_cmpl
|
||||
// - esp_bt_status_t status
|
||||
case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d]", param->adv_start_cmpl.status);
|
||||
log_v("[status: %d]", param->adv_start_cmpl.status);
|
||||
break;
|
||||
} // ESP_GAP_BLE_ADV_START_COMPLETE_EVT
|
||||
|
||||
@ -1081,7 +1074,7 @@ void BLEUtils::dumpGapEvent(
|
||||
// adv_stop_cmpl
|
||||
// - esp_bt_status_t status
|
||||
case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d]", param->adv_stop_cmpl.status);
|
||||
log_v("[status: %d]", param->adv_stop_cmpl.status);
|
||||
break;
|
||||
} // ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT
|
||||
|
||||
@ -1096,7 +1089,7 @@ void BLEUtils::dumpGapEvent(
|
||||
// - esp_bd_addr_type_t addr_type
|
||||
// - esp_bt_dev_type_t dev_type
|
||||
case ESP_GAP_BLE_AUTH_CMPL_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[bd_addr: %s, key_present: %d, key: ***, key_type: %d, success: %d, fail_reason: %d, addr_type: ***, dev_type: %s]",
|
||||
log_v("[bd_addr: %s, key_present: %d, key: ***, key_type: %d, success: %d, fail_reason: %d, addr_type: ***, dev_type: %s]",
|
||||
BLEAddress(param->ble_security.auth_cmpl.bd_addr).toString().c_str(),
|
||||
param->ble_security.auth_cmpl.key_present,
|
||||
param->ble_security.auth_cmpl.key_type,
|
||||
@ -1112,7 +1105,7 @@ void BLEUtils::dumpGapEvent(
|
||||
// clear_bond_dev_cmpl
|
||||
// - esp_bt_status_t status
|
||||
case ESP_GAP_BLE_CLEAR_BOND_DEV_COMPLETE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d]", param->clear_bond_dev_cmpl.status);
|
||||
log_v("[status: %d]", param->clear_bond_dev_cmpl.status);
|
||||
break;
|
||||
} // ESP_GAP_BLE_CLEAR_BOND_DEV_COMPLETE_EVT
|
||||
|
||||
@ -1128,7 +1121,7 @@ void BLEUtils::dumpGapEvent(
|
||||
|
||||
// ESP_GAP_BLE_NC_REQ_EVT
|
||||
case ESP_GAP_BLE_NC_REQ_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[bd_addr: %s, passkey: %d]",
|
||||
log_v("[bd_addr: %s, passkey: %d]",
|
||||
BLEAddress(param->ble_security.key_notif.bd_addr).toString().c_str(),
|
||||
param->ble_security.key_notif.passkey);
|
||||
break;
|
||||
@ -1141,7 +1134,7 @@ void BLEUtils::dumpGapEvent(
|
||||
// - int8_t rssi
|
||||
// - esp_bd_addr_t remote_addr
|
||||
case ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d, rssi: %d, remote_addr: %s]",
|
||||
log_v("[status: %d, rssi: %d, remote_addr: %s]",
|
||||
param->read_rssi_cmpl.status,
|
||||
param->read_rssi_cmpl.rssi,
|
||||
BLEAddress(param->read_rssi_cmpl.remote_addr).toString().c_str()
|
||||
@ -1154,7 +1147,7 @@ void BLEUtils::dumpGapEvent(
|
||||
// scan_param_cmpl.
|
||||
// - esp_bt_status_t status
|
||||
case ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d]", param->scan_param_cmpl.status);
|
||||
log_v("[status: %d]", param->scan_param_cmpl.status);
|
||||
break;
|
||||
} // ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT
|
||||
|
||||
@ -1175,7 +1168,7 @@ void BLEUtils::dumpGapEvent(
|
||||
case ESP_GAP_BLE_SCAN_RESULT_EVT: {
|
||||
switch (param->scan_rst.search_evt) {
|
||||
case ESP_GAP_SEARCH_INQ_RES_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "search_evt: %s, bda: %s, dev_type: %s, ble_addr_type: %s, ble_evt_type: %s, rssi: %d, ble_adv: ??, flag: %d (%s), num_resps: %d, adv_data_len: %d, scan_rsp_len: %d",
|
||||
log_v("search_evt: %s, bda: %s, dev_type: %s, ble_addr_type: %s, ble_evt_type: %s, rssi: %d, ble_adv: ??, flag: %d (%s), num_resps: %d, adv_data_len: %d, scan_rsp_len: %d",
|
||||
searchEventTypeToString(param->scan_rst.search_evt),
|
||||
BLEAddress(param->scan_rst.bda).toString().c_str(),
|
||||
devTypeToString(param->scan_rst.dev_type),
|
||||
@ -1192,7 +1185,7 @@ void BLEUtils::dumpGapEvent(
|
||||
} // ESP_GAP_SEARCH_INQ_RES_EVT
|
||||
|
||||
default: {
|
||||
ESP_LOGV(LOG_TAG, "search_evt: %s",searchEventTypeToString(param->scan_rst.search_evt));
|
||||
log_v("search_evt: %s",searchEventTypeToString(param->scan_rst.search_evt));
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -1204,13 +1197,13 @@ void BLEUtils::dumpGapEvent(
|
||||
// scan_rsp_data_cmpl
|
||||
// - esp_bt_status_t status
|
||||
case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d]", param->scan_rsp_data_cmpl.status);
|
||||
log_v("[status: %d]", param->scan_rsp_data_cmpl.status);
|
||||
break;
|
||||
} // ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT
|
||||
|
||||
// ESP_GAP_BLE_SCAN_RSP_DATA_RAW_SET_COMPLETE_EVT
|
||||
case ESP_GAP_BLE_SCAN_RSP_DATA_RAW_SET_COMPLETE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d]", param->scan_rsp_data_raw_cmpl.status);
|
||||
log_v("[status: %d]", param->scan_rsp_data_raw_cmpl.status);
|
||||
break;
|
||||
} // ESP_GAP_BLE_SCAN_RSP_DATA_RAW_SET_COMPLETE_EVT
|
||||
|
||||
@ -1219,7 +1212,7 @@ void BLEUtils::dumpGapEvent(
|
||||
// scan_start_cmpl
|
||||
// - esp_bt_status_t status
|
||||
case ESP_GAP_BLE_SCAN_START_COMPLETE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d]", param->scan_start_cmpl.status);
|
||||
log_v("[status: %d]", param->scan_start_cmpl.status);
|
||||
break;
|
||||
} // ESP_GAP_BLE_SCAN_START_COMPLETE_EVT
|
||||
|
||||
@ -1228,7 +1221,7 @@ void BLEUtils::dumpGapEvent(
|
||||
// scan_stop_cmpl
|
||||
// - esp_bt_status_t status
|
||||
case ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d]", param->scan_stop_cmpl.status);
|
||||
log_v("[status: %d]", param->scan_stop_cmpl.status);
|
||||
break;
|
||||
} // ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT
|
||||
|
||||
@ -1243,7 +1236,7 @@ void BLEUtils::dumpGapEvent(
|
||||
// - uint16_t conn_int
|
||||
// - uint16_t timeout
|
||||
case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %d, bd_addr: %s, min_int: %d, max_int: %d, latency: %d, conn_int: %d, timeout: %d]",
|
||||
log_v("[status: %d, bd_addr: %s, min_int: %d, max_int: %d, latency: %d, conn_int: %d, timeout: %d]",
|
||||
param->update_conn_params.status,
|
||||
BLEAddress(param->update_conn_params.bda).toString().c_str(),
|
||||
param->update_conn_params.min_int,
|
||||
@ -1257,12 +1250,12 @@ void BLEUtils::dumpGapEvent(
|
||||
|
||||
// ESP_GAP_BLE_SEC_REQ_EVT
|
||||
case ESP_GAP_BLE_SEC_REQ_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[bd_addr: %s]", BLEAddress(param->ble_security.ble_req.bd_addr).toString().c_str());
|
||||
log_v("[bd_addr: %s]", BLEAddress(param->ble_security.ble_req.bd_addr).toString().c_str());
|
||||
break;
|
||||
} // ESP_GAP_BLE_SEC_REQ_EVT
|
||||
#endif
|
||||
default: {
|
||||
ESP_LOGV(LOG_TAG, "*** dumpGapEvent: Logger not coded ***");
|
||||
log_v("*** dumpGapEvent: Logger not coded ***");
|
||||
break;
|
||||
} // default
|
||||
} // switch
|
||||
@ -1281,7 +1274,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
esp_ble_gattc_cb_param_t* evtParam) {
|
||||
|
||||
//esp_ble_gattc_cb_param_t* evtParam = (esp_ble_gattc_cb_param_t*) param;
|
||||
ESP_LOGV(LOG_TAG, "GATT Event: %s", BLEUtils::gattClientEventTypeToString(event).c_str());
|
||||
log_v("GATT Event: %s", BLEUtils::gattClientEventTypeToString(event).c_str());
|
||||
switch (event) {
|
||||
#if CONFIG_LOG_DEFAULT_LEVEL > 4
|
||||
// ESP_GATTC_CLOSE_EVT
|
||||
@ -1292,7 +1285,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
// - esp_bd_addr_t remote_bda
|
||||
// - esp_gatt_conn_reason_t reason
|
||||
case ESP_GATTC_CLOSE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, reason:%s, conn_id: %d]",
|
||||
log_v("[status: %s, reason:%s, conn_id: %d]",
|
||||
BLEUtils::gattStatusToString(evtParam->close.status).c_str(),
|
||||
BLEUtils::gattCloseReasonToString(evtParam->close.reason).c_str(),
|
||||
evtParam->close.conn_id);
|
||||
@ -1306,7 +1299,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
// - uint16_t conn_id
|
||||
// - esp_bd_addr_t remote_bda
|
||||
case ESP_GATTC_CONNECT_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[conn_id: %d, remote_bda: %s]",
|
||||
log_v("[conn_id: %d, remote_bda: %s]",
|
||||
evtParam->connect.conn_id,
|
||||
BLEAddress(evtParam->connect.remote_bda).toString().c_str()
|
||||
);
|
||||
@ -1320,7 +1313,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
// - uint16_t conn_id
|
||||
// - esp_bd_addr_t remote_bda
|
||||
case ESP_GATTC_DISCONNECT_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[reason: %s, conn_id: %d, remote_bda: %s]",
|
||||
log_v("[reason: %s, conn_id: %d, remote_bda: %s]",
|
||||
BLEUtils::gattCloseReasonToString(evtParam->disconnect.reason).c_str(),
|
||||
evtParam->disconnect.conn_id,
|
||||
BLEAddress(evtParam->disconnect.remote_bda).toString().c_str()
|
||||
@ -1346,7 +1339,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
if (evtParam->get_char.char_id.uuid.len == ESP_UUID_LEN_16) {
|
||||
description = BLEUtils::gattCharacteristicUUIDToString(evtParam->get_char.char_id.uuid.uuid.uuid16);
|
||||
}
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, conn_id: %d, srvc_id: %s, char_id: %s [description: %s]\nchar_prop: %s]",
|
||||
log_v("[status: %s, conn_id: %d, srvc_id: %s, char_id: %s [description: %s]\nchar_prop: %s]",
|
||||
BLEUtils::gattStatusToString(evtParam->get_char.status).c_str(),
|
||||
evtParam->get_char.conn_id,
|
||||
BLEUtils::gattServiceIdToString(evtParam->get_char.srvc_id).c_str(),
|
||||
@ -1355,7 +1348,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
BLEUtils::characteristicPropertiesToString(evtParam->get_char.char_prop).c_str()
|
||||
);
|
||||
} else {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, conn_id: %d, srvc_id: %s]",
|
||||
log_v("[status: %s, conn_id: %d, srvc_id: %s]",
|
||||
BLEUtils::gattStatusToString(evtParam->get_char.status).c_str(),
|
||||
evtParam->get_char.conn_id,
|
||||
BLEUtils::gattServiceIdToString(evtParam->get_char.srvc_id).c_str()
|
||||
@ -1376,7 +1369,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
// bool is_notify
|
||||
//
|
||||
case ESP_GATTC_NOTIFY_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[conn_id: %d, remote_bda: %s, handle: %d 0x%.2x, value_len: %d, is_notify: %d]",
|
||||
log_v("[conn_id: %d, remote_bda: %s, handle: %d 0x%.2x, value_len: %d, is_notify: %d]",
|
||||
evtParam->notify.conn_id,
|
||||
BLEAddress(evtParam->notify.remote_bda).toString().c_str(),
|
||||
evtParam->notify.handle,
|
||||
@ -1396,7 +1389,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
// - uint16_t mtu
|
||||
//
|
||||
case ESP_GATTC_OPEN_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, conn_id: %d, remote_bda: %s, mtu: %d]",
|
||||
log_v("[status: %s, conn_id: %d, remote_bda: %s, mtu: %d]",
|
||||
BLEUtils::gattStatusToString(evtParam->open.status).c_str(),
|
||||
evtParam->open.conn_id,
|
||||
BLEAddress(evtParam->open.remote_bda).toString().c_str(),
|
||||
@ -1416,7 +1409,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
// uint16_t value_type
|
||||
// uint16_t value_len
|
||||
case ESP_GATTC_READ_CHAR_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, conn_id: %d, handle: %d 0x%.2x, value_len: %d]",
|
||||
log_v("[status: %s, conn_id: %d, handle: %d 0x%.2x, value_len: %d]",
|
||||
BLEUtils::gattStatusToString(evtParam->read.status).c_str(),
|
||||
evtParam->read.conn_id,
|
||||
evtParam->read.handle,
|
||||
@ -1427,7 +1420,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
GeneralUtils::hexDump(evtParam->read.value, evtParam->read.value_len);
|
||||
/*
|
||||
char* pHexData = BLEUtils::buildHexData(nullptr, evtParam->read.value, evtParam->read.value_len);
|
||||
ESP_LOGV(LOG_TAG, "value: %s \"%s\"", pHexData, BLEUtils::buildPrintData(evtParam->read.value, evtParam->read.value_len).c_str());
|
||||
log_v("value: %s \"%s\"", pHexData, BLEUtils::buildPrintData(evtParam->read.value, evtParam->read.value_len).c_str());
|
||||
free(pHexData);
|
||||
*/
|
||||
}
|
||||
@ -1440,7 +1433,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
// - esp_gatt_status_t status
|
||||
// - uint16_t app_id
|
||||
case ESP_GATTC_REG_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, app_id: 0x%x]",
|
||||
log_v("[status: %s, app_id: 0x%x]",
|
||||
BLEUtils::gattStatusToString(evtParam->reg.status).c_str(),
|
||||
evtParam->reg.app_id);
|
||||
break;
|
||||
@ -1452,7 +1445,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
// - esp_gatt_status_t status
|
||||
// - uint16_t handle
|
||||
case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, handle: %d 0x%.2x]",
|
||||
log_v("[status: %s, handle: %d 0x%.2x]",
|
||||
BLEUtils::gattStatusToString(evtParam->reg_for_notify.status).c_str(),
|
||||
evtParam->reg_for_notify.handle,
|
||||
evtParam->reg_for_notify.handle
|
||||
@ -1466,7 +1459,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
// - esp_gatt_status_t status
|
||||
// - uint16_t conn_id
|
||||
case ESP_GATTC_SEARCH_CMPL_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, conn_id: %d]",
|
||||
log_v("[status: %s, conn_id: %d]",
|
||||
BLEUtils::gattStatusToString(evtParam->search_cmpl.status).c_str(),
|
||||
evtParam->search_cmpl.conn_id);
|
||||
break;
|
||||
@ -1480,7 +1473,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
// - uint16_t end_handle
|
||||
// - esp_gatt_id_t srvc_id
|
||||
case ESP_GATTC_SEARCH_RES_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[conn_id: %d, start_handle: %d 0x%.2x, end_handle: %d 0x%.2x, srvc_id: %s",
|
||||
log_v("[conn_id: %d, start_handle: %d 0x%.2x, end_handle: %d 0x%.2x, srvc_id: %s",
|
||||
evtParam->search_res.conn_id,
|
||||
evtParam->search_res.start_handle,
|
||||
evtParam->search_res.start_handle,
|
||||
@ -1498,7 +1491,7 @@ void BLEUtils::dumpGattClientEvent(
|
||||
// - uint16_t handle
|
||||
// - uint16_t offset
|
||||
case ESP_GATTC_WRITE_CHAR_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, conn_id: %d, handle: %d 0x%.2x, offset: %d]",
|
||||
log_v("[status: %s, conn_id: %d, handle: %d 0x%.2x, offset: %d]",
|
||||
BLEUtils::gattStatusToString(evtParam->write.status).c_str(),
|
||||
evtParam->write.conn_id,
|
||||
evtParam->write.handle,
|
||||
@ -1528,12 +1521,12 @@ void BLEUtils::dumpGattServerEvent(
|
||||
esp_gatts_cb_event_t event,
|
||||
esp_gatt_if_t gatts_if,
|
||||
esp_ble_gatts_cb_param_t* evtParam) {
|
||||
ESP_LOGV(LOG_TAG, "GATT ServerEvent: %s", BLEUtils::gattServerEventTypeToString(event).c_str());
|
||||
log_v("GATT ServerEvent: %s", BLEUtils::gattServerEventTypeToString(event).c_str());
|
||||
switch (event) {
|
||||
#if CONFIG_LOG_DEFAULT_LEVEL > 4
|
||||
|
||||
case ESP_GATTS_ADD_CHAR_DESCR_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, attr_handle: %d 0x%.2x, service_handle: %d 0x%.2x, char_uuid: %s]",
|
||||
log_v("[status: %s, attr_handle: %d 0x%.2x, service_handle: %d 0x%.2x, char_uuid: %s]",
|
||||
gattStatusToString(evtParam->add_char_descr.status).c_str(),
|
||||
evtParam->add_char_descr.attr_handle,
|
||||
evtParam->add_char_descr.attr_handle,
|
||||
@ -1545,7 +1538,7 @@ void BLEUtils::dumpGattServerEvent(
|
||||
|
||||
case ESP_GATTS_ADD_CHAR_EVT: {
|
||||
if (evtParam->add_char.status == ESP_GATT_OK) {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, attr_handle: %d 0x%.2x, service_handle: %d 0x%.2x, char_uuid: %s]",
|
||||
log_v("[status: %s, attr_handle: %d 0x%.2x, service_handle: %d 0x%.2x, char_uuid: %s]",
|
||||
gattStatusToString(evtParam->add_char.status).c_str(),
|
||||
evtParam->add_char.attr_handle,
|
||||
evtParam->add_char.attr_handle,
|
||||
@ -1553,7 +1546,7 @@ void BLEUtils::dumpGattServerEvent(
|
||||
evtParam->add_char.service_handle,
|
||||
BLEUUID(evtParam->add_char.char_uuid).toString().c_str());
|
||||
} else {
|
||||
ESP_LOGE(LOG_TAG, "[status: %s, attr_handle: %d 0x%.2x, service_handle: %d 0x%.2x, char_uuid: %s]",
|
||||
log_e("[status: %s, attr_handle: %d 0x%.2x, service_handle: %d 0x%.2x, char_uuid: %s]",
|
||||
gattStatusToString(evtParam->add_char.status).c_str(),
|
||||
evtParam->add_char.attr_handle,
|
||||
evtParam->add_char.attr_handle,
|
||||
@ -1571,7 +1564,7 @@ void BLEUtils::dumpGattServerEvent(
|
||||
// - esp_gatt_status_t status – The status code.
|
||||
// - uint16_t conn_id – The connection used.
|
||||
case ESP_GATTS_CONF_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, conn_id: 0x%.2x]",
|
||||
log_v("[status: %s, conn_id: 0x%.2x]",
|
||||
gattStatusToString(evtParam->conf.status).c_str(),
|
||||
evtParam->conf.conn_id);
|
||||
break;
|
||||
@ -1579,21 +1572,21 @@ void BLEUtils::dumpGattServerEvent(
|
||||
|
||||
|
||||
case ESP_GATTS_CONGEST_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[conn_id: %d, congested: %d]",
|
||||
log_v("[conn_id: %d, congested: %d]",
|
||||
evtParam->congest.conn_id,
|
||||
evtParam->congest.congested);
|
||||
break;
|
||||
} // ESP_GATTS_CONGEST_EVT
|
||||
|
||||
case ESP_GATTS_CONNECT_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[conn_id: %d, remote_bda: %s]",
|
||||
log_v("[conn_id: %d, remote_bda: %s]",
|
||||
evtParam->connect.conn_id,
|
||||
BLEAddress(evtParam->connect.remote_bda).toString().c_str());
|
||||
break;
|
||||
} // ESP_GATTS_CONNECT_EVT
|
||||
|
||||
case ESP_GATTS_CREATE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, service_handle: %d 0x%.2x, service_id: [%s]]",
|
||||
log_v("[status: %s, service_handle: %d 0x%.2x, service_id: [%s]]",
|
||||
gattStatusToString(evtParam->create.status).c_str(),
|
||||
evtParam->create.service_handle,
|
||||
evtParam->create.service_handle,
|
||||
@ -1602,7 +1595,7 @@ void BLEUtils::dumpGattServerEvent(
|
||||
} // ESP_GATTS_CREATE_EVT
|
||||
|
||||
case ESP_GATTS_DISCONNECT_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[conn_id: %d, remote_bda: %s]",
|
||||
log_v("[conn_id: %d, remote_bda: %s]",
|
||||
evtParam->connect.conn_id,
|
||||
BLEAddress(evtParam->connect.remote_bda).toString().c_str());
|
||||
break;
|
||||
@ -1633,7 +1626,7 @@ void BLEUtils::dumpGattServerEvent(
|
||||
break;
|
||||
}
|
||||
|
||||
ESP_LOGV(LOG_TAG, "[conn_id: %d, trans_id: %d, bda: %s, exec_write_flag: 0x%.2x=%s]",
|
||||
log_v("[conn_id: %d, trans_id: %d, bda: %s, exec_write_flag: 0x%.2x=%s]",
|
||||
evtParam->exec_write.conn_id,
|
||||
evtParam->exec_write.trans_id,
|
||||
BLEAddress(evtParam->exec_write.bda).toString().c_str(),
|
||||
@ -1644,14 +1637,14 @@ void BLEUtils::dumpGattServerEvent(
|
||||
|
||||
|
||||
case ESP_GATTS_MTU_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[conn_id: %d, mtu: %d]",
|
||||
log_v("[conn_id: %d, mtu: %d]",
|
||||
evtParam->mtu.conn_id,
|
||||
evtParam->mtu.mtu);
|
||||
break;
|
||||
} // ESP_GATTS_MTU_EVT
|
||||
|
||||
case ESP_GATTS_READ_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[conn_id: %d, trans_id: %d, bda: %s, handle: 0x%.2x, is_long: %d, need_rsp:%d]",
|
||||
log_v("[conn_id: %d, trans_id: %d, bda: %s, handle: 0x%.2x, is_long: %d, need_rsp:%d]",
|
||||
evtParam->read.conn_id,
|
||||
evtParam->read.trans_id,
|
||||
BLEAddress(evtParam->read.bda).toString().c_str(),
|
||||
@ -1662,14 +1655,14 @@ void BLEUtils::dumpGattServerEvent(
|
||||
} // ESP_GATTS_READ_EVT
|
||||
|
||||
case ESP_GATTS_RESPONSE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, handle: 0x%.2x]",
|
||||
log_v("[status: %s, handle: 0x%.2x]",
|
||||
gattStatusToString(evtParam->rsp.status).c_str(),
|
||||
evtParam->rsp.handle);
|
||||
break;
|
||||
} // ESP_GATTS_RESPONSE_EVT
|
||||
|
||||
case ESP_GATTS_REG_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, app_id: %d]",
|
||||
log_v("[status: %s, app_id: %d]",
|
||||
gattStatusToString(evtParam->reg.status).c_str(),
|
||||
evtParam->reg.app_id);
|
||||
break;
|
||||
@ -1682,7 +1675,7 @@ void BLEUtils::dumpGattServerEvent(
|
||||
// - esp_gatt_status_t status
|
||||
// - uint16_t service_handle
|
||||
case ESP_GATTS_START_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[status: %s, service_handle: 0x%.2x]",
|
||||
log_v("[status: %s, service_handle: 0x%.2x]",
|
||||
gattStatusToString(evtParam->start.status).c_str(),
|
||||
evtParam->start.service_handle);
|
||||
break;
|
||||
@ -1702,7 +1695,7 @@ void BLEUtils::dumpGattServerEvent(
|
||||
// - uint16_t len – The length of the incoming value part.
|
||||
// - uint8_t* value – The data for this value part.
|
||||
case ESP_GATTS_WRITE_EVT: {
|
||||
ESP_LOGV(LOG_TAG, "[conn_id: %d, trans_id: %d, bda: %s, handle: 0x%.2x, offset: %d, need_rsp: %d, is_prep: %d, len: %d]",
|
||||
log_v("[conn_id: %d, trans_id: %d, bda: %s, handle: 0x%.2x, offset: %d, need_rsp: %d, is_prep: %d, len: %d]",
|
||||
evtParam->write.conn_id,
|
||||
evtParam->write.trans_id,
|
||||
BLEAddress(evtParam->write.bda).toString().c_str(),
|
||||
@ -1712,13 +1705,13 @@ void BLEUtils::dumpGattServerEvent(
|
||||
evtParam->write.is_prep,
|
||||
evtParam->write.len);
|
||||
char* pHex = buildHexData(nullptr, evtParam->write.value, evtParam->write.len);
|
||||
ESP_LOGV(LOG_TAG, "[Data: %s]", pHex);
|
||||
log_v("[Data: %s]", pHex);
|
||||
free(pHex);
|
||||
break;
|
||||
} // ESP_GATTS_WRITE_EVT
|
||||
#endif
|
||||
default:
|
||||
ESP_LOGV(LOG_TAG, "dumpGattServerEvent: *** NOT CODED ***");
|
||||
log_v("dumpGattServerEvent: *** NOT CODED ***");
|
||||
break;
|
||||
}
|
||||
} // dumpGattServerEvent
|
||||
@ -1744,7 +1737,7 @@ const char* BLEUtils::eventTypeToString(esp_ble_evt_type_t eventType) {
|
||||
return "ESP_BLE_EVT_SCAN_RSP";
|
||||
#endif
|
||||
default:
|
||||
ESP_LOGV(LOG_TAG, "Unknown esp_ble_evt_type_t: %d (0x%.2x)", eventType, eventType);
|
||||
log_v("Unknown esp_ble_evt_type_t: %d (0x%.2x)", eventType, eventType);
|
||||
return "*** Unknown ***";
|
||||
}
|
||||
} // eventTypeToString
|
||||
@ -1815,7 +1808,7 @@ const char* BLEUtils::gapEventToString(uint32_t eventType) {
|
||||
return "ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT";
|
||||
#endif
|
||||
default:
|
||||
ESP_LOGV(LOG_TAG, "gapEventToString: Unknown event type %d 0x%.2x", eventType, eventType);
|
||||
log_v("gapEventToString: Unknown event type %d 0x%.2x", eventType, eventType);
|
||||
return "Unknown event type";
|
||||
}
|
||||
} // gapEventToString
|
||||
@ -2025,7 +2018,7 @@ const char* BLEUtils::searchEventTypeToString(esp_gap_search_evt_t searchEvt) {
|
||||
return "ESP_GAP_SEARCH_SEARCH_CANCEL_CMPL_EVT";
|
||||
#endif
|
||||
default:
|
||||
ESP_LOGV(LOG_TAG, "Unknown event type: 0x%x", searchEvt);
|
||||
log_v("Unknown event type: 0x%x", searchEvt);
|
||||
return "Unknown event type";
|
||||
}
|
||||
} // searchEventTypeToString
|
||||
|
||||
Reference in New Issue
Block a user