From 25a450a789489b7d0b6f4d3e79906e3020a43397 Mon Sep 17 00:00:00 2001 From: Rahul Tank Date: Fri, 2 Jul 2021 18:53:09 +0530 Subject: [PATCH] Nimble: Fix logging level mismatch Added fix for two issues: 1. Fix C++ compilation issue due to automatic conversion between int and esp_error_level_t 2. Use correct level macros to use system wide logging scheme --- porting/nimble/include/modlog/modlog.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/porting/nimble/include/modlog/modlog.h b/porting/nimble/include/modlog/modlog.h index f725e458c..a689cd51f 100644 --- a/porting/nimble/include/modlog/modlog.h +++ b/porting/nimble/include/modlog/modlog.h @@ -36,23 +36,23 @@ #ifdef ESP_PLATFORM #define MODLOG_ESP_LOCAL(level, ml_msg_, ...) do { \ - if (MYNEWT_VAL(BLE_HS_LOG_LVL) <= level) esp_log_write(level, "NimBLE", ml_msg_, ##__VA_ARGS__); \ + if (MYNEWT_VAL(BLE_HS_LOG_LVL) <= LOG_LOCAL_LEVEL) ESP_LOG_LEVEL_LOCAL(level, "NimBLE", ml_msg_, ##__VA_ARGS__); \ } while(0) #define MODLOG_DEBUG(ml_mod_, ml_msg_, ...) \ - MODLOG_ESP_LOCAL(LOG_LEVEL_DEBUG, ml_msg_, ##__VA_ARGS__) + MODLOG_ESP_LOCAL(ESP_LOG_DEBUG, ml_msg_, ##__VA_ARGS__) #define MODLOG_INFO(ml_mod_, ml_msg_, ...) \ - MODLOG_ESP_LOCAL(LOG_LEVEL_INFO, ml_msg_, ##__VA_ARGS__) + MODLOG_ESP_LOCAL(ESP_LOG_INFO, ml_msg_, ##__VA_ARGS__) #define MODLOG_WARN(ml_mod_, ml_msg_, ...) \ - MODLOG_ESP_LOCAL(LOG_LEVEL_WARN, ml_msg_, ##__VA_ARGS__) + MODLOG_ESP_LOCAL(ESP_LOG_WARN, ml_msg_, ##__VA_ARGS__) #define MODLOG_ERROR(ml_mod_, ml_msg_, ...) \ - MODLOG_ESP_LOCAL(LOG_LEVEL_ERROR, ml_msg_, ##__VA_ARGS__) + MODLOG_ESP_LOCAL(ESP_LOG_ERROR, ml_msg_, ##__VA_ARGS__) #define MODLOG_CRITICAL(ml_mod_, ml_msg_, ...) \ - MODLOG_ESP_LOCAL(LOG_LEVEL_CRITICAL, ml_msg_, ##__VA_ARGS__) + MODLOG_ESP_LOCAL(ESP_LOG_ERROR, ml_msg_, ##__VA_ARGS__) #else