espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-04 02:50:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/nimble_esp_ble_mesh_v3.3' into 'release/v3.3'

Browse Source 
Add support of NimBLE host in ESP-BLE-Mesh (backport v3.3)

See merge request espressif/esp-idf!7510
This commit is contained in:
Jiang Jiang Jian
2020-02-14 16:43:05 +08:00
parent f88a04aa3e cf6f1e8246
commit 91f0fcc3b3
55 changed files with 2613 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/bluedroid/stack/btu/btu_init.c
View File

@@ -240,7 +240,7 @@ UINT16 BTU_BleAclPktSize(void)
bool BTU_check_queue_is_congest(void)
{
UBaseType_t wait_size = uxQueueMessagesWaiting(xBtuQueue);
if(wait_size >= QUEUE_CONGEST_SIZE ) {
if(wait_size >= BT_QUEUE_CONGEST_SIZE ) {
return true;
}
return false;

22
components/bt/bluedroid/stack/include/stack/bt_types.h
View File

@@ -21,14 +21,7 @@
#include <stdint.h>
#include <stdbool.h>
#ifndef FALSE
# define FALSE false
#endif
#ifndef TRUE
# define TRUE true
#endif
#include "bt_common.h"
typedef uint8_t UINT8;
typedef uint16_t UINT16;
@@ -524,19 +517,6 @@ typedef struct {
typedef UINT8 tBT_DEVICE_TYPE;
/*****************************************************************************/
/* Define trace levels */
#define BT_TRACE_LEVEL_NONE 0 /* No trace messages to be generated */
#define BT_TRACE_LEVEL_ERROR 1 /* Error condition trace messages */
#define BT_TRACE_LEVEL_WARNING 2 /* Warning condition trace messages */
#define BT_TRACE_LEVEL_API 3 /* API traces */
#define BT_TRACE_LEVEL_EVENT 4 /* Debug messages for events */
#define BT_TRACE_LEVEL_DEBUG 5 /* Full debug messages */
#define BT_TRACE_LEVEL_VERBOSE 6 /* Verbose debug messages */
#define MAX_TRACE_LEVEL 6
/* Define New Trace Type Definition */
/* TRACE_CTRL_TYPE 0x^^000000*/
#define TRACE_CTRL_MASK 0xff000000