Skip to content

Commit

Permalink
DSRR-157 Aligned to new XML definitions from spec PR #7813 - includes…
Browse files Browse the repository at this point in the history
… autogen code. Last commit before rebasing to upstream.
  • Loading branch information
jamesharrow committed Nov 19, 2023
1 parent 79a6811 commit 99c86ce
Show file tree
Hide file tree
Showing 56 changed files with 5,692 additions and 8,525 deletions.
159 changes: 78 additions & 81 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -3395,27 +3395,17 @@ server cluster DeviceEnergyManagement = 152 {
command RequestConstraintBasedForecast(RequestConstraintBasedForecastRequest): DefaultSuccess = 6;
}

/** This cluster provides an interface for the management of Electric Vehicle Supply Equipment (EVSE). */
/** Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management. */
server cluster EnergyEvse = 153 {
enum EnergyTransferStoppedReasonEnum : ENUM8 {
kEvStopped = 0;
kEvseStopped = 1;
kEVStopped = 0;
kEVSEStopped = 1;
kOther = 2;
}

enum EvseStateEnum : ENUM8 {
kNotPluggedIn = 0;
kPluggedInNoDemand = 1;
kPluggedInDemand = 2;
kPluggedInCharging = 3;
kPluggedInDischarging = 4;
kSessionEnding = 5;
kFault = 6;
}

enum FaultStateEnum : ENUM8 {
kNoError = 0;
kEvseMeterFailure = 1;
kMeterFailure = 1;
kOverVoltage = 2;
kUnderVoltage = 3;
kOverCurrent = 4;
Expand All @@ -3426,13 +3416,23 @@ server cluster EnergyEvse = 153 {
kPowerQuality = 9;
kPilotShortCircuit = 10;
kEmergencyStop = 11;
kEvDisconnected = 12;
kEVDisconnected = 12;
kWrongPowerSupply = 13;
kLiveNeutralSwap = 14;
kOverTemperature = 15;
kOther = 255;
}

enum StateEnum : ENUM8 {
kNotPluggedIn = 0;
kPluggedInNoDemand = 1;
kPluggedInDemand = 2;
kPluggedInCharging = 3;
kPluggedInDischarging = 4;
kSessionEnding = 5;
kFault = 6;
}

enum SupplyStateEnum : ENUM8 {
kDisabled = 0;
kChargingEnabled = 1;
Expand All @@ -3443,11 +3443,10 @@ server cluster EnergyEvse = 153 {

bitmap Feature : BITMAP32 {
kChargingPreferences = 0x1;
kSessions = 0x2;
kSoCReporting = 0x4;
kPlugAndCharge = 0x8;
kRFID = 0x10;
kV2X = 0x20;
kSoCReporting = 0x2;
kPlugAndCharge = 0x4;
kRFID = 0x8;
kV2X = 0x10;
}

bitmap TargetDayOfWeekBitmap : BITMAP8 {
Expand All @@ -3463,71 +3462,70 @@ server cluster EnergyEvse = 153 {
struct ChargingTargetStruct {
int16u targetTime = 0;
optional percent targetSoC = 1;
optional int32s addedEnergy = 2;
optional int64s addedEnergy = 2;
}

info event EVConnected = 0 {
INT32U sessionId = 0;
int32u sessionID = 0;
}

info event EVNotDetected = 1 {
INT32U sessionId = 0;
EvseStateEnum state = 1;
int32u sessionID = 0;
StateEnum state = 1;
elapsed_s sessionDuration = 2;
INT32S sessionEnergyCharged = 3;
INT32S sessionEnergyDischarged = 4;
int64s sessionEnergyCharged = 3;
int64s sessionEnergyDischarged = 4;
}

info event EnergyTransferStarted = 2 {
INT32U sessionId = 0;
EvseStateEnum state = 1;
INT32U maximumCurrent = 2;
int32u sessionID = 0;
StateEnum state = 1;
int64s maximumCurrent = 2;
}

info event EnergyTransferStopped = 3 {
INT32U sessionId = 0;
EvseStateEnum state = 1;
int32u sessionID = 0;
StateEnum state = 1;
EnergyTransferStoppedReasonEnum reason = 2;
INT32S energyTransferred = 4;
int64s energyTransferred = 4;
}

critical event Fault = 4 {
INT32U sessionId = 0;
EvseStateEnum state = 1;
EvseStateEnum faultStatePreviousState = 2;
EvseStateEnum faultStateCurrentState = 4;
int32u sessionID = 0;
StateEnum state = 1;
FaultStateEnum faultStatePreviousState = 2;
FaultStateEnum faultStateCurrentState = 4;
}

info event RFID = 5 {
OCTET_STRING uid = 0;
octet_string uid = 0;
}

readonly attribute nullable EvseStateEnum state = 0;
readonly attribute nullable StateEnum state = 0;
readonly attribute SupplyStateEnum supplyState = 1;
readonly attribute FaultStateEnum faultState = 2;
readonly attribute nullable elapsed_s enableChargeTime = 3;
readonly attribute nullable elapsed_s enableDischargeTime = 4;
readonly attribute int32u circuitCapacity = 5;
readonly attribute int32u minimumChargeCurrent = 6;
readonly attribute int32u maximumChargeCurrent = 7;
readonly attribute int32u maximumDischargeCurrent = 8;
attribute access(write: manage) int32u userMaximumChargeCurrent = 9;
attribute access(write: manage) elapsed_s randomisationDelayWindow = 10;
readonly attribute nullable epoch_s chargingEnabledUntil = 3;
readonly attribute nullable epoch_s dischargingEnabledUntil = 4;
readonly attribute int64s circuitCapacity = 5;
readonly attribute int64s minimumChargeCurrent = 6;
readonly attribute int64s maximumChargeCurrent = 7;
readonly attribute int64s maximumDischargeCurrent = 8;
attribute access(write: manage) int64s userMaximumChargeCurrent = 9;
attribute access(write: manage) elapsed_s randomizationDelayWindow = 10;
readonly attribute int8u numberOfWeeklyTargets = 33;
readonly attribute int8u numberOfDailyTargets = 34;
readonly attribute nullable epoch_s nextChargeStartTime = 35;
readonly attribute nullable epoch_s nextChargeTargetTime = 36;
readonly attribute nullable int32s nextChargeRequiredEnergy = 37;
readonly attribute nullable int8u nextChargeTargetSoc = 38;
attribute access(write: manage) nullable int16u approxEvEfficiency = 39;
readonly attribute nullable Percent stateOfCharge = 48;
readonly attribute nullable int32s batteryCapacity = 49;
readonly attribute nullable char_string<32> vehicleId = 50;
readonly attribute int32u sessionId = 64;
readonly attribute int16u eventSequenceNumber = 65;
readonly attribute elapsed_s sessionDuration = 66;
readonly attribute int32s sessionEnergyCharged = 67;
readonly attribute int32s sessionEnergyDischarged = 68;
readonly attribute nullable int64s nextChargeRequiredEnergy = 37;
readonly attribute nullable percent nextChargeTargetSoC = 38;
attribute access(write: manage) nullable int16u approximateEVEfficiency = 39;
readonly attribute nullable percent stateOfCharge = 48;
readonly attribute nullable int64s batteryCapacity = 49;
readonly attribute nullable char_string<0x20> vehicleID = 50;
readonly attribute nullable int32u sessionID = 64;
readonly attribute elapsed_s sessionDuration = 65;
readonly attribute int64s sessionEnergyCharged = 66;
readonly attribute int64s sessionEnergyDischarged = 67;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -3536,18 +3534,18 @@ server cluster EnergyEvse = 153 {
readonly attribute int16u clusterRevision = 65533;

request struct EnableChargingRequest {
nullable elapsed_s enableChargeTime = 0;
INT32U minimumChargeCurrent = 1;
INT32U maximumChargeCurrent = 2;
nullable epoch_s chargingEnabledUntil = 0;
int64s minimumChargeCurrent = 1;
int64s maximumChargeCurrent = 2;
}

request struct EnableDischargingRequest {
nullable elapsed_s enableDischargeTime = 0;
INT32U maximumDischargeCurrent = 1;
nullable epoch_s dischargingEnabledUntil = 0;
int64s maximumDischargeCurrent = 1;
}

request struct SetTargetsRequest {
TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
TargetDayOfWeekBitmap dayOfWeekforSequence = 0;
ChargingTargetStruct chargingTargets[] = 1;
}

Expand All @@ -3556,17 +3554,17 @@ server cluster EnergyEvse = 153 {
}

response struct GetTargetsResponse = 0 {
TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
TargetDayOfWeekBitmap dayOfWeekforSequence = 0;
ChargingTargetStruct chargingTargets[] = 1;
}

command Disable(): DefaultSuccess = 1;
command EnableCharging(EnableChargingRequest): DefaultSuccess = 2;
command EnableDischarging(EnableDischargingRequest): DefaultSuccess = 3;
command StartDiagnostics(): DefaultSuccess = 4;
command SetTargets(SetTargetsRequest): DefaultSuccess = 5;
command GetTargets(GetTargetsRequest): DefaultSuccess = 6;
command ClearTargets(): DefaultSuccess = 7;
timed command Disable(): DefaultSuccess = 1;
timed command EnableCharging(EnableChargingRequest): DefaultSuccess = 2;
timed command EnableDischarging(EnableDischargingRequest): DefaultSuccess = 3;
timed command StartDiagnostics(): DefaultSuccess = 4;
timed command SetTargets(SetTargetsRequest): DefaultSuccess = 5;
timed command GetTargets(GetTargetsRequest): GetTargetsResponse = 6;
timed command ClearTargets(): DefaultSuccess = 7;
}

/** An interface to a generic way to secure a door */
Expand Down Expand Up @@ -8047,27 +8045,26 @@ endpoint 2 {
ram attribute state;
ram attribute supplyState;
ram attribute faultState;
ram attribute enableChargeTime;
ram attribute enableDischargeTime;
ram attribute chargingEnabledUntil;
ram attribute dischargingEnabledUntil;
ram attribute circuitCapacity default = 0x0;
ram attribute minimumChargeCurrent default = 0x1770;
ram attribute minimumChargeCurrent default = 6000;
ram attribute maximumChargeCurrent default = 0x0;
ram attribute maximumDischargeCurrent default = 0x0;
ram attribute userMaximumChargeCurrent default = 0x0;
ram attribute randomisationDelayWindow default = 600;
ram attribute randomizationDelayWindow default = 600;
ram attribute numberOfWeeklyTargets default = 0x0;
ram attribute numberOfDailyTargets default = 0x1;
ram attribute nextChargeStartTime;
ram attribute nextChargeTargetTime;
ram attribute nextChargeRequiredEnergy;
ram attribute nextChargeTargetSoc;
ram attribute approxEvEfficiency;
ram attribute nextChargeTargetSoC;
ram attribute approximateEVEfficiency;
ram attribute stateOfCharge;
ram attribute batteryCapacity;
ram attribute vehicleId;
ram attribute sessionId default = 0x0;
ram attribute eventSequenceNumber default = 0x0001;
ram attribute sessionDuration default = 0x0;
ram attribute vehicleID;
ram attribute sessionID default = 0x0;
ram attribute sessionDuration default = 0x0001;
ram attribute sessionEnergyCharged default = 0x0;
ram attribute sessionEnergyDischarged default = 0x0;
callback attribute generatedCommandList;
Expand Down
Loading

0 comments on commit 99c86ce

Please sign in to comment.