Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 3e29702

Browse filesBrowse files
SuGliderSuGlider
authored
fixes BLE and WiFi Debug log messages (espressif#6902)
1 parent 29b8c87 commit 3e29702
Copy full SHA for 3e29702

File tree

Expand file treeCollapse file tree

2 files changed

+19
-19
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+19
-19
lines changed

‎libraries/BLE/src/BLEUtils.cpp

Copy file name to clipboardExpand all lines: libraries/BLE/src/BLEUtils.cpp
+17-17Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ typedef struct {
3636
} member_t;
3737

3838
static const member_t members_ids[] = {
39-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
39+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
4040
{0xFE08, "Microsoft"},
4141
{0xFE09, "Pillsy, Inc."},
4242
{0xFE0A, "ruwido austria gmbh"},
@@ -296,7 +296,7 @@ typedef struct {
296296
} gattdescriptor_t;
297297

298298
static const gattdescriptor_t g_descriptor_ids[] = {
299-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
299+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
300300
{0x2905,"Characteristic Aggregate Format"},
301301
{0x2900,"Characteristic Extended Properties"},
302302
{0x2904,"Characteristic Presentation Format"},
@@ -322,7 +322,7 @@ typedef struct {
322322
} characteristicMap_t;
323323

324324
static const characteristicMap_t g_characteristicsMappings[] = {
325-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
325+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
326326
{0x2A7E,"Aerobic Heart Rate Lower Limit"},
327327
{0x2A84,"Aerobic Heart Rate Upper Limit"},
328328
{0x2A7F,"Aerobic Threshold"},
@@ -557,7 +557,7 @@ typedef struct {
557557
* Definition of the service ids to names that we know about.
558558
*/
559559
static const gattService_t g_gattServices[] = {
560-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
560+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
561561
{"Alert Notification Service", "org.bluetooth.service.alert_notification", 0x1811},
562562
{"Automation IO", "org.bluetooth.service.automation_io", 0x1815 },
563563
{"Battery Service","org.bluetooth.service.battery_service", 0x180F},
@@ -638,7 +638,7 @@ static std::string gattIdToString(esp_gatt_id_t gattId) {
638638
*/
639639
const char* BLEUtils::addressTypeToString(esp_ble_addr_type_t type) {
640640
switch (type) {
641-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
641+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
642642
case BLE_ADDR_TYPE_PUBLIC:
643643
return "BLE_ADDR_TYPE_PUBLIC";
644644
case BLE_ADDR_TYPE_RANDOM:
@@ -690,7 +690,7 @@ std::string BLEUtils::adFlagsToString(uint8_t adFlags) {
690690
*/
691691
const char* BLEUtils::advTypeToString(uint8_t advType) {
692692
switch (advType) {
693-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
693+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
694694
case ESP_BLE_AD_TYPE_FLAG: // 0x01
695695
return "ESP_BLE_AD_TYPE_FLAG";
696696
case ESP_BLE_AD_TYPE_16SRV_PART: // 0x02
@@ -825,7 +825,7 @@ std::string BLEUtils::buildPrintData(uint8_t* source, size_t length) {
825825
*/
826826
std::string BLEUtils::gattCloseReasonToString(esp_gatt_conn_reason_t reason) {
827827
switch (reason) {
828-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
828+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
829829
case ESP_GATT_CONN_UNKNOWN: {
830830
return "ESP_GATT_CONN_UNKNOWN";
831831
}
@@ -863,7 +863,7 @@ std::string BLEUtils::gattCloseReasonToString(esp_gatt_conn_reason_t reason) {
863863

864864
std::string BLEUtils::gattClientEventTypeToString(esp_gattc_cb_event_t eventType) {
865865
switch (eventType) {
866-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
866+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
867867
case ESP_GATTC_ACL_EVT:
868868
return "ESP_GATTC_ACL_EVT";
869869
case ESP_GATTC_ADV_DATA_EVT:
@@ -961,7 +961,7 @@ std::string BLEUtils::gattClientEventTypeToString(esp_gattc_cb_event_t eventType
961961
*/
962962
std::string BLEUtils::gattServerEventTypeToString(esp_gatts_cb_event_t eventType) {
963963
switch (eventType) {
964-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
964+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
965965
case ESP_GATTS_REG_EVT:
966966
return "ESP_GATTS_REG_EVT";
967967
case ESP_GATTS_READ_EVT:
@@ -1026,7 +1026,7 @@ std::string BLEUtils::gattServerEventTypeToString(esp_gatts_cb_event_t eventType
10261026
*/
10271027
const char* BLEUtils::devTypeToString(esp_bt_dev_type_t type) {
10281028
switch (type) {
1029-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
1029+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
10301030
case ESP_BT_DEVICE_TYPE_BREDR:
10311031
return "ESP_BT_DEVICE_TYPE_BREDR";
10321032
case ESP_BT_DEVICE_TYPE_BLE:
@@ -1048,7 +1048,7 @@ void BLEUtils::dumpGapEvent(
10481048
esp_ble_gap_cb_param_t* param) {
10491049
log_v("Received a GAP event: %s", gapEventToString(event));
10501050
switch (event) {
1051-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
1051+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
10521052
// ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT
10531053
// adv_data_cmpl
10541054
// - esp_bt_status_t
@@ -1282,7 +1282,7 @@ void BLEUtils::dumpGattClientEvent(
12821282
//esp_ble_gattc_cb_param_t* evtParam = (esp_ble_gattc_cb_param_t*) param;
12831283
log_v("GATT Event: %s", BLEUtils::gattClientEventTypeToString(event).c_str());
12841284
switch (event) {
1285-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
1285+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
12861286
// ESP_GATTC_CLOSE_EVT
12871287
//
12881288
// close:
@@ -1529,7 +1529,7 @@ void BLEUtils::dumpGattServerEvent(
15291529
esp_ble_gatts_cb_param_t* evtParam) {
15301530
log_v("GATT ServerEvent: %s", BLEUtils::gattServerEventTypeToString(event).c_str());
15311531
switch (event) {
1532-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
1532+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
15331533

15341534
case ESP_GATTS_ADD_CHAR_DESCR_EVT: {
15351535
log_v("[status: %s, attr_handle: %d 0x%.2x, service_handle: %d 0x%.2x, char_uuid: %s]",
@@ -1730,7 +1730,7 @@ void BLEUtils::dumpGattServerEvent(
17301730
*/
17311731
const char* BLEUtils::eventTypeToString(esp_ble_evt_type_t eventType) {
17321732
switch (eventType) {
1733-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
1733+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
17341734
case ESP_BLE_EVT_CONN_ADV:
17351735
return "ESP_BLE_EVT_CONN_ADV";
17361736
case ESP_BLE_EVT_CONN_DIR_ADV:
@@ -1757,7 +1757,7 @@ const char* BLEUtils::eventTypeToString(esp_ble_evt_type_t eventType) {
17571757
*/
17581758
const char* BLEUtils::gapEventToString(uint32_t eventType) {
17591759
switch (eventType) {
1760-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
1760+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
17611761
case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT:
17621762
return "ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT";
17631763
case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT:
@@ -1901,7 +1901,7 @@ std::string BLEUtils::gattServiceToString(uint32_t serviceId) {
19011901
*/
19021902
std::string BLEUtils::gattStatusToString(esp_gatt_status_t status) {
19031903
switch (status) {
1904-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
1904+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
19051905
case ESP_GATT_OK:
19061906
return "ESP_GATT_OK";
19071907
case ESP_GATT_INVALID_HANDLE:
@@ -2015,7 +2015,7 @@ std::string BLEUtils::getMember(uint32_t memberId) {
20152015
*/
20162016
const char* BLEUtils::searchEventTypeToString(esp_gap_search_evt_t searchEvt) {
20172017
switch (searchEvt) {
2018-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
2018+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
20192019
case ESP_GAP_SEARCH_INQ_RES_EVT:
20202020
return "ESP_GAP_SEARCH_INQ_RES_EVT";
20212021
case ESP_GAP_SEARCH_INQ_CMPL_EVT:

‎libraries/BLE/src/GeneralUtils.cpp

Copy file name to clipboardExpand all lines: libraries/BLE/src/GeneralUtils.cpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ std::vector<std::string> GeneralUtils::split(std::string source, char delimiter)
368368
*/
369369
const char* GeneralUtils::errorToString(esp_err_t errCode) {
370370
switch (errCode) {
371-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
371+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
372372
case ESP_OK:
373373
return "ESP_OK";
374374
case ESP_FAIL:
@@ -453,7 +453,7 @@ const char* GeneralUtils::wifiErrorToString(uint8_t errCode) {
453453
if (errCode == UINT8_MAX) return "Not Connected (default value)";
454454

455455
switch ((wifi_err_reason_t) errCode) {
456-
#if CONFIG_LOG_DEFAULT_LEVEL > 4
456+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
457457
case WIFI_REASON_UNSPECIFIED:
458458
return "WIFI_REASON_UNSPECIFIED";
459459
case WIFI_REASON_AUTH_EXPIRE:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.