samples: matter: allow matter samples to retry BT advertising

* bump Matter manifest to pull BLEMgr fixes * allow matter samples to retry to start advertising when the previous request failed Signed-off-by: Marcin Kajor <[email protected]>
nrfconnect · Feb 21, 2024 · b8e601f · b8e601f
1 parent 0814d9b
commit b8e601f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/samples/matter/common/src/board/board.cpp b/samples/matter/common/src/board/board.cpp
@@ -278,7 +278,14 @@ void Board::StartBLEAdvertisement()
 	}
 
 	if (chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled()) {
-		LOG_INF("BLE advertising is already enabled");
+		if (!chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertising()) {
+			LOG_INF("BLE advertising is already enabled but not active - restarting");
+			/* Kick the BLEMgr state machine to retry to start advertising one more time. */
+			CHIP_ERROR err = chip::DeviceLayer::ConnectivityMgr().SetBLEAdvertisingEnabled(true);
+			VerifyOrReturn(CHIP_NO_ERROR == err, LOG_ERR("Could not restart Matter advertisement"));
+		} else {
+			LOG_INF("BLE advertising is already enabled and active");
+		}
 		return;
 	}
 

diff --git a/west.yml b/west.yml
@@ -154,7 +154,7 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
-      revision: a4d48b7c8b55cbe6c27665cd90e33ceba2e78615
+      revision: 623ef0a639167458d86ae83414aa78285e90b34d
       submodules:
         - name: nlio
           path: third_party/nlio/repo