lly
574958367f
ble_mesh: stack: Fix mbedtls aes ctx not initialized
2021-02-05 03:26:49 +00:00
Ivan Grokhotkov
5dd22738d6
Merge branch 'bugfix/esp_pm_dump_critical_v4.0' into 'release/v4.0'
...
esp_pm: esp_pm_dump_locks: don't print from a critical section, and fix formatting (backport v4.0)
See merge request espressif/esp-idf!12019
2021-02-05 09:52:40 +08:00
Michael (XIAO Xufeng)
2a7aaacec6
Merge branch 'spi_dma_close_before_cpu_reset_v4.0' into 'release/v4.0'
...
spi: fix issue with closing DMA before CPU reset (4.0)
See merge request espressif/esp-idf!10840
2021-02-05 00:52:09 +08:00
Mahavir Jain
1b5d2bf66e
Merge branch 'bugfix/protocomm_http_print_v4.0' into 'release/v4.0'
...
protocomm_httpd: Change an info print to debug print as it isn't really required in the logs (v4.0)
See merge request espressif/esp-idf!12263
2021-02-04 20:51:19 +08:00
Piyush Shah
948ec32caf
protocomm_httpd: Change an info print to debug print as it isn't really required in the logs
2021-02-04 15:05:22 +05:30
Anton Maklakov
43127a5084
Merge branch 'bugfix/ttfw_idf_find_artifacts_inaccurate_with_same_prefix_path_v4.0' into 'release/v4.0'
...
CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one (v4.0)
See merge request espressif/esp-idf!12230
2021-02-03 11:34:30 +08:00
David Čermák
a6bddd68d2
Merge branch 'feature/support_transport_keepalive_v4.0' into 'release/v4.0'
...
Feature/support transport keepalive v4.0 [backport v4.0]
See merge request espressif/esp-idf!12155
2021-02-02 22:00:53 +08:00
Mahavir Jain
e454fdb8fc
Merge branch 'bugfix/reenable_encrypted_partition_write_v4.0' into 'release/v4.0'
...
Re-enable encrypted flash read/writes even if flash encryption is disabled (v4.0)
See merge request espressif/esp-idf!12192
2021-02-02 18:30:27 +08:00
Fu Hanxi
f39d69b592
CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one
2021-02-02 11:14:28 +08:00
Mahavir Jain
7b60b944b1
Merge branch 'bugfix/update_howsmyssl_cert_v4.0' into 'release/v4.0'
...
examples/protocols: update www.howsmyssl.com certificate to fix test failures (v4.0)
See merge request espressif/esp-idf!12213
2021-02-01 18:18:29 +08:00
Mahavir Jain
ae1aef7b9e
examples/protocols: update www.howsmyssl.com certificate to fix test failures
2021-02-01 11:10:38 +05:30
Mahavir Jain
544a2a4f4e
unit-test-app: disable encrypted flash read/write in psram config to fix build failure
2021-01-29 11:45:51 +05:30
Mahavir Jain
d82adb482b
spi_flash: add config option to enable encrypted partition read/write
...
This feature can be disabled to save some IRAM (approx 1KB) for cases
where flash encryption feature is not required.
2021-01-29 11:45:50 +05:30
Mahavir Jain
9c169a1812
Revert "esp_partition: disable encrypted reads/writes if flash encryption is disabled"
...
This reverts commit bf35ef1ce7
.
It has been noticed that there are scenarios where even though firmware is not enabled
with flash encryption config feature, it should be able to write to encrypted partitions.
This revert adds the feature back which was removed around v4.0 timelines, and same
change will be backported to all releases (upto v4.0) for consistency.
2021-01-29 11:45:50 +05:30
yuanjm
9ada8df5c0
Make OTA example support keepalive
2021-01-25 21:01:31 +08:00
Shubham Kulkarni
985de73e6d
Add options for esp_http_client and esp_websocket_client to support keepalive
2021-01-25 21:01:30 +08:00
yuanjm
7201411f49
Modify esp-tls and tcp_transport to support keep alive for tcp and ssl connection
2021-01-25 21:01:25 +08:00
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