Darian Leung
5311a60af2
CAN: Simplify caps header
...
This commit simplifies the defines made in the _caps.h header. Kconfig
option dependencies were moved into the LL, and the check for a
valid BRP has bee simplified.
2021-03-09 08:47:57 +08:00
Jiang Jiang Jian
356bf67443
Merge branch 'bugfix/fix_tx_issue_after_esp_restart_v4.1' into 'release/v4.1'
...
components/bt: Shutdown Bluetooth before esp_restart.(V4.1)
See merge request espressif/esp-idf!11756
2021-03-05 12:29:27 +00:00
Jiang Jiang Jian
8cfb4a2426
Merge branch 'bugfix/fix_csa_channel_crash_v4.1' into 'release/v4.1'
...
esp_wifi: fix CSA and BAR crash issue(v4.1)
See merge request espressif/esp-idf!12550
2021-03-05 12:24:18 +00:00
Jiang Jiang Jian
f71577afe0
Merge branch 'feature/add_init_and_deinit_evt_for_a2dp_4_1' into 'release/v4.1'
...
feature/ Add A2DP Init and Deinit Complete Evt [backport v4.1]
See merge request espressif/esp-idf!12151
2021-03-05 12:21:12 +00:00
Jiang Jiang Jian
34e1d1d69f
Merge branch 'bugfix/fix_a2dp_underrun_issue_4_1' into 'release/v4.1'
...
Fix A2DP Underrun Issue [backport v4.1]
See merge request espressif/esp-idf!12278
2021-03-05 12:18:45 +00:00
Mahavir Jain
4567b6e866
Merge branch 'bugfix/correct_logging_timestamp_format_v4.1' into 'release/v4.1'
...
log: correct timestamp formatting to unsigned integer type (v4.1)
See merge request espressif/esp-idf!12612
2021-03-05 09:27:04 +00:00
Aditya Patwardhan
5b215dbc9e
protocomm: Fixed NULL check of allocated memory
...
Fixes one part of - https://github.com/espressif/esp-idf/issues/6440
2021-03-05 10:10:55 +05:30
Aditya Patwardhan
b8274496f9
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:10:55 +05:30
Mahavir Jain
188eb221aa
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:47 +05:30
Jiang Jiang Jian
d481781180
Merge branch 'bugfix/fix_spp_vfs_dynamic_memory_bugs_v4.1' into 'release/v4.1'
...
component_bt/fix spp vfs demo crash when use dynamic memory[backport v4.1]
See merge request espressif/esp-idf!11728
2021-03-04 03:34:43 +00:00
ChenJianxing
a7302a6880
esp_wifi: fix CSA and BAR crash issue
2021-03-02 11:32:46 +08:00
baohongde
cc49472ea4
components/bt: Fix crash in Bluetooth when esp_restart
2021-03-01 14:46:26 +08:00
baohongde
fdfc95812c
components/bt: Shutdown Bluetooth before esp_restart.
2021-03-01 14:46:05 +08:00
Shubham Kulkarni
761a3cdeae
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:56:42 +05:30
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
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)
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
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
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
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
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
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
lly
829b16a997
ble_mesh: stack: Fix compile warning when log is disabled
2021-02-07 12:03:24 +08:00
lly
cb918dcd2f
ble_mesh: stack: Add prefix BLE_MESH_ for log related macros
2021-02-07 12:03:24 +08:00
lly
638b36cc6b
ble_mesh: stack: Use different random for each provisioning
2021-02-07 11:46:20 +08:00
lly
59443eca02
ble_mesh: stack: Fix proxy client may fail to resend msg
2021-02-07 11:44:13 +08:00
lly
7799954d99
ble_mesh: stack: Remove node set device name return status check
2021-02-07 11:41:57 +08:00
lly
fc27117299
ble_mesh: stack: Enable updating lighting hsl state
2021-02-07 11:39:53 +08:00
lly
eb52b1da96
ble_mesh: stack: Fix using wrong | for OR between macros
2021-02-07 11:36:45 +08:00
lly
4e8a53aec2
ble_mesh: stack: Fix compile warning with BIT macro
2021-02-07 11:33:00 +08:00
lly
938530b193
ble_mesh: stack: Update mesh max conn macro when using bluedroid
2021-02-07 11:32:55 +08:00
morris
e2886115dc
mcpwm: fix second fault line broken
...
Closes: https://github.com/espressif/esp-idf/issues/6053
2021-02-06 21:45:51 +08:00
morris
e85a444cd0
mcpwm: fix wrong capture edge
2021-02-06 21:45:51 +08:00