Sfoglia il codice sorgente

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
Jiang Jiang Jian 2 anni fa
parent
commit
db4598e305

+ 1 - 1
components/esp_wifi/include/esp_wifi.h

@@ -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_MODE: invalid mode
   *    - ESP_ERR_WIFI_PASSWORD: invalid password
   *    - ESP_ERR_WIFI_PASSWORD: invalid password
   *    - ESP_ERR_WIFI_NVS: WiFi internal NVS error
   *    - 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);
 esp_err_t esp_wifi_set_config(wifi_interface_t interface, wifi_config_t *conf);
 
 

+ 1 - 1
components/esp_wifi/lib

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

+ 4 - 4
components/protocomm/test_apps/main/test_protocomm.c

@@ -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
  * 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,
     ret = mbedtls_aes_setkey_enc(&session->ctx_aes, session->sym_key,
                                  sizeof(session->sym_key)*8);
                                  sizeof(session->sym_key)*8);
     if (ret != 0) {
     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);
         free(outbuf);
         return ESP_FAIL;
         return ESP_FAIL;
     }
     }
@@ -243,7 +243,7 @@ static esp_err_t prepare_command1(session_t *session, SessionData *req)
                                 &session->nc_off, session->rand,
                                 &session->nc_off, session->rand,
                                 session->stb, session->device_pubkey, outbuf);
                                 session->stb, session->device_pubkey, outbuf);
     if (ret != 0) {
     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);
         free(outbuf);
         return ESP_FAIL;
         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,
                                     &session->nc_off, session->rand, session->stb,
                                     in->sr1->device_verify_data.data, check_buf);
                                     in->sr1->device_verify_data.data, check_buf);
     if (ret != 0) {
     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;
         return ESP_FAIL;
     }
     }
     hexdump("Dec Device verifier", check_buf, sizeof(check_buf));
     hexdump("Dec Device verifier", check_buf, sizeof(check_buf));