adjust based on review comments - 2

src/include/platform/CHIPDeviceConfig.h

@@ -620,9 +620,9 @@
 /**
  * CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING
  *
- * Optional configuration to enable Extended Announcement Duration up to 48h
- * Should be used together with extending CHIP_DEVICE_CONFIG_DISCOVERY_TIMEOUT_SECS past 15 minutes
- * Disabled by default
+ * Optional configuration to enable Extended Announcement Duration up to 48h.
+ * Should be used together with extending CHIP_DEVICE_CONFIG_DISCOVERY_TIMEOUT_SECS past 15 minutes.
+ * Disabled by default.
  */
 
 #ifndef CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING
@@ -632,35 +632,33 @@
 #if CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING
 
 /**
- * CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_CHANGE_TIME
+ * CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_CHANGE_TIME_MS
  *
  * The amount of time in miliseconds after which BLE advertisement should be switched from the slow
  * advertising to the extended advertising, counting from the moment of advertisement commencement.
  *
- *  Defaults to 15 minutes measured in ms.
+ *  Defaults to 900000 ms.
  */
-#ifndef CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_CHANGE_TIME
-#define CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_CHANGE_TIME (15 * 60 * 1000)
+#ifndef CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_CHANGE_TIME_MS
+#define CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_CHANGE_TIME_MS (15 * 60 * 1000)
 #endif
 
 /**
  * CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MIN
  *
  * The minimum interval (in units of 0.625ms) at which the device will send BLE advertisements while
- * in extended advertising mode. The minimum interval should be smaller and not equal to the
- * CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MAX.
+ * in the extended advertising mode. The minimum interval shall not be smaller than the default value
+ * and should not be equal to the CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MAX.
  *
  * Defaults to 1920 (1200 ms).
  */
-#ifndef CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MIN
 #define CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MIN 1920
-#endif
 
 /**
  * CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MAX
  *
- * The interval (in units of 0.625ms) at which the device will send BLE advertisements while
- * in extended advertising mode. The maximum interval should be greater and not equal to the
+ * The maximum interval (in units of 0.625ms) at which the device will send BLE advertisements while
+ * in the extended advertising mode. The maximum interval should be greater and not equal to the
  * CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MIN.
  *
  * Defaults to 1936 (1210 ms).
@@ -669,6 +667,8 @@
 #define CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MAX 1936
 #endif
 
+static_assert(CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MIN < CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MAX, "Max Extended Advertising Interval cannot be smaller or equal to the Min Extended Advertising Interval");
+
 #endif
 
 // -------------------- Service Provisioning Configuration --------------------

src/platform/silabs/efr32/BLEManagerImpl.cpp

@@ -463,8 +463,8 @@ CHIP_ERROR BLEManagerImpl::ConfigureAdvertisingData(void)
     // Check for extended advertisement interval and redact VID/PID if past the initial period.
     if (mFlags.Has(Flags::kExtAdvertisingEnabled))
     {
-        mDeviceIdInfo.SetVendorId(0x0000);
-        mDeviceIdInfo.SetProductId(0x0000);
+        mDeviceIdInfo.SetVendorId(0);
+        mDeviceIdInfo.SetProductId(0);
         mDeviceIdInfo.SetExtendedAnnouncementFlag(true);
     }
 #endif
@@ -565,17 +565,20 @@ CHIP_ERROR BLEManagerImpl::StartAdvertising(void)
     }
     else
     {
-        if (!(mFlags.Has(Flags::kExtAdvertisingEnabled)))
+#if CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING
+        if (!mFlags.Has(Flags::kExtAdvertisingEnabled))
         {
             interval_min = CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN;
             interval_max = CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX;
         }
-#if CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING
         else
         {
             interval_min = CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MIN;
             interval_max = CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MAX;
         }
+#else
+        interval_min = CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN;
+        interval_max = CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX;
 #endif
     }
 
@@ -978,7 +981,7 @@ void BLEManagerImpl::BleAdvTimeoutHandler(TimerHandle_t xTimer)
         BLEMgr().SetAdvertisingMode(BLEAdvertisingMode::kSlowAdvertising);
 #if CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING
         BLEMgrImpl().mFlags.Clear(Flags::kExtAdvertisingEnabled);
-        BLEMgrImpl().StartBleAdvTimeoutTimer(CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_CHANGE_TIME);
+        BLEMgrImpl().StartBleAdvTimeoutTimer(CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_CHANGE_TIME_MS);
 #endif
     }
 #if CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING