Jiang Jiang Jian
cd59d107b2
Merge branch 'bugfix/ble_mesh_node_id_adv_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Fix Node ID adv with wrong timeout (v3.3)
See merge request espressif/esp-idf!11880
2021-01-11 11:46:41 +08:00
Jiang Jiang Jian
66a1b39814
Merge branch 'bugfix/add_macro_to_blufi' into 'release/v3.3'
...
component/bt: Add a macro to control the compilation of blufi.(backport v3.3)
See merge request espressif/esp-idf!11891
2021-01-11 11:45:14 +08:00
Jiang Jiang Jian
1df7be0e58
Merge branch 'feat/ble_mesh_provisioner_recv_hb_support_v3.3' into 'release/v3.3'
...
Feat/ble mesh provisioner recv hb support (v3.3)
See merge request espressif/esp-idf!11916
2021-01-11 11:44:27 +08:00
Jiang Jiang Jian
d3bdcccd3b
Merge branch 'bugfix/fix_wifi_stack_overflow_v3.3' into 'release/v3.3'
...
esp_wifi: Fix WiFi stack overflow issue (v3.3)
See merge request espressif/esp-idf!11889
2021-01-11 11:43:53 +08:00
lly
79a5037ee2
ble_mesh: ci: Add enabling hb recv sdkconfig file
2021-01-08 09:36:52 +08:00
lly
e9caf68d6e
ble_mesh: stack: Provisioner supports receiving heartbeat
2021-01-08 09:35:03 +08:00
xiehang
60291300a2
Revert "esp_wifi: Fix handling of multiple AP credentials in WPS"
...
This reverts commit de0d1fffcd
.
2021-01-06 19:30:56 +08:00
wangcheng
e9d28837ec
component/bt: Add a macro to control the compilation of blufi.
2021-01-06 18:04:30 +08:00
lly
6c6ad3f772
ble_mesh: stack: Fix Node ID adv with wrong timeout
2021-01-05 20:16:42 +08:00
Jiang Jiang Jian
71df1f7422
Merge branch 'bugfix/btdm_blufi_data_sequence_not_reset_after_disconnect_v3.3' into 'release/v3.3'
...
component/bt: fix Blufi sends data after disconnect the seq still increase(backport v3.3)
See merge request espressif/esp-idf!10245
2021-01-05 11:10:35 +08:00
XieWenxiang
d8b42e565c
component/bt: fix Blufi sends data after disconnect the seq still increase(backport v3.3)
2021-01-05 01:53:33 +00:00
Jiang Jiang Jian
509de0aac3
Merge branch 'bugfix/mcpwm_period_error_v3.3' into 'release/v3.3'
...
bugfix(mcpwm_period_error): fix the issue of wrong period (backport v3.3)
See merge request espressif/esp-idf!7186
2021-01-05 09:53:22 +08:00
Jiang Jiang Jian
f3aaa39c43
Merge branch 'bugfix/btdm_blufi_send_longer_custom_data_will_congested_v3.3' into 'release/v3.3'
...
component/bt: fix Blufi sends longer customer data will will lead congested(backport v3.3)
See merge request espressif/esp-idf!11724
2021-01-05 09:51:39 +08:00
Angus Gratton
f61f54ee67
Merge branch 'feature/dis_uart_dl_mode_v3.3' into 'release/v3.3'
...
feature: Disable UART download mode (v3.3)
See merge request espressif/esp-idf!10767
2021-01-04 15:29:14 +08:00
Mahavir Jain
6917a40294
Merge branch 'fix/i2c_pm_lock_v3.3' into 'release/v3.3'
...
i2c: Acquire PM lock after acquiring mutex (v3.3)
See merge request espressif/esp-idf!11833
2020-12-30 18:50:14 +08:00
Sachin Parekh
25147f2560
i2c: Acquire PM lock after acquiring mutex
2020-12-30 13:25:40 +05:30
Jiang Jiang Jian
29e69a12d3
Merge branch 'feature/oocd_ver_backport_v3.3' into 'release/v3.3'
...
tools: Updates OpenOCD version to 'v0.10.0-esp32-20200709' (backport v3.3)
See merge request espressif/esp-idf!9750
2020-12-28 11:50:57 +08:00
Chen Zheng Wei
d3eb487d40
mcpwm: fix the issue of wrong period (backport v3.3)
2020-12-28 03:48:11 +00:00
Jiang Jiang Jian
c4aafb06ce
Merge branch 'feature/nvs_erase_check_init_3.3' into 'release/v3.3'
...
NVS Flash: prevent erasing initialized partition (backport v3.3)
See merge request espressif/esp-idf!10072
2020-12-28 11:46:34 +08:00
Jiang Jiang Jian
777c8bbd44
Merge branch 'bugfix/bt_bluedroid_same_public_key_attack_v3.3' into 'release/v3.3'
...
Bluedroid: Fixes for some Bluetooth vulnerabilities. (v3.3)
See merge request espressif/esp-idf!11767
2020-12-28 11:41:19 +08:00
Chinmay Chhajed
0b84a1242e
Bluedroid: Fixes for some vulnerabilities.
...
This commit fixes 'Impersonation in Passkey entry protocol'
(CVE-2020-26558) and suggests fixes for other vulnerabilites like
'Impersonation in the Pin Pairing Protocol' (CVE-2020-26555) and
'Authentication of the LE Legacy Pairing Protocol'
CVE-2020-26558 can be easily implemented if the peer device can
impersonate our public key. This commit adds a check by comparing our
and received public key and returns failed pairing if keys are same.
This commit also adds comments suggesting to use secure connection when
supported by all devices.
2020-12-25 16:03:33 +05:30
Jiang Jiang Jian
cc8525f630
Merge branch 'bugfix/backport_v3.3_esp_tls_closing_fd0' into 'release/v3.3'
...
Bugfix/backport v3.3 esp tls closing fd0
See merge request espressif/esp-idf!11055
2020-12-24 16:05:11 +08:00
Anton Maklakov
0713c7dbb4
Merge branch 'feature/ci_relative_submodules_v3.3' into 'release/v3.3'
...
CI: relative submodules (v3.3)
See merge request espressif/esp-idf!11735
2020-12-24 11:13:06 +08:00
XieWenxiang
b0719d3fc6
component/bt: fix Blufi sends longer customer data will will lead congested
2020-12-24 09:37:35 +08:00
Jiang Jiang Jian
8ff6e2eee5
Merge branch 'bugfix/wps_multiple_ap_creds_v3.3' into 'release/v3.3'
...
Bugfix/wps multiple ap creds v3.3 (backport v3.3)
See merge request espressif/esp-idf!11727
2020-12-23 23:33:46 +08:00
Anton Maklakov
6dfb8a5fc3
Merge branch 'bugfix/mdns_example_test_exit_v3.3' into 'release/v3.3'
...
ci: Fixed mdns example test to correctly exit helper thread
See merge request espressif/esp-idf!11676
2020-12-23 21:50:18 +08:00
Jiang Jiang Jian
1a6530156d
Merge branch 'bugfix/fix_spp_vfs_dynamic_memory_bugs_v3.3' into 'release/v3.3'
...
component_bt/fix spp vfs demo crash when use dynamic memory[backport v3.3]
See merge request espressif/esp-idf!11725
2020-12-23 21:39:51 +08:00
Anton Maklakov
5487864df9
tools: Add a script for switching to real submodules in forks
2020-12-23 17:41:33 +07:00
Anton Maklakov
d7d8857fc5
ci: Use relative submodule URLs over IDF. Correct CI accordindly
...
Clean up `before_script`s
Update `check_submodule_sync`
Remove tools/ci/mirror* stuff
2020-12-23 17:41:33 +07:00
Anton Maklakov
69cd53dbd9
ci: Remove unused IS_PRIVATE and IS_PUBLIC environment
2020-12-23 16:52:57 +07:00
xutao
9c252b8f22
bugfix: backport esp_tls_closing_fd0 to v3.3
2020-12-23 09:51:48 +00:00
xiehang
56416dddda
esp_wifi: Updata WiFi lib
...
1. Fix handling of multiple AP credentials in WPS
2. Fix esp_wifi log levels
2020-12-23 15:48:06 +08:00
xiehang
de0d1fffcd
esp_wifi: Fix handling of multiple AP credentials in WPS
...
WPS can send multiple AP credentials, while existing implementation
will only use the first credentials which could be for the 5G band.
Fix this by passing these credentials to the App and attempting
to connect using each of those. Older Apps will remain compatible
without breaking WPS, but the issue will remain.
2020-12-23 15:05:28 +08:00
liqigan
46fa26b56f
fix spp vfs demo crash when use dynamic memory
2020-12-23 14:44:48 +08:00
Jiang Jiang Jian
896180ec73
Merge branch 'bugfix/collection_bugfix_backport_for_3_3' into 'release/v3.3'
...
Bugfix/collection bugfix backport for 3 3
See merge request espressif/esp-idf!11708
2020-12-23 11:23:14 +08:00
Jiang Jiang Jian
1e747edd7d
Merge branch 'bugfix/blufi_config_potential_double_free_v3.3' into 'release/v3.3'
...
component/bt: Fix a potential double free error.
See merge request espressif/esp-idf!11716
2020-12-23 11:22:40 +08:00
wangcheng
929ad413cb
component/bt: Fix a potential double free error.
2020-12-22 19:09:15 +08:00
weitianhua
282d234ea5
components/bt: Fixed the problem of early release of pointer(p_ccb) in funcion
2020-12-22 15:12:55 +08:00
weitianhua
86de405578
Collection of bugfix backport for release/v3.3
2020-12-22 15:08:59 +08:00
Jiang Jiang Jian
3e6dd18075
Merge branch 'bugfix/revert_tx_optimization_v3.3' into 'release/v3.3'
...
esp_wifi: revert tx optimization(v3.3)
See merge request espressif/esp-idf!11688
2020-12-21 23:19:08 +08:00
Jiang Jiang Jian
1b4a46a28f
Merge branch 'bugfix/ipv6_check_ns_na_packet_length' into 'release/v3.3'
...
lw-ip:bugfix for ipv6 check ns na packet length
See merge request espressif/esp-idf!11680
2020-12-21 23:18:27 +08:00
zhangyanjiao
d5f9d1f748
Revert "esp_wifi: optimize WiFi TX performance"
...
This reverts commit 7b245e59c4
.
2020-12-21 15:53:19 +08:00
Michael (XIAO Xufeng)
ed420aacc0
Merge branch 'bugfix/WEL_DISABLE_V3.3' into 'release/v3.3'
...
spi_flash: ensure wel is diabled when flash is not being operated
See merge request espressif/esp-idf!11653
2020-12-21 15:48:51 +08:00
xueyunfei
ee1f925dff
bugfix for ipv6 check ns na packet length
2020-12-21 10:54:24 +08:00
Jiang Jiang Jian
0a80c654e9
Merge branch 'bugfix/decouple_wifi_bt_with_coex_v3.3' into 'release/v3.3'
...
esp_wifi: decouple Wi-Fi and bluetooth with coexist to reduce binary file size(backport v3.3)
See merge request espressif/esp-idf!11644
2020-12-20 16:26:40 +08:00
David Cermak
86dbff4297
ci: Fixed mdns example test to correctly exit helper thread
2020-12-18 16:54:04 +01:00
Ivan Grokhotkov
857e2f0943
Merge branch 'bugfix/docker_gdb_python_v3.3' into 'release/v3.3'
...
tools/docker: Add libpython2.7 in order to satisfy GDB dependencies (backport v3.3)
See merge request espressif/esp-idf!10310
2020-12-17 23:16:26 +08:00
Angus Gratton
a461605003
efuse: Add ESP32 V3 'disable Download Mode' functionality
2020-12-17 17:44:21 +11:00
Xia Xiaotian
3cf6f36765
esp_wifi: decouple Wi-Fi and bluetooth with coexist to reduce binary file size
2020-12-17 14:21:59 +08:00
Cao Sen Miao
6d63c59ddb
spi_flash: ensure sel is diabled when flash is not being operated
2020-12-17 10:58:49 +08:00