alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
14,399 Commits 20 Branches 148 Tags 384 MiB
76b0097103
Commit Graph

14399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
baohongde
76b0097103 components/bt: Fix assert without sw coexist enabled 2021-02-26 14:29:34 +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
Ivan Grokhotkov
74e1613b17 Merge branch 'bugfix/nvs_close_nukes_all_handles_v4.2' into 'release/v4.2' 
NVS: fixed deinit other partition's handles (v4.2)

See merge request espressif/esp-idf!11497
 2021-02-05 10:06:37 +08:00
Ivan Grokhotkov
89cab3140d Merge branch 'bugfix/idf_monitor_baudrate_arg_crash_v4.2' into 'release/v4.2' 
idf monitor: fix crash when monitor baudrate argument set (Backport v4.2)

See merge request espressif/esp-idf!9758
 2021-02-05 10:06:07 +08:00
Mahavir Jain
040f5c8e0a Merge branch 'bugfix/reenable_encrypted_partition_write_v4.2' into 'release/v4.2' 
Re-enable encrypted flash read/writes even if flash encryption is disabled (v4.2)

See merge request espressif/esp-idf!12190
 2021-02-05 01:05:04 +08:00
Mahavir Jain
aa3efa6cf1 Merge branch 'bugfix/protocomm_http_print_v4.2' into 'release/v4.2' 
protocomm_httpd: Change an info print to debug print as it isn't really required in the logs (v4.2)

See merge request espressif/esp-idf!12261
 2021-02-04 23:09:28 +08:00
KonstantinKondrashov
a8df2af065 bootloader: Fix warnings caused by security features 
Closes: https://github.com/espressif/esp-idf/issues/6198
 2021-02-04 22:24:25 +08:00
Piyush Shah
5c6b9d0625 protocomm_httpd: Change an info print to debug print as it isn't really required in the logs 2021-02-04 15:02:52 +05:30
Mahavir Jain
79aa9636b9 unit-test-app: disable encrypted flash read/write in psram config to fix build failure 2021-02-03 09:07:36 +00:00
Mahavir Jain
19b7705b8d 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-02-03 09:07:36 +00:00
Mahavir Jain
294fe8238c 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-02-03 09:07:36 +00:00
Michael (XIAO Xufeng)
0382c2e04e Merge branch 'bugfix/mcpwm_can_set_two_falut_signal_v4.2' into 'release/v4.2' 
mcpwm: fix second fault line broken issue (v4.2)

See merge request espressif/esp-idf!12171
 2021-02-03 14:49:16 +08:00
Anton Maklakov
81680a633f Merge branch 'bugfix/ttfw_idf_find_artifacts_inaccurate_with_same_prefix_path_v4.2' into 'release/v4.2' 
CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one (v4.2)

See merge request espressif/esp-idf!12228
 2021-02-03 11:34:34 +08:00
David Čermák
6fd3557d99 Merge branch 'feature/support_transport_keepalive_v4.2' into 'release/v4.2' 
Feature/support transport keepalive v4.2 [backport v4.2]

See merge request espressif/esp-idf!12157
 2021-02-03 03:46:24 +08:00
Krzysztof Budzynski
f697f475e5 Merge branch 'doc/uart_num_fix_v4.2' into 'release/v4.2' 
docs: fix uart number naming error (v4.2)

See merge request espressif/esp-idf!12068
 2021-02-02 16:08:33 +08:00
Fu Hanxi
d9455d8587 CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one 2021-02-02 11:14:06 +08:00
Mahavir Jain
2ea3519964 Merge branch 'bugfix/update_howsmyssl_cert_v4.2' into 'release/v4.2' 
examples/protocols: update www.howsmyssl.com certificate to fix test failures (v4.2)

See merge request espressif/esp-idf!12211
 2021-02-01 20:25:00 +08:00
Mahavir Jain
0dedf0e1f5 examples/protocols: update www.howsmyssl.com certificate to fix test failures 2021-02-01 11:01:35 +05:30
morris
48dc6e9347 mcpwm: fix second fault line broken 
Closes: https://github.com/espressif/esp-idf/issues/6053
 2021-01-27 14:56:33 +08:00
morris
87b051c87a mcpwm: fix wrong capture edge 2021-01-27 14:56:33 +08:00