Add Electrical power measurement to energy management app

.github/workflows/tests.yaml

@@ -476,9 +476,16 @@ jobs:
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-lock-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-lock-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DRLK_2_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DeviceBasicComposition.py" --script-args "--storage-path admin_storage.json --manual-code 10054912339 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-lock-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-lock-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DeviceConformance.py" --script-args "--storage-path admin_storage.json --manual-code 10054912339 --bool-arg ignore_in_progress:True allow_provisional:True --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto  --tests test_TC_IDM_10_2"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-energy-management-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-energy-management-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_EEM_2_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-energy-management-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-energy-management-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_EEM_2_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-energy-management-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-energy-management-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_EEM_2_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-energy-management-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-energy-management-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_EEM_2_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-energy-management-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-energy-management-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_EEM_2_5.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-energy-management-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-energy-management-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_EEVSE_2_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-energy-management-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-energy-management-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_EEVSE_2_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-energy-management-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-energy-management-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_EEVSE_2_5.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-energy-management-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-energy-management-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_EPM_2_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-energy-management-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-energy-management-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_EPM_2_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'

examples/all-clusters-app/all-clusters-common/src/electrical-power-measurement-stub.cpp

@@ -16,239 +16,25 @@
  *    limitations under the License.
  */
 
-#include <app/clusters/electrical-power-measurement-server/electrical-power-measurement-server.h>
+#include <ElectricalPowerMeasurementDelegate.h>
 
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::ElectricalPowerMeasurement;
-using namespace chip::app::Clusters::ElectricalPowerMeasurement::Structs;
 
