[all-device-app] Add ICD support

examples/all-devices-app/all-devices-common/device/types/power-source/BatteryPowerSource.cpp

@@ -37,9 +37,13 @@ CHIP_ERROR BatteryPowerSource::Register(chip::EndpointId endpoint, CodeDrivenDat
     // Power Source (some arbitrary configuration)
     SimpleBatteryPowerSourceCluster::Config config(mDescription, mReplaceability, mTimerDelegate);
     config.usedOptionalAttributes.Set<BatPercentRemainingId>();
+    config.usedOptionalAttributes.Set<BatVoltageId>();
     config.status = Clusters::PowerSource::PowerSourceStatusEnum::kActive;
     config.order  = 0;
     config.batPercentRemaining.SetNonNull(200); // 100% (doubled percentage)
+    // BatVoltage is expressed in millivolts (see Matter spec 11.7.7.13).
+    // Start at 3.0V, a typical nominal voltage for a fresh CR2032 / 2xAA cell.
+    config.batVoltage.SetNonNull(3000);
     mEndpointList[0] = endpoint;
 
     mBatteryPowerSourceCluster.Create(endpoint, config);

examples/all-devices-app/all-devices-common/device/types/power-source/BatteryPowerSource.h

@@ -28,10 +28,14 @@ class BatteryPowerSource : public SingleEndpoint
 {
     using Feature                               = Clusters::PowerSource::Feature;
     constexpr static auto BatPercentRemainingId = Clusters::PowerSource::Attributes::BatPercentRemaining::Id;
+    constexpr static auto BatVoltageId          = Clusters::PowerSource::Attributes::BatVoltage::Id;
 
 public:
-    using SimpleBatteryPowerSourceCluster = Clusters::PowerSourceCluster<BitFlags<Feature>(Feature::kBattery).Raw(),
-                                                                         OptionalAttributeSet<BatPercentRemainingId>::All()>;
+    // Simple battery-backed Power Source Cluster that exposes both BatPercentRemaining and BatVoltage
+    // so commissioners (e.g. Home Assistant) can display a battery level and a battery voltage reading.
+    using SimpleBatteryPowerSourceCluster =
+        Clusters::PowerSourceCluster<BitFlags<Feature>(Feature::kBattery).Raw(),
+                                     OptionalAttributeSet<BatPercentRemainingId, BatVoltageId>::All()>;
     // Takes delegates for the clusters.
     BatteryPowerSource(CharSpan description, Clusters::PowerSource::BatReplaceabilityEnum replaceability,
                        TimerDelegate & timerDelegate);

examples/all-devices-app/all-devices-common/device/types/power-source/impl/DecreasingBatteryPowerSource.cpp

@@ -64,6 +64,25 @@ void DecreasingBatteryPowerSource::TimerFired()
 
     LogErrorOnFailure(batteryCluster.SetBatPercentRemaining(batteryLevel));
 
+    // Also drop the battery voltage linearly with the remaining percentage so
+    // commissioners (e.g. Home Assistant) can display a live voltage reading.
+    // Range: 3.0V (full) -> 2.0V (empty), expressed in millivolts.
+    constexpr uint32_t kFullVoltageMv  = 3000;
+    constexpr uint32_t kEmptyVoltageMv = 2000;
+    DataModel::Nullable<uint32_t> batteryVoltage;
+    if (batteryLevel.IsNull())
+    {
+        batteryVoltage.SetNull();
+    }
+    else
+    {
+        // batteryLevel is a doubled percentage in the range [0, 200].
+        const uint32_t percent = batteryLevel.Value();
+        const uint32_t voltage = kEmptyVoltageMv + ((kFullVoltageMv - kEmptyVoltageMv) * percent) / 200;
+        batteryVoltage.SetNonNull(voltage);
+    }
+    batteryCluster.SetBatVoltage(batteryVoltage);
+
     // Restart the timer to continue decreasing the battery level
     SuccessOrDie(mTimerDelegate.StartTimer(this, kDecreaseBatteryLevelInterval));
 }

examples/all-devices-app/all-devices-common/device/types/root-node/BUILD.gn

@@ -31,8 +31,11 @@ source_set("root-node") {
     "${chip_root}/src/app/clusters/general-diagnostics-server",
     "${chip_root}/src/app/clusters/group-key-mgmt-server",
     "${chip_root}/src/app/clusters/groupcast",
+    "${chip_root}/src/app/clusters/icd-management-server:icd-management-server",
     "${chip_root}/src/app/clusters/operational-credentials-server",
     "${chip_root}/src/app/clusters/software-diagnostics-server",
+    "${chip_root}/src/app/icd/server:configuration-data",
+    "${chip_root}/src/app/icd/server:icd-server-config",
     "${chip_root}/src/data-model-providers/codedriven",
     "${chip_root}/src/lib/core:error",
     "${chip_root}/src/lib/support",

examples/all-devices-app/all-devices-common/device/types/root-node/RootNode.cpp

@@ -21,10 +21,15 @@
 #include <app/InteractionModelEngine.h>
 #include <app/clusters/groupcast/GroupcastCluster.h>
 #include <app/clusters/groupcast/GroupcastContext.h>
+#include <app/icd/server/ICDServerConfig.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+#include <app/icd/server/ICDConfigurationData.h>
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
@@ -134,6 +139,33 @@ CHIP_ERROR RootNode::Register(EndpointId endpointId, CodeDrivenDataModelProvider
                                           });
     ReturnErrorOnFailure(provider.AddCluster(mOperationalCredentialsCluster.Registration()));
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    // Register the ICD Management cluster on the root endpoint so this device advertises as
+    // an Intermittently Connected Device. The ICDManager itself lives on Server::GetInstance()
+    // and is initialized automatically by the CHIP application server when
+    // CHIP_CONFIG_ENABLE_ICD_SERVER=1.
+    if (mContext.icdSymmetricKeystore != nullptr)
+    {
+#if CHIP_CONFIG_ENABLE_ICD_CIP
+        using ClusterType = ICDManagementClusterWithCIP;
+#else
+        using ClusterType = ICDManagementCluster;
+#endif // CHIP_CONFIG_ENABLE_ICD_CIP
+
+        constexpr ClusterType::OptionalCommandSet enabledCommands =
+#if CHIP_CONFIG_ENABLE_ICD_LIT
+            ClusterType::OptionalCommandSet().Set<IcdManagement::Commands::StayActiveRequest::Id>();
+#else
+            ClusterType::OptionalCommandSet();
+#endif // CHIP_CONFIG_ENABLE_ICD_LIT
+
+        mIcdManagementCluster.Create(endpointId, *mContext.icdSymmetricKeystore, mContext.fabricTable,
+                                     ICDConfigurationData::GetInstance(), ClusterType::OptionalAttributeSet(0), enabledCommands,
+                                     BitMask<IcdManagement::UserActiveModeTriggerBitmap>(0), CharSpan());
+        ReturnErrorOnFailure(provider.AddCluster(mIcdManagementCluster.Registration()));
+    }
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+
     return provider.AddEndpoint(mEndpointRegistration);
 }
 
