Skip to content

Commit 820034e

Browse files
authored
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)
1 parent 598356c commit 820034e

File tree

9 files changed

+284
-257
lines changed

9 files changed

+284
-257
lines changed

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

-6
Original file line numberDiff line numberDiff line change
@@ -8301,25 +8301,19 @@ endpoint 1 {
83018301
callback attribute supplyState;
83028302
callback attribute faultState;
83038303
callback attribute chargingEnabledUntil;
8304-
callback attribute dischargingEnabledUntil;
83058304
callback attribute circuitCapacity;
83068305
callback attribute minimumChargeCurrent;
83078306
callback attribute maximumChargeCurrent;
8308-
callback attribute maximumDischargeCurrent;
83098307
callback attribute userMaximumChargeCurrent;
83108308
callback attribute randomizationDelayWindow;
83118309
callback attribute nextChargeStartTime;
83128310
callback attribute nextChargeTargetTime;
83138311
callback attribute nextChargeRequiredEnergy;
83148312
callback attribute nextChargeTargetSoC;
83158313
callback attribute approximateEVEfficiency;
8316-
callback attribute stateOfCharge;
8317-
callback attribute batteryCapacity;
8318-
callback attribute vehicleID;
83198314
callback attribute sessionID;
83208315
callback attribute sessionDuration;
83218316
callback attribute sessionEnergyCharged;
8322-
callback attribute sessionEnergyDischarged;
83238317
callback attribute generatedCommandList;
83248318
callback attribute acceptedCommandList;
83258319
callback attribute eventList;

examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+5-100
Original file line numberDiff line numberDiff line change
@@ -3097,10 +3097,10 @@
30973097
"side": "server",
30983098
"type": "bitmap32",
30993099
"included": 1,
3100-
"storageOption": "RAM",
3100+
"storageOption": "External",
31013101
"singleton": 0,
31023102
"bounded": 0,
3103-
"defaultValue": "0",
3103+
"defaultValue": null,
31043104
"reportable": 1,
31053105
"minInterval": 1,
31063106
"maxInterval": 65534,
@@ -3113,10 +3113,10 @@
31133113
"side": "server",
31143114
"type": "int16u",
31153115
"included": 1,
3116-
"storageOption": "RAM",
3116+
"storageOption": "External",
31173117
"singleton": 0,
31183118
"bounded": 0,
3119-
"defaultValue": "0x0002",
3119+
"defaultValue": null,
31203120
"reportable": 1,
31213121
"minInterval": 0,
31223122
"maxInterval": 65344,
@@ -8570,6 +8570,7 @@
85708570
"define": "LAUNDRY_DRYER_CONTROLS_CLUSTER",
85718571
"side": "server",
85728572
"enabled": 1,
8573+
"apiMaturity": "provisional",
85738574
"attributes": [
85748575
{
85758576
"name": "SupportedDrynessLevels",
@@ -13815,22 +13816,6 @@
1381513816
"maxInterval": 65534,
1381613817
"reportableChange": 0
1381713818
},
13818-
{
13819-
"name": "DischargingEnabledUntil",
13820-
"code": 4,
13821-
"mfgCode": null,
13822-
"side": "server",
13823-
"type": "epoch_s",
13824-
"included": 1,
13825-
"storageOption": "External",
13826-
"singleton": 0,
13827-
"bounded": 0,
13828-
"defaultValue": null,
13829-
"reportable": 1,
13830-
"minInterval": 1,
13831-
"maxInterval": 65534,
13832-
"reportableChange": 0
13833-
},
1383413819
{
1383513820
"name": "CircuitCapacity",
1383613821
"code": 5,
@@ -13879,22 +13864,6 @@
1387913864
"maxInterval": 65534,
1388013865
"reportableChange": 0
1388113866
},
13882-
{
13883-
"name": "MaximumDischargeCurrent",
13884-
"code": 8,
13885-
"mfgCode": null,
13886-
"side": "server",
13887-
"type": "amperage_ma",
13888-
"included": 1,
13889-
"storageOption": "External",
13890-
"singleton": 0,
13891-
"bounded": 0,
13892-
"defaultValue": null,
13893-
"reportable": 1,
13894-
"minInterval": 1,
13895-
"maxInterval": 65534,
13896-
"reportableChange": 0
13897-
},
1389813867
{
1389913868
"name": "UserMaximumChargeCurrent",
1390013869
"code": 9,
@@ -14007,54 +13976,6 @@
1400713976
"maxInterval": 65534,
1400813977
"reportableChange": 0
1400913978
},
14010-
{
14011-
"name": "StateOfCharge",
14012-
"code": 48,
14013-
"mfgCode": null,
14014-
"side": "server",
14015-
"type": "percent",
14016-
"included": 1,
14017-
"storageOption": "External",
14018-
"singleton": 0,
14019-
"bounded": 0,
14020-
"defaultValue": null,
14021-
"reportable": 1,
14022-
"minInterval": 1,
14023-
"maxInterval": 65534,
14024-
"reportableChange": 0
14025-
},
14026-
{
14027-
"name": "BatteryCapacity",
14028-
"code": 49,
14029-
"mfgCode": null,
14030-
"side": "server",
14031-
"type": "energy_mwh",
14032-
"included": 1,
14033-
"storageOption": "External",
14034-
"singleton": 0,
14035-
"bounded": 0,
14036-
"defaultValue": null,
14037-
"reportable": 1,
14038-
"minInterval": 1,
14039-
"maxInterval": 65534,
14040-
"reportableChange": 0
14041-
},
14042-
{
14043-
"name": "VehicleID",
14044-
"code": 50,
14045-
"mfgCode": null,
14046-
"side": "server",
14047-
"type": "char_string",
14048-
"included": 1,
14049-
"storageOption": "External",
14050-
"singleton": 0,
14051-
"bounded": 0,
14052-
"defaultValue": null,
14053-
"reportable": 1,
14054-
"minInterval": 1,
14055-
"maxInterval": 65534,
14056-
"reportableChange": 0
14057-
},
1405813979
{
1405913980
"name": "SessionID",
1406013981
"code": 64,
@@ -14103,22 +14024,6 @@
1410314024
"maxInterval": 65534,
1410414025
"reportableChange": 0
1410514026
},
14106-
{
14107-
"name": "SessionEnergyDischarged",
14108-
"code": 67,
14109-
"mfgCode": null,
14110-
"side": "server",
14111-
"type": "energy_mwh",
14112-
"included": 1,
14113-
"storageOption": "External",
14114-
"singleton": 0,
14115-
"bounded": 0,
14116-
"defaultValue": null,
14117-
"reportable": 1,
14118-
"minInterval": 1,
14119-
"maxInterval": 65534,
14120-
"reportableChange": 0
14121-
},
1412214027
{
1412314028
"name": "GeneratedCommandList",
1412414029
"code": 65528,

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

+2
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,7 @@ void emberAfElectricalPowerMeasurementClusterInitCallback(chip::EndpointId endpo
4747
OptionalAttributes::kOptionalAttributeNeutralCurrent));
4848

4949
gEPMInstance->Init();
50+
51+
gEPMDelegate->SetPowerMode(PowerModeEnum::kAc);
5052
}
5153
}

