Addressing further review comments from Boris

Author: PeterC1965

examples/energy-management-app/energy-management-common/include/DeviceEnergyManagementDelegateImpl.h

@@ -50,6 +50,9 @@ class DeviceEnergyManagementDelegate : public DeviceEnergyManagement::Delegate
      * @brief Implements a handler to begin to adjust client power
      *        consumption/generation to the level requested.
      *
+     *        Note callers must call GetPowerAdjustmentCapability and ensure the return value is not null
+     *        before calling PowerAdjustRequest.
+     *
      * @param power Milli-Watts the ESA SHALL use during the adjustment period.
      * @param duration The duration that the ESA SHALL maintain the requested power for.
      * @return  Success if the adjustment is accepted; otherwise the command SHALL be rejected with appropriate error.

examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp

@@ -864,7 +864,7 @@ CHIP_ERROR DeviceEnergyManagementDelegate::SetAbsMinPower(int64_t newValueMw)
     mAbsMinPowerMw = newValueMw;
     if (oldValueMw != newValueMw)
     {
-        ChipLogDetail(AppServer, "mAbsMinPower updated to %d", static_cast<int>(mAbsMinPowerMw));
+        ChipLogDetail(AppServer, "mAbsMinPower updated to " ChipLogFormatX64, ChipLogValueX64(mAbsMinPowerMw));
         MatterReportingAttributeChangeCallback(mEndpointId, DeviceEnergyManagement::Id, AbsMinPower::Id);
     }
 
@@ -878,7 +878,7 @@ CHIP_ERROR DeviceEnergyManagementDelegate::SetAbsMaxPower(int64_t newValueMw)
     mAbsMaxPowerMw = newValueMw;
     if (oldValueMw != newValueMw)
     {
-        ChipLogDetail(AppServer, "mAbsMaxPower updated to %d", static_cast<int>(mAbsMaxPowerMw));
+        ChipLogDetail(AppServer, "mAbsMaxPower updated to " ChipLogFormatX64, ChipLogValueX64(mAbsMaxPowerMw));
         MatterReportingAttributeChangeCallback(mEndpointId, DeviceEnergyManagement::Id, AbsMaxPower::Id);
     }
 

src/app/clusters/device-energy-management-server/device-energy-management-server.h

@@ -45,6 +45,9 @@ class Delegate
      * @brief Delegate should implement a handler to begin to adjust client power
      *        consumption/generation to the level requested.
      *
+     *        Note callers must call GetPowerAdjustmentCapability and ensure the return value is not null
+     *        before calling PowerAdjustRequest.
+     *
      * @param power Milli-Watts the ESA SHALL use during the adjustment period.
      * @param duration The duration that the ESA SHALL maintain the requested power for.
      * @return  Success if the adjustment is accepted; otherwise the command SHALL be rejected with appropriate error.

src/python_testing/TC_DEM_2_2.py

@@ -23,7 +23,7 @@
 # test-runner-run/run1/app: ${ENERGY_MANAGEMENT_APP}
 # test-runner-run/run1/factoryreset: True
 # test-runner-run/run1/quiet: True
-# test-runner-run/run1/app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json --enable-key 000102030405060708090a0b0c0d0e0f
+# test-runner-run/run1/app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json --enable-key 000102030405060708090a0b0c0d0e0f --featureSet 0x01
 # test-runner-run/run1/script-args: --storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --endpoint 1 --trace-to json:${TRACE_TEST_JSON}.json --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
 # === END CI TEST ARGUMENTS ===