github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-08-25 07:36:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop unreachable PENDING_VERIFY guard

Browse Source
This commit is contained in:
J. Nick Koston
2026-08-21 00:47:41 -05:00
parent a15eec26f0
commit 9eeb5ae2e9
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/ota/ota_backend_esp_idf.cpp
+3 -10
View File
@@ -70,16 +70,9 @@ OTAResponseTypes IDFOTABackend::begin(size_t image_size, ota::OTAType ota_type)
esp_err_t err;
#ifdef USE_OTA_BLOCK_ERASE_AHEAD
this->erased_end_ = 0;
#ifdef CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE
// esp_ota_begin() refuses to start while the running app is unconfirmed;
// esp_ota_resume() does not, so keep that behavior here.
esp_ota_img_states_t running_state;
if (esp_ota_get_state_partition(esp_ota_get_running_partition(), &running_state) == ESP_OK &&
running_state == ESP_OTA_IMG_PENDING_VERIFY) {
ESP_LOGE(TAG, "Running app has not confirmed state (ESP_OTA_IMG_PENDING_VERIFY)");
return OTA_RESPONSE_ERROR_UNKNOWN;
}
#endif
// Unlike esp_ota_begin(), esp_ota_resume() does not reject a running app in
// ESP_OTA_IMG_PENDING_VERIFY; that state is unreachable here because the app
// was marked valid at boot (esp32/hal.cpp) or just above under USE_OTA_ROLLBACK.
// erase_size 0 (!= OTA_WITH_SEQUENTIAL_WRITES) means no erase; erase_ahead_() handles it
err = esp_ota_resume(this->partition_, 0, 0, &this->update_handle_);
#if defined(CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE) && ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)