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
11,516 Commits 20 Branches 148 Tags 384 MiB
8f7fb5f126
Commit Graph

8022 Commits

Author SHA1 Message Date
Shubham Kulkarni
8f7fb5f126 esp_wifi_deinit: Return ESP_ERR_WIFI_NOT_STOPPED if wifi is not stopped 
Add test case to test this workflow
 2021-03-01 03:55:01 +00:00
Michael (XIAO Xufeng)
756cb17ae0 Merge branch 'feat/spi_flash_override_size_v4.0' into 'release/v4.0' 
spi_flash: add config option to override flash size in bootloader header (v4.0)

See merge request espressif/esp-idf!12462
 2021-02-26 10:07:18 +00:00
Michael (XIAO Xufeng)
e65ed8c959 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-26 10:12:16 +08:00
Michael (XIAO Xufeng)
b870f6f43c Revert "ci: temporarily disable RS485 related tests" 
This reverts commit 983220e216
 2021-02-23 11:06:33 +08:00
Chinmay Chhajed
3c7594f1ff component/bt: Added check for NULL valued combination key. 2021-02-10 15:44:12 +05:30
Chinmay Chhajed
ce21340dc5 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:41:40 +05:30
Chinmay Chhajed
c98b72326e 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:41:31 +05:30
Mahavir Jain
857b34cfd8 Merge branch 'bugfix/softap_prov_cookies_v4.0' into 'release/v4.0' 
protocomm_httpd: Use HTTP cookies to track session (v4.0)

See merge request espressif/esp-idf!12267
 2021-02-09 16:59:24 +08:00
lly
dbe997ce1b ble_mesh: stack: Fix deinit server models with no matching id 2021-02-07 11:18:49 +08:00
Piyush Shah
f132cf2b8b 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-05 14:28:45 +05:30
Piyush Shah
7755d3955f 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-05 14:28:45 +05:30
lly
d94289c83a ble_mesh: stack: Fix mbedtls aes ctx not deallocated 2021-02-05 03:26:49 +00:00
lly
574958367f ble_mesh: stack: Fix mbedtls aes ctx not initialized 2021-02-05 03:26:49 +00:00
Ivan Grokhotkov
5dd22738d6 Merge branch 'bugfix/esp_pm_dump_critical_v4.0' into 'release/v4.0' 
esp_pm: esp_pm_dump_locks: don't print from a critical section, and fix formatting (backport v4.0)

See merge request espressif/esp-idf!12019
 2021-02-05 09:52:40 +08:00
Michael (XIAO Xufeng)
2a7aaacec6 Merge branch 'spi_dma_close_before_cpu_reset_v4.0' into 'release/v4.0' 
spi: fix issue with closing DMA before CPU reset (4.0)

See merge request espressif/esp-idf!10840
 2021-02-05 00:52:09 +08:00
Piyush Shah
948ec32caf protocomm_httpd: Change an info print to debug print as it isn't really required in the logs 2021-02-04 15:05:22 +05:30
David Čermák
a6bddd68d2 Merge branch 'feature/support_transport_keepalive_v4.0' into 'release/v4.0' 
Feature/support transport keepalive v4.0 [backport v4.0]

See merge request espressif/esp-idf!12155
 2021-02-02 22:00:53 +08:00
Mahavir Jain
d82adb482b 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-01-29 11:45:50 +05:30
Mahavir Jain
9c169a1812 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-01-29 11:45:50 +05:30
Shubham Kulkarni
985de73e6d Add options for esp_http_client and esp_websocket_client to support keepalive 2021-01-25 21:01:30 +08:00
yuanjm
7201411f49 Modify esp-tls and tcp_transport to support keep alive for tcp and ssl connection 2021-01-25 21:01:25 +08:00
Michael (XIAO Xufeng)
8e8e54737d Merge branch 'bugfix/modbus_fix_slave_id_support_v40' into 'release/v4.0' 
Bugfix/modbus fix slave id support v40

See merge request espressif/esp-idf!12096
 2021-01-25 12:23:57 +08:00
Mahavir Jain
4b50c99957 Merge branch 'bugfix/httpd_session_close_lru_v4.0' into 'release/v4.0' 
esp_http_server: Add flag in sock_db to identify httpd_sess_close is called from httpd_session_close_lru (v4.0)

See merge request espressif/esp-idf!12114
 2021-01-22 21:26:29 +08:00
Mahavir Jain
7d677373e1 Merge branch 'bugfix/http_client_buffer_overread_v4.0' into 'release/v4.0' 
esp_http_client: Fix buffer overread, update https_request example to use HTTP/1.1 (v4.0)

See merge request espressif/esp-idf!12110
 2021-01-22 18:08:49 +08:00
Shubham Kulkarni
9951421910 esp_http_server: Add lru_socket flag in sock_db to indicate httpd_sess_close is called from httpd_sess_close_lru 2021-01-22 11:17:17 +05:30
Shubham Kulkarni
d0a4d91838 esp_http_client.c: Clear raw_len for response buffer after dispatching HTTP_EVENT_ON_FINISH event 
Closes: https://github.com/espressif/esp-idf/issues/6146
 2021-01-22 11:04:11 +05:30
aleks
4f7f09a64f freemodbus: fix compilation issue when slave id support is enabled 
Closes https://github.com/espressif/esp-idf/issues/6003
 2021-01-21 18:50:39 +01:00
