QA team requested that all attributes in EPM cluster be turned on in …

…energy-management-app (project-chip#32095) * Fixes: project-chip#32089 In all-clusters-app, Set the EPM PowerMode attribute to AC. In energy-management-app turned on all features and attributes for testing. Fixed issue in TC_EPM_2_1.py when valid attribute is returned. Improved type checking for HarmonicCurrents and HarmonicPhases * Turned on additional attributes in EPM cluster on energy-management-app. Now runs tests without skipping unsupported attributes. * Turned on additional attributes in EPM cluster on energy-management-app. Now runs tests without skipping unsupported attributes. * Fixes project-chip#31925 - QA team expect HarmonicCurrents and HarmonicPhases to have 1 entry in the list for testing * Turned off 3 provisional features which fail the TC_DeviceConformance.py test * Removed EVSE attributes which are provisional in 1.3 (SOC, PNC, V2X)
raul-marquez-csa · Feb 16, 2024 · 38c3610 · 38c3610
1 parent 84fb708
commit 38c3610
Show file tree

Hide file tree

Showing 9 changed files with 284 additions and 257 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -8301,25 +8301,19 @@ endpoint 1 {
  callback attribute supplyState;
  callback attribute faultState;
  callback attribute chargingEnabledUntil;
- callback attribute dischargingEnabledUntil;
  callback attribute circuitCapacity;
  callback attribute minimumChargeCurrent;
  callback attribute maximumChargeCurrent;
- callback attribute maximumDischargeCurrent;
  callback attribute userMaximumChargeCurrent;
  callback attribute randomizationDelayWindow;
  callback attribute nextChargeStartTime;
  callback attribute nextChargeTargetTime;
  callback attribute nextChargeRequiredEnergy;
  callback attribute nextChargeTargetSoC;
  callback attribute approximateEVEfficiency;
- callback attribute stateOfCharge;
- callback attribute batteryCapacity;
- callback attribute vehicleID;
  callback attribute sessionID;
  callback attribute sessionDuration;
  callback attribute sessionEnergyCharged;
- callback attribute sessionEnergyDischarged;
  callback attribute generatedCommandList;
  callback attribute acceptedCommandList;
  callback attribute eventList;

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -3097,10 +3097,10 @@
  "side": "server",
  "type": "bitmap32",
  "included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
  "singleton": 0,
  "bounded": 0,
- "defaultValue": "0",
+ "defaultValue": null,
  "reportable": 1,
  "minInterval": 1,
  "maxInterval": 65534,
@@ -3113,10 +3113,10 @@
  "side": "server",
  "type": "int16u",
  "included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
  "singleton": 0,
  "bounded": 0,
- "defaultValue": "0x0002",
+ "defaultValue": null,
  "reportable": 1,
  "minInterval": 0,
  "maxInterval": 65344,
@@ -8570,6 +8570,7 @@
  "define": "LAUNDRY_DRYER_CONTROLS_CLUSTER",
  "side": "server",
  "enabled": 1,
+ "apiMaturity": "provisional",
  "attributes": [
  {
  "name": "SupportedDrynessLevels",
@@ -13815,22 +13816,6 @@
  "maxInterval": 65534,
  "reportableChange": 0
  },
- {
- "name": "DischargingEnabledUntil",
- "code": 4,
- "mfgCode": null,
- "side": "server",
- "type": "epoch_s",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
  {
  "name": "CircuitCapacity",
  "code": 5,
@@ -13879,22 +13864,6 @@
  "maxInterval": 65534,
  "reportableChange": 0
  },
- {
- "name": "MaximumDischargeCurrent",
- "code": 8,
- "mfgCode": null,
- "side": "server",
- "type": "amperage_ma",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
  {
  "name": "UserMaximumChargeCurrent",
  "code": 9,
@@ -14007,54 +13976,6 @@
  "maxInterval": 65534,
  "reportableChange": 0
  },
- {
- "name": "StateOfCharge",
- "code": 48,
- "mfgCode": null,
- "side": "server",
- "type": "percent",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "BatteryCapacity",
- "code": 49,
- "mfgCode": null,
- "side": "server",
- "type": "energy_mwh",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "VehicleID",
- "code": 50,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
  {
  "name": "SessionID",
  "code": 64,
@@ -14103,22 +14024,6 @@
  "maxInterval": 65534,
  "reportableChange": 0
  },
- {
- "name": "SessionEnergyDischarged",
- "code": 67,
- "mfgCode": null,
- "side": "server",
- "type": "energy_mwh",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": null,
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
  {
  "name": "GeneratedCommandList",
  "code": 65528,

diff --git a/examples/all-clusters-app/all-clusters-common/src/electrical-power-measurement-stub.cpp b/examples/all-clusters-app/all-clusters-common/src/electrical-power-measurement-stub.cpp
@@ -47,5 +47,7 @@ void emberAfElectricalPowerMeasurementClusterInitCallback(chip::EndpointId endpo
  OptionalAttributes::kOptionalAttributeNeutralCurrent));
 
  gEPMInstance->Init();
+
+ gEPMDelegate->SetPowerMode(PowerModeEnum::kAc);
  }
 }
diff --git a/examples/all-clusters-app/all-clusters-common/src/energy-evse-stub.cpp b/examples/all-clusters-app/all-clusters-common/src/energy-evse-stub.cpp
@@ -35,9 +35,7 @@ void emberAfEnergyEvseClusterInitCallback(chip::EndpointId endpointId)
  {
  gInstance = std::make_unique<EnergyEvseManager>(
  endpointId, *gDelegate,
- BitMask<EnergyEvse::Feature, uint32_t>(EnergyEvse::Feature::kChargingPreferences, EnergyEvse::Feature::kPlugAndCharge,
- EnergyEvse::Feature::kRfid, EnergyEvse::Feature::kSoCReporting,
- EnergyEvse::Feature::kV2x),
+ BitMask<EnergyEvse::Feature, uint32_t>(EnergyEvse::Feature::kChargingPreferences, EnergyEvse::Feature::kRfid),
  BitMask<OptionalAttributes, uint32_t>(OptionalAttributes::kSupportsUserMaximumChargingCurrent,
  OptionalAttributes::kSupportsRandomizationWindow,
  OptionalAttributes::kSupportsApproximateEvEfficiency),

diff --git a/examples/energy-management-app/energy-management-common/energy-management-app.matter b/examples/energy-management-app/energy-management-common/energy-management-app.matter
@@ -1896,7 +1896,19 @@ endpoint 1 {
  callback attribute ranges;
  callback attribute voltage;
  callback attribute activeCurrent;
+ callback attribute reactiveCurrent;
+ callback attribute apparentCurrent;
  callback attribute activePower;
+ callback attribute reactivePower;
+ callback attribute apparentPower;
+ callback attribute RMSVoltage;
+ callback attribute RMSCurrent;
+ callback attribute RMSPower;
+ callback attribute frequency;
+ callback attribute harmonicCurrents;
+ callback attribute harmonicPhases;
+ callback attribute powerFactor;
+ callback attribute neutralCurrent;
  callback attribute generatedCommandList;
  callback attribute acceptedCommandList;
  callback attribute eventList;
@@ -1963,25 +1975,19 @@ endpoint 1 {
  callback attribute supplyState;
  callback attribute faultState;
  callback attribute chargingEnabledUntil;
- callback attribute dischargingEnabledUntil;
  callback attribute circuitCapacity;
  callback attribute minimumChargeCurrent;
  callback attribute maximumChargeCurrent;
- callback attribute maximumDischargeCurrent;
  callback attribute userMaximumChargeCurrent;
  callback attribute randomizationDelayWindow;
  callback attribute nextChargeStartTime;
  callback attribute nextChargeTargetTime;
  callback attribute nextChargeRequiredEnergy;
  callback attribute nextChargeTargetSoC;
  callback attribute approximateEVEfficiency;
- callback attribute stateOfCharge;
- callback attribute batteryCapacity;
- callback attribute vehicleID;
  callback attribute sessionID;
  callback attribute sessionDuration;
  callback attribute sessionEnergyCharged;
- callback attribute sessionEnergyDischarged;
  callback attribute generatedCommandList;
  callback attribute acceptedCommandList;
  callback attribute eventList;