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
13,376 Commits 20 Branches 148 Tags 384 MiB
287695f623
Commit Graph

13376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael (XIAO Xufeng)
657ae5e11e Merge branch 'feat/spi_flash_override_size_v4.1' into 'release/v4.1' 
spi_flash: add config option to override flash size in bootloader header (v4.1)

See merge request espressif/esp-idf!12457
 2021-02-26 02:08:39 +00:00
Island
8ed7a899d7 Merge branch 'bugfix/ble_mesh_server_model_deinit_v4.1' into 'release/v4.1' 
ble_mesh: stack: Fix deinit server models with no matching id (v4.1)

See merge request espressif/esp-idf!12316
 2021-02-25 11:09:48 +00:00
Wang Fang
90118531a7 docs: fix broken example links for release v4.1 2021-02-25 13:41:04 +08:00
Angus Gratton
fcef475989 Merge branch 'bugfix/esptool_version_v4.1' into 'release/v4.1' 
esptool: Update esptool to latest v2.x version

See merge request espressif/esp-idf!11487
 2021-02-24 22:30:37 +00:00
Michael (XIAO Xufeng)
b6bc7e9df8 Merge branch 'revert-983220e2_v4.1' into 'release/v4.1' 
ci: enable RS485 related tests again (v4.1)

See merge request espressif/esp-idf!12464
 2021-02-24 06:45:13 +00:00
Krzysztof Budzynski
0503b02312 Merge branch 'docs/remove_rtd_pdf_link_v4.1' into 'release/v4.1' 
docs: remove rtd pdf link (v4.1)

See merge request espressif/esp-idf!12467
 2021-02-23 10:46:30 +00:00
Marius Vikhammer
10311644e4 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:46:06 +08:00
Michael (XIAO Xufeng)
46d8dad2e1 Revert "ci: temporarily disable RS485 related tests" 
This reverts commit 983220e216
 2021-02-23 11:02:10 +08:00
Michael (XIAO Xufeng)
f6da7f3305 spi_flash: add config option to override flash size in bootloader header 
Sometimes the flash size read from bootloader is not correct. This may
forbid SPI Flash driver from reading the the area larger than the size
in bootloader header.

When the new config option is enabled, the latest configured
ESPTOOLPY_FLAHSIZE in the app header will be used to override the value
read from bootloader header.
 2021-02-23 01:23:53 +08:00
Michael (XIAO Xufeng)
52496189d9 Merge branch 'bugfix/freemodbus_fix_parity_propagation_issue_v41' into 'release/v4.1' 
Bugfix/freemodbus fix parity propagation issue (Backport v4.1)

See merge request espressif/esp-idf!12388
 2021-02-22 05:26:31 +00:00
zwj
ed04398a8c add connection parameter check 2021-02-22 11:29:06 +08:00
zwj
62396e3b23 fix ble connection maximum latency is 499 2021-02-22 11:28:55 +08:00
zwj
37c2b7e9b7 disable bluedroid congest error log print 2021-02-22 11:28:42 +08:00
zhiweijian
490af40be5 fix read multi char failed(GATT_27001) 2021-02-22 11:28:25 +08:00
zhiweijian
89a1f8e7a9 fix add white list failed 2021-02-22 11:28:07 +08:00
zwj
c1f23ada19 fix bluedroid repair faild if the two most significant bits of public address is '01' 2021-02-22 11:27:54 +08:00
zwj
1b6572ec9f - fix congest return value 
- fix system no rsp when doing disconnect
- fix no congest event when ssc do writing performance
 2021-02-22 11:27:39 +08:00
zwj
0e2236a2f1 fix ble read multi char err when the number of handles is more than 10 2021-02-22 11:27:22 +08:00
zwj
e109c9980c fix scan rsp length err 2021-02-22 11:27:09 +08:00
zwj
a2eec8a1e2 fix vendor hci memory leak 2021-02-22 11:26:56 +08:00
Ivan Grokhotkov
b1c383211c Merge branch 'bugfix/eclipse_make_decode_v4.1' into 'release/v4.1' 
tools: Fix Eclipse build: “UnicodeDecodeError: 'ascii' codec can't decode byte” (v4.1)

See merge request espressif/esp-idf!12359
 2021-02-19 15:55:47 +00:00
Ivan Grokhotkov
dc70cd1304 Merge branch 'feature/prefer_python3_in_installer_v4.1' into 'release/v4.1' 
tools: Prefer python3 during install and export (v4.1)

See merge request espressif/esp-idf!12378
 2021-02-19 15:53:29 +00:00
Mahavir Jain
e7e776a535 Merge branch 'bugfix/fix_enable_reset_provision_cause_device_crash_v4.1' into 'release/v4.1' 
provisioning: Fix enable CONFIG_EXAMPLE_RESET_PROVISIONED will cause device crash [backport v4.1]

See merge request espressif/esp-idf!12351
 2021-02-19 12:39:43 +00:00
lly
6b6a883824 ble_mesh: stack: Fix deinit server models with no matching id 2021-02-19 01:03:55 +00:00
Island
77feee975e Merge branch 'bugfix/ignore_null_valued_comb_key_4_1' into 'release/v4.1' 
Bugfix/ignore null valued comb key 4 1

See merge request espressif/esp-idf!12408
 2021-02-18 13:58:52 +00:00
