espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-02 05:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nimble/fix_broadcaster_role' into 'nimble-1.3.0-idf'

Browse Source 
NimBLE: Add custom logging support and broadcaster role build failure fix

See merge request espressif/esp-nimble!72
This commit is contained in:
Hrishikesh Dhayagude
2021-04-19 10:08:01 +00:00
parent 04d00bc46f f0ad8684b8
commit f04c92400a
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_gap.c
+3 -3
View File
@@ -948,7 +948,7 @@ ble_gap_master_ticks_until_exp(void)
return 0; return 0;
} }
#if !MYNEWT_VAL(BLE_EXT_ADV) #if NIMBLE_BLE_ADVERTISE && !MYNEWT_VAL(BLE_EXT_ADV)
static uint32_t static uint32_t
ble_gap_slave_ticks_until_exp(void) ble_gap_slave_ticks_until_exp(void)
{ {
@@ -1957,7 +1957,7 @@ ble_gap_master_timer(void)
return BLE_HS_FOREVER; return BLE_HS_FOREVER;
} }
#if !MYNEWT_VAL(BLE_EXT_ADV) #if NIMBLE_BLE_ADVERTISE && !MYNEWT_VAL(BLE_EXT_ADV)
static int32_t static int32_t
ble_gap_slave_timer(void) ble_gap_slave_timer(void)
{ {
@@ -2056,7 +2056,7 @@ ble_gap_timer(void)
min_ticks = min(master_ticks, update_ticks); min_ticks = min(master_ticks, update_ticks);
#if !MYNEWT_VAL(BLE_EXT_ADV) #if NIMBLE_BLE_ADVERTISE && !MYNEWT_VAL(BLE_EXT_ADV)
min_ticks = min(min_ticks, ble_gap_slave_timer()); min_ticks = min(min_ticks, ble_gap_slave_timer());
#endif #endif
porting/nimble/include/modlog/modlog.h
+7 -6
View File
@@ -23,6 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include "log/log.h" #include "log/log.h"
#include "log_common/log_common.h"
#ifdef ESP_PLATFORM #ifdef ESP_PLATFORM
#include "esp_log.h" #include "esp_log.h"
@@ -34,23 +35,23 @@
#ifdef ESP_PLATFORM #ifdef ESP_PLATFORM
#define MODLOG_ESP_LOCAL(level, ml_msg_, ...) do { \ #define MODLOG_ESP_LOCAL(level, ml_msg_, ...) do { \
if (LOG_LOCAL_LEVEL >= level) esp_log_write(level, "NimBLE", ml_msg_, ##__VA_ARGS__); \ if (MYNEWT_VAL(BLE_HS_LOG_LVL) <= level) esp_log_write(level, "NimBLE", ml_msg_, ##__VA_ARGS__); \
} while(0) } while(0)
#define MODLOG_DEBUG(ml_mod_, ml_msg_, ...) \ #define MODLOG_DEBUG(ml_mod_, ml_msg_, ...) \
MODLOG_ESP_LOCAL(ESP_LOG_DEBUG, ml_msg_, ##__VA_ARGS__) MODLOG_ESP_LOCAL(LOG_LEVEL_DEBUG, ml_msg_, ##__VA_ARGS__)
#define MODLOG_INFO(ml_mod_, ml_msg_, ...) \ #define MODLOG_INFO(ml_mod_, ml_msg_, ...) \
MODLOG_ESP_LOCAL(ESP_LOG_INFO, ml_msg_, ##__VA_ARGS__) MODLOG_ESP_LOCAL(LOG_LEVEL_INFO, ml_msg_, ##__VA_ARGS__)
#define MODLOG_WARN(ml_mod_, ml_msg_, ...) \ #define MODLOG_WARN(ml_mod_, ml_msg_, ...) \
MODLOG_ESP_LOCAL(ESP_LOG_WARN, ml_msg_, ##__VA_ARGS__) MODLOG_ESP_LOCAL(LOG_LEVEL_WARN, ml_msg_, ##__VA_ARGS__)
#define MODLOG_ERROR(ml_mod_, ml_msg_, ...) \ #define MODLOG_ERROR(ml_mod_, ml_msg_, ...) \
MODLOG_ESP_LOCAL(ESP_LOG_ERROR, ml_msg_, ##__VA_ARGS__) MODLOG_ESP_LOCAL(LOG_LEVEL_ERROR, ml_msg_, ##__VA_ARGS__)
#define MODLOG_CRITICAL(ml_mod_, ml_msg_, ...) \ #define MODLOG_CRITICAL(ml_mod_, ml_msg_, ...) \
MODLOG_ESP_LOCAL(ESP_LOG_ERROR, ml_msg_, ##__VA_ARGS__) MODLOG_ESP_LOCAL(LOG_LEVEL_CRITICAL, ml_msg_, ##__VA_ARGS__)
#else #else
porting/nimble/src/nimble_port.c
-3
View File
@@ -41,9 +41,6 @@ nimble_port_init(void)
void ble_store_ram_init(void); void ble_store_ram_init(void);
#if NIMBLE_CFG_CONTROLLER #if NIMBLE_CFG_CONTROLLER
void ble_hci_ram_init(void); void ble_hci_ram_init(void);
#endif
#ifdef ESP_PLATFORM
esp_log_level_set("NimBLE", LOG_LOCAL_LEVEL);
#endif #endif
/* Initialize default event queue */ /* Initialize default event queue */
ble_npl_eventq_init(&g_eventq_dflt); ble_npl_eventq_init(&g_eventq_dflt);