-namespace chip {
-namespace app {
-namespace Clusters {
-namespace ElectricalPowerMeasurement {
-
-static MeasurementAccuracyRangeStruct::Type activeCurrentAccuracyRanges[] = { { .rangeMin = 500, .rangeMax = 1000 } };
-
-class StubAccuracyIterator : public Delegate::AccuracyIterator
-{
-public:
-    size_t Count() override;
-    bool Next(MeasurementAccuracyStruct::Type & output) override;
-    void Release() override;
-
-private:
-    uint8_t mIndex;
-};
-
-size_t StubAccuracyIterator::Count()
-{
-    return 1;
-}
-
-bool StubAccuracyIterator::Next(MeasurementAccuracyStruct::Type & output)
-{
-    if (mIndex >= 1)
-    {
-        return false;
-    }
-    output.measurementType  = MeasurementTypeEnum::kActiveCurrent;
-    output.measured         = true;
-    output.minMeasuredValue = -10000000;
-    output.maxMeasuredValue = 10000000;
-    output.accuracyRanges   = DataModel::List<const MeasurementAccuracyRangeStruct::Type>(activeCurrentAccuracyRanges);
-    mIndex++;
-    return true;
-}
-
-void StubAccuracyIterator::Release()
-{
-    mIndex = 0;
-}
-
-class StubRangeIterator : public Delegate::RangeIterator
-{
-public:
-    size_t Count() override;
-    bool Next(MeasurementRangeStruct::Type & output) override;
-    void Release() override;
-};
-
-size_t StubRangeIterator::Count()
-{
-    return 0;
-}
-
-bool StubRangeIterator::Next(MeasurementRangeStruct::Type & output)
-{
-    return false;
-}
-
-void StubRangeIterator::Release() {}
-
-class StubHarmonicMeasurementIterator : public Delegate::HarmonicMeasurementIterator
-{
-public:
-    size_t Count() override;
-    bool Next(HarmonicMeasurementStruct::Type & output) override;
-    void Release() override;
-};
-
-size_t StubHarmonicMeasurementIterator::Count()
-{
-    return 0;
-}
-
-bool StubHarmonicMeasurementIterator::Next(HarmonicMeasurementStruct::Type & output)
-{
-    return false;
-}
-
-void StubHarmonicMeasurementIterator::Release() {}
-
-static StubAccuracyIterator accuracyIterator;
-static StubRangeIterator rangeIterator;
-static StubHarmonicMeasurementIterator harmonicMeasurementIterator;
-
-class ElectricalPowerMeasurementDelegate : public Delegate
-{
-public:
-    PowerModeEnum GetPowerMode() override;
-    uint8_t GetNumberOfMeasurementTypes() override;
-    AccuracyIterator * IterateAccuracy() override;
-    RangeIterator * IterateRanges() override;
-    DataModel::Nullable<int64_t> GetVoltage() override;
-    DataModel::Nullable<int64_t> GetActiveCurrent() override;
-    DataModel::Nullable<int64_t> GetReactiveCurrent() override;
-    DataModel::Nullable<int64_t> GetApparentCurrent() override;
-    DataModel::Nullable<int64_t> GetActivePower() override;
-    DataModel::Nullable<int64_t> GetReactivePower() override;
-    DataModel::Nullable<int64_t> GetApparentPower() override;
-    DataModel::Nullable<int64_t> GetRMSVoltage() override;
-    DataModel::Nullable<int64_t> GetRMSCurrent() override;
-    DataModel::Nullable<int64_t> GetRMSPower() override;
-    DataModel::Nullable<int64_t> GetFrequency() override;
-    HarmonicMeasurementIterator * IterateHarmonicCurrents() override;
-    HarmonicMeasurementIterator * IterateHarmonicPhases() override;
-    DataModel::Nullable<int64_t> GetPowerFactor() override;
-    DataModel::Nullable<int64_t> GetNeutralCurrent() override;
-
-    ~ElectricalPowerMeasurementDelegate() = default;
-};
-
-PowerModeEnum ElectricalPowerMeasurementDelegate::GetPowerMode()
-{
-    return PowerModeEnum::kAc;
-}
-
-uint8_t ElectricalPowerMeasurementDelegate::GetNumberOfMeasurementTypes()
-{
-    return 1;
-}
-
-Delegate::AccuracyIterator * ElectricalPowerMeasurementDelegate::IterateAccuracy()
-{
-    return &accuracyIterator;
-}
-
-Delegate::RangeIterator * ElectricalPowerMeasurementDelegate::IterateRanges()
-{
-    return &rangeIterator;
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetVoltage()
-{
-    return {};
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetActiveCurrent()
-{
-    return {};
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetReactiveCurrent()
-{
-    return {};
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetApparentCurrent()
-{
-    return {};
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetActivePower()
-{
-    return DataModel::Nullable<int64_t>(10000);
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetReactivePower()
-{
-    return {};
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetApparentPower()
-{
-    return {};
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetRMSVoltage()
-{
-    return {};
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetRMSCurrent()
-{
-    return {};
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetRMSPower()
-{
-    return {};
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetFrequency()
-{
-    return {};
-}
-
-Delegate::HarmonicMeasurementIterator * ElectricalPowerMeasurementDelegate::IterateHarmonicCurrents()
-{
-    return &harmonicMeasurementIterator;
-}
-
-Delegate::HarmonicMeasurementIterator * ElectricalPowerMeasurementDelegate::IterateHarmonicPhases()
-{
-    return &harmonicMeasurementIterator;
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetPowerFactor()
-{
-    return {};
-}
-
-DataModel::Nullable<int64_t> ElectricalPowerMeasurementDelegate::GetNeutralCurrent()
-{
-    return {};
-}
-
-} // namespace ElectricalPowerMeasurement
-} // namespace Clusters
-} // namespace app
-} // namespace chip
-
-static std::unique_ptr<ElectricalPowerMeasurement::Delegate> gDelegate;
-static std::unique_ptr<ElectricalPowerMeasurement::Instance> gInstance;
+static std::unique_ptr<ElectricalPowerMeasurementDelegate> gEPMDelegate;
+static std::unique_ptr<ElectricalPowerMeasurementInstance> gEPMInstance;
 
 void emberAfElectricalPowerMeasurementClusterInitCallback(chip::EndpointId endpointId)
 {
     VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
-    VerifyOrDie(!gInstance);
+    VerifyOrDie(!gEPMInstance);
 
-    gDelegate = std::make_unique<ElectricalPowerMeasurementDelegate>();
-    if (gDelegate)
+    gEPMDelegate = std::make_unique<ElectricalPowerMeasurementDelegate>();
+    if (gEPMDelegate)
     {
-        gInstance = std::make_unique<Instance>(
-            endpointId, *gDelegate,
+        gEPMInstance = std::make_unique<ElectricalPowerMeasurementInstance>(
+            endpointId, *gEPMDelegate,
             BitMask<Feature, uint32_t>(Feature::kDirectCurrent, Feature::kAlternatingCurrent, Feature::kPolyphasePower,
                                        Feature::kHarmonics, Feature::kPowerQuality),
             BitMask<OptionalAttributes, uint32_t>(
@@ -260,6 +46,6 @@ void emberAfElectricalPowerMeasurementClusterInitCallback(chip::EndpointId endpo
                 OptionalAttributes::kOptionalAttributeFrequency, OptionalAttributes::kOptionalAttributePowerFactor,
                 OptionalAttributes::kOptionalAttributeNeutralCurrent));
 
-        gInstance->Init();
+        gEPMInstance->Init();
     }
 }

examples/all-clusters-app/ameba/chip_main.cmake

@@ -179,6 +179,7 @@ list(
 
     ${chip_dir}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp
     ${chip_dir}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp
+    ${chip_dir}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp
     ${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp
     ${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp
 

examples/all-clusters-app/asr/BUILD.gn

@@ -84,6 +84,7 @@ asr_executable("clusters_app") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
+    "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
     "${examples_plat_dir}/ButtonHandler.cpp",