Chinmay Chhajed
a585bb54e4 bt: NULL combkey check and fixed divide by zero error. 
- Added check for NULL valued combination key. (cbc69c8b9)
- Fix divided by zero err & clear timer after remote reject when respond the parameters update (d886f91)
 2021-02-18 15:37:20 +05:30
aleks
471237dab6 freemodbus: fix mb controller parity propagation issues 
Closes https://github.com/espressif/esp-idf/issues/6377
 2021-02-17 12:34:00 +01:00
Mahavir Jain
8938eed1c4 Merge branch 'bugfix/softap_prov_cookies_v4.1' into 'release/v4.1' 
protocomm_httpd: Use HTTP cookies to track session (v4.1)

See merge request espressif/esp-idf!12266
 2021-02-15 04:45:14 +00:00
Angus Gratton
fed98cd6ad ci: ttfw: Encode serial port data to whatever the console encoding is 
This is a bit of a hack, but gives us a way to always log it
 2021-02-15 10:48:30 +11:00
Angus Gratton
65fb2ead1a ci: Log failure to close any DUT 2021-02-15 10:48:30 +11:00
Roland Dobai
52ecfeb337 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:46:28 +01:00
Piyush Shah
3a5be7ce26 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-12 05:53:00 +00:00
Piyush Shah
c13fe0be6e 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-12 05:53:00 +00:00
Angus Gratton
ba17e97665 Merge branch 'bugfix/get_component_requirements_v4.1' into 'release/v4.1' 
cmake: fix getting component requirements (v4.1)

See merge request espressif/esp-idf!9714
 2021-02-11 07:56:19 +08:00
Patryk Krzywdziński
85b96879f2 Fix eclipse build: “UnicodeDecodeError: 'ascii' codec can't decode byte” 
Closes https://github.com/espressif/esp-idf/pull/6505
 2021-02-10 12:50:39 +01:00
Chinmay Chhajed
428e9b008c 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-10 15:13:10 +05:30
Chinmay Chhajed
1c6c6998bc 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-10 15:13:02 +05:30
yuanjm
b497628ef6 provisioning: Fix enable CONFIG_EXAMPLE_RESET_PROVISIONED will cause device crash 2021-02-10 16:05:26 +08:00
Island
131bfd90a4 Merge branch 'bugfix/ble_mesh_mbedtls_aes_fix_v4.1' into 'release/v4.1' 
Bugfix/ble mesh mbedtls aes fix (v4.1)

See merge request espressif/esp-idf!12326
 2021-02-09 16:24:54 +08:00
Angus Gratton
42b126e4dd Merge branch 'bugfix/sign_compare_warning_in_soc_component' into 'release/v4.1' 
fix sign compare warning in soc component

See merge request espressif/esp-idf!11434
 2021-02-09 11:05:12 +08:00
Michael (XIAO Xufeng)
e508a64ae9 Merge branch 'bugfix/mcpwm_can_set_two_falut_signal_v4.1' into 'release/v4.1' 
mcpwm: fix second fault line broken issue (v4.1)

See merge request espressif/esp-idf!12172
 2021-02-08 14:21:43 +08:00
Island
261d107abd Merge branch 'bugfix/ble_mesh_log_macro_v4.1' into 'release/v4.1' 
ble_mesh: stack: Add prefix for log macros (v4.1)

See merge request espressif/esp-idf!12325
 2021-02-07 16:39:38 +08:00
Island
528e9b2818 Merge branch 'bugfix/ble_mesh_prov_use_diff_rand_v4.1' into 'release/v4.1' 
ble_mesh: stack: Use different random for each provisioning (v4.1)

See merge request espressif/esp-idf!12323
 2021-02-07 16:38:42 +08:00
Island
47d859b2a4 Merge branch 'bugfix/ble_mesh_proxy_client_net_resend_v4.1' into 'release/v4.1' 
ble_mesh: stack: Fix proxy client may fail to resend msg (v4.1)

See merge request espressif/esp-idf!12322
 2021-02-07 16:38:36 +08:00
Island
9ef16af05e Merge branch 'bugfix/ble_mesh_node_set_name_status_check_v4.1' into 'release/v4.1' 
ble_mesh: stack: Remove node set device name return status check (v4.1)

See merge request espressif/esp-idf!12321
 2021-02-07 16:38:25 +08:00
Island
3a06fa4bd9 Merge branch 'update/ble_mesh_set_hsl_states_v4.1' into 'release/v4.1' 
ble_mesh: stack: Enable updating lighting hsl state (v4.1)

See merge request espressif/esp-idf!12320
 2021-02-07 16:38:13 +08:00
Island
afcbf0d311 Merge branch 'bugfix/ble_mesh_macro_OR_v4.1' into 'release/v4.1' 
ble_mesh: stack: Fix using wrong | for OR between macros (v4.1)

See merge request espressif/esp-idf!12319
 2021-02-07 16:37:58 +08:00
Island
47d6b3f2b3 Merge branch 'bugfix/ble_mesh_build_error_c3_merge_master_v4.1' into 'release/v4.1' 
Bugfix/ble mesh build error merge master (v4.1)

See merge request espressif/esp-idf!12318
 2021-02-07 16:37:49 +08:00
lly
10b5436cc9 ble_mesh: stack: Fix mbedtls aes ctx not deallocated 2021-02-07 12:06:49 +08:00
lly
5e8695d7be ble_mesh: stack: Fix mbedtls aes ctx not initialized 2021-02-07 12:06:49 +08:00