Skip to content

Commit f327faa

Browse files
hicklinhicklin
committed
Merge branch 'refs/heads/master' into Add-service-area-cluster-to-rvc-device-type-template
# Conflicts: # src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt # src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt # src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterLocationStruct.kt # src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ServiceAreaClusterProgressStruct.kt # src/controller/java/generated/java/matter/controller/cluster/clusters/ServiceAreaCluster.kt # src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt # src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt # src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationStruct.kt # src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterProgressStruct.kt
2 parents dd6b34c + ce71ed5 commit f327faa

11 files changed

+57
-44
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
2525
class ServiceAreaClusterHomeLocationStruct(
2626
val locationName: String,
2727
val floorNumber: Int?,
28-
val areaType: UInt?,
28+
val areaType: UInt?
2929
) {
3030
override fun toString(): String = buildString {
3131
append("ServiceAreaClusterHomeLocationStruct {\n")

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ServiceAreaClusterLocationInfoStruct(
2626
val locationInfo: ServiceAreaClusterHomeLocationStruct?,
2727
val landmarkTag: UInt?,
2828
val positionTag: UInt?,
29-
val surfaceTag: UInt?,
29+
val surfaceTag: UInt?
3030
) {
3131
override fun toString(): String = buildString {
3232
append("ServiceAreaClusterLocationInfoStruct {\n")
@@ -76,7 +76,7 @@ class ServiceAreaClusterLocationInfoStruct(
7676
if (!tlvReader.isNull()) {
7777
ServiceAreaClusterHomeLocationStruct.fromTlv(
7878
ContextSpecificTag(TAG_LOCATION_INFO),
79-
tlvReader,
79+
tlvReader
8080
)
8181
} else {
8282
tlvReader.getNull(ContextSpecificTag(TAG_LOCATION_INFO))
@@ -110,7 +110,7 @@ class ServiceAreaClusterLocationInfoStruct(
110110
locationInfo,
111111
landmarkTag,
112112
positionTag,
113-
surfaceTag,
113+
surfaceTag
114114
)
115115
}
116116
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
2525
class ServiceAreaClusterLocationStruct(
2626
val locationID: ULong,
2727
val mapID: UInt?,
28-
val locationInfo: ServiceAreaClusterLocationInfoStruct,
28+
val locationInfo: ServiceAreaClusterLocationInfoStruct
2929
) {
3030
override fun toString(): String = buildString {
3131
append("ServiceAreaClusterLocationStruct {\n")
@@ -67,7 +67,7 @@ class ServiceAreaClusterLocationStruct(
6767
val locationInfo =
6868
ServiceAreaClusterLocationInfoStruct.fromTlv(
6969
ContextSpecificTag(TAG_LOCATION_INFO),
70-
tlvReader,
70+
tlvReader
7171
)
7272

7373
tlvReader.exitContainer()

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ServiceAreaClusterProgressStruct(
2727
val locationID: ULong,
2828
val status: UInt,
2929
val totalOperationalTime: Optional<ULong>?,
30-
val estimatedTime: Optional<ULong>?,
30+
val estimatedTime: Optional<ULong>?
3131
) {
3232
override fun toString(): String = buildString {
3333
append("ServiceAreaClusterProgressStruct {\n")
@@ -102,7 +102,7 @@ class ServiceAreaClusterProgressStruct(
102102
locationID,
103103
status,
104104
totalOperationalTime,
105-
estimatedTime,
105+
estimatedTime
106106
)
107107
}
108108
}

‎src/controller/java/generated/java/matter/controller/cluster/clusters/ServiceAreaCluster.kt

+27-27
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
149149

150150
suspend fun selectLocations(
151151
newLocations: List<UInt>?,
152-
timedInvokeTimeout: Duration? = null,
152+
timedInvokeTimeout: Duration? = null
153153
): SelectLocationsResponse {
154154
val commandId: UInt = 0u
155155

@@ -170,7 +170,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
170170
InvokeRequest(
171171
CommandPath(endpointId, clusterId = CLUSTER_ID, commandId),
172172
tlvPayload = tlvWriter.getEncoded(),
173-
timedRequest = timedInvokeTimeout,
173+
timedRequest = timedInvokeTimeout
174174
)
175175

176176
val response: InvokeResponse = controller.invoke(request)
@@ -230,7 +230,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
230230
InvokeRequest(
231231
CommandPath(endpointId, clusterId = CLUSTER_ID, commandId),
232232
tlvPayload = tlvWriter.getEncoded(),
233-
timedRequest = timedInvokeTimeout,
233+
timedRequest = timedInvokeTimeout
234234
)
235235

236236
val response: InvokeResponse = controller.invoke(request)
@@ -317,7 +317,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
317317

318318
suspend fun subscribeSupportedLocationsAttribute(
319319
minInterval: Int,
320-
maxInterval: Int,
320+
maxInterval: Int
321321
): Flow<SupportedLocationsAttributeSubscriptionState> {
322322
val ATTRIBUTE_ID: UInt = 0u
323323
val attributePaths =
@@ -330,7 +330,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
330330
eventPaths = emptyList(),
331331
attributePaths = attributePaths,
332332
minInterval = Duration.ofSeconds(minInterval.toLong()),
333-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
333+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
334334
)
335335

336336
return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -419,7 +419,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
419419

420420
suspend fun subscribeSupportedMapsAttribute(
421421
minInterval: Int,
422-
maxInterval: Int,
422+
maxInterval: Int
423423
): Flow<SupportedMapsAttributeSubscriptionState> {
424424
val ATTRIBUTE_ID: UInt = 1u
425425
val attributePaths =
@@ -432,7 +432,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
432432
eventPaths = emptyList(),
433433
attributePaths = attributePaths,
434434
minInterval = Duration.ofSeconds(minInterval.toLong()),
435-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
435+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
436436
)
437437

438438
return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -524,7 +524,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
524524

525525
suspend fun subscribeSelectedLocationsAttribute(
526526
minInterval: Int,
527-
maxInterval: Int,
527+
maxInterval: Int
528528
): Flow<SelectedLocationsAttributeSubscriptionState> {
529529
val ATTRIBUTE_ID: UInt = 2u
530530
val attributePaths =
@@ -537,7 +537,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
537537
eventPaths = emptyList(),
538538
attributePaths = attributePaths,
539539
minInterval = Duration.ofSeconds(minInterval.toLong()),
540-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
540+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
541541
)
542542

543543
return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -629,7 +629,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
629629

630630
suspend fun subscribeCurrentLocationAttribute(
631631
minInterval: Int,
632-
maxInterval: Int,
632+
maxInterval: Int
633633
): Flow<CurrentLocationAttributeSubscriptionState> {
634634
val ATTRIBUTE_ID: UInt = 3u
635635
val attributePaths =
@@ -642,7 +642,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
642642
eventPaths = emptyList(),
643643
attributePaths = attributePaths,
644644
minInterval = Duration.ofSeconds(minInterval.toLong()),
645-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
645+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
646646
)
647647

648648
return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -732,7 +732,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
732732

733733
suspend fun subscribeEstimatedEndTimeAttribute(
734734
minInterval: Int,
735-
maxInterval: Int,
735+
maxInterval: Int
736736
): Flow<EstimatedEndTimeAttributeSubscriptionState> {
737737
val ATTRIBUTE_ID: UInt = 4u
738738
val attributePaths =
@@ -745,7 +745,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
745745
eventPaths = emptyList(),
746746
attributePaths = attributePaths,
747747
minInterval = Duration.ofSeconds(minInterval.toLong()),
748-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
748+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
749749
)
750750

751751
return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -841,7 +841,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
841841

842842
suspend fun subscribeProgressAttribute(
843843
minInterval: Int,
844-
maxInterval: Int,
844+
maxInterval: Int
845845
): Flow<ProgressAttributeSubscriptionState> {
846846
val ATTRIBUTE_ID: UInt = 5u
847847
val attributePaths =
@@ -854,7 +854,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
854854
eventPaths = emptyList(),
855855
attributePaths = attributePaths,
856856
minInterval = Duration.ofSeconds(minInterval.toLong()),
857-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
857+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
858858
)
859859

860860
return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -945,7 +945,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
945945

946946
suspend fun subscribeGeneratedCommandListAttribute(
947947
minInterval: Int,
948-
maxInterval: Int,
948+
maxInterval: Int
949949
): Flow<GeneratedCommandListAttributeSubscriptionState> {
950950
val ATTRIBUTE_ID: UInt = 65528u
951951
val attributePaths =
@@ -958,7 +958,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
958958
eventPaths = emptyList(),
959959
attributePaths = attributePaths,
960960
minInterval = Duration.ofSeconds(minInterval.toLong()),
961-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
961+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
962962
)
963963

964964
return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -1042,7 +1042,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
10421042

10431043
suspend fun subscribeAcceptedCommandListAttribute(
10441044
minInterval: Int,
1045-
maxInterval: Int,
1045+
maxInterval: Int
10461046
): Flow<AcceptedCommandListAttributeSubscriptionState> {
10471047
val ATTRIBUTE_ID: UInt = 65529u
10481048
val attributePaths =
@@ -1055,7 +1055,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
10551055
eventPaths = emptyList(),
10561056
attributePaths = attributePaths,
10571057
minInterval = Duration.ofSeconds(minInterval.toLong()),
1058-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
1058+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
10591059
)
10601060

10611061
return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -1139,7 +1139,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
11391139

11401140
suspend fun subscribeEventListAttribute(
11411141
minInterval: Int,
1142-
maxInterval: Int,
1142+
maxInterval: Int
11431143
): Flow<EventListAttributeSubscriptionState> {
11441144
val ATTRIBUTE_ID: UInt = 65530u
11451145
val attributePaths =
@@ -1152,7 +1152,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
11521152
eventPaths = emptyList(),
11531153
attributePaths = attributePaths,
11541154
minInterval = Duration.ofSeconds(minInterval.toLong()),
1155-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
1155+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
11561156
)
11571157

11581158
return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -1234,7 +1234,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
12341234

12351235
suspend fun subscribeAttributeListAttribute(
12361236
minInterval: Int,
1237-
maxInterval: Int,
1237+
maxInterval: Int
12381238
): Flow<AttributeListAttributeSubscriptionState> {
12391239
val ATTRIBUTE_ID: UInt = 65531u
12401240
val attributePaths =
@@ -1247,7 +1247,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
12471247
eventPaths = emptyList(),
12481248
attributePaths = attributePaths,
12491249
minInterval = Duration.ofSeconds(minInterval.toLong()),
1250-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
1250+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
12511251
)
12521252

12531253
return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -1322,7 +1322,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
13221322

13231323
suspend fun subscribeFeatureMapAttribute(
13241324
minInterval: Int,
1325-
maxInterval: Int,
1325+
maxInterval: Int
13261326
): Flow<UIntSubscriptionState> {
13271327
val ATTRIBUTE_ID: UInt = 65532u
13281328
val attributePaths =
@@ -1335,7 +1335,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
13351335
eventPaths = emptyList(),
13361336
attributePaths = attributePaths,
13371337
minInterval = Duration.ofSeconds(minInterval.toLong()),
1338-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
1338+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
13391339
)
13401340

13411341
return controller.subscribe(subscribeRequest).transform { subscriptionState ->
@@ -1403,7 +1403,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
14031403

14041404
suspend fun subscribeClusterRevisionAttribute(
14051405
minInterval: Int,
1406-
maxInterval: Int,
1406+
maxInterval: Int
14071407
): Flow<UShortSubscriptionState> {
14081408
val ATTRIBUTE_ID: UInt = 65533u
14091409
val attributePaths =
@@ -1416,7 +1416,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
14161416
eventPaths = emptyList(),
14171417
attributePaths = attributePaths,
14181418
minInterval = Duration.ofSeconds(minInterval.toLong()),
1419-
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
1419+
maxInterval = Duration.ofSeconds(maxInterval.toLong())
14201420
)
14211421

14221422
return controller.subscribe(subscribeRequest).transform { subscriptionState ->

‎src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterHomeLocationStruct.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
2525
class ServiceAreaClusterHomeLocationStruct(
2626
val locationName: String,
2727
val floorNumber: Short?,
28-
val areaType: UByte?,
28+
val areaType: UByte?
2929
) {
3030
override fun toString(): String = buildString {
3131
append("ServiceAreaClusterHomeLocationStruct {\n")

‎src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationInfoStruct.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ServiceAreaClusterLocationInfoStruct(
2626
val locationInfo: ServiceAreaClusterHomeLocationStruct?,
2727
val landmarkTag: UByte?,
2828
val positionTag: UByte?,
29-
val surfaceTag: UByte?,
29+
val surfaceTag: UByte?
3030
) {
3131
override fun toString(): String = buildString {
3232
append("ServiceAreaClusterLocationInfoStruct {\n")
@@ -76,7 +76,7 @@ class ServiceAreaClusterLocationInfoStruct(
7676
if (!tlvReader.isNull()) {
7777
ServiceAreaClusterHomeLocationStruct.fromTlv(
7878
ContextSpecificTag(TAG_LOCATION_INFO),
79-
tlvReader,
79+
tlvReader
8080
)
8181
} else {
8282
tlvReader.getNull(ContextSpecificTag(TAG_LOCATION_INFO))
@@ -110,7 +110,7 @@ class ServiceAreaClusterLocationInfoStruct(
110110
locationInfo,
111111
landmarkTag,
112112
positionTag,
113-
surfaceTag,
113+
surfaceTag
114114
)
115115
}
116116
}

‎src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterLocationStruct.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
2525
class ServiceAreaClusterLocationStruct(
2626
val locationID: UInt,
2727
val mapID: UByte?,
28-
val locationInfo: ServiceAreaClusterLocationInfoStruct,
28+
val locationInfo: ServiceAreaClusterLocationInfoStruct
2929
) {
3030
override fun toString(): String = buildString {
3131
append("ServiceAreaClusterLocationStruct {\n")
@@ -67,7 +67,7 @@ class ServiceAreaClusterLocationStruct(
6767
val locationInfo =
6868
ServiceAreaClusterLocationInfoStruct.fromTlv(
6969
ContextSpecificTag(TAG_LOCATION_INFO),
70-
tlvReader,
70+
tlvReader
7171
)
7272

7373
tlvReader.exitContainer()

‎src/controller/java/generated/java/matter/controller/cluster/structs/ServiceAreaClusterProgressStruct.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ServiceAreaClusterProgressStruct(
2727
val locationID: UInt,
2828
val status: UByte,
2929
val totalOperationalTime: Optional<UInt>?,
30-
val estimatedTime: Optional<UInt>?,
30+
val estimatedTime: Optional<UInt>?
3131
) {
3232
override fun toString(): String = buildString {
3333
append("ServiceAreaClusterProgressStruct {\n")
@@ -102,7 +102,7 @@ class ServiceAreaClusterProgressStruct(
102102
locationID,
103103
status,
104104
totalOperationalTime,
105-
estimatedTime,
105+
estimatedTime
106106
)
107107
}
108108
}

‎src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ - (BOOL)_deleteEndpointIndexForNodeID:(NSNumber *)nodeID
479479

480480
- (NSString *)_clusterIndexKeyForNodeID:(NSNumber *)nodeID endpointID:(NSNumber *)endpointID
481481
{
482-
return [sAttributeCacheClusterIndexKeyPrefix stringByAppendingFormat:@":0x%016llX:%0x04X", nodeID.unsignedLongLongValue, endpointID.unsignedShortValue];
482+
return [sAttributeCacheClusterIndexKeyPrefix stringByAppendingFormat:@":0x%016llX:0x%04X", nodeID.unsignedLongLongValue, endpointID.unsignedShortValue];
483483
}
484484

485485
- (nullable NSArray<NSNumber *> *)_fetchClusterIndexForNodeID:(NSNumber *)nodeID endpointID:(NSNumber *)endpointID

0 commit comments

Comments
 (0)