Michael (XIAO Xufeng)
8e8e54737d
Merge branch 'bugfix/modbus_fix_slave_id_support_v40' into 'release/v4.0'
...
Bugfix/modbus fix slave id support v40
See merge request espressif/esp-idf!12096
2021-01-25 12:23:57 +08:00
Mahavir Jain
4b50c99957
Merge branch 'bugfix/httpd_session_close_lru_v4.0' into 'release/v4.0'
...
esp_http_server: Add flag in sock_db to identify httpd_sess_close is called from httpd_session_close_lru (v4.0)
See merge request espressif/esp-idf!12114
2021-01-22 21:26:29 +08:00
Mahavir Jain
7d677373e1
Merge branch 'bugfix/http_client_buffer_overread_v4.0' into 'release/v4.0'
...
esp_http_client: Fix buffer overread, update https_request example to use HTTP/1.1 (v4.0)
See merge request espressif/esp-idf!12110
2021-01-22 18:08:49 +08:00
Shubham Kulkarni
1c10469890
Enable lru_purge_enable in simple HTTP server example
2021-01-22 15:35:46 +05:30
Mahavir Jain
5d490dbc1e
Merge branch 'fix/esp_tls_fix_memory_leak_v4.0' into 'release/v4.0'
...
esp-tls: Fix mem leak when global_ca_store is freed
See merge request espressif/esp-idf!12087
2021-01-22 17:37:32 +08:00
Shubham Kulkarni
9951421910
esp_http_server: Add lru_socket flag in sock_db to indicate httpd_sess_close is called from httpd_sess_close_lru
2021-01-22 11:17:17 +05:30
Shubham Kulkarni
d0a4d91838
esp_http_client.c: Clear raw_len for response buffer after dispatching HTTP_EVENT_ON_FINISH event
...
Closes: https://github.com/espressif/esp-idf/issues/6146
2021-01-22 11:04:11 +05:30
aleks
4f7f09a64f
freemodbus: fix compilation issue when slave id support is enabled
...
Closes https://github.com/espressif/esp-idf/issues/6003
2021-01-21 18:50:39 +01:00
Aditya Patwardhan
4df95abb22
esp-tls: Fix mem leak when global_ca_store is freed
2021-01-21 11:31:52 +05:30
Island
38ea44faaf
Merge branch 'bugfix/ble_mesh_node_set_name_status_check_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Remove node set device name return status check (v4.0)
See merge request espressif/esp-idf!12082
2021-01-21 11:08:02 +08:00
Island
9f78bcc36d
Merge branch 'bugfix/ble_mesh_proxy_client_net_resend_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Fix proxy client may fail to resend msg (v4.0)
See merge request espressif/esp-idf!12080
2021-01-21 11:07:41 +08:00
Island
ffc0f59565
Merge branch 'bugfix/ble_mesh_prov_use_diff_rand_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Use different random for each provisioning (v4.0)
See merge request espressif/esp-idf!12078
2021-01-21 11:07:26 +08:00
lly
9d4abeb907
ble_mesh: stack: Remove node set device name return status check
2021-01-20 21:11:33 +08:00
lly
4c86bec0e9
ble_mesh: stack: Fix proxy client may fail to resend msg
2021-01-20 21:10:30 +08:00
lly
8737392af0
ble_mesh: stack: Use different random for each provisioning
2021-01-20 21:09:28 +08:00
David Čermák
b1178d092e
Merge branch 'bugfix/mdns_txt_length_collision_v4.0' into 'release/v4.0'
...
mDNS: Fix of text length calculation when detecting a collision(Backport v4.0)
See merge request espressif/esp-idf!12027
2021-01-19 22:16:08 +08:00
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