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
12,987 Commits 20 Branches 148 Tags 384 MiB
54c71781a9
Commit Graph

8936 Commits

Author SHA1 Message Date
baohongde
54c71781a9 components/bt: Fix assert without sw coexist enabled 2021-02-26 14:33:01 +08:00
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
lly
bdf6d3e8cb ble_mesh: stack: Support reporting normal ble adv packets 2021-02-05 21:22:52 +08:00
lly
e06a5587c7 ble_mesh: stack: Add a btc file for ble coex functions 
Previously if starting/stopping BLE advertising when BLE Mesh
is enabled, the corresponding events will be notified through
the callback registered by esp_ble_mesh_register_prov_callback().

With this commit, the func esp_ble_mesh_register_ble_callback()
needs to be invoked for resgitering the callback used for BLE
coexistence related functionalities (i.e. ADV/SCAN).
 2021-02-05 21:22:52 +08:00
lly
228ab398b9 ble_mesh: stack: Move ble scan funcitons to a single file 2021-02-05 21:22:52 +08:00
lly
9cff5797a1 ble_mesh: stack: Optimize handling received mesh adv packets 2021-02-05 21:22:52 +08:00
lly
1cdd2b0609 ble_mesh: stack: Move bt_mesh_rand to mesh_common.c 2021-02-05 14:55:38 +08:00
lly
a0da80fe89 ble_mesh: stack: Remove useless BT_DBG_ENABLED in a few files 2021-02-05 14:55:33 +08:00
lly
f3ff34d818 ble_mesh: Replace zephyr integer types with C99 types [Zephyr] 2021-02-05 14:55:11 +08:00
lly
392fb4b916 ble_mesh: stack: Update ARRAY_SIZE definition 2021-02-05 14:54:17 +08:00
Island
8812365c6f Merge branch 'feat/ble_mesh_multiple_nvs_namespace_v4.1' into 'release/v4.1' 
ble_mesh: stack: Provisioner supports multiple nvs namespaces (v4.1)

See merge request espressif/esp-idf!12264
 2021-02-05 14:49:32 +08:00
Mahavir Jain
a60e9c136b Merge branch 'fix/wolfssl_domain_name_check_v4.1' into 'release/v4.1' 
esp_tls_wolfssl : Add domain name check (v4.1)

See merge request espressif/esp-idf!11817
 2021-02-05 12:07:11 +08:00
lly
c1f3b20273 ble_mesh: stack: Provisioner supports multiple nvs namespaces 
Now Provisioner can use different NVS namespaces to store
different instances of mesh information, for example, for
different user accounts.
 2021-02-05 03:10:47 +00:00
Piyush Shah
6ebb73df7c protocomm_httpd: Change an info print to debug print as it isn't really required in the logs 2021-02-04 15:04:43 +05:30
lly
ad718c53cd ble_mesh: stack: Provisioner supports receiving heartbeat 2021-02-04 03:33:45 +00:00