@@ -142,6 +174,13 @@ void RootNode::Unregister(CodeDrivenDataModelProvider & provider)
     UnregisterDescriptor(provider);
 
     // De-init in reverse order as init, in case there were data dependencies.
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    if (mIcdManagementCluster.IsConstructed())
+    {
+        LogErrorOnFailure(provider.RemoveCluster(&mIcdManagementCluster.Cluster()));
+        mIcdManagementCluster.Destroy();
+    }
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     if (mOperationalCredentialsCluster.IsConstructed())
     {
         LogErrorOnFailure(provider.RemoveCluster(&mOperationalCredentialsCluster.Cluster()));

examples/all-devices-app/all-devices-common/device/types/root-node/RootNode.h

@@ -29,13 +29,19 @@
 #include <app/clusters/groupcast/GroupcastCluster.h>
 #include <app/clusters/operational-credentials-server/OperationalCredentialsCluster.h>
 #include <app/clusters/software-diagnostics-server/SoftwareDiagnosticsCluster.h>
+#include <app/icd/server/ICDServerConfig.h>
 #include <app/server-cluster/ServerClusterInterfaceRegistry.h>
 #include <credentials/GroupDataProvider.h>
 #include <device/api/SingleEndpoint.h>
 #include <devices/Types.h>
 #include <lib/support/TimerDelegate.h>
 #include <platform/DiagnosticDataProvider.h>
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+#include <app/clusters/icd-management-server/ICDManagementCluster.h>
+#include <crypto/SessionKeystore.h>
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+
 namespace chip {
 namespace app {
 
@@ -63,6 +69,11 @@ class RootNode : public SingleEndpoint
         EventManagement & eventManagement;
         TimerDelegate & timerDelegate;
         uint16_t minGuaranteedSubscriptionsPerFabric;
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+        // Optional. When non-null, the RootNode registers the ICDManagement cluster on the
+        // root endpoint using this keystore so the device advertises as an ICD.
+        Crypto::SessionKeystore * icdSymmetricKeystore = nullptr;
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
         TermsAndConditionsProvider & termsAndConditionsProvider;
 #endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
@@ -95,6 +106,13 @@ class RootNode : public SingleEndpoint
     LazyRegisteredServerCluster<Clusters::SoftwareDiagnosticsServerCluster> mSoftwareDiagnosticsServerCluster;
     LazyRegisteredServerCluster<Clusters::AccessControlCluster> mAccessControlCluster;
     LazyRegisteredServerCluster<Clusters::OperationalCredentialsCluster> mOperationalCredentialsCluster;
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+#if CHIP_CONFIG_ENABLE_ICD_CIP
+    LazyRegisteredServerCluster<Clusters::ICDManagementClusterWithCIP> mIcdManagementCluster;
+#else
+    LazyRegisteredServerCluster<Clusters::ICDManagementCluster> mIcdManagementCluster;
+#endif // CHIP_CONFIG_ENABLE_ICD_CIP
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 };
 
 } // namespace app

examples/all-devices-app/docs/supported_clusters.md

@@ -111,7 +111,7 @@ To update or validate this list manually, follow these steps:
 | 65        | Groups                                                     | 4 (0x0004)    | Yes                | Yes                 |                                       |
 | 66        | HEPA Filter Monitoring                                     | 113 (0x0071)  | Yes                | No                  | Alias of Resource Monitoring          |
 | 67        | Humidistat                                                 | 517 (0x0205)  | Yes                | No                  |                                       |
-| 68        | ICD Management                                             | 70 (0x0046)   | Yes                | No                  |                                       |
+| 68        | ICD Management                                             | 70 (0x0046)   | Yes                | Yes                 |                                       |
 | 69        | Identify                                                   | 3 (0x0003)    | Yes                | Yes                 |                                       |
 | 70        | Illuminance Measurement                                    | 1024 (0x0400) | Yes                | Yes                 |                                       |
 | 71        | Joint Fabric Administrator                                 | 1875 (0x0753) | No                 | No                  |                                       |
@@ -203,4 +203,4 @@ To update or validate this list manually, follow these steps:
 | 157       | Wi-Fi Network Management                                   | 1105 (0x0451) | Yes                | Yes                 |                                       |
 | 158       | Window Covering                                            | 258 (0x0102)  | No                 | No                  |                                       |
 | 159       | Zone Management                                            | 1360 (0x0550) | Yes                | No                  |                                       |
-| **Total** | **159**                                                    |               | **103**            | **58**              |                                       |
+| **Total** | **159**                                                    |               | **103**            | **59**              |                                       |

examples/all-devices-app/silabs/BUILD.gn

@@ -77,11 +77,23 @@ efr32_sdk("sdk") {
   defines = []
 }
 
+source_set("silabs-battery-power-source") {
+  sources = [
+    "src/delegates/SilabsBatteryPowerSource.cpp",
+    "src/delegates/SilabsBatteryPowerSource.h",
+  ]
+
+  public_deps = [
+    "${chip_root}/examples/all-devices-app/all-devices-common/device/types/power-source",
+  ]
+}
+
 silabs_executable("all_devices_app") {
   output_name = "matter-silabs-all-devices-example.out"
   defines = []
   include_dirs = [
     "include",
+    "src",
     "${chip_root}/examples/all-devices-app/all-devices-common",
     "${chip_root}/src/data-model-providers/codedriven",
     "${chip_root}/src/data-model-providers",
@@ -106,6 +118,7 @@ silabs_executable("all_devices_app") {
 
   deps = [
     ":sdk",
+    ":silabs-battery-power-source",
     "${chip_root}/src/platform/logging:default",
 
     # Code-driven data model providers

examples/all-devices-app/silabs/README.md

@@ -94,3 +94,41 @@ matterCli> devtype list
 matterCli> devtype set humidity-sensor
 matterCli> reboot
 ```
+
+## Low-power build (ICD, MTD, no shell/LEDs)
+
+To reproduce a low-power / battery-operated sample-app configuration, add the
+`--low-power` flag (which disables LEDs, buttons, LCD and shell), select the
+`power-source` device type in addition to the sensor(s) you want on the endpoint
+topology, enable the ICD server, and switch the OpenThread stack to MTD:
+
+```bash
+./scripts/examples/gn_silabs_example.sh \
+    examples/all-devices-app/silabs \
+    out/temp_sensor/ \
+    BRD2601B \
+    --low-power \
+    'all_devices_enabled_devices=["humidity-sensor","temperature-sensor","power-source"]' \
+    'all_devices_default_devices=["humidity-sensor","temperature-sensor"]' \
+    'all_devices_app_name="TempSensor"' \
+    'sl_enable_si70xx_sensor=true' \
+    'chip_enable_icd_server=true' \
+    'chip_openthread_ftd=false'
+```
+
+Notes:
+
+-   `all_devices_default_devices` intentionally omits `power-source`; the app
+    auto-appends a `power-source` endpoint when `chip_enable_icd_server=true`
+    (see `maybeAddPowerSource()` in `src/AppTask.cpp`) so commissioners can
+    display a battery level / battery voltage.
+-   `sl_enable_si70xx_sensor=true` wires the on-board Si7021 sensor of the
+    BRD2601B to feed the humidity- and temperature-sensor endpoints.
+
+### Expected power consumption
+
+Once commissioned, in ICD Idle Mode (i.e. between polls), current draw on the
+BRD2601B should easily reach **~4 µA**. If you observe a significantly higher
+baseline or short periodic wake-ups on the power scope, double-check that
+`--low-power`, `chip_enable_icd_server=true` and `chip_openthread_ftd=false` all
+made it into the build.

examples/all-devices-app/silabs/src/AppTask.cpp

@@ -38,12 +38,14 @@
 #include <app/EventManagement.h>
 #include <app/InteractionModelEngine.h>
 #include <app/TestEventTriggerDelegate.h>
+#include <app/icd/server/ICDServerConfig.h>
 #include <app/server/Dnssd.h>
 #include <app/server/Server.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/OnboardingCodesUtil.h>
 
 #include <app_config/enabled_devices.h>
+#include <delegates/SilabsBatteryPowerSource.h>
 #include <device-factory/DeviceFactory.h>
 #include <device/api/allocator/ConsecutiveEndpointIdAllocator.h>
 #include <device/types/root-node/RootNode.h>
@@ -100,7 +102,11 @@ void AppTask::AppTaskMain(void * pvParameter)
         appError(err);
     }
 
+#if !(defined(CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER)
+    // On ICD builds the status LED timer would wake the CPU every 10 ms (see
+    // kLightTimerPeriod in BaseApplication.cpp), which defeats low-power mode.
     GetAppTask().StartStatusLEDTimer();
+#endif
 
     SILABS_LOG("App Task started");
 
@@ -176,6 +182,15 @@ CHIP_ERROR AppTask::InitCodeDrivenDataModel(chip::PersistentStorageDelegate & st
             chip::app::InteractionModelEngine::GetInstance()->GetMinGuaranteedSubscriptionsPerFabric(),
     };
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    // When the build is configured as an Intermittently Connected Device, hand the RootNode
+    // the SessionKeystore so it can construct the ICDManagement cluster on the root endpoint.
+    // The ICDManager itself is already owned/initialized by chip::Server when
+    // CHIP_CONFIG_ENABLE_ICD_SERVER=1, so no extra setup is required here.
+    rootNodeContext.icdSymmetricKeystore = chip::Server::GetInstance().GetSessionKeystore();
+    ChipLogProgress(AppServer, "ICD server enabled: registering ICDManagement cluster on the root endpoint");
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+
 #if CHIP_ENABLE_OPENTHREAD
     sRootNode = std::make_unique<chip::app::ThreadRootNode>(rootNodeContext,
                                                             chip::app::ThreadRootNode::ThreadContext{
@@ -211,6 +226,12 @@ CHIP_ERROR AppTask::InitCodeDrivenDataModel(chip::PersistentStorageDelegate & st
 
     auto & deviceFactory = chip::app::DeviceFactory::GetInstance();
 
+#if ALL_DEVICES_ENABLE_POWER_SOURCE
+    // Override the generic DecreasingBatteryPowerSource with a silabs-specific
+    // implementation tuned for the platform.
+    deviceFactory.RegisterCreator("power-source", []() { return std::make_unique<chip::app::SilabsBatteryPowerSource>(); });
+#endif
+
     ConsecutiveEndpointIdAllocator allocator(kDeviceEndpointId);
 
     auto instantiateDevice = [&](const std::string & type) -> CHIP_ERROR {
@@ -233,6 +254,23 @@ CHIP_ERROR AppTask::InitCodeDrivenDataModel(chip::PersistentStorageDelegate & st
     // build configuration.
     constexpr std::string_view kBuildTimeDevices{ ALL_DEVICES_DEFAULT_DEVICES };
 
+    // Helper that (when this build is configured as an ICD) instantiates an extra
+    // `power-source` endpoint so commissioners can display a battery level and
+    // battery voltage. The primary device stays whatever the user selected.
+    auto maybeAddPowerSource = [&]() -> CHIP_ERROR {
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+        if (!deviceFactory.IsValidDevice("power-source"))
+        {
+            ChipLogError(AppServer,
+                         "ICD build requested a power-source endpoint but the device factory has no 'power-source' entry");
+            return CHIP_NO_ERROR;
+        }
+        return instantiateDevice("power-source");
+#else
+        return CHIP_NO_ERROR;
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+    };
+
     if (!kBuildTimeDevices.empty())
     {
         sConstructedDevices.reserve(ALL_DEVICES_DEFAULT_DEVICES_COUNT);
@@ -249,6 +287,7 @@ CHIP_ERROR AppTask::InitCodeDrivenDataModel(chip::PersistentStorageDelegate & st
             }
             remaining.remove_prefix(comma + 1);
         }
+        ReturnErrorOnFailure(maybeAddPowerSource());
         return CHIP_NO_ERROR;
     }
 
@@ -270,7 +309,9 @@ CHIP_ERROR AppTask::InitCodeDrivenDataModel(chip::PersistentStorageDelegate & st
         deviceType = deviceFactory.GetDefaultDevice();
     }
 
-    return instantiateDevice(deviceType);
+    ReturnErrorOnFailure(instantiateDevice(deviceType));
+    ReturnErrorOnFailure(maybeAddPowerSource());
+    return CHIP_NO_ERROR;
 }
 
 chip::app::CodeDrivenDataModelProvider * AppTask::GetDataModelProvider()