Skip to content

Commit 155c495

Browse files
PeterC1965PeterC1965
committed
Catch up with head master + regenerate all files
1 parent 8e5046b commit 155c495

File tree

27 files changed

+210
-486
lines changed

27 files changed

+210
-486
lines changed

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

+3-6
Original file line numberDiff line numberDiff line change
@@ -4291,7 +4291,7 @@ provisional cluster DeviceEnergyManagement = 152 {
42914291

42924292
/** 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. */
42934293
cluster EnergyEvse = 153 {
4294-
revision 4;
4294+
revision 2;
42954295

42964296
enum EnergyTransferStoppedReasonEnum : enum8 {
42974297
kEVStopped = 0;
@@ -4335,7 +4335,6 @@ cluster EnergyEvse = 153 {
43354335
kDischargingEnabled = 2;
43364336
kDisabledError = 3;
43374337
kDisabledDiagnostics = 4;
4338-
kEnabled = 5;
43394338
}
43404339

43414340
bitmap Feature : bitmap32 {
@@ -4363,8 +4362,8 @@ cluster EnergyEvse = 153 {
43634362
}
43644363

43654364
struct ChargingTargetScheduleStruct {
4366-
optional TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
4367-
optional ChargingTargetStruct chargingTargets[] = 1;
4365+
TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
4366+
ChargingTargetStruct chargingTargets[] = 1;
43684367
}
43694368

43704369
info event EVConnected = 0 {
@@ -4383,15 +4382,13 @@ cluster EnergyEvse = 153 {
43834382
int32u sessionID = 0;
43844383
StateEnum state = 1;
43854384
amperage_ma maximumCurrent = 2;
4386-
optional amperage_ma maximumDischargingCurrent = 3;
43874385
}
43884386

43894387
info event EnergyTransferStopped = 3 {
43904388
int32u sessionID = 0;
43914389
StateEnum state = 1;
43924390
EnergyTransferStoppedReasonEnum reason = 2;
43934391
energy_mwh energyTransferred = 4;
4394-
optional energy_mwh energyDischarged = 5;
43954392
}
43964393

43974394
critical event Fault = 4 {

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

+3-6
Original file line numberDiff line numberDiff line change
@@ -1651,7 +1651,7 @@ provisional cluster DeviceEnergyManagement = 152 {
16511651

16521652
/** 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. */
16531653
cluster EnergyEvse = 153 {
1654-
revision 4;
1654+
revision 2;
16551655

16561656
enum EnergyTransferStoppedReasonEnum : enum8 {
16571657
kEVStopped = 0;
@@ -1695,7 +1695,6 @@ cluster EnergyEvse = 153 {
16951695
kDischargingEnabled = 2;
16961696
kDisabledError = 3;
16971697
kDisabledDiagnostics = 4;
1698-
kEnabled = 5;
16991698
}
17001699

17011700
bitmap Feature : bitmap32 {
@@ -1723,8 +1722,8 @@ cluster EnergyEvse = 153 {
17231722
}
17241723

17251724
struct ChargingTargetScheduleStruct {
1726-
optional TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
1727-
optional ChargingTargetStruct chargingTargets[] = 1;
1725+
TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
1726+
ChargingTargetStruct chargingTargets[] = 1;
17281727
}
17291728

17301729
info event EVConnected = 0 {
@@ -1743,15 +1742,13 @@ cluster EnergyEvse = 153 {
17431742
int32u sessionID = 0;
17441743
StateEnum state = 1;
17451744
amperage_ma maximumCurrent = 2;
1746-
optional amperage_ma maximumDischargingCurrent = 3;
17471745
}
17481746

17491747
info event EnergyTransferStopped = 3 {
17501748
int32u sessionID = 0;
17511749
StateEnum state = 1;
17521750
EnergyTransferStoppedReasonEnum reason = 2;
17531751
energy_mwh energyTransferred = 4;
1754-
optional energy_mwh energyDischarged = 5;
17551752
}
17561753

17571754
critical event Fault = 4 {

‎examples/water-heater-management-app/water-heater-management-common/water-heater-management-app.matter

+3-6
Original file line numberDiff line numberDiff line change
@@ -1709,7 +1709,7 @@ provisional cluster DeviceEnergyManagement = 152 {
17091709

17101710
/** 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. */
17111711
cluster EnergyEvse = 153 {
1712-
revision 4;
1712+
revision 2;
17131713

17141714
enum EnergyTransferStoppedReasonEnum : enum8 {
17151715
kEVStopped = 0;
@@ -1753,7 +1753,6 @@ cluster EnergyEvse = 153 {
17531753
kDischargingEnabled = 2;
17541754
kDisabledError = 3;
17551755
kDisabledDiagnostics = 4;
1756-
kEnabled = 5;
17571756
}
17581757

17591758
bitmap Feature : bitmap32 {
@@ -1781,8 +1780,8 @@ cluster EnergyEvse = 153 {
17811780
}
17821781

17831782
struct ChargingTargetScheduleStruct {
1784-
optional TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
1785-
optional ChargingTargetStruct chargingTargets[] = 1;
1783+
TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
1784+
ChargingTargetStruct chargingTargets[] = 1;
17861785
}
17871786

17881787
info event EVConnected = 0 {
@@ -1801,15 +1800,13 @@ cluster EnergyEvse = 153 {
18011800
int32u sessionID = 0;
18021801
StateEnum state = 1;
18031802
amperage_ma maximumCurrent = 2;
1804-
optional amperage_ma maximumDischargingCurrent = 3;
18051803
}
18061804

18071805
info event EnergyTransferStopped = 3 {
18081806
int32u sessionID = 0;
18091807
StateEnum state = 1;
18101808
EnergyTransferStoppedReasonEnum reason = 2;
18111809
energy_mwh energyTransferred = 4;
1812-
optional energy_mwh energyDischarged = 5;
18131810
}
18141811

18151812
critical event Fault = 4 {

‎src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml

+53-55
Large diffs are not rendered by default.

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

+3-6
Original file line numberDiff line numberDiff line change
@@ -4874,7 +4874,7 @@ provisional cluster DeviceEnergyManagement = 152 {
48744874

48754875
/** 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. */
48764876
cluster EnergyEvse = 153 {
4877-
revision 4;
4877+
revision 2;
48784878

48794879
enum EnergyTransferStoppedReasonEnum : enum8 {
48804880
kEVStopped = 0;
@@ -4918,7 +4918,6 @@ cluster EnergyEvse = 153 {
49184918
kDischargingEnabled = 2;
49194919
kDisabledError = 3;
49204920
kDisabledDiagnostics = 4;
4921-
kEnabled = 5;
49224921
}
49234922

49244923
bitmap Feature : bitmap32 {
@@ -4946,8 +4945,8 @@ cluster EnergyEvse = 153 {
49464945
}
49474946

49484947
struct ChargingTargetScheduleStruct {
4949-
optional TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
4950-
optional ChargingTargetStruct chargingTargets[] = 1;
4948+
TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
4949+
ChargingTargetStruct chargingTargets[] = 1;
49514950
}
49524951

49534952
info event EVConnected = 0 {
@@ -4966,15 +4965,13 @@ cluster EnergyEvse = 153 {
49664965
int32u sessionID = 0;
49674966
StateEnum state = 1;
49684967
amperage_ma maximumCurrent = 2;
4969-
optional amperage_ma maximumDischargingCurrent = 3;
49704968
}
49714969

49724970
info event EnergyTransferStopped = 3 {
49734971
int32u sessionID = 0;
49744972
StateEnum state = 1;
49754973
EnergyTransferStoppedReasonEnum reason = 2;
49764974
energy_mwh energyTransferred = 4;
4977-
optional energy_mwh energyDischarged = 5;
49784975
}
49794976

49804977
critical event Fault = 4 {

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

+4-34
Original file line numberDiff line numberDiff line change
@@ -4323,30 +4323,25 @@ public static class EnergyEvseClusterEnergyTransferStartedEvent {
43234323
public Long sessionID;
43244324
public Integer state;
43254325
public Long maximumCurrent;
4326-
public Optional<Long> maximumDischargingCurrent;
43274326
private static final long SESSION_I_D_ID = 0L;
43284327
private static final long STATE_ID = 1L;
43294328
private static final long MAXIMUM_CURRENT_ID = 2L;
4330-
private static final long MAXIMUM_DISCHARGING_CURRENT_ID = 3L;
43314329

43324330
public EnergyEvseClusterEnergyTransferStartedEvent(
43334331
Long sessionID,
43344332
Integer state,
4335-
Long maximumCurrent,
4336-
Optional<Long> maximumDischargingCurrent
4333+
Long maximumCurrent
43374334
) {
43384335
this.sessionID = sessionID;
43394336
this.state = state;
43404337
this.maximumCurrent = maximumCurrent;
4341-
this.maximumDischargingCurrent = maximumDischargingCurrent;
43424338
}
43434339

43444340
public StructType encodeTlv() {
43454341
ArrayList<StructElement> values = new ArrayList<>();
43464342
values.add(new StructElement(SESSION_I_D_ID, new UIntType(sessionID)));
43474343
values.add(new StructElement(STATE_ID, new UIntType(state)));
43484344
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())));
43504345

43514346
return new StructType(values);
43524347
}
@@ -4358,7 +4353,6 @@ public static EnergyEvseClusterEnergyTransferStartedEvent decodeTlv(BaseTLVType
43584353
Long sessionID = null;
43594354
Integer state = null;
43604355
Long maximumCurrent = null;
4361-
Optional<Long> maximumDischargingCurrent = Optional.empty();
43624356
for (StructElement element: ((StructType)tlvValue).value()) {
43634357
if (element.contextTagNum() == SESSION_I_D_ID) {
43644358
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -4375,18 +4369,12 @@ public static EnergyEvseClusterEnergyTransferStartedEvent decodeTlv(BaseTLVType
43754369
IntType castingValue = element.value(IntType.class);
43764370
maximumCurrent = castingValue.value(Long.class);
43774371
}
4378-
} else if (element.contextTagNum() == MAXIMUM_DISCHARGING_CURRENT_ID) {
4379-
if (element.value(BaseTLVType.class).type() == TLVType.Int) {
4380-
IntType castingValue = element.value(IntType.class);
4381-
maximumDischargingCurrent = Optional.of(castingValue.value(Long.class));
4382-
}
43834372
}
43844373
}
43854374
return new EnergyEvseClusterEnergyTransferStartedEvent(
43864375
sessionID,
43874376
state,
4388-
maximumCurrent,
4389-
maximumDischargingCurrent
4377+
maximumCurrent
43904378
);
43914379
}
43924380

@@ -4403,9 +4391,6 @@ public String toString() {
44034391
output.append("\tmaximumCurrent: ");
44044392
output.append(maximumCurrent);
44054393
output.append("\n");
4406-
output.append("\tmaximumDischargingCurrent: ");
4407-
output.append(maximumDischargingCurrent);
4408-
output.append("\n");
44094394
output.append("}\n");
44104395
return output.toString();
44114396
}
@@ -4415,25 +4400,21 @@ public static class EnergyEvseClusterEnergyTransferStoppedEvent {
44154400
public Integer state;
44164401
public Integer reason;
44174402
public Long energyTransferred;
4418-
public Optional<Long> energyDischarged;
44194403
private static final long SESSION_I_D_ID = 0L;
44204404
private static final long STATE_ID = 1L;
44214405
private static final long REASON_ID = 2L;
44224406
private static final long ENERGY_TRANSFERRED_ID = 4L;
4423-
private static final long ENERGY_DISCHARGED_ID = 5L;
44244407

44254408
public EnergyEvseClusterEnergyTransferStoppedEvent(
44264409
Long sessionID,
44274410
Integer state,
44284411
Integer reason,
4429-
Long energyTransferred,
4430-
Optional<Long> energyDischarged
4412+
Long energyTransferred
44314413
) {
44324414
this.sessionID = sessionID;
44334415
this.state = state;
44344416
this.reason = reason;
44354417
this.energyTransferred = energyTransferred;
4436-
this.energyDischarged = energyDischarged;
44374418
}
44384419

44394420
public StructType encodeTlv() {
@@ -4442,7 +4423,6 @@ public StructType encodeTlv() {
44424423
values.add(new StructElement(STATE_ID, new UIntType(state)));
44434424
values.add(new StructElement(REASON_ID, new UIntType(reason)));
44444425
values.add(new StructElement(ENERGY_TRANSFERRED_ID, new IntType(energyTransferred)));
4445-
values.add(new StructElement(ENERGY_DISCHARGED_ID, energyDischarged.<BaseTLVType>map((nonOptionalenergyDischarged) -> new IntType(nonOptionalenergyDischarged)).orElse(new EmptyType())));
44464426

44474427
return new StructType(values);
44484428
}
@@ -4455,7 +4435,6 @@ public static EnergyEvseClusterEnergyTransferStoppedEvent decodeTlv(BaseTLVType
44554435
Integer state = null;
44564436
Integer reason = null;
44574437
Long energyTransferred = null;
4458-
Optional<Long> energyDischarged = Optional.empty();
44594438
for (StructElement element: ((StructType)tlvValue).value()) {
44604439
if (element.contextTagNum() == SESSION_I_D_ID) {
44614440
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -4477,19 +4456,13 @@ public static EnergyEvseClusterEnergyTransferStoppedEvent decodeTlv(BaseTLVType
44774456
IntType castingValue = element.value(IntType.class);
44784457
energyTransferred = castingValue.value(Long.class);
44794458
}
4480-
} else if (element.contextTagNum() == ENERGY_DISCHARGED_ID) {
4481-
if (element.value(BaseTLVType.class).type() == TLVType.Int) {
4482-
IntType castingValue = element.value(IntType.class);
4483-
energyDischarged = Optional.of(castingValue.value(Long.class));
4484-
}
44854459
}
44864460
}
44874461
return new EnergyEvseClusterEnergyTransferStoppedEvent(
44884462
sessionID,
44894463
state,
44904464
reason,
4491-
energyTransferred,
4492-
energyDischarged
4465+
energyTransferred
44934466
);
44944467
}
44954468

@@ -4509,9 +4482,6 @@ public String toString() {
45094482
output.append("\tenergyTransferred: ");
45104483
output.append(energyTransferred);
45114484
output.append("\n");
4512-
output.append("\tenergyDischarged: ");
4513-
output.append(energyDischarged);
4514-
output.append("\n");
45154485
output.append("}\n");
45164486
return output.toString();
45174487
}

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -8230,23 +8230,23 @@ public String toString() {
82308230
}
82318231
}
82328232
public static class EnergyEvseClusterChargingTargetScheduleStruct {
8233-
public Optional<Integer> dayOfWeekForSequence;
8234-
public Optional<ArrayList<ChipStructs.EnergyEvseClusterChargingTargetStruct>> chargingTargets;
8233+
public Integer dayOfWeekForSequence;
8234+
public ArrayList<ChipStructs.EnergyEvseClusterChargingTargetStruct> chargingTargets;
82358235
private static final long DAY_OF_WEEK_FOR_SEQUENCE_ID = 0L;
82368236
private static final long CHARGING_TARGETS_ID = 1L;
82378237

82388238
public EnergyEvseClusterChargingTargetScheduleStruct(
8239-
Optional<Integer> dayOfWeekForSequence,
8240-
Optional<ArrayList<ChipStructs.EnergyEvseClusterChargingTargetStruct>> chargingTargets
8239+
Integer dayOfWeekForSequence,
8240+
ArrayList<ChipStructs.EnergyEvseClusterChargingTargetStruct> chargingTargets
82418241
) {
82428242
this.dayOfWeekForSequence = dayOfWeekForSequence;
82438243
this.chargingTargets = chargingTargets;
82448244
}
82458245

82468246
public StructType encodeTlv() {
82478247
ArrayList<StructElement> values = new ArrayList<>();
8248-
values.add(new StructElement(DAY_OF_WEEK_FOR_SEQUENCE_ID, dayOfWeekForSequence.<BaseTLVType>map((nonOptionaldayOfWeekForSequence) -> new UIntType(nonOptionaldayOfWeekForSequence)).orElse(new EmptyType())));
8249-
values.add(new StructElement(CHARGING_TARGETS_ID, chargingTargets.<BaseTLVType>map((nonOptionalchargingTargets) -> ArrayType.generateArrayType(nonOptionalchargingTargets, (elementnonOptionalchargingTargets) -> elementnonOptionalchargingTargets.encodeTlv())).orElse(new EmptyType())));
8248+
values.add(new StructElement(DAY_OF_WEEK_FOR_SEQUENCE_ID, new UIntType(dayOfWeekForSequence)));
8249+
values.add(new StructElement(CHARGING_TARGETS_ID, ArrayType.generateArrayType(chargingTargets, (elementchargingTargets) -> elementchargingTargets.encodeTlv())));
82508250

82518251
return new StructType(values);
82528252
}
@@ -8255,18 +8255,18 @@ public static EnergyEvseClusterChargingTargetScheduleStruct decodeTlv(BaseTLVTyp
82558255
if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
82568256
return null;
82578257
}
8258-
Optional<Integer> dayOfWeekForSequence = Optional.empty();
8259-
Optional<ArrayList<ChipStructs.EnergyEvseClusterChargingTargetStruct>> chargingTargets = Optional.empty();
8258+
Integer dayOfWeekForSequence = null;
8259+
ArrayList<ChipStructs.EnergyEvseClusterChargingTargetStruct> chargingTargets = null;
82608260
for (StructElement element: ((StructType)tlvValue).value()) {
82618261
if (element.contextTagNum() == DAY_OF_WEEK_FOR_SEQUENCE_ID) {
82628262
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
82638263
UIntType castingValue = element.value(UIntType.class);
8264-
dayOfWeekForSequence = Optional.of(castingValue.value(Integer.class));
8264+
dayOfWeekForSequence = castingValue.value(Integer.class);
82658265
}
82668266
} else if (element.contextTagNum() == CHARGING_TARGETS_ID) {
82678267
if (element.value(BaseTLVType.class).type() == TLVType.Array) {
82688268
ArrayType castingValue = element.value(ArrayType.class);
8269-
chargingTargets = Optional.of(castingValue.map((elementcastingValue) -> ChipStructs.EnergyEvseClusterChargingTargetStruct.decodeTlv(elementcastingValue)));
8269+
chargingTargets = castingValue.map((elementcastingValue) -> ChipStructs.EnergyEvseClusterChargingTargetStruct.decodeTlv(elementcastingValue));
82708270
}
82718271
}
82728272
}

0 commit comments

Comments
 (0)