Merge branch 'bugfix/fix_roll_back_flag_not_clear' into 'master'

bugfix: Fix when OTA successfully and rollback flag not clear See merge request app-frameworks/esp-rainmaker!492
espressif · Jan 31, 2025 · a43bb53 · a43bb53
2 parents 7585504 + e11bb30
commit a43bb53
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/components/esp_rainmaker/src/ota/esp_rmaker_ota.c b/components/esp_rainmaker/src/ota/esp_rmaker_ota.c
@@ -525,6 +525,18 @@ static void event_handler(void* arg, esp_event_base_t event_base,
     }
 }
 
+static esp_err_t esp_rmaker_erase_rollback_flag(void)
+{
+    nvs_handle handle;
+    esp_err_t err = nvs_open_from_partition(ESP_RMAKER_NVS_PART_NAME, RMAKER_OTA_NVS_NAMESPACE, NVS_READWRITE, &handle);
+    if (err == ESP_OK) {
+        nvs_erase_key(handle, RMAKER_OTA_UPDATE_FLAG_NVS_NAME);
+        nvs_commit(handle);
+        nvs_close(handle);
+    }
+    return ESP_OK;
+}
+
 esp_err_t esp_rmaker_ota_mark_valid(void)
 {
     const esp_partition_t *running = esp_ota_get_running_partition();
@@ -542,6 +554,7 @@ esp_err_t esp_rmaker_ota_mark_valid(void)
         return ESP_ERR_INVALID_ARG;
     }
     esp_ota_mark_app_valid_cancel_rollback();
+    esp_rmaker_erase_rollback_flag();
     ota->ota_in_progress = false;
     if (ota->rollback_timer) {
         xTimerStop(ota->rollback_timer, portMAX_DELAY);
@@ -592,18 +605,6 @@ static esp_err_t esp_ota_check_for_mqtt(esp_rmaker_ota_t *ota)
     return esp_event_handler_register(RMAKER_COMMON_EVENT, RMAKER_MQTT_EVENT_CONNECTED, &event_handler, ota);
 }
 
-static esp_err_t esp_rmaker_erase_rollback_flag(void)
-{
-    nvs_handle handle;
-    esp_err_t err = nvs_open_from_partition(ESP_RMAKER_NVS_PART_NAME, RMAKER_OTA_NVS_NAMESPACE, NVS_READWRITE, &handle);
-    if (err == ESP_OK) {
-        nvs_erase_key(handle, RMAKER_OTA_UPDATE_FLAG_NVS_NAME);
-        nvs_commit(handle);
-        nvs_close(handle);
-    }
-    return ESP_OK;
-}
-
 static void esp_rmaker_ota_manage_rollback(esp_rmaker_ota_t *ota)
 {
     /* If rollback is enabled, and the ota update flag is found, it means that the OTA validation is pending