esp-idf/components/bt/bluedroid/stack
Tian Hao acda125e8b Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid
# Conflicts:
#	components/bt/bluedroid/profiles/core/bt_prf_sys_main.c
#	components/bt/bluedroid/profiles/core/bt_prf_task.c
#	components/bt/bluedroid/profiles/core/include/bt_prf_sys.h
#	components/bt/bluedroid/profiles/core/include/bt_prf_task.h
#	components/bt/bluedroid/profiles/esp/include/wx_airsync_prf.h
#	components/bt/bluedroid/profiles/esp/wechat_AirSync/wx_airsync_prf.c
#	components/bt/bluedroid/stack/btm/btm_sec.c
2016-11-04 19:32:47 +08:00
..
btm Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid 2016-11-04 19:32:47 +08:00
btu Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid 2016-11-04 19:32:47 +08:00
gap component bt:Added the BLE scan API to the bt project 2016-10-25 05:07:36 -04:00
gatt component bt:modified the API format to the standard format 2016-10-31 06:55:54 -04:00
hcic component/bt : use LOG_XXX instead of print 2016-10-26 15:57:40 +08:00
include component bt:Change the button profile function to the new API function 2016-11-02 02:05:30 -04:00
l2cap component bt:Change the button profile function to the new API function 2016-11-02 02:05:30 -04:00
sdp component/bt: add new demo for Bluetooth SDP client 2016-10-31 12:34:11 +08:00
smp component bt:added the stop adverstising API to the BTA module 2016-10-19 01:55:14 -04:00