mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/disable_tsf_tbtt_soc_wakeup_after_wifi_disconnected' into 'master' 

fix(pm): fix soc wakeup after wifi disconnected

Closes IDFGH-11162

See merge request espressif/esp-idf!26401
pull/12486/head
Jiang Jiang Jian 2023-10-16 23:01:12 +08:00
rodzic ea81f4c4a3 516496b9d3
commit db4598e305
3 zmienionych plików z 6 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
components/esp_wifi/include/esp_wifi.h
Wyświetl plik

@ -829,7 +829,7 @@ esp_err_t esp_wifi_get_promiscuous_ctrl_filter(wifi_promiscuous_filter_t *filter
* - ESP_ERR_WIFI_MODE: invalid mode
* - ESP_ERR_WIFI_PASSWORD: invalid password
* - ESP_ERR_WIFI_NVS: WiFi internal NVS error
* - others: refer to the erro code in esp_err.h
* - others: refer to the error code in esp_err.h
*/
esp_err_t esp_wifi_set_config(wifi_interface_t interface, wifi_config_t *conf);

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 3e202a0f02851aa103fa8a2d33d40f87b85b2484
Subproject commit 983a779766850d8e0d6114a9512cfefc11a8aa64

8
components/protocomm/test_apps/main/test_protocomm.c
Wyświetl plik

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2018-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -234,7 +234,7 @@ static esp_err_t prepare_command1(session_t *session, SessionData *req)
ret = mbedtls_aes_setkey_enc(&session->ctx_aes, session->sym_key,
sizeof(session->sym_key)*8);
if (ret != 0) {
ESP_LOGE(TAG, "Failed at mbedtls_aes_setkey_enc with erro code : %d", ret);
ESP_LOGE(TAG, "Failed at mbedtls_aes_setkey_enc with error code : %d", ret);
free(outbuf);
return ESP_FAIL;
}
@ -243,7 +243,7 @@ static esp_err_t prepare_command1(session_t *session, SessionData *req)
&session->nc_off, session->rand,
session->stb, session->device_pubkey, outbuf);
if (ret != 0) {
ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with erro code : %d", ret);
ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with error code : %d", ret);
free(outbuf);
return ESP_FAIL;
}
@ -308,7 +308,7 @@ static esp_err_t verify_response1(session_t *session, SessionData *resp)
&session->nc_off, session->rand, session->stb,
in->sr1->device_verify_data.data, check_buf);
if (ret != 0) {
ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with erro code : %d", ret);
ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with error code : %d", ret);
return ESP_FAIL;
}
hexdump("Dec Device verifier", check_buf, sizeof(check_buf));