Jiang Jiang Jian
a61ec41740
Merge branch 'bugfix/btdm_blufi_send_custom_data_will_congested_after_connection_is_broken_v4.0' into 'release/v4.0'
...
component/bt: fix Blufi sends customer data will congested when connection is broken(backport v4.0)
See merge request espressif/esp-idf!11849
2021-01-19 21:44:35 +08:00
Island
c23c45a12a
Merge branch 'bugfix/ble_mesh_log_macro_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Add prefix for log macros (v4.0)
See merge request espressif/esp-idf!12053
2021-01-19 17:34:26 +08:00
Angus Gratton
c26e20770d
Merge branch 'bugfix/soc_cpu_signed_compare_v4_0_pr5687' into 'release/v4.0'
...
fix compiler warning: comparison of integer expressions of different...
See merge request espressif/esp-idf!12049
2021-01-19 15:46:30 +08:00
Angus Gratton
7c204c38dd
Merge branch 'bugfix/idf_py_disable_cmake_warnings_default_v4.0' into 'release/v4.0'
...
idf.py: disable cmake uninitialized variable warnings by default (v4.0)
See merge request espressif/esp-idf!10203
2021-01-19 14:21:50 +08:00
lly
421f044eea
ble_mesh: stack: Fix compile warning when log is disabled
2021-01-19 14:05:25 +08:00
lly
3e5d2b9c41
ble_mesh: ci: Add disable log sdkconfig test files
2021-01-19 14:05:25 +08:00
lly
f9152550d2
ble_mesh: stack: Add prefix BLE_MESH_ for log related macros
2021-01-19 14:05:25 +08:00
SiLeader
d7c8dd270f
fix compiler warning: comparison of integer expressions of different signedness: 'int' and 'unsigned int'
...
Merges https://github.com/espressif/esp-idf/pull/5687
Equivalent fix to https://github.com/espressif/esp-idf/issues/6120 for v4.0 branch
2021-01-19 09:15:52 +11:00
Jiang Jiang Jian
a3cee22e7e
Merge branch 'bugfix/fix_some_wifi_bugs_0105_v4.0' into 'release/v4.0'
...
Bugfix/fix some wifi bugs 0105 v4.0 (backport v4.0)
See merge request espressif/esp-idf!11906
2021-01-18 21:22:29 +08:00
Jiang Jiang Jian
822e64d312
Merge branch 'bugfix/fix_iperf_example_crash_issue_v4.0' into 'release/v4.0'
...
Bugfix/fix iperf example crash issue v4.0 (backport v4.0)
See merge request espressif/esp-idf!12020
2021-01-18 19:18:07 +08:00
Island
ff7db0cdc4
Merge branch 'update/ble_mesh_set_hsl_states_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Enable updating lighting hsl state (v4.0)
See merge request espressif/esp-idf!12037
2021-01-18 19:10:26 +08:00
Island
173a5fc131
Merge branch 'bugfix/ble_mesh_build_error_c3_merge_master_v4.0' into 'release/v4.0'
...
Bugfix/ble mesh build error merge master (v4.0)
See merge request espressif/esp-idf!12039
2021-01-18 19:10:01 +08:00
lly
7134ef67cf
ble_mesh: stack: Fix compile warning with BIT macro
2021-01-18 14:08:49 +08:00
lly
d42f39dcb4
ble_mesh: stack: Update mesh max conn macro when using bluedroid
2021-01-18 14:08:12 +08:00
lly
5c1e3eabc1
ble_mesh: stack: Enable updating lighting hsl state
2021-01-18 14:02:01 +08:00
Island
3a56233a4d
Merge branch 'bugfix/bluedroid_avoid_same_bdaddr_conn_v4.0' into 'release/v4.0'
...
Bluedroid: Do not connect if peer BD_ADDR is same as own BD_ADDR. (v4.0)
See merge request espressif/esp-idf!11992
2021-01-18 14:01:19 +08:00
suren.gabrielyan
52fa88b54e
mDNS: Fix of text length calculation when detecting a collision
2021-01-15 16:53:27 +04:00
suren.gabrielyan
0f80a4bd47
mDNS: Fix of collision detection during txt length calculation
...
Closes https://github.com/espressif/esp-idf/issues/6114
2021-01-15 16:53:09 +04:00
xiehang
eb1a1620fe
example: Scan failure should not cause system crash
2021-01-15 20:03:25 +08:00
xiehang
7778034cba
example: do not check the return value of esp_wifi_connect()
2021-01-15 20:00:40 +08:00
Ivan Grokhotkov
9d9d30965f
esp_pm: fix formatting issues in esp_pm_dump_locks
...
- line was truncated because 64 characters were not sufficient
- length passed to snprintf should be full buffer length, not -1
- make the width of lock name field fixed
- fix alignment of lock type column
2021-01-15 12:42:34 +01:00
Ivan Grokhotkov
62da2362a8
esp_pm: esp_pm_dump_locks: don't print from a critical section
...
Reported in https://github.com/espressif/esp-idf/issues/1917
2021-01-15 12:40:17 +01:00
xiehang
9370b74ee0
esp_wifi: Update WiFi lib
...
1. Add check CSA state before CSA timer process
2. Change wifi scan duration from 120ms to 100ms
3. Using deport reg instead of ahb
4. Check TID in ieee80211_recv_bar()
5. Revert to report specific reason code when receiving deauth during 4-way-handshark
6. Fix the bug that tx ampdu parameter is not from peer device
7. Refactor wifi_interface_t
8. Faster WiFi station connect improvement, avoid 100ms passive scan
9. Add FCS failed packets filter
10.Update esp32 phy lib to v4660
11.Fix csa timer issue
12.Fix country code last byte to space instead of NULL
13.Fix softap cannot forward A-MSDU
14.Fix max tx power to 20dBm
15.Fix the issue that the esp_wifi_sta_get_ap_info can't get country
2021-01-15 03:51:36 +00:00
xiehang
155a7f816d
esp_wifi: ESP32 phy add [sections:phy_iram]
2021-01-15 03:51:36 +00:00
ChenJianxing
9eb34fd153
esp_wifi: optimize phy version log
2021-01-15 03:51:36 +00:00
ronghulin
70777a256a
bugfix: fix some wifi bugs
...
1. fix max tx power to 20dBm
2. fix the issue that the esp_wifi_sta_get_ap_info can't get country
Closes https://github.com/espressif/esp-idf/issues/6267
2021-01-15 03:51:36 +00:00
Island
5718652952
Merge branch 'bugfix/ble_mesh_macro_OR_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Fix using wrong | for OR between macros (v4.0)
See merge request espressif/esp-idf!11995
2021-01-14 19:01:15 +08:00
lly
4902b2745b
ble_mesh: stack: Fix using wrong | for OR between macros
2021-01-14 15:59:46 +08:00
Island
a47099b028
Merge branch 'feat/ble_mesh_support_ble_scan_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Add BLE scan callback when mesh is enabled (v4.0)
See merge request espressif/esp-idf!11965
2021-01-14 15:47:52 +08:00
Chinmay Chhajed
c4fe4dbf67
Bluedroid: Do not connect if peer BD_ADDR is same as own BD_ADDR.
2021-01-14 12:23:04 +05:30
Jiang Jiang Jian
f2038b959a
Merge branch 'bugfix/fix_spp_vfs_dynamic_memory_bugs_v4.0' into 'release/v4.0'
...
component_bt/fix spp vfs demo crash when use dynamic memory[backport v4.0]
See merge request espressif/esp-idf!11729
2021-01-14 11:19:34 +08:00
Mahavir Jain
5a64638848
Merge branch 'fix/esp_tls_add_warning_if_ca_chain_has_invalid_cert_v4.0' into 'release/v4.0'
...
esp_tls: Add warning if the CA chain provided contains one/more invalid cert
See merge request espressif/esp-idf!11943
2021-01-12 23:26:55 +08:00
lly
024017e3f2
ble_mesh: ci: Add ble & ble mesh coex sdkconfig test files
2021-01-12 19:15:36 +08:00
lly
f9b53a909b
ble_mesh: stack: Support reporting normal ble adv packets
2021-01-12 19:15:36 +08:00
lly
34b5c1cf72
ble_mesh: stack: Add a btc file for ble coex functions
...
Previously if starting/stopping BLE advertising when BLE Mesh
is enabled, the corresponding events will be notified through
the callback registered by esp_ble_mesh_register_prov_callback().
With this commit, the func esp_ble_mesh_register_ble_callback()
needs to be invoked for resgitering the callback used for BLE
coexistence related functionalities (i.e. ADV/SCAN).
2021-01-12 19:15:36 +08:00
lly
88b550ba75
ble_mesh: stack: Move ble scan funcitons to a single file
2021-01-12 19:15:35 +08:00
lly
d1553311a2
ble_mesh: stack: Optimize handling received mesh adv packets
2021-01-12 19:15:35 +08:00
Island
725f882897
Merge branch 'optimize/ble_mesh_miscellaneous_v4.0' into 'release/v4.0'
...
Optimize/ble mesh miscellaneous (v4.0)
See merge request espressif/esp-idf!11949
2021-01-12 19:13:10 +08:00
lly
73dee43e55
ble_mesh: stack: Move bt_mesh_rand to mesh_common.c
2021-01-11 19:28:36 +08:00
lly
decd6956f3
ble_mesh: stack: Remove useless BT_DBG_ENABLED in a few files
2021-01-11 19:28:31 +08:00
lly
93991bda4a
ble_mesh: Replace zephyr integer types with C99 types [Zephyr]
2021-01-11 19:28:25 +08:00
lly
866b6b439c
ble_mesh: stack: Update ARRAY_SIZE definition
2021-01-11 19:27:55 +08:00
Island
9172fcaa77
Merge branch 'feat/ble_mesh_multiple_nvs_namespace_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Provisioner supports multiple nvs namespaces (v4.0)
See merge request espressif/esp-idf!11936
2021-01-11 18:55:37 +08:00
Aditya Patwardhan
238ac2293b
esp_tls: Add warning if the CA chain provided contains one/more invalid cert
2021-01-11 12:41:07 +05:30
Mahavir Jain
0be9d54b90
Merge branch 'feature/upgrade_mbedtls_to_v4.0' into 'release/v4.0'
...
mbedtls: upgrade to v2.16.9 release (v4.0)
See merge request espressif/esp-idf!11901
2021-01-11 14:01:14 +08:00
lly
63adf8503f
ble_mesh: ci: Add settings sdkconfig test files
2021-01-11 10:08:33 +08:00
lly
8c883fd410
ble_mesh: stack: Provisioner supports multiple nvs namespaces
...
Now Provisioner can use different NVS namespaces to store
different instances of mesh information, for example, for
different user accounts.
2021-01-11 10:08:23 +08:00
Island
c97fc5ef8c
Merge branch 'feat/ble_mesh_provisioner_recv_hb_support_v4.0' into 'release/v4.0'
...
Feat/ble mesh provisioner recv hb support (v4.0)
See merge request espressif/esp-idf!11915
2021-01-08 18:30:28 +08:00
lly
f9f29b779c
ble_mesh: ci: Add enabling hb recv sdkconfig file
2021-01-08 09:33:04 +08:00
lly
f0af8858da
ble_mesh: stack: Provisioner supports receiving heartbeat
2021-01-08 09:33:04 +08:00