Skip to content

Commit e9a80de

Browse files
jamesharrowjamesharrow
committed
Updated after regen_all
1 parent 35d9aac commit e9a80de

File tree

15 files changed

+79
-81
lines changed

15 files changed

+79
-81
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -4390,7 +4390,7 @@ cluster EnergyEvse = 153 {
43904390
int32u sessionID = 0;
43914391
StateEnum state = 1;
43924392
amperage_ma maximumCurrent = 2;
4393-
optional amperage_ma maximumDischargingCurrent = 3;
4393+
optional amperage_ma maximumDischargeCurrent = 3;
43944394
}
43954395

43964396
info event EnergyTransferStopped = 3 {
@@ -4463,15 +4463,15 @@ cluster EnergyEvse = 153 {
44634463

44644464
/** Allows a client to disable the EVSE from charging and discharging. */
44654465
timed command Disable(): DefaultSuccess = 1;
4466-
/** Allows a client to enable the EVSE to charge an EV. */
4466+
/** This command allows a client to enable the EVSE to charge an EV, */
44674467
timed command EnableCharging(EnableChargingRequest): DefaultSuccess = 2;
4468-
/** Allows a client to enable the EVSE to discharge an EV. */
4468+
/** Upon receipt, this SHALL allow a client to enable the discharge of an EV, */
44694469
timed command EnableDischarging(EnableDischargingRequest): DefaultSuccess = 3;
44704470
/** Allows a client to put the EVSE into a self-diagnostics mode. */
44714471
timed command StartDiagnostics(): DefaultSuccess = 4;
44724472
/** Allows a client to set the user specified charging targets. */
44734473
timed command SetTargets(SetTargetsRequest): DefaultSuccess = 5;
4474-
/** Allows a client to retrieve the user specified charging targets. */
4474+
/** Allows a client to retrieve the current set of charging targets. */
44754475
timed command GetTargets(): GetTargetsResponse = 6;
44764476
/** Allows a client to clear all stored charging targets. */
44774477
timed command ClearTargets(): DefaultSuccess = 7;

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1743,7 +1743,7 @@ cluster EnergyEvse = 153 {
17431743
int32u sessionID = 0;
17441744
StateEnum state = 1;
17451745
amperage_ma maximumCurrent = 2;
1746-
optional amperage_ma maximumDischargingCurrent = 3;
1746+
optional amperage_ma maximumDischargeCurrent = 3;
17471747
}
17481748

17491749
info event EnergyTransferStopped = 3 {
@@ -1816,15 +1816,15 @@ cluster EnergyEvse = 153 {
18161816

18171817
/** Allows a client to disable the EVSE from charging and discharging. */
18181818
timed command Disable(): DefaultSuccess = 1;
1819-
/** Allows a client to enable the EVSE to charge an EV. */
1819+
/** This command allows a client to enable the EVSE to charge an EV, */
18201820
timed command EnableCharging(EnableChargingRequest): DefaultSuccess = 2;
1821-
/** Allows a client to enable the EVSE to discharge an EV. */
1821+
/** Upon receipt, this SHALL allow a client to enable the discharge of an EV, */
18221822
timed command EnableDischarging(EnableDischargingRequest): DefaultSuccess = 3;
18231823
/** Allows a client to put the EVSE into a self-diagnostics mode. */
18241824
timed command StartDiagnostics(): DefaultSuccess = 4;
18251825
/** Allows a client to set the user specified charging targets. */
18261826
timed command SetTargets(SetTargetsRequest): DefaultSuccess = 5;
1827-
/** Allows a client to retrieve the user specified charging targets. */
1827+
/** Allows a client to retrieve the current set of charging targets. */
18281828
timed command GetTargets(): GetTargetsResponse = 6;
18291829
/** Allows a client to clear all stored charging targets. */
18301830
timed command ClearTargets(): DefaultSuccess = 7;

‎src/controller/data_model/controller-clusters.matter

+4-4
Original file line numberDiff line numberDiff line change
@@ -4980,7 +4980,7 @@ cluster EnergyEvse = 153 {
49804980
int32u sessionID = 0;
49814981
StateEnum state = 1;
49824982
amperage_ma maximumCurrent = 2;
4983-
optional amperage_ma maximumDischargingCurrent = 3;
4983+
optional amperage_ma maximumDischargeCurrent = 3;
49844984
}
49854985

49864986
info event EnergyTransferStopped = 3 {
@@ -5053,15 +5053,15 @@ cluster EnergyEvse = 153 {
50535053

50545054
/** Allows a client to disable the EVSE from charging and discharging. */
50555055
timed command Disable(): DefaultSuccess = 1;
5056-
/** Allows a client to enable the EVSE to charge an EV. */
5056+
/** This command allows a client to enable the EVSE to charge an EV, */
50575057
timed command EnableCharging(EnableChargingRequest): DefaultSuccess = 2;
5058-
/** Allows a client to enable the EVSE to discharge an EV. */
5058+
/** Upon receipt, this SHALL allow a client to enable the discharge of an EV, */
50595059
timed command EnableDischarging(EnableDischargingRequest): DefaultSuccess = 3;
50605060
/** Allows a client to put the EVSE into a self-diagnostics mode. */
50615061
timed command StartDiagnostics(): DefaultSuccess = 4;
50625062
/** Allows a client to set the user specified charging targets. */
50635063
timed command SetTargets(SetTargetsRequest): DefaultSuccess = 5;
5064-
/** Allows a client to retrieve the user specified charging targets. */
5064+
/** Allows a client to retrieve the current set of charging targets. */
50655065
timed command GetTargets(): GetTargetsResponse = 6;
50665066
/** Allows a client to clear all stored charging targets. */
50675067
timed command ClearTargets(): DefaultSuccess = 7;

‎src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -4323,30 +4323,30 @@ public static class EnergyEvseClusterEnergyTransferStartedEvent {
43234323
public Long sessionID;
43244324
public Integer state;
43254325
public Long maximumCurrent;
4326-
public Optional<Long> maximumDischargingCurrent;
4326+
public Optional<Long> maximumDischargeCurrent;
43274327
private static final long SESSION_I_D_ID = 0L;
43284328
private static final long STATE_ID = 1L;
43294329
private static final long MAXIMUM_CURRENT_ID = 2L;
4330-
private static final long MAXIMUM_DISCHARGING_CURRENT_ID = 3L;
4330+
private static final long MAXIMUM_DISCHARGE_CURRENT_ID = 3L;
43314331

43324332
public EnergyEvseClusterEnergyTransferStartedEvent(
43334333
Long sessionID,
43344334
Integer state,
43354335
Long maximumCurrent,
4336-
Optional<Long> maximumDischargingCurrent
4336+
Optional<Long> maximumDischargeCurrent
43374337
) {
43384338
this.sessionID = sessionID;
43394339
this.state = state;
43404340
this.maximumCurrent = maximumCurrent;
4341-
this.maximumDischargingCurrent = maximumDischargingCurrent;
4341+
this.maximumDischargeCurrent = maximumDischargeCurrent;
43424342
}
43434343

43444344
public StructType encodeTlv() {
43454345
ArrayList<StructElement> values = new ArrayList<>();
43464346
values.add(new StructElement(SESSION_I_D_ID, new UIntType(sessionID)));
43474347
values.add(new StructElement(STATE_ID, new UIntType(state)));
43484348
values.add(new StructElement(MAXIMUM_CURRENT_ID, new IntType(maximumCurrent)));
4349-
values.add(new StructElement(MAXIMUM_DISCHARGING_CURRENT_ID, maximumDischargingCurrent.<BaseTLVType>map((nonOptionalmaximumDischargingCurrent) -> new IntType(nonOptionalmaximumDischargingCurrent)).orElse(new EmptyType())));
4349+
values.add(new StructElement(MAXIMUM_DISCHARGE_CURRENT_ID, maximumDischargeCurrent.<BaseTLVType>map((nonOptionalmaximumDischargeCurrent) -> new IntType(nonOptionalmaximumDischargeCurrent)).orElse(new EmptyType())));
43504350

43514351
return new StructType(values);
43524352
}
@@ -4358,7 +4358,7 @@ public static EnergyEvseClusterEnergyTransferStartedEvent decodeTlv(BaseTLVType
43584358
Long sessionID = null;
43594359
Integer state = null;
43604360
Long maximumCurrent = null;
4361-
Optional<Long> maximumDischargingCurrent = Optional.empty();
4361+
Optional<Long> maximumDischargeCurrent = Optional.empty();
43624362
for (StructElement element: ((StructType)tlvValue).value()) {
43634363
if (element.contextTagNum() == SESSION_I_D_ID) {
43644364
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -4375,18 +4375,18 @@ public static EnergyEvseClusterEnergyTransferStartedEvent decodeTlv(BaseTLVType
43754375
IntType castingValue = element.value(IntType.class);
43764376
maximumCurrent = castingValue.value(Long.class);
43774377
}
4378-
} else if (element.contextTagNum() == MAXIMUM_DISCHARGING_CURRENT_ID) {
4378+
} else if (element.contextTagNum() == MAXIMUM_DISCHARGE_CURRENT_ID) {
43794379
if (element.value(BaseTLVType.class).type() == TLVType.Int) {
43804380
IntType castingValue = element.value(IntType.class);
4381-
maximumDischargingCurrent = Optional.of(castingValue.value(Long.class));
4381+
maximumDischargeCurrent = Optional.of(castingValue.value(Long.class));
43824382
}
43834383
}
43844384
}
43854385
return new EnergyEvseClusterEnergyTransferStartedEvent(
43864386
sessionID,
43874387
state,
43884388
maximumCurrent,
4389-
maximumDischargingCurrent
4389+
maximumDischargeCurrent
43904390
);
43914391
}
43924392

@@ -4403,8 +4403,8 @@ public String toString() {
44034403
output.append("\tmaximumCurrent: ");
44044404
output.append(maximumCurrent);
44054405
output.append("\n");
4406-
output.append("\tmaximumDischargingCurrent: ");
4407-
output.append(maximumDischargingCurrent);
4406+
output.append("\tmaximumDischargeCurrent: ");
4407+
output.append(maximumDischargeCurrent);
44084408
output.append("\n");
44094409
output.append("}\n");
44104410
return output.toString();

‎src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ class EnergyEvseClusterEnergyTransferStartedEvent(
2727
val sessionID: ULong,
2828
val state: UInt,
2929
val maximumCurrent: Long,
30-
val maximumDischargingCurrent: Optional<Long>,
30+
val maximumDischargeCurrent: Optional<Long>,
3131
) {
3232
override fun toString(): String = buildString {
3333
append("EnergyEvseClusterEnergyTransferStartedEvent {\n")
3434
append("\tsessionID : $sessionID\n")
3535
append("\tstate : $state\n")
3636
append("\tmaximumCurrent : $maximumCurrent\n")
37-
append("\tmaximumDischargingCurrent : $maximumDischargingCurrent\n")
37+
append("\tmaximumDischargeCurrent : $maximumDischargeCurrent\n")
3838
append("}\n")
3939
}
4040

@@ -44,9 +44,9 @@ class EnergyEvseClusterEnergyTransferStartedEvent(
4444
put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
4545
put(ContextSpecificTag(TAG_STATE), state)
4646
put(ContextSpecificTag(TAG_MAXIMUM_CURRENT), maximumCurrent)
47-
if (maximumDischargingCurrent.isPresent) {
48-
val optmaximumDischargingCurrent = maximumDischargingCurrent.get()
49-
put(ContextSpecificTag(TAG_MAXIMUM_DISCHARGING_CURRENT), optmaximumDischargingCurrent)
47+
if (maximumDischargeCurrent.isPresent) {
48+
val optmaximumDischargeCurrent = maximumDischargeCurrent.get()
49+
put(ContextSpecificTag(TAG_MAXIMUM_DISCHARGE_CURRENT), optmaximumDischargeCurrent)
5050
}
5151
endStructure()
5252
}
@@ -56,16 +56,16 @@ class EnergyEvseClusterEnergyTransferStartedEvent(
5656
private const val TAG_SESSION_I_D = 0
5757
private const val TAG_STATE = 1
5858
private const val TAG_MAXIMUM_CURRENT = 2
59-
private const val TAG_MAXIMUM_DISCHARGING_CURRENT = 3
59+
private const val TAG_MAXIMUM_DISCHARGE_CURRENT = 3
6060

6161
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEnergyTransferStartedEvent {
6262
tlvReader.enterStructure(tlvTag)
6363
val sessionID = tlvReader.getULong(ContextSpecificTag(TAG_SESSION_I_D))
6464
val state = tlvReader.getUInt(ContextSpecificTag(TAG_STATE))
6565
val maximumCurrent = tlvReader.getLong(ContextSpecificTag(TAG_MAXIMUM_CURRENT))
66-
val maximumDischargingCurrent =
67-
if (tlvReader.isNextTag(ContextSpecificTag(TAG_MAXIMUM_DISCHARGING_CURRENT))) {
68-
Optional.of(tlvReader.getLong(ContextSpecificTag(TAG_MAXIMUM_DISCHARGING_CURRENT)))
66+
val maximumDischargeCurrent =
67+
if (tlvReader.isNextTag(ContextSpecificTag(TAG_MAXIMUM_DISCHARGE_CURRENT))) {
68+
Optional.of(tlvReader.getLong(ContextSpecificTag(TAG_MAXIMUM_DISCHARGE_CURRENT)))
6969
} else {
7070
Optional.empty()
7171
}
@@ -76,7 +76,7 @@ class EnergyEvseClusterEnergyTransferStartedEvent(
7676
sessionID,
7777
state,
7878
maximumCurrent,
79-
maximumDischargingCurrent,
79+
maximumDischargeCurrent,
8080
)
8181
}
8282
}

‎src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ class EnergyEvseClusterEnergyTransferStartedEvent(
2727
val sessionID: UInt,
2828
val state: UByte,
2929
val maximumCurrent: Long,
30-
val maximumDischargingCurrent: Optional<Long>,
30+
val maximumDischargeCurrent: Optional<Long>,
3131
) {
3232
override fun toString(): String = buildString {
3333
append("EnergyEvseClusterEnergyTransferStartedEvent {\n")
3434
append("\tsessionID : $sessionID\n")
3535
append("\tstate : $state\n")
3636
append("\tmaximumCurrent : $maximumCurrent\n")
37-
append("\tmaximumDischargingCurrent : $maximumDischargingCurrent\n")
37+
append("\tmaximumDischargeCurrent : $maximumDischargeCurrent\n")
3838
append("}\n")
3939
}
4040

@@ -44,9 +44,9 @@ class EnergyEvseClusterEnergyTransferStartedEvent(
4444
put(ContextSpecificTag(TAG_SESSION_I_D), sessionID)
4545
put(ContextSpecificTag(TAG_STATE), state)
4646
put(ContextSpecificTag(TAG_MAXIMUM_CURRENT), maximumCurrent)
47-
if (maximumDischargingCurrent.isPresent) {
48-
val optmaximumDischargingCurrent = maximumDischargingCurrent.get()
49-
put(ContextSpecificTag(TAG_MAXIMUM_DISCHARGING_CURRENT), optmaximumDischargingCurrent)
47+
if (maximumDischargeCurrent.isPresent) {
48+
val optmaximumDischargeCurrent = maximumDischargeCurrent.get()
49+
put(ContextSpecificTag(TAG_MAXIMUM_DISCHARGE_CURRENT), optmaximumDischargeCurrent)
5050
}
5151
endStructure()
5252
}
@@ -56,16 +56,16 @@ class EnergyEvseClusterEnergyTransferStartedEvent(
5656
private const val TAG_SESSION_I_D = 0
5757
private const val TAG_STATE = 1
5858
private const val TAG_MAXIMUM_CURRENT = 2
59-
private const val TAG_MAXIMUM_DISCHARGING_CURRENT = 3
59+
private const val TAG_MAXIMUM_DISCHARGE_CURRENT = 3
6060

6161
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): EnergyEvseClusterEnergyTransferStartedEvent {
6262
tlvReader.enterStructure(tlvTag)
6363
val sessionID = tlvReader.getUInt(ContextSpecificTag(TAG_SESSION_I_D))
6464
val state = tlvReader.getUByte(ContextSpecificTag(TAG_STATE))
6565
val maximumCurrent = tlvReader.getLong(ContextSpecificTag(TAG_MAXIMUM_CURRENT))
66-
val maximumDischargingCurrent =
67-
if (tlvReader.isNextTag(ContextSpecificTag(TAG_MAXIMUM_DISCHARGING_CURRENT))) {
68-
Optional.of(tlvReader.getLong(ContextSpecificTag(TAG_MAXIMUM_DISCHARGING_CURRENT)))
66+
val maximumDischargeCurrent =
67+
if (tlvReader.isNextTag(ContextSpecificTag(TAG_MAXIMUM_DISCHARGE_CURRENT))) {
68+
Optional.of(tlvReader.getLong(ContextSpecificTag(TAG_MAXIMUM_DISCHARGE_CURRENT)))
6969
} else {
7070
Optional.empty()
7171
}
@@ -76,7 +76,7 @@ class EnergyEvseClusterEnergyTransferStartedEvent(
7676
sessionID,
7777
state,
7878
maximumCurrent,
79-
maximumDischargingCurrent,
79+
maximumDischargeCurrent,
8080
)
8181
}
8282
}

‎src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp

+13-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/controller/python/chip/clusters/Objects.py

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)