diff --git a/porting/nimble/include/modlog/modlog.h b/porting/nimble/include/modlog/modlog.h index 29b1e8f08..c0304a0df 100644 --- a/porting/nimble/include/modlog/modlog.h +++ b/porting/nimble/include/modlog/modlog.h @@ -24,8 +24,32 @@ #include "log/log.h" +#ifdef ESP_PLATFORM +#include "esp_log.h" +#include +#include +#endif + #define MODLOG_MODULE_DFLT 255 +#ifdef ESP_PLATFORM +#define MODLOG_DEBUG(ml_mod_, ml_msg_, ...) \ + esp_log_write(ESP_LOG_DEBUG, "NimBLE",ml_msg_, ##__VA_ARGS__) + +#define MODLOG_INFO(ml_mod_, ml_msg_, ...) \ + esp_log_write(ESP_LOG_INFO, "NimBLE",ml_msg_, ##__VA_ARGS__) + +#define MODLOG_WARN(ml_mod_, ml_msg_, ...) \ + esp_log_write(ESP_LOG_WARN, "NimBLE",ml_msg_, ##__VA_ARGS__) + +#define MODLOG_ERROR(ml_mod_, ml_msg_, ...) \ + esp_log_write(ESP_LOG_ERROR, "NimBLE",ml_msg_, ##__VA_ARGS__) + +#define MODLOG_CRITICAL(ml_mod_, ml_msg_, ...) \ + esp_log_write(ESP_LOG_ERROR, "NimBLE",ml_msg_, ##__VA_ARGS__) + +#else + #if MYNEWT_VAL(LOG_LEVEL) <= LOG_LEVEL_DEBUG || defined __DOXYGEN__ #define MODLOG_DEBUG(ml_mod_, ml_msg_, ...) \ printf((ml_msg_), ##__VA_ARGS__) @@ -61,6 +85,8 @@ #define MODLOG_CRITICAL(ml_mod_, ...) IGNORE(__VA_ARGS__) #endif +#endif + #define MODLOG(ml_lvl_, ml_mod_, ...) \ MODLOG_ ## ml_lvl_((ml_mod_), __VA_ARGS__) diff --git a/porting/nimble/src/nimble_port.c b/porting/nimble/src/nimble_port.c index ff350a890..b7a839303 100644 --- a/porting/nimble/src/nimble_port.c +++ b/porting/nimble/src/nimble_port.c @@ -25,6 +25,9 @@ #if NIMBLE_CFG_CONTROLLER #include "controller/ble_ll.h" #endif +#ifdef ESP_PLATFORM +#include "esp_log.h" +#endif static struct ble_npl_eventq g_eventq_dflt; @@ -36,7 +39,9 @@ nimble_port_init(void) #if NIMBLE_CFG_CONTROLLER void ble_hci_ram_init(void); #endif - +#ifdef ESP_PLATFORM + esp_log_level_set("NimBLE", LOG_LOCAL_LEVEL); +#endif /* Initialize default event queue */ ble_npl_eventq_init(&g_eventq_dflt);