Branch with Test_event_1 tag + cherry pick of PR project-chip#5503 to…

… add ble advertissement timeouts

- fix conflicts from Cherry picking due to api modified in master vs test_event_1 tag

src/platform/EFR32/BLEManagerImpl.cpp

@@ -183,8 +183,8 @@ CHIP_ERROR BLEManagerImpl::_Init()
                                        BleAdvTimeoutHandler // timer callback handler
     );
 
-    mFlags.ClearAll().Set(Flags::kAdvertisingEnabled, CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART);
-    mFlags.Set(Flags::kFastAdvertisingEnabled, true);
+    mFlags = CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART ? kFlag_AdvertisingEnabled : 0;
+    SetFlag(mFlags, kFlag_FastAdvertisingEnabled, true);
     PlatformMgr().ScheduleWork(DriveBLEState, 0);
 
 exit:
@@ -703,7 +703,7 @@ CHIP_ERROR BLEManagerImpl::StartAdvertising(void)
     sl_bt_advertiser_set_random_address(advertising_set_handle, kResolvableRandomAddrType, unusedBdAddr, &unusedBdAddr);
     (void) unusedBdAddr;
 
-    mFlags.Clear(Flags::kRestartAdvertising);
+    ClearFlag(mFlags, kFlag_Advertising);
 
     interval_min = interval_max =
         ((numConnectionss == 0 && !ConfigurationMgr().IsPairedToAccount()) || GetFlag(mFlags, kFlag_FastAdvertisingEnabled))
@@ -718,10 +718,10 @@ CHIP_ERROR BLEManagerImpl::StartAdvertising(void)
 
     if (SL_STATUS_OK == ret)
     {
-        uint32_t BleAdvTimeoutMs = (mFlags.Has(Flags::kFastAdvertisingEnabled) ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_TIMEOUT
+        uint32_t BleAdvTimeoutMs = (GetFlag(mFlags, kFlag_FastAdvertisingEnabled) ? CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_TIMEOUT
                                                                                : CHIP_DEVICE_CONFIG_BLE_ADVERTISING_TIMEOUT);
         StartBleAdvTimeoutTimer(BleAdvTimeoutMs);
-        mFlags.Set(Flags::kAdvertising);
+        SetFlag(mFlags, kFlag_Advertising, true);
     }
 
     err = MapBLEError(ret);
@@ -831,8 +831,8 @@ void BLEManagerImpl::HandleConnectionCloseEvent(volatile sl_bt_msg_t * evt)
 
         // Arrange to re-enable connectable advertising in case it was disabled due to the
         // maximum connection limit being reached.
-        mFlags.Set(Flags::kRestartAdvertising);
-        mFlags.Set(Flags::kFastAdvertisingEnabled);
+        SetFlag(mFlags, kFlag_RestartAdvertising, true);
+        SetFlag(mFlags, kFlag_FastAdvertisingEnabled, true);
         PlatformMgr().ScheduleWork(DriveBLEState, 0);
     }
 }
@@ -1056,11 +1056,11 @@ void BLEManagerImpl::BleAdvTimeoutHandler(TimerHandle_t xTimer)
     CHIP_ERROR err;
     sl_status_t ret;
 
-    if (sInstance.mFlags.Has(Flags::kFastAdvertisingEnabled))
+    if (GetFlag(sInstance.mFlags, kFlag_FastAdvertisingEnabled))
     {
         ChipLogDetail(DeviceLayer, "bleAdv Timeout : Start slow advertissment");
 
-        sInstance.mFlags.Clear(Flags::kFastAdvertisingEnabled);
+        ClearFlag(sInstance.mFlags, kFlag_FastAdvertisingEnabled);
 
         // stop advertiser, change interval and restart it;
         sl_bt_advertiser_stop(sInstance.advertising_set_handle);