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
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
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
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
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
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
Hrishikesh Dhayagude
11a5fb8ab6
components/bt: Remove warnings in btc_gatts_arg_deep_copy() that are confusing
...
Fixes: https://github.com/espressif/esp-idf/issues/2811
The warning print "NULL value" is only kept for event
BTC_GATTS_ACT_SET_ATTR_VALUE as this can be useful in case user forgets
to set attribute value
Signed-off-by: Hrishikesh Dhayagude <hrishi@espressif.com>
2018-12-20 14:20:56 +05:30
Jiang Jiang Jian
65142bc59e
Merge branch 'bugfix/btdm_configure_ssp_in_menuconfig' into 'master'
...
components/bt: Configure SSP in menuconfig and fix two bugs
See merge request idf/esp-idf!3892
2018-12-20 15:31:08 +08:00
baohongde
d601ed8023
components/bt: Fix two bugs about pairing
...
1. Fix Legacy Pairing failed without remote device name
2. Fix discovery no device after disabling SSP
2018-12-20 11:10:52 +08:00
baohongde
45e59a9f56
components/bt: Fix two bugs about pairing
...
1. Fix Legacy Pairing failed without remote device name
2. Fix discovery no device after disabling SSP
2018-12-19 19:42:47 +08:00
Jiang Jiang Jian
ded8b0102a
Merge branch 'bugfix/btdm_fix_auth_mode_error_when_reconnection_in_smp_v3.2' into 'release/v3.2'
...
Component/bt: fix auth_mode error when reconnection in SMP (backport v3.2)
See merge request idf/esp-idf!3955
2018-12-14 18:24:01 +08:00
Jiang Jiang Jian
bc30569842
Merge branch 'bufix/btdm_fix_save_key_when_auth_mode_without_bond' into 'master'
...
Component/bt: fix save keys when auth mode without bond
See merge request idf/esp-idf!3782
2018-12-14 10:35:14 +08:00
zhiweijian
2c1e3d1ef2
Component/bt: fix save keys when auth mode without bond
2018-12-13 15:45:53 +08:00
zhiweijian
7c6211fe45
Component/bt: fix save keys when auth mode without bond
2018-12-13 15:43:31 +08:00
zhiweijian
bf608b6709
Component/bt: fix auth_mode error when reconnection in SMP
2018-12-13 15:33:37 +08:00
zhiweijian
5c5799fa51
Component/bt: fix auth_mode error when reconnection in SMP
2018-12-04 18:05:25 +08:00
zhiweijian
dd3d89db49
Component/bt: add update duplicate scan exceptional list APIs
2018-11-23 16:46:17 +08:00
Jiang Jiang Jian
69c9e050b0
Merge branch 'bugfix/btdm_add_check_peer_addr_type_in_set_adv_params' into 'master'
...
Component/bt: add check peer addr type in set adv params
See merge request idf/esp-idf!3732
2018-11-20 20:02:13 +08:00
zhiweijian
c59c40741b
Component/bt: add check peer addr type in set adv params
2018-11-19 17:15:41 +08:00
zhiweijian
3c7819eaf2
Component/bt: add check peer addr type in set adv params
2018-11-19 17:04:48 +08:00
baohongde
b021bbdc80
components/bt: Some errors in comment
2018-11-16 15:27:28 +08:00
baohongde
ac5a3443a4
components/bt: Some errors in comment
2018-11-16 11:27:22 +08:00
Jiang Jiang Jian
71f1a34540
Merge branch 'feature/btdm_support_oob_in_SMP' into 'master'
...
Component/bt: support OOB in SMP
See merge request idf/esp-idf!3496
2018-11-08 16:44:15 +08:00
Hrishikesh Dhayagude
2c353edbc4
components/bt: Fix btc_gatts_arg_deep_copy() and bta_gatts_indicate_handle()
2018-11-06 21:01:54 +08:00
Jiang Jiang Jian
ded53bd0ff
Merge branch 'bugfix/btdm_allow_a2dp_codec_dynamic_alloc' into 'master'
...
bugfix/btdm_allow_a2dp_codec_dynamic_allocated
See merge request idf/esp-idf!3598
2018-11-06 11:56:30 +08:00
Jiang Jiang Jian
a60a71ff07
Merge branch 'bugfix/btdm_name_buffer_allocation_size_differs' into 'master'
...
components/bt: Fix the different size of name buffer allocation size
See merge request idf/esp-idf!3587
2018-11-01 15:56:45 +08:00
wangmengyang
7bb83b0056
component/bt: allow dynamic allocation of SBC encoder/decoder buffer used in A2DP to save internal DRAM
2018-10-31 16:11:49 +00:00
baohongde
e19a352a2b
components/bt: Fix the different size of name buffer allocation size
...
Close https://github.com/espressif/esp-idf/issues/2615
2018-10-31 17:39:31 +08:00
Jiang Jiang Jian
39c03558e8
Merge branch 'bugfix/btdm_add_attr_handle_for_ESP_GATTS_CONF_EVT' into 'master'
...
Component/bt: add attr_handle for ESP_GATTS_CONF_EVT
See merge request idf/esp-idf!3492
2018-10-31 17:20:47 +08:00
Jiang Jiang Jian
0bc364f7ea
Merge branch 'bugfix/btdm_add_sniff_mode_to_spp' into 'master'
...
components/bt: Add sniff mode to SPP
See merge request idf/esp-idf!3472
2018-10-26 11:38:50 +08:00
zhiweijian
4e81705ca2
Component/bt: support OOB in SMP
2018-10-25 07:09:59 +00:00
zwj
501ebabc4e
component/bt: fix remove bond list failed
2018-10-24 23:23:50 +00:00
zhiweijian
44827bb681
Component/bt: add attr_handle for ESP_GATTS_CONF_EVT
2018-10-19 08:19:36 +00:00
baohongde
a6d054b079
components/bt: Add sniff mode to SPP
...
In idle state for a while, SPP will enter sniff mode.
2018-10-12 11:22:28 +08:00