Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

QA team requested that EPM cluster has at least 1 entry in the list for HarmonicCurrent and HarmonicPhases #32103

Closed
wants to merge 5 commits into from
Closed

QA team requested that EPM cluster has at least 1 entry in the list for HarmonicCurrent and HarmonicPhases #32103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec69c76
Turned on additional attributes in EPM cluster on energy-management-a…
jamesharrow Feb 13, 2024
c2cdde3
Fixes #31925 - QA team expect HarmonicCurrents and HarmonicPhases to …
jamesharrow Feb 13, 2024
40beb53
Merge remote-tracking branch 'upstream/master' into 31925-cert-test-f…
jamesharrow Feb 13, 2024
440db82
Turned off 3 provisional features which fail the TC_DeviceConformance…
jamesharrow Feb 13, 2024
64316e3
Removed EVSE attributes which are provisional in 1.3 (SOC, PNC, V2X)
jamesharrow Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
105 changes: 5 additions & 100 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -8570,6 +8570,7 @@
"define": "LAUNDRY_DRYER_CONTROLS_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"attributes": [
{
"name": "SupportedDrynessLevels",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions examples/all-clusters-app/all-clusters-common/src/electrical-power-measurement-stub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,7 @@ void emberAfElectricalPowerMeasurementClusterInitCallback(chip::EndpointId endpo
OptionalAttributes::kOptionalAttributeNeutralCurrent));

gEPMInstance->Init();

gEPMDelegate->SetPowerMode(PowerModeEnum::kAc);
}
}
4 changes: 1 addition & 3 deletions examples/all-clusters-app/all-clusters-common/src/energy-evse-stub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
18 changes: 12 additions & 6 deletions examples/energy-management-app/energy-management-common/energy-management-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading
Loading