Cao Sen Miao
f80f4cbf2d
ci: move freerom/sdmmc repo to psram3 for saving ram
2021-03-11 13:54:15 +08:00
Cao Sen Miao
54b817a59e
flash_encryption: Quick fixed the issue that block when flash_encryption_write, Related https://github.com/espressif/esp-idf/issues/6322 , Related https://github.com/espressif/esp-idf/issues/6254
2021-03-11 13:52:28 +08:00
Angus Gratton
32b0264529
Merge branch 'doc/flash_enc_update_v4.2' into 'release/v4.2'
...
docs: update flash encryption docs for S2
See merge request espressif/esp-idf!12324
2021-03-09 06:41:53 +00:00
Jiang Jiang Jian
37a8c8ce6c
Merge branch 'bugfix/btdm_crash_when_esp_restart_v4.2' into 'release/v4.2'
...
components/bt: Fix crash in Bluetooth when esp_restart
See merge request espressif/esp-idf!12567
2021-03-05 12:27:43 +00:00
Jiang Jiang Jian
2289d4fcc0
Merge branch 'bugfix/fix_csa_channel_crash_v4.2' into 'release/v4.2'
...
esp_wifi: fix CSA and BAR crash issue(v4.2)
See merge request espressif/esp-idf!12549
2021-03-05 12:24:33 +00:00
Jiang Jiang Jian
e1f1d11b76
Merge branch 'feature/add_init_and_deinit_evt_for_a2dp_4_2' into 'release/v4.2'
...
feature/ Add A2DP Init and Deinit Complete Evt [backport v4.2]
See merge request espressif/esp-idf!12150
2021-03-05 12:19:18 +00:00
Mahavir Jain
24157cc60a
Merge branch 'fix/esp_tls_prevent_freeing_global_CA_store_after_each_request_v4.2' into 'release/v4.2'
...
fix(esp_tls): prevent freeing global CA store after each request (v4.2)
See merge request espressif/esp-idf!12631
2021-03-05 08:52:38 +00:00
Aditya Patwardhan
a2ccb3c0ac
protocomm: Fixed NULL check of allocated memory
...
Fixes one part of - https://github.com/espressif/esp-idf/issues/6440
2021-03-05 10:06:18 +05:30
Aditya Patwardhan
a2e6db19e6
esp_tls: Fix misplaced paranthesis in esp_tls_mbedtls.c
...
Fixes one part of - https://github.com/espressif/esp-idf/issues/6440
2021-03-05 10:06:10 +05:30
Aditya Patwardhan
d66ad18853
Fix esp_tls: Prevent freeing of global ca store after each connection
...
when dynamic ssl buffers are enabled
2021-03-05 09:55:10 +05:30
Michael (XIAO Xufeng)
e7435a75f5
Merge branch 'bugfix/phy_xpd_v4.2' into 'release/v4.2'
...
wifi: add set_xpd_sar override(backport v4.2)
See merge request espressif/esp-idf!11540
2021-03-04 08:41:17 +00:00
Mahavir Jain
10d40bd526
Merge branch 'bugfix/correct_logging_timestamp_format_v4.2' into 'release/v4.2'
...
log: correct timestamp formatting to unsigned integer type (v4.2)
See merge request espressif/esp-idf!12611
2021-03-04 07:39:33 +00:00
Mahavir Jain
a177897f4d
log: correct timestamp formatting to unsigned integer type
...
Closes https://github.com/espressif/esp-idf/issues/6226
Closes IDFGH-4393
2021-03-04 11:54:30 +05:30
ChenJianxing
1f3b6b2e6d
esp_wifi: fix CSA and BAR crash issue.
2021-03-02 11:51:01 +08:00
KonstantinKondrashov
33236c9593
doc: update S2 flash encryption & secure boot docs
2021-03-01 17:48:17 +08:00
baohongde
70de8f5158
components/bt: Fix crash in Bluetooth when esp_restart
2021-03-01 14:43:45 +08:00
Mahavir Jain
77a78a22f6
Merge branch 'bugfix/esp_wifi_deinit_v4.2' into 'release/v4.2'
...
esp_wifi_deinit: Return ESP_ERR_WIFI_NOT_STOPPED if wifi is not stopped (v4.2)
See merge request espressif/esp-idf!12540
2021-03-01 05:32:08 +00:00
Shubham Kulkarni
9689f87887
esp_wifi_deinit: Return ESP_ERR_WIFI_NOT_STOPPED if wifi is not stopped
...
Add test case to test this workflow
2021-02-26 14:53:59 +05:30
Marius Vikhammer
da809e92b7
docs: update S2 flash encryption docs
2021-02-26 01:42:04 +08:00
Angus Gratton
af8bc4c436
Merge branch 'bugfix/SECURE_DISABLE_ROM_DL_MODE_does_not_work_v4.2' into 'release/v4.2'
...
bootloader: SECURE_ENABLE_SECURE_ROM_DL_MODE cannot be y when SECURE_DISABLE_ROM_DL_MODE=y (v4.2)
See merge request espressif/esp-idf!12341
2021-02-24 09:40:44 +00:00
Michael (XIAO Xufeng)
807e864d7d
Merge branch 'revert-983220e2_v4.2' into 'release/v4.2'
...
ci: enable RS485 related tests again (v4.2)
See merge request espressif/esp-idf!12463
2021-02-24 06:45:58 +00:00
Krzysztof Budzynski
d960752cd9
Merge branch 'docs/remove_rtd_pdf_link_v4.2' into 'release/v4.2'
...
docs: remove rtd pdf link (v4.2)
See merge request espressif/esp-idf!12466
2021-02-23 10:45:37 +00:00
Marius Vikhammer
c0ae1f03a4
docs: remove RTD download PDF links
...
PDF download is available from the version selector menu.
Read the docs links are out of date.
2021-02-23 11:39:33 +08:00
Michael (XIAO Xufeng)
c4fe55d42a
Revert "ci: temporarily disable RS485 related tests"
...
This reverts commit 983220e216
2021-02-23 11:00:37 +08:00
Michael (XIAO Xufeng)
e511dd58b3
Merge branch 'bugfix/freemodbus_fix_parity_propagation_issue_v42' into 'release/v4.2'
...
Bugfix/freemodbus fix parity propagation issue (Backport v4.2)
See merge request espressif/esp-idf!12389
2021-02-22 05:23:02 +00:00
Ivan Grokhotkov
af1ebd7e01
Merge branch 'bugfix/eclipse_make_decode_v4.2' into 'release/v4.2'
...
tools: Fix Eclipse build: “UnicodeDecodeError: 'ascii' codec can't decode byte” (v4.2)
See merge request espressif/esp-idf!12358
2021-02-19 15:55:37 +00:00
Ivan Grokhotkov
9ebdeea54e
Merge branch 'feature/prefer_python3_in_installer_v4.2' into 'release/v4.2'
...
tools: Prefer python3 during install and export (v4.2)
See merge request espressif/esp-idf!12377
2021-02-19 15:52:45 +00:00
Mahavir Jain
cbe966135e
Merge branch 'bugfix/fix_enable_reset_provision_cause_device_crash_v4.2' into 'release/v4.2'
...
provisioning: Fix enable CONFIG_EXAMPLE_RESET_PROVISIONED will cause device crash [backport v4.2]
See merge request espressif/esp-idf!12352
2021-02-19 12:57:27 +00:00
yuanjm
9240750bf4
provisioning: Fix enable CONFIG_EXAMPLE_RESET_PROVISIONED will cause device crash
2021-02-19 11:31:51 +00:00
Island
cd9237f871
Merge branch 'bugfix/ignore_null_valued_comb_key_4_2' into 'release/v4.2'
...
Bugfix/ignore null valued comb key 4 2
See merge request espressif/esp-idf!12346
2021-02-18 13:58:25 +00:00
Chinmay Chhajed
8455518127
component/bt: Added check for NULL valued combination key.
2021-02-18 06:12:17 +00:00
Chinmay Chhajed
24291f7a3b
Bluedroid: Do not initiate/accept connection with device having same BDADDR.
...
Added BD_ADDR comparison in l2cu_lcp_allocate and removed check from
security connection request handler as it's handled in l2cu_lcp_allocate
for both connection request and create connection.
2021-02-18 06:12:17 +00:00
Chinmay Chhajed
359509ccdc
bt: removed esp_bt_get_mac()
...
There was no need for this function as there is already a way present to
fetch own mac address. Own mac addr can be fetched by calling
controller_get_interface().
2021-02-18 06:12:17 +00:00
Angus Gratton
ceb11fd543
Merge branch 'bugfix/cmake_example_sdkconfig_path_v4.2' into 'release/v4.2'
...
cmake/example: Move idf_as_lib sdkconfig path to project, document configuring project (v4.2)
See merge request espressif/esp-idf!10859
2021-02-17 22:45:21 +00:00
aleks
be68c0e8d8
freemodbus: fix mb controller parity propagation issues
...
Closes https://github.com/espressif/esp-idf/issues/6377
2021-02-17 12:40:34 +01:00
Roland Dobai
2c66dfc089
tools: Prefer python3 during install and export
...
Install and export script should work on systems without "python"
executable.
Closes https://github.com/espressif/esp-idf/pull/6471
Closes https://github.com/espressif/esp-idf/issues/6532
Related to https://github.com/espressif/esp-idf/issues/6421 and
https://github.com/espressif/arduino-esp32/issues/4717
2021-02-14 19:05:33 +01:00
Mahavir Jain
391b2ebcf0
Merge branch 'bugfix/softap_prov_cookies_v4.2' into 'release/v4.2'
...
protocomm_httpd: Use HTTP cookies to track session (v4.2)
See merge request espressif/esp-idf!12265
2021-02-11 10:42:42 +08:00
Patryk Krzywdziński
3b5b61f402
Fix eclipse build: “UnicodeDecodeError: 'ascii' codec can't decode byte”
...
Closes https://github.com/espressif/esp-idf/pull/6505
2021-02-10 12:49:56 +01:00
Piyush Shah
d228fc826c
protocomm security1: Restart security session if SESSION_STATE_CMD0 is received
...
With the introduction of cookies to track a session, it is possible that the
clients restart the provisioning on the same session, specifically when a user
cancels a current provisioning attempt. This can result in an error as the state
on the device side and client side will go out of sync.
This has now been changed such that if SESSION_STATE_CMD0 is received on
an existing session, the state is reset and flow allowed to continue.
2021-02-10 15:47:29 +05:30
Piyush Shah
328254c631
protocomm_httpd: Use HTTP cookies to track session
...
Earlier, a "socket connection" was being considered as a protocomm "session".
However, for HTTP, we cannot expect clients to necessarily use the same
socket for all requests of a given transaction. This was indeed causing
some failures for Wi-Fi provisioning from Android phones.
So, we have introduced http cookies to track a session even if the socket
connection does not stay intact throughout the transaction.
This change is backward compatible. If the client does not use cookies, the
socket connection will be considered as the session.
Closes: https://github.com/espressif/esp-idf/issues/6316
Reference: https://github.com/espressif/esp-idf/pull/6330
2021-02-10 15:47:28 +05:30
Angus Gratton
2dd5a87cf1
Merge branch 'bugfix/websocket_example_error_handling_v4.2' into 'release/v4.2'
...
ci: Fix websocket example test error handling
See merge request espressif/esp-idf!11657
2021-02-10 15:51:32 +08:00
Yann Pomarède
4abc541d6f
bootloader: SECURE_ENABLE_SECURE_ROM_DL_MODE cannot be y when SECURE_DISABLE_ROM_DL_MODE=y
...
Closes: https://github.com/espressif/esp-idf/pull/6442
2021-02-09 16:34:30 +08:00
Island
1df0c17b98
Merge branch 'bugfix/ble_mesh_server_model_deinit_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Fix deinit server models with no matching id (v4.2)
See merge request espressif/esp-idf!12314
2021-02-09 16:25:39 +08:00
Angus Gratton
660f41772c
ci: Fix websocket example test error handling
...
If connection fails for websocket test, a second exception was generated in
__exit__
2021-02-09 06:59:56 +00:00
Angus Gratton
ea476f1731
Merge branch 'bugfix/SECURE_ENABLE_SECURE_ROM_DL_MODE_v4.2' into 'release/v4.2'
...
bootloader: Fix warnings caused by security features (v4.2)
See merge request espressif/esp-idf!12286
2021-02-09 11:06:50 +08:00
lly
4070a6dc70
ble_mesh: stack: Fix deinit server models with no matching id
2021-02-07 11:18:31 +08:00
Jiang Jiang Jian
0ab739f72c
Merge branch 'bugfix/ble_mesh_wifi_coexit_example_v4.2' into 'release/v4.2'
...
bugfix: Delete local variables to avoid null global variables (backport v4.2)
See merge request espressif/esp-idf!11372
2021-02-05 20:21:58 +08:00
Island
3f46cb9789
Merge branch 'bugfix/ble_mesh_mbedtls_aes_fix_v4.2' into 'release/v4.2'
...
Bugfix/ble mesh mbedtls aes fix (v4.2)
See merge request espressif/esp-idf!12270
2021-02-05 14:46:00 +08:00
lly
c74c7fdb5a
ble_mesh: stack: Fix mbedtls aes ctx not deallocated
2021-02-05 03:26:26 +00:00
lly
02d3d358b5
ble_mesh: stack: Fix mbedtls aes ctx not initialized
2021-02-05 03:26:26 +00:00