Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
mringwal committed Sep 27, 2017
2 parents 301f884 + 8a46ec4 commit 62284eb3db194555ad4ec0eb0851d00ce2985937
Showing with 2,718 additions and 1,566 deletions.
  1. +1 −0 chipset/bcm/btstack_chipset_bcm_download_firmware.c
  2. +1 −0 doc/manual/docs/how_to.md
  3. +31 −33 example/Makefile.inc
  4. +319 −0 example/hid_mouse_demo.c
  5. +447 −0 example/hog_keyboard_demo.c
  6. +14 −0 example/hog_keyboard_demo.gatt
  7. +350 −0 example/hog_mouse_demo.c
  8. +14 −0 example/hog_mouse_demo.gatt
  9. +1 −6 example/le_counter.c
  10. +1 −6 example/spp_and_le_counter.c
  11. +0 −585 platform/embedded/hci_transport_h4_ehcill_embedded.c
  12. +0 −321 platform/embedded/hci_transport_h4_embedded.c
  13. +2 −2 port/arduino/Makefile
  14. +192 −145 port/esp32/template/sdkconfig
  15. +1 −1 port/ez430-rf2560/Makefile
  16. +1 −1 port/msp-exp430f5438-cc2564b/Makefile
  17. +1 −1 port/msp430f5229lp-cc2564b/Makefile
  18. +1 −1 port/stm32-f103rb-nucleo/Makefile
  19. +3 −3 src/ble/ancs_client.c
  20. +64 −11 src/ble/att_db.c
  21. +55 −3 src/ble/att_db.h
  22. +16 −8 src/ble/att_db_util.c
  23. +2 −2 src/ble/att_server.c
  24. +4 −3 src/ble/gatt-service/device_information_service_server.c
  25. +2 −1 src/ble/gatt-service/device_information_service_server.h
  26. +16 −0 src/ble/gatt-service/hids.gatt
  27. +239 −0 src/ble/gatt-service/hids_device.c
  28. +78 −0 src/ble/gatt-service/hids_device.h
  29. +2 −2 src/ble/gatt_client.c
  30. +272 −157 src/ble/sm.c
  31. +2 −1 src/bluetooth.h
  32. +50 −0 src/btstack_defines.h
  33. +94 −0 src/btstack_event.h
  34. +4 −4 src/btstack_util.c
  35. +1 −1 src/classic/bnep.c
  36. +4 −4 src/classic/hfp.c
  37. +8 −11 src/classic/hfp_ag.c
  38. +6 −1 src/classic/hfp_hf.c
  39. +10 −12 src/classic/hsp_ag.c
  40. +5 −4 src/classic/hsp_hs.c
  41. +4 −2 src/classic/pbap_client.c
  42. +5 −4 src/classic/rfcomm.c
  43. +45 −45 src/classic/sdp_client.c
  44. +49 −14 src/classic/sdp_server.c
  45. +31 −19 src/classic/sdp_util.c
  46. +7 −2 src/classic/sdp_util.h
  47. +6 −7 src/hci.c
  48. +207 −120 src/l2cap.c
  49. +16 −5 test/att_db/le_counter.h
  50. +1 −1 test/ble_client/advertising_data_parser.c
  51. +1 −0 test/gatt_client/gatt_client_test.c
  52. +1 −0 tool/btstack_event_generator.py
  53. +31 −17 tool/compile_gatt.py
