[ASR] fix double init in BLEManager and OTA (project-chip#31579)

* fix BLE pairing issue because the initialization time of ble is earlier the callback registration time * fix ota fail issue * Restyled by clang-format * Update ASR582X SDK to v1.9.1
joonhaengHeo · Feb 27, 2024 · 8428564 · 8428564
1 parent a2d98f8
commit 8428564
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/platform/ASR/ASROTAImageProcessor.cpp b/src/platform/ASR/ASROTAImageProcessor.cpp
@@ -20,9 +20,6 @@
 #include <app/clusters/ota-requestor/OTADownloader.h>
 #include <app/clusters/ota-requestor/OTARequestorInterface.h>
 
-/// No error, operation OK
-#define LEGA_OTA_OK 0L
-
 namespace chip {
 
 CHIP_ERROR ASROTAImageProcessor::PrepareDownload()
@@ -121,7 +118,8 @@ void ASROTAImageProcessor::HandlePrepareDownload(intptr_t context)
 
     imageProcessor->mHeaderParser.Init();
 
-    imageProcessor->mDownloader->OnPreparedForDownload(err == LEGA_OTA_OK ? CHIP_NO_ERROR : CHIP_ERROR_INTERNAL);
+    imageProcessor->mDownloader->OnPreparedForDownload(
+        ((err == LEGA_OTA_OK) || (err == LEGA_OTA_INIT_ALREADY)) ? CHIP_NO_ERROR : CHIP_ERROR_INTERNAL);
 }
 
 void ASROTAImageProcessor::HandleFinalize(intptr_t context)

diff --git a/src/platform/ASR/BLEManagerImpl.cpp b/src/platform/ASR/BLEManagerImpl.cpp
@@ -110,6 +110,9 @@ CHIP_ERROR BLEManagerImpl::_Init()
     }
     else
     {
+        matter_ble_stack_open();
+        matter_ble_add_service();
+        BLEMgrImpl().SetStackInit();
         mFlags.Set(Flags::kFlag_StackInitialized, true);
         log_i("ble is alread open!\n");
     }

diff --git a/third_party/asr/asr582x/asr_sdk b/third_party/asr/asr582x/asr_sdk