Michael Balzer
e97f72ea24
Merge remote-tracking branch 'upstream/release/v3.3'
...
# Conflicts:
# .gitlab-ci.yml
# components/bootloader/project_include.cmake
# components/bootloader_support/include/bootloader_common.h
# components/bootloader_support/src/bootloader_common.c
# components/bt/Kconfig
# components/bt/bluedroid/btc/profile/std/include/btc_gap_ble.h
# components/bt/bluedroid/stack/btm/btm_ble_gap.c
# components/bt/bluedroid/stack/btm/btm_devctl.c
# components/bt/bluedroid/stack/include/stack/hcidefs.h
# components/bt/bluedroid/stack/smp/smp_act.c
# components/bt/bt.c
# components/bt/lib
# components/driver/Kconfig
# components/driver/include/driver/rmt.h
# components/driver/test/test_spi_master.c
# components/driver/uart.c
# components/esp32/CMakeLists.txt
# components/esp32/Kconfig
# components/esp32/ld/esp32.project.ld.in
# components/esp32/ld/esp32.spiram.rom-functions-dram.ld
# components/esp32/ld/esp32.spiram.rom-functions-iram.ld
# components/esp32/lib
# components/esp32/spiram.c
# components/esp32/spiram_psram.c
# components/esp32/test/test_wifi.c
# components/esp32/wifi_init.c
# components/esp_http_server/include/esp_http_server.h
# components/esp_http_server/src/esp_httpd_priv.h
# components/esp_http_server/src/httpd_parse.c
# components/esp_http_server/src/httpd_sess.c
# components/esp_http_server/src/httpd_txrx.c
# components/esp_http_server/src/httpd_uri.c
# components/esp_http_server/test/test_http_server.c
# components/esp_https_ota/src/esp_https_ota.c
# components/ethernet/emac_main.c
# components/freemodbus/Kconfig
# components/idf_test/include/idf_performance.h
# components/idf_test/integration_test/TC_IT_BLUEDROID_SMP.yml
# components/lwip/Kconfig
# components/newlib/test/test_time.c
# components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
# components/spi_flash/Kconfig
# components/ulp/cmake/CMakeLists.txt
# components/ulp/component_ulp_common.cmake
# components/vfs/vfs.c
# docs/conf_common.py
# docs/en/api-reference/provisioning/wifi_provisioning.rst
# examples/mesh/internal_communication/main/Kconfig.projbuild
# examples/protocols/aws_iot/subscribe_publish/main/CMakeLists.txt
# examples/protocols/aws_iot/thing_shadow/main/CMakeLists.txt
# examples/protocols/coap_client/README.md
# examples/protocols/coap_server/README.md
# examples/protocols/modbus_slave/main/Kconfig.projbuild
# examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py
# examples/protocols/mqtt/tcp/main/Kconfig.projbuild
# examples/protocols/mqtt/ws/mqtt_ws_example_test.py
# examples/protocols/mqtt/wss/mqtt_wss_example_test.py
# examples/wifi/iperf/components/iperf/iperf.c
# requirements.txt
# tools/ci/build_examples.sh
# tools/ci/test_build_system_cmake.sh
# tools/cmake/idf_functions.cmake
# tools/cmake/kconfig.cmake
# tools/cmake/scripts/expand_requirements.cmake
# tools/esp_prov/README.md
# tools/esp_prov/esp_prov.py
# tools/esp_prov/transport/ble_cli.py
# tools/idf.py
# tools/kconfig_new/confgen.py
# tools/mass_mfg/docs/README.rst
# tools/mass_mfg/samples/sample_config.csv
# tools/tiny-test-fw/DUT.py
# tools/tiny-test-fw/IDF/IDFApp.py
# tools/tiny-test-fw/IDF/IDFDUT.py
# tools/tiny-test-fw/TinyFW.py
# tools/unit-test-app/tools/UnitTestParser.py
# tools/unit-test-app/unit_test.py
2019-07-20 22:11:10 +02:00
Michael Balzer
40f01ec30a
Merge remote-tracking branch 'upstream/release/v3.2'
2019-07-20 15:22:14 +02:00
Jiang Jiang Jian
cbec031c91
Merge branch 'bugfix/btdm_backport_2_bugs_v3.2' into 'release/v3.2'
...
Bugfix/btdm backport 2 bugs v3.2
See merge request idf/esp-idf!5269
2019-07-02 17:33:53 +08:00
zhiweijian
eaf8cfbf8d
component/bt: fix unpack hci enhance connection complete event error
2019-06-24 03:23:31 +00:00
Jiang Jiang Jian
f60acb2196
Merge branch 'feature/btdm_add_ble_link_timeout_config_v3.3' into 'release/v3.3'
...
Component/bt: add ble link timeout config in menuconfig(backport v3.3)
See merge request idf/esp-idf!4825
2019-06-19 14:47:31 +08:00
wangmengyang
29b009d6fd
component/bt: fix some performance issues in A2DP source data flow control
...
1. modify the limit of frames to send to avoid dropping packet on A2DP source due to TX data queue overflow
2. reduce the A2DP source data queue size in order to achieve faster control respnonse
2019-06-17 14:06:19 +08:00
Jiang Jiang Jian
193b8e93a8
Merge branch 'bugfix/btdm_abort_if_deinit_spp_without_init_v3.2' into 'release/v3.2'
...
components/bt: Fix abort if call esp_spp_deinit without calling esp_spp_init
See merge request idf/esp-idf!4862
2019-04-26 21:01:35 +08:00
baohongde
f95826144e
components/bt: Fix abort if call esp_spp_deinit without calling esp_spp_init
2019-04-24 11:34:06 +08:00
baohongde
39dbe7daa8
components/bt: Fix abort if call esp_spp_deinit without calling esp_spp_init
2019-04-24 11:30:04 +08:00
zhiweijian
96c8343e46
Component/bt: add ble link timeout config in menuconfig
...
- add ble link timeout config in menuconfig
- disable background connection when call gatts_open
2019-04-22 21:55:06 +08:00
zhiweijian
3295ed0995
Component/bt: add ble link timeout config in menuconfig
...
- add ble link timeout config in menuconfig
- disable background connection when call gatts_open
2019-04-22 21:49:59 +08:00
Jiang Jiang Jian
fa40e43c8d
Merge branch 'bugfix/btdm_fix_warning_when_disable_logs_v3.2' into 'release/v3.2'
...
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure
See merge request idf/esp-idf!4620
2019-04-15 18:52:09 +08:00
Jiang Jiang Jian
9f29dbf656
Merge branch 'bugfix/btdm_fix_build_warning_when_bluedroid_disable_log_v3.2' into 'release/v3.2'
...
Component/bt: fix build warning when bluedroid disable log (backport v3.2)
See merge request idf/esp-idf!4566
2019-04-15 18:50:58 +08:00
Jiang Jiang Jian
2da22620f8
Merge branch 'feature/btdm_add_mesh_adv_type_and_srv_uuid_for_dup_scan_except_v3.2' into 'release/v3.2'
...
Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list (backport v3.2)
See merge request idf/esp-idf!4606
2019-04-14 02:56:43 +08:00
Jiang Jiang Jian
065d451e47
Merge branch 'bugfix/btdm_modify_HCI_GET_CMD_BUF_v3.2' into 'release/v3.2'
...
Component/bt: modify HCI_GET_CMD_BUF (backport v3.2)
See merge request idf/esp-idf!4599
2019-04-12 21:58:51 +08:00
Jiang Jiang Jian
c8990eb39d
Merge branch 'bugfix/btdm_add_scan_window_interval_check_v3.2' into 'release/v3.2'
...
Component/bt: add scan window and interval check when set scan params (backport v3.2)
See merge request idf/esp-idf!4311
2019-04-12 21:57:50 +08:00
Jiang Jiang Jian
c90f770599
Merge branch 'bugfix/btdm_fix_blufi_prepare_write_crash_v3.2' into 'release/v3.2'
...
Component/bt: fix blufi prepare write crash (backport V3.2)
See merge request idf/esp-idf!4563
2019-04-12 21:57:23 +08:00
Jiang Jiang Jian
a218d4b925
Merge branch 'bugfix/btdm_fix_warning_when_disable_logs_v3.3' into 'release/v3.3'
...
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure
See merge request idf/esp-idf!4619
2019-04-04 18:45:31 +08:00
Jiang Jiang Jian
f03382b0ff
Merge branch 'feature/btdm_add_mesh_adv_type_and_srv_uuid_for_dup_scan_except_v3.3' into 'release/v3.3'
...
Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list (backport v3.3)
See merge request idf/esp-idf!4605
2019-04-01 21:49:29 +08:00
zhiweijian
3130b19cf8
Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list
2019-03-28 11:20:51 +08:00
zhiweijian
826146e985
Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list
2019-03-28 11:13:30 +08:00
baohongde
5ede49ca4a
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure
2019-03-26 15:29:22 +08:00
baohongde
bbdb236ab7
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure
2019-03-26 14:59:58 +08:00
baohongde
dca83700f2
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure
2019-03-26 14:46:36 +08:00
zhiweijian
6b4dcd4f5c
Component/bt: modify HCI_GET_CMD_BUF
2019-03-22 15:02:20 +08:00
zhiweijian
88fe438524
Component/bt: modify HCI_GET_CMD_BUF
2019-03-22 14:59:11 +08:00
Jiang Jiang Jian
c05a0ae6c3
Merge branch 'bugfix/btdm_fix_build_warning_when_bluedroid_disable_log_v3.3' into 'release/v3.3'
...
Component/bt: fix build warning when bluedroid disable log (backport V3.3)
See merge request idf/esp-idf!4565
2019-03-20 21:22:33 +08:00
zhiweijian
241ba1a6bb
Component/bt: fix iOS and win10 compatibility error for HID
2019-03-20 19:47:04 +08:00
zhiweijian
78d32f2e8b
Component/bt: fix build warning when bluedroid disable log
2019-03-20 15:06:17 +08:00
zhiweijian
3ed0f8e113
Component/bt: fix build warning when bluedroid disable log
2019-03-20 15:02:57 +08:00
zhiweijian
f237b92bc4
Component/bt: fix blufi prepare write crash
2019-03-20 14:27:11 +08:00
zhiweijian
7e1ccb56a7
Component/bt: fix blufi prepare write crash
2019-03-20 14:23:11 +08:00
zhiweijian
fed772641a
Component/bt: add update duplicate scan exceptional list APIs
2019-03-14 20:59:38 +08:00
zhiweijian
a1546e0714
Component/bt: add BLE adv report flow control
2019-03-13 14:58:32 +08:00
zhiweijian
6628fddae6
Component/bt: add BLE adv report flow control
2019-03-12 20:18:30 +08:00
zwj
b305a96a74
component/bt: add vendor hci cmd
2019-03-12 11:55:42 +08:00
zhiweijian
d71df18d92
Component/bt: fix iOS and win10 compatibility error for HID
2019-02-28 20:39:12 +08:00
Jiang Jiang Jian
484d8ab7ed
Merge branch 'bugfix/btdm_fix_remove_bonded_device_warnning' into 'master'
...
Component/bt: fix remove bonded device warnning
See merge request idf/esp-idf!3704
2019-02-27 17:54:37 +08:00
zhiweijian
46a3c36343
Component/bt: add scan window and interval check when set scan params
2019-02-25 13:22:32 +00:00
wangmengyang
b8f0c32a0a
component/bt: allow dynamic allocation of SBC encoder/decoder buffer used in A2DP to save internal DRAM
2019-02-13 19:15:34 +08:00
Jiang Jiang Jian
8a69ffc36f
Merge branch 'bugfix/btdm_add_handle_in_gatts_conf_event_for_indication_v3.2' into 'release/v3.2'
...
Component/bt: add handle in gatts conf event for indication (backport v3.2)
See merge request idf/esp-idf!4222
2019-02-01 21:34:05 +08:00
Jiang Jiang Jian
d4d3ccf6d9
Merge branch 'bugfix/btdm_add_handle_in_gatts_conf_event_for_indication' into 'master'
...
Component/bt: add handle in gatts conf event for indication
See merge request idf/esp-idf!4024
2019-02-01 21:33:39 +08:00
zhiweijian
95c7f45e84
Component/bt: add handle in gatts conf event for indication
2019-01-31 20:30:23 +08:00
zhiweijian
651a08f710
Component/bt: fix write char crash after disconnection
2019-01-31 12:20:16 +00:00
zhiweijian
b51a0fcea5
Component/bt: fix write char crash after disconnection
2019-01-31 12:18:54 +00:00
zhiweijian
b2a515c347
Component/bt: add handle in gatts conf event for indication
2019-01-28 07:12:22 +00:00
Jiang Jiang Jian
5c88c5996d
Merge branch 'bugfix/ble_active_scan_not_wait_scan_rsp' into 'master'
...
component/bt: add a option to make report adv data and scan response individually
See merge request idf/esp-idf!4131
2019-01-25 11:53:06 +08:00
Tian Hao
78511c3cc3
component/bt: add a option to make report adv data and scan response individually
...
Originally, when doing BLE active scan, Bluedroid will not report adv to
application layer until receive scan response. This option is used to
disable the behavior. When enable this option, Bluedroid will report
adv data or scan response to application layer immediately.
2019-01-24 14:43:36 +08:00
Tian Hao
6c8a8664aa
component/bt: add a option to make report adv data and scan response individually
...
Originally, when doing BLE active scan, Bluedroid will not report adv to
application layer until receive scan response. This option is used to
disable the behavior. When enable this option, Bluedroid will report
adv data or scan response to application layer immediately.
2019-01-24 14:30:02 +08:00
Michael Reutman
fdd865f22d
Fix typo in error message in esp_bluedroid_init
...
Closes https://github.com/espressif/esp-idf/pull/2835
2019-01-23 16:47:23 +05:30