@@ -140,6 +140,7 @@ void btstack_chipset_bcm_download_firmware(const btstack_uart_block_t * the_uart
chipset = btstack_chipset_bcm_instance();
baudrate = baudrate_upload;
download_complete = done;
btstack_chipset_bcm_enable_init_script(1);
int res = uart_driver->open();
if (res) {
@@ -42,6 +42,7 @@ System properties:
HAVE_MALLOC | Use dynamic memory
HAVE_AES128 | Use platform AES128 engine - not needed usually
HAVE_BTSTACK_STDIN | STDIN is available for CLI interface
HAVE_MBEDTLS_ECC_P256 | mbedTLS provides NIST P-256 operations e.g. for LE Secure Connections
Embedded platform properties:
View
@@ -6,7 +6,7 @@ VPATH += ${BTSTACK_ROOT}/src/classic
VPATH += ${BTSTACK_ROOT}/example
VPATH += ${BTSTACK_ROOT}/3rd-party/hxcmod-player
VPATH += ${BTSTACK_ROOT}/3rd-party/micro-ecc
VPATH += ${BTSTACK_ROOT}/3rd-party/bluedroid/decoder/srce
VPATH += ${BTSTACK_ROOT}/3rd-party/bluedroid/decoder/srce
VPATH += ${BTSTACK_ROOT}/3rd-party/bluedroid/encoder//srce
CFLAGS += -I.
@@ -118,6 +118,9 @@ EXAMPLES = \
hfp_ag_demo \
hfp_hf_demo \
hid_keyboard_demo \
hid_mouse_demo \
hog_keyboard_demo \
hog_mouse_demo \
hsp_ag_demo \
hsp_hs_demo \
le_counter \
@@ -147,17 +150,19 @@ EXAMPLES_USING_LE = \
gap_le_advertisements \
sm_pairing_peripheral \
sm_pairing_central \
hog_keyboard_demo \
hog_mouse_demo \
# .o for .c
CORE_OBJ = $(CORE:.c=.o)
COMMON_OBJ = $(COMMON:.c=.o)
CLASSIC_OBJ = $(CLASSIC:.c=.o)
COMMON_OBJ = $(COMMON:.c=.o)
CLASSIC_OBJ = $(CLASSIC:.c=.o)
SM_OBJ = $(SM:.c=.o) $(MICROECC:.c=.o)
ATT_OBJ = $(ATT:.c=.o)
GATT_CLIENT_OBJ = $(GATT_CLIENT:.c=.o)
GATT_SERVER_OBJ = $(GATT_SERVER:.c=.o)
PAN_OBJ = $(PAN:.c=.o)
SBC_DECODER_OBJ = $(SBC_DECODER:.c=.o)
SBC_DECODER_OBJ = $(SBC_DECODER:.c=.o)
SBC_ENCODER_OBJ = $(SBC_ENCODER:.c=.o)
CVSD_PLC_OBJ = $(CVSD_PLC:.c=.o)
AVDTP_OBJ = $(AVDTP:.c=.o)
@@ -166,24 +171,8 @@ HXCMOD_PLAYER_OBJ = $(HXCMOD_PLAYER:.c=.o)
default_target: all
# compile .gatt descriptions
profile.h: profile.gatt
python ${BTSTACK_ROOT}/tool/compile_gatt.py $< $@
ancs_client_demo.h: ancs_client_demo.gatt
python ${BTSTACK_ROOT}/tool/compile_gatt.py $< $@
gatt_browser.h: gatt_browser.gatt
python ${BTSTACK_ROOT}/tool/compile_gatt.py $< $@
gatt_battery_query.h: gatt_battery_query.gatt
python ${BTSTACK_ROOT}/tool/compile_gatt.py $< $@
spp_and_le_counter.h: spp_and_le_counter.gatt
python ${BTSTACK_ROOT}/tool/compile_gatt.py $< $@
spp_and_le_streamer.h: spp_and_le_counter.gatt
python ${BTSTACK_ROOT}/tool/compile_gatt.py $< $@
le_counter.h: le_counter.gatt
python ${BTSTACK_ROOT}/tool/compile_gatt.py $< $@
le_streamer.h: le_streamer.gatt
python ${BTSTACK_ROOT}/tool/compile_gatt.py $< $@
sm_pairing_peripheral.h: sm_pairing_peripheral.gatt
python ${BTSTACK_ROOT}/tool/compile_gatt.py $< $@
%.h: %.gatt
python ${BTSTACK_ROOT}/tool/compile_gatt.py $< $@
# examples
sdp_rfcomm_query: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${PAN_OBJ} ${SDP_CLIENT} sdp_rfcomm_query.c
@@ -192,37 +181,43 @@ sdp_rfcomm_query: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${PAN_OBJ} ${SDP_CLIE
pbap_client_demo: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} obex_iterator.c goep_client.c pbap_client.c pbap_client_demo.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
sdp_general_query: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} sdp_general_query.c
sdp_general_query: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} sdp_general_query.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
sdp_bnep_query: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} sdp_bnep_query.c
sdp_bnep_query: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} sdp_bnep_query.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
spp_counter: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} spp_counter.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
le_counter: le_counter.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} battery_service_server.o le_counter.c
le_counter: le_counter.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} battery_service_server.o le_counter.c
${CC} $(filter-out le_counter.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
sm_pairing_peripheral: sm_pairing_peripheral.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} sm_pairing_peripheral.c
hog_keyboard_demo: hog_keyboard_demo.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} battery_service_server.o device_information_service_server.o hids_device.o btstack_ring_buffer.o hog_keyboard_demo.c
${CC} $(filter-out hog_keyboard_demo.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
hog_mouse_demo: hog_mouse_demo.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} battery_service_server.o device_information_service_server.o hids_device.o hog_mouse_demo.c
${CC} $(filter-out hog_mouse_demo.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
sm_pairing_peripheral: sm_pairing_peripheral.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} sm_pairing_peripheral.c
${CC} $(filter-out sm_pairing_peripheral.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
sm_pairing_central: ${CORE_OBJ} ${COMMON_OBJ} ${SM_OBJ} sm_pairing_central.o
sm_pairing_central: ${CORE_OBJ} ${COMMON_OBJ} ${SM_OBJ} sm_pairing_central.o
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
le_streamer: le_streamer.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} le_streamer.c
le_streamer: le_streamer.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} le_streamer.c
${CC} $(filter-out le_streamer.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
le_streamer_client: ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_CLIENT_OBJ} ${SM_OBJ} le_streamer_client.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
spp_and_le_counter: spp_and_le_counter.h ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} spp_and_le_counter.c
spp_and_le_counter: spp_and_le_counter.h ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} spp_and_le_counter.c
${CC} $(filter-out spp_and_le_counter.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
spp_and_le_streamer: spp_and_le_streamer.h ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} spp_and_le_streamer.c
spp_and_le_streamer: spp_and_le_streamer.h ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} spp_and_le_streamer.c
${CC} $(filter-out spp_and_le_streamer.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
spp_streamer: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} spp_streamer.c
spp_streamer: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} spp_streamer.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
spp_streamer_client: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} spp_streamer_client.c
@@ -234,7 +229,7 @@ gap_dedicated_bonding: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} gap_dedicated_bo
gap_inquiry: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} gap_inquiry.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
panu_demo: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} panu_demo.c
panu_demo: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} panu_demo.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
gatt_browser: gatt_browser.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_CLIENT_OBJ} ${GATT_SERVER_OBJ} ${SM_OBJ} gatt_browser.c
@@ -267,6 +262,9 @@ hfp_hf_demo: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} ${SBC_DECODE
hid_keyboard_demo: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} btstack_ring_buffer.o hid_device.o hid_keyboard_demo.o
${CC} $^ ${CFLAGS} -I${BTSTACK_ROOT}/platform/posix ${LDFLAGS} -o $@
hid_mouse_demo: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} btstack_ring_buffer.o hid_device.o hid_mouse_demo.o
${CC} $^ ${CFLAGS} -I${BTSTACK_ROOT}/platform/posix ${LDFLAGS} -o $@
a2dp_source_demo: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} ${SBC_ENCODER_OBJ} ${SBC_DECODER_OBJ} ${AVDTP_OBJ} ${HXCMOD_PLAYER_OBJ} avrcp.o avrcp_target.o a2dp_source_demo.c
${CC} $^ ${CFLAGS} -I${BTSTACK_ROOT}/platform/posix ${LDFLAGS} -o $@
@@ -276,7 +274,7 @@ a2dp_sink_demo: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} ${SBC_ENC
clean:
rm -f ${EXAMPLES} *_demo
rm -f *.o *.out *.hex *.exe *.wav *.sbc
rm -f ancs_client_demo.h profile.h spp_and_le_counter.h le_counter.h le_streamer.h
rm -f ancs_client_demo.h profile.h spp_and_le_counter.h le_counter.h le_streamer.h hog_keyboard_demo.h hog_mouse_demo.h
rm -f gatt_battery_query.h gatt_browser.h sm_pairing_peripheral.h spp_and_le_streamer.h
rm -rf *.dSYM
rm -rf ${BTSTACK_ROOT}/src/*.o
Oops, something went wrong.

0 comments on commit 62284eb

Please sign in to comment.