[Telink] Fix NotifyUpdateApplied issue TC-SU-2.6 (#29435)

* [Telink] Fix NotifyUpdateApplied issue TC-SU-2.6 * Restyled by clang-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
project-chip · Jan 15, 2024 · 7f913e7 · 7f913e7
1 parent 5867357
commit 7f913e7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/examples/platform/telink/common/src/AppTaskCommon.cpp b/examples/platform/telink/common/src/AppTaskCommon.cpp
@@ -34,6 +34,11 @@
 #include "OTAUtil.h"
 #endif
 
+#ifdef CONFIG_BOOTLOADER_MCUBOOT
+#include <app/clusters/ota-requestor/OTARequestorInterface.h>
+#include <zephyr/dfu/mcuboot.h>
+#endif /* CONFIG_BOOTLOADER_MCUBOOT */
+
 #include <zephyr/fs/nvs.h>
 #include <zephyr/settings/settings.h>
 
@@ -311,6 +316,26 @@ CHIP_ERROR AppTaskCommon::InitCommonParts(void)
     InitBasicOTARequestor();
 #endif
 
+#ifdef CONFIG_BOOTLOADER_MCUBOOT
+#if CONFIG_CHIP_OTA_REQUESTOR
+    if (GetRequestorInstance()->GetCurrentUpdateState() == Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum::kIdle &&
+        mcuboot_swap_type() == BOOT_SWAP_TYPE_REVERT)
+#else
+    if (mcuboot_swap_type() == BOOT_SWAP_TYPE_REVERT)
+#endif
+    {
+        int img_confirmation = boot_write_img_confirmed();
+        if (img_confirmation)
+        {
+            LOG_ERR("Image not confirmed %d. Will be reverted!", img_confirmation);
+        }
+        else
+        {
+            LOG_INF("Image confirmed");
+        }
+    }
+#endif /* CONFIG_BOOTLOADER_MCUBOOT */
+
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 

diff --git a/examples/platform/telink/common/src/mainCommon.cpp b/examples/platform/telink/common/src/mainCommon.cpp
@@ -31,10 +31,6 @@
 #include "Rpc.h"
 #endif
 
-#ifdef CONFIG_BOOTLOADER_MCUBOOT
-#include <zephyr/dfu/mcuboot.h>
-#endif /* CONFIG_BOOTLOADER_MCUBOOT */
-
 LOG_MODULE_REGISTER(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
 using namespace ::chip;
@@ -157,21 +153,6 @@ int main(void)
         goto exit;
     }
 
-#ifdef CONFIG_BOOTLOADER_MCUBOOT
-    if (mcuboot_swap_type() == BOOT_SWAP_TYPE_REVERT)
-    {
-        int img_confirmation = boot_write_img_confirmed();
-        if (img_confirmation)
-        {
-            LOG_ERR("Image not confirmed %d. Will be reverted!", img_confirmation);
-        }
-        else
-        {
-            LOG_INF("Image confirmed");
-        }
-    }
-#endif /* CONFIG_BOOTLOADER_MCUBOOT */
-
     err = GetAppTask().StartApp();
 
 exit: