Commit graph

10 commits

Author SHA1 Message Date
Tian Hao
66b31b89ac Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid
# Conflicts:
#	examples/07_blufi/components/bluedroid_demos/app_project/SampleClientProject.c
#	examples/07_blufi/components/bluedroid_demos/app_project/SampleServerProject.c
#	examples/07_blufi/components/bluedroid_demos/include/bt_app_common.h
2016-11-01 14:19:38 +08:00
Tian Hao
45638b3f98 component/bt : use LOG_XXX instead of print 2016-10-26 15:57:40 +08:00
Tian Hao
8e247f3b4c component/bt : delete extra GATTAPP_REGISTER 2016-10-24 20:07:19 +08:00
Tian Hao
5fbfa2a01d blufi cleanup the bad things 2016-10-24 17:08:37 +08:00
wangmengyang
063e9e8287 component/bt: Merge branch 'feature/btdm_bluedroid' into feature/bt_gap 2016-10-21 15:19:39 +08:00
wangmengyang
2c0ceb484b component/bt: Bluedroid BTA/SDP module is ported 2016-10-21 15:12:22 +08:00
wangmengyang
e81ff4f68c component/bt: fix compiler error for examples/07_blufi
1. add the missing include of header in bt_app_core.c for examples/07_blufi,
 where macro "BUT_PROFILE_CFG" should be set non-zero;
2016-10-19 19:51:18 +08:00
wangmengyang
0574f2f55a component/bt: fix of compiler errors after previous merge of code; 2016-10-17 23:53:02 +08:00
Tian Hao
e32d4e546a component/bt : advertising no random address
1. advertising with public bdaddr
2. increase queue size avoid for exception because of the log is a lot
2016-10-10 19:21:12 +08:00
Tian Hao
eb8cb8d22e component/bt : add bluf that use bluetooth config wifi connection demos
1. add libphy.a librtc.a, but store in bt submodule, if someone use them, please copy to esp32/lib/ instead the origin one
2. add 07_blufi demo
3. change esp32/Kconfig to allow bt/wifi coexist
2016-10-07 11:16:13 +08:00