Aditya Patwardhan
4df95abb22 esp-tls: Fix mem leak when global_ca_store is freed 2021-01-21 11:31:52 +05:30
Island
38ea44faaf Merge branch 'bugfix/ble_mesh_node_set_name_status_check_v4.0' into 'release/v4.0' 
ble_mesh: stack: Remove node set device name return status check (v4.0)

See merge request espressif/esp-idf!12082
 2021-01-21 11:08:02 +08:00
Island
9f78bcc36d Merge branch 'bugfix/ble_mesh_proxy_client_net_resend_v4.0' into 'release/v4.0' 
ble_mesh: stack: Fix proxy client may fail to resend msg (v4.0)

See merge request espressif/esp-idf!12080
 2021-01-21 11:07:41 +08:00
lly
9d4abeb907 ble_mesh: stack: Remove node set device name return status check 2021-01-20 21:11:33 +08:00
lly
4c86bec0e9 ble_mesh: stack: Fix proxy client may fail to resend msg 2021-01-20 21:10:30 +08:00
lly
8737392af0 ble_mesh: stack: Use different random for each provisioning 2021-01-20 21:09:28 +08:00
David Čermák
b1178d092e Merge branch 'bugfix/mdns_txt_length_collision_v4.0' into 'release/v4.0' 
mDNS: Fix of text length calculation when detecting a collision(Backport v4.0)

See merge request espressif/esp-idf!12027
 2021-01-19 22:16:08 +08:00
Jiang Jiang Jian
a61ec41740 Merge branch 'bugfix/btdm_blufi_send_custom_data_will_congested_after_connection_is_broken_v4.0' into 'release/v4.0' 
component/bt: fix Blufi sends customer data will congested when connection is broken(backport v4.0)

See merge request espressif/esp-idf!11849
 2021-01-19 21:44:35 +08:00
Island
c23c45a12a Merge branch 'bugfix/ble_mesh_log_macro_v4.0' into 'release/v4.0' 
ble_mesh: stack: Add prefix for log macros (v4.0)

See merge request espressif/esp-idf!12053
 2021-01-19 17:34:26 +08:00
Angus Gratton
c26e20770d Merge branch 'bugfix/soc_cpu_signed_compare_v4_0_pr5687' into 'release/v4.0' 
fix compiler warning: comparison of integer expressions of different...

See merge request espressif/esp-idf!12049
 2021-01-19 15:46:30 +08:00
lly
421f044eea ble_mesh: stack: Fix compile warning when log is disabled 2021-01-19 14:05:25 +08:00
lly
f9152550d2 ble_mesh: stack: Add prefix BLE_MESH_ for log related macros 2021-01-19 14:05:25 +08:00
SiLeader
d7c8dd270f fix compiler warning: comparison of integer expressions of different signedness: 'int' and 'unsigned int' 
Merges https://github.com/espressif/esp-idf/pull/5687
Equivalent fix to https://github.com/espressif/esp-idf/issues/6120 for v4.0 branch
 2021-01-19 09:15:52 +11:00
Jiang Jiang Jian
a3cee22e7e Merge branch 'bugfix/fix_some_wifi_bugs_0105_v4.0' into 'release/v4.0' 
Bugfix/fix some wifi bugs 0105 v4.0 (backport v4.0)

See merge request espressif/esp-idf!11906
 2021-01-18 21:22:29 +08:00
Island
ff7db0cdc4 Merge branch 'update/ble_mesh_set_hsl_states_v4.0' into 'release/v4.0' 
ble_mesh: stack: Enable updating lighting hsl state (v4.0)

See merge request espressif/esp-idf!12037
 2021-01-18 19:10:26 +08:00
lly
7134ef67cf ble_mesh: stack: Fix compile warning with BIT macro 2021-01-18 14:08:49 +08:00
lly
d42f39dcb4 ble_mesh: stack: Update mesh max conn macro when using bluedroid 2021-01-18 14:08:12 +08:00
lly
5c1e3eabc1 ble_mesh: stack: Enable updating lighting hsl state 2021-01-18 14:02:01 +08:00
Island
3a56233a4d Merge branch 'bugfix/bluedroid_avoid_same_bdaddr_conn_v4.0' into 'release/v4.0' 
Bluedroid: Do not connect if peer BD_ADDR is same as own BD_ADDR. (v4.0)

See merge request espressif/esp-idf!11992
 2021-01-18 14:01:19 +08:00
suren.gabrielyan
52fa88b54e mDNS: Fix of text length calculation when detecting a collision 2021-01-15 16:53:27 +04:00
suren.gabrielyan
0f80a4bd47 mDNS: Fix of collision detection during txt length calculation 
Closes https://github.com/espressif/esp-idf/issues/6114
 2021-01-15 16:53:09 +04:00
Ivan Grokhotkov
9d9d30965f esp_pm: fix formatting issues in esp_pm_dump_locks 
- line was truncated because 64 characters were not sufficient
- length passed to snprintf should be full buffer length, not -1
- make the width of lock name field fixed
- fix alignment of lock type column
 2021-01-15 12:42:34 +01:00
Ivan Grokhotkov
62da2362a8 esp_pm: esp_pm_dump_locks: don't print from a critical section 
Reported in https://github.com/espressif/esp-idf/issues/1917
 2021-01-15 12:40:17 +01:00