Skip to content

Commit 61181f2

Browse files
hicklinhicklin
committed
Regenerated zap files.
1 parent 9d34335 commit 61181f2

16 files changed

+1214
-1299
lines changed

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

+26-26
Original file line numberDiff line numberDiff line change
@@ -6031,32 +6031,32 @@ cluster ServiceArea = 336 {
60316031
kGuestRoom = 41;
60326032
kGym = 42;
60336033
kHallway = 43;
6034-
kKidsRoom = 44;
6035-
kKidsBedroom = 45;
6036-
kKitchen = 46;
6037-
kLarder = 47;
6038-
kLaundryRoom = 48;
6039-
kLawn = 49;
6040-
kLibrary = 50;
6041-
kLivingRoom = 51;
6042-
kLounge = 52;
6043-
kManCave = 53;
6044-
kMasterBathroom = 54;
6045-
kMasterBedroom = 55;
6046-
kMediaTVRoom = 56;
6047-
kMudRoom = 57;
6048-
kMusicRoom = 58;
6049-
kNursery = 59;
6050-
kOffice = 60;
6051-
kOutdoorKitchen = 61;
6052-
kOutside = 62;
6053-
kPantry = 63;
6054-
kParkingLot = 64;
6055-
kParlor = 65;
6056-
kPatio = 66;
6057-
kPlayRoom = 67;
6058-
kPoolRoom = 68;
6059-
kPorch = 69;
6034+
kHearthRoom = 44;
6035+
kKidsRoom = 45;
6036+
kKidsBedroom = 46;
6037+
kKitchen = 47;
6038+
kLarder = 48;
6039+
kLaundryRoom = 49;
6040+
kLawn = 50;
6041+
kLibrary = 51;
6042+
kLivingRoom = 52;
6043+
kLounge = 53;
6044+
kMediaTVRoom = 54;
6045+
kMudRoom = 55;
6046+
kMusicRoom = 56;
6047+
kNursery = 57;
6048+
kOffice = 58;
6049+
kOutdoorKitchen = 59;
6050+
kOutside = 60;
6051+
kPantry = 61;
6052+
kParkingLot = 62;
6053+
kParlor = 63;
6054+
kPatio = 64;
6055+
kPlayRoom = 65;
6056+
kPoolRoom = 66;
6057+
kPorch = 67;
6058+
kPrimaryBathroom = 68;
6059+
kPrimaryBedroom = 69;
60606060
kRamp = 70;
60616061
kReceptionRoom = 71;
60626062
kRecreationRoom = 72;

‎src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt

+30-31
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,17 @@
1717
package chip.devicecontroller.cluster.structs
1818

1919
import chip.devicecontroller.cluster.*
20-
import matter.tlv.AnonymousTag
2120
import matter.tlv.ContextSpecificTag
2221
import matter.tlv.Tag
23-
import matter.tlv.TlvParsingException
2422
import matter.tlv.TlvReader
2523
import matter.tlv.TlvWriter
2624

27-
import java.util.Optional
28-
29-
class ServiceAreaClusterHomeLocationStruct (
30-
val locationName: String,
31-
val floorNumber: Int?,
32-
val areaType: UInt?) {
33-
override fun toString(): String = buildString {
25+
class ServiceAreaClusterHomeLocationStruct(
26+
val locationName: String,
27+
val floorNumber: Int?,
28+
val areaType: UInt?
29+
) {
30+
override fun toString(): String = buildString {
3431
append("ServiceAreaClusterHomeLocationStruct {\n")
3532
append("\tlocationName : $locationName\n")
3633
append("\tfloorNumber : $floorNumber\n")
@@ -43,15 +40,15 @@ class ServiceAreaClusterHomeLocationStruct (
4340
startStructure(tlvTag)
4441
put(ContextSpecificTag(TAG_LOCATION_NAME), locationName)
4542
if (floorNumber != null) {
46-
put(ContextSpecificTag(TAG_FLOOR_NUMBER), floorNumber)
47-
} else {
48-
putNull(ContextSpecificTag(TAG_FLOOR_NUMBER))
49-
}
43+
put(ContextSpecificTag(TAG_FLOOR_NUMBER), floorNumber)
44+
} else {
45+
putNull(ContextSpecificTag(TAG_FLOOR_NUMBER))
46+
}
5047
if (areaType != null) {
51-
put(ContextSpecificTag(TAG_AREA_TYPE), areaType)
52-
} else {
53-
putNull(ContextSpecificTag(TAG_AREA_TYPE))
54-
}
48+
put(ContextSpecificTag(TAG_AREA_TYPE), areaType)
49+
} else {
50+
putNull(ContextSpecificTag(TAG_AREA_TYPE))
51+
}
5552
endStructure()
5653
}
5754
}
@@ -61,22 +58,24 @@ class ServiceAreaClusterHomeLocationStruct (
6158
private const val TAG_FLOOR_NUMBER = 1
6259
private const val TAG_AREA_TYPE = 2
6360

64-
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : ServiceAreaClusterHomeLocationStruct {
61+
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ServiceAreaClusterHomeLocationStruct {
6562
tlvReader.enterStructure(tlvTag)
6663
val locationName = tlvReader.getString(ContextSpecificTag(TAG_LOCATION_NAME))
67-
val floorNumber = if (!tlvReader.isNull()) {
68-
tlvReader.getInt(ContextSpecificTag(TAG_FLOOR_NUMBER))
69-
} else {
70-
tlvReader.getNull(ContextSpecificTag(TAG_FLOOR_NUMBER))
71-
null
72-
}
73-
val areaType = if (!tlvReader.isNull()) {
74-
tlvReader.getUInt(ContextSpecificTag(TAG_AREA_TYPE))
75-
} else {
76-
tlvReader.getNull(ContextSpecificTag(TAG_AREA_TYPE))
77-
null
78-
}
79-
64+
val floorNumber =
65+
if (!tlvReader.isNull()) {
66+
tlvReader.getInt(ContextSpecificTag(TAG_FLOOR_NUMBER))
67+
} else {
68+
tlvReader.getNull(ContextSpecificTag(TAG_FLOOR_NUMBER))
69+
null
70+
}
71+
val areaType =
72+
if (!tlvReader.isNull()) {
73+
tlvReader.getUInt(ContextSpecificTag(TAG_AREA_TYPE))
74+
} else {
75+
tlvReader.getNull(ContextSpecificTag(TAG_AREA_TYPE))
76+
null
77+
}
78+
8079
tlvReader.exitContainer()
8180

8281
return ServiceAreaClusterHomeLocationStruct(locationName, floorNumber, areaType)

‎src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt

+62-53
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,18 @@
1717
package chip.devicecontroller.cluster.structs
1818

1919
import chip.devicecontroller.cluster.*
20-
import matter.tlv.AnonymousTag
2120
import matter.tlv.ContextSpecificTag
2221
import matter.tlv.Tag
23-
import matter.tlv.TlvParsingException
2422
import matter.tlv.TlvReader
2523
import matter.tlv.TlvWriter
2624

27-
import java.util.Optional
28-
29-
class ServiceAreaClusterLocationInfoStruct (
30-
val homeLocationInfo: ServiceAreaClusterHomeLocationStruct?,
31-
val landmarkTag: UInt?,
32-
val positionTag: UInt?,
33-
val surfaceTag: UInt?) {
34-
override fun toString(): String = buildString {
25+
class ServiceAreaClusterLocationInfoStruct(
26+
val homeLocationInfo: ServiceAreaClusterHomeLocationStruct?,
27+
val landmarkTag: UInt?,
28+
val positionTag: UInt?,
29+
val surfaceTag: UInt?
30+
) {
31+
override fun toString(): String = buildString {
3532
append("ServiceAreaClusterLocationInfoStruct {\n")
3633
append("\thomeLocationInfo : $homeLocationInfo\n")
3734
append("\tlandmarkTag : $landmarkTag\n")
@@ -44,25 +41,25 @@ class ServiceAreaClusterLocationInfoStruct (
4441
tlvWriter.apply {
4542
startStructure(tlvTag)
4643
if (homeLocationInfo != null) {
47-
homeLocationInfo.toTlv(ContextSpecificTag(TAG_HOME_LOCATION_INFO), this)
48-
} else {
49-
putNull(ContextSpecificTag(TAG_HOME_LOCATION_INFO))
50-
}
44+
homeLocationInfo.toTlv(ContextSpecificTag(TAG_HOME_LOCATION_INFO), this)
45+
} else {
46+
putNull(ContextSpecificTag(TAG_HOME_LOCATION_INFO))
47+
}
5148
if (landmarkTag != null) {
52-
put(ContextSpecificTag(TAG_LANDMARK_TAG), landmarkTag)
53-
} else {
54-
putNull(ContextSpecificTag(TAG_LANDMARK_TAG))
55-
}
49+
put(ContextSpecificTag(TAG_LANDMARK_TAG), landmarkTag)
50+
} else {
51+
putNull(ContextSpecificTag(TAG_LANDMARK_TAG))
52+
}
5653
if (positionTag != null) {
57-
put(ContextSpecificTag(TAG_POSITION_TAG), positionTag)
58-
} else {
59-
putNull(ContextSpecificTag(TAG_POSITION_TAG))
60-
}
54+
put(ContextSpecificTag(TAG_POSITION_TAG), positionTag)
55+
} else {
56+
putNull(ContextSpecificTag(TAG_POSITION_TAG))
57+
}
6158
if (surfaceTag != null) {
62-
put(ContextSpecificTag(TAG_SURFACE_TAG), surfaceTag)
63-
} else {
64-
putNull(ContextSpecificTag(TAG_SURFACE_TAG))
65-
}
59+
put(ContextSpecificTag(TAG_SURFACE_TAG), surfaceTag)
60+
} else {
61+
putNull(ContextSpecificTag(TAG_SURFACE_TAG))
62+
}
6663
endStructure()
6764
}
6865
}
@@ -73,36 +70,48 @@ class ServiceAreaClusterLocationInfoStruct (
7370
private const val TAG_POSITION_TAG = 2
7471
private const val TAG_SURFACE_TAG = 3
7572

76-
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : ServiceAreaClusterLocationInfoStruct {
73+
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ServiceAreaClusterLocationInfoStruct {
7774
tlvReader.enterStructure(tlvTag)
78-
val homeLocationInfo = if (!tlvReader.isNull()) {
79-
ServiceAreaClusterHomeLocationStruct.fromTlv(ContextSpecificTag(TAG_HOME_LOCATION_INFO), tlvReader)
80-
} else {
81-
tlvReader.getNull(ContextSpecificTag(TAG_HOME_LOCATION_INFO))
82-
null
83-
}
84-
val landmarkTag = if (!tlvReader.isNull()) {
85-
tlvReader.getUInt(ContextSpecificTag(TAG_LANDMARK_TAG))
86-
} else {
87-
tlvReader.getNull(ContextSpecificTag(TAG_LANDMARK_TAG))
88-
null
89-
}
90-
val positionTag = if (!tlvReader.isNull()) {
91-
tlvReader.getUInt(ContextSpecificTag(TAG_POSITION_TAG))
92-
} else {
93-
tlvReader.getNull(ContextSpecificTag(TAG_POSITION_TAG))
94-
null
95-
}
96-
val surfaceTag = if (!tlvReader.isNull()) {
97-
tlvReader.getUInt(ContextSpecificTag(TAG_SURFACE_TAG))
98-
} else {
99-
tlvReader.getNull(ContextSpecificTag(TAG_SURFACE_TAG))
100-
null
101-
}
102-
75+
val homeLocationInfo =
76+
if (!tlvReader.isNull()) {
77+
ServiceAreaClusterHomeLocationStruct.fromTlv(
78+
ContextSpecificTag(TAG_HOME_LOCATION_INFO),
79+
tlvReader
80+
)
81+
} else {
82+
tlvReader.getNull(ContextSpecificTag(TAG_HOME_LOCATION_INFO))
83+
null
84+
}
85+
val landmarkTag =
86+
if (!tlvReader.isNull()) {
87+
tlvReader.getUInt(ContextSpecificTag(TAG_LANDMARK_TAG))
88+
} else {
89+
tlvReader.getNull(ContextSpecificTag(TAG_LANDMARK_TAG))
90+
null
91+
}
92+
val positionTag =
93+
if (!tlvReader.isNull()) {
94+
tlvReader.getUInt(ContextSpecificTag(TAG_POSITION_TAG))
95+
} else {
96+
tlvReader.getNull(ContextSpecificTag(TAG_POSITION_TAG))
97+
null
98+
}
99+
val surfaceTag =
100+
if (!tlvReader.isNull()) {
101+
tlvReader.getUInt(ContextSpecificTag(TAG_SURFACE_TAG))
102+
} else {
103+
tlvReader.getNull(ContextSpecificTag(TAG_SURFACE_TAG))
104+
null
105+
}
106+
103107
tlvReader.exitContainer()
104108

105-
return ServiceAreaClusterLocationInfoStruct(homeLocationInfo, landmarkTag, positionTag, surfaceTag)
109+
return ServiceAreaClusterLocationInfoStruct(
110+
homeLocationInfo,
111+
landmarkTag,
112+
positionTag,
113+
surfaceTag
114+
)
106115
}
107116
}
108117
}

‎src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationStruct.kt

+24-22
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,17 @@
1717
package chip.devicecontroller.cluster.structs
1818

1919
import chip.devicecontroller.cluster.*
20-
import matter.tlv.AnonymousTag
2120
import matter.tlv.ContextSpecificTag
2221
import matter.tlv.Tag
23-
import matter.tlv.TlvParsingException
2422
import matter.tlv.TlvReader
2523
import matter.tlv.TlvWriter
2624

27-
import java.util.Optional
28-
29-
class ServiceAreaClusterLocationStruct (
30-
val locationId: ULong,
31-
val mapId: UInt?,
32-
val locationInfo: ServiceAreaClusterLocationInfoStruct) {
33-
override fun toString(): String = buildString {
25+
class ServiceAreaClusterLocationStruct(
26+
val locationId: ULong,
27+
val mapId: UInt?,
28+
val locationInfo: ServiceAreaClusterLocationInfoStruct
29+
) {
30+
override fun toString(): String = buildString {
3431
append("ServiceAreaClusterLocationStruct {\n")
3532
append("\tlocationId : $locationId\n")
3633
append("\tmapId : $mapId\n")
@@ -43,10 +40,10 @@ class ServiceAreaClusterLocationStruct (
4340
startStructure(tlvTag)
4441
put(ContextSpecificTag(TAG_LOCATION_ID), locationId)
4542
if (mapId != null) {
46-
put(ContextSpecificTag(TAG_MAP_ID), mapId)
47-
} else {
48-
putNull(ContextSpecificTag(TAG_MAP_ID))
49-
}
43+
put(ContextSpecificTag(TAG_MAP_ID), mapId)
44+
} else {
45+
putNull(ContextSpecificTag(TAG_MAP_ID))
46+
}
5047
locationInfo.toTlv(ContextSpecificTag(TAG_LOCATION_INFO), this)
5148
endStructure()
5249
}
@@ -57,17 +54,22 @@ class ServiceAreaClusterLocationStruct (
5754
private const val TAG_MAP_ID = 1
5855
private const val TAG_LOCATION_INFO = 2
5956

60-
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : ServiceAreaClusterLocationStruct {
57+
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ServiceAreaClusterLocationStruct {
6158
tlvReader.enterStructure(tlvTag)
6259
val locationId = tlvReader.getULong(ContextSpecificTag(TAG_LOCATION_ID))
63-
val mapId = if (!tlvReader.isNull()) {
64-
tlvReader.getUInt(ContextSpecificTag(TAG_MAP_ID))
65-
} else {
66-
tlvReader.getNull(ContextSpecificTag(TAG_MAP_ID))
67-
null
68-
}
69-
val locationInfo = ServiceAreaClusterLocationInfoStruct.fromTlv(ContextSpecificTag(TAG_LOCATION_INFO), tlvReader)
70-
60+
val mapId =
61+
if (!tlvReader.isNull()) {
62+
tlvReader.getUInt(ContextSpecificTag(TAG_MAP_ID))
63+
} else {
64+
tlvReader.getNull(ContextSpecificTag(TAG_MAP_ID))
65+
null
66+
}
67+
val locationInfo =
68+
ServiceAreaClusterLocationInfoStruct.fromTlv(
69+
ContextSpecificTag(TAG_LOCATION_INFO),
70+
tlvReader
71+
)
72+
7173
tlvReader.exitContainer()
7274

7375
return ServiceAreaClusterLocationStruct(locationId, mapId, locationInfo)

0 commit comments

Comments
 (0)