examples/all-clusters-app/all-clusters-common/src/energy-evse-stub.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ void emberAfEnergyEvseClusterInitCallback(chip::EndpointId endpointId)
3535
{
3636
gInstance = std::make_unique<EnergyEvseManager>(
3737
endpointId, *gDelegate,
38-
BitMask<EnergyEvse::Feature, uint32_t>(EnergyEvse::Feature::kChargingPreferences, EnergyEvse::Feature::kPlugAndCharge,
39-
EnergyEvse::Feature::kRfid, EnergyEvse::Feature::kSoCReporting,
40-
EnergyEvse::Feature::kV2x),
38+
BitMask<EnergyEvse::Feature, uint32_t>(EnergyEvse::Feature::kChargingPreferences, EnergyEvse::Feature::kRfid),
4139
BitMask<OptionalAttributes, uint32_t>(OptionalAttributes::kSupportsUserMaximumChargingCurrent,
4240
OptionalAttributes::kSupportsRandomizationWindow,
4341
OptionalAttributes::kSupportsApproximateEvEfficiency),

examples/energy-management-app/energy-management-common/energy-management-app.matter

+12-6
Original file line numberDiff line numberDiff line change
@@ -1896,7 +1896,19 @@ endpoint 1 {
18961896
callback attribute ranges;
18971897
callback attribute voltage;
18981898
callback attribute activeCurrent;
1899+
callback attribute reactiveCurrent;
1900+
callback attribute apparentCurrent;
18991901
callback attribute activePower;
1902+
callback attribute reactivePower;
1903+
callback attribute apparentPower;
1904+
callback attribute RMSVoltage;
1905+
callback attribute RMSCurrent;
1906+
callback attribute RMSPower;
1907+
callback attribute frequency;
1908+
callback attribute harmonicCurrents;
1909+
callback attribute harmonicPhases;
1910+
callback attribute powerFactor;
1911+
callback attribute neutralCurrent;
19001912
callback attribute generatedCommandList;
19011913
callback attribute acceptedCommandList;
19021914
callback attribute eventList;
@@ -1963,25 +1975,19 @@ endpoint 1 {
19631975
callback attribute supplyState;
19641976
callback attribute faultState;
19651977
callback attribute chargingEnabledUntil;
1966-
callback attribute dischargingEnabledUntil;
19671978
callback attribute circuitCapacity;
19681979
callback attribute minimumChargeCurrent;
19691980
callback attribute maximumChargeCurrent;
1970-
callback attribute maximumDischargeCurrent;
19711981
callback attribute userMaximumChargeCurrent;
19721982
callback attribute randomizationDelayWindow;
19731983
callback attribute nextChargeStartTime;
19741984
callback attribute nextChargeTargetTime;
19751985
callback attribute nextChargeRequiredEnergy;
19761986
callback attribute nextChargeTargetSoC;
19771987
callback attribute approximateEVEfficiency;
1978-
callback attribute stateOfCharge;
1979-
callback attribute batteryCapacity;
1980-
callback attribute vehicleID;
19811988
callback attribute sessionID;
19821989
callback attribute sessionDuration;
19831990
callback attribute sessionEnergyCharged;
1984-
callback attribute sessionEnergyDischarged;
19851991
callback attribute generatedCommandList;
19861992
callback attribute acceptedCommandList;
19871993
callback attribute eventList;

0 commit comments

Comments
 (0)