Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add service area cluster to rvc device type template #34075

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
0a7ecbd
Add definitions for common HomeLocationStruct and types - see connect…
johnfierke May 22, 2024
234c103
Add definition for Service Area Cluster - see connectedhomeip-spec PR…
johnfierke May 22, 2024
ac17ea0
Add semantic tag definitions needed for Service Area Cluster - see co…
johnfierke May 22, 2024
e70eaa8
Update Service Area Cluster definition of LocationInfoStruct - see co…
johnfierke May 22, 2024
c115aa6
Rename SurfaceTag to FloorSurfaceTag - spec PR 8937 commit 431739b3e3…
johnfierke May 22, 2024
08219ee
Fix Carport typo, remove IsGroundFloor field (spec change)
johnfierke May 23, 2024
b6bcd68
Update home location definitions per spec PR 8933 commit f04958166412…
johnfierke May 25, 2024
893333d
update generated files
johnfierke May 25, 2024
0099124
Merge branch 'Add-common-definitions-for-Home-Location' into Add-xml-…
johnfierke May 25, 2024
7fdbde7
Update Service Area Cluster definitions per spec PR 8937 up to commit…
johnfierke May 25, 2024
a969dbc
update generated files
johnfierke May 25, 2024
6f74d9d
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 3, 2024
8aaa2dc
Regenerated zap files after merge.
hicklin Jun 3, 2024
ca9d207
Moved the AreaTypeTag namespace definition to namespaces.xml.
hicklin Jun 3, 2024
9837b22
Moved the HomeLoc global struct into global-sturcts.xml.
hicklin Jun 3, 2024
71e6931
Updated the AreaTypeTag namespace to match the latest spec definition.
hicklin Jun 3, 2024
def38fc
Updated the AreaTypeTag namespace to match the latest spec definition.
hicklin Jun 3, 2024
d132cfb
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 3, 2024
3811e36
Updated the matterlint rules with the changes in the xml files.
hicklin Jun 3, 2024
568eb3f
Reverted changes to the rvc zap file.
hicklin Jun 3, 2024
a562e2b
Addded global xml files to relevant lists of xmls.
hicklin Jun 3, 2024
7d61a65
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 4, 2024
cf62628
Merge branch 'Add-common-definitions-for-Home-Location' into Add-xml-…
hicklin Jun 4, 2024
7d60124
Added the Position, Landmark and Floor Surface Namespaces.
hicklin Jun 4, 2024
7dd222e
Merge branch 'Add-common-definitions-for-Home-Location' into Add-xml-…
hicklin Jun 4, 2024
9d34335
Removed namespace tag definitions from the service area cluters XML.
hicklin Jun 4, 2024
61181f2
Regenerated zap files.
hicklin Jun 4, 2024
abad92f
Explicitly set the conformance.
hicklin Jun 7, 2024
b827762
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 7, 2024
4a15763
Merge branch 'Add-common-definitions-for-Home-Location' into Add-xml-…
hicklin Jun 7, 2024
672936c
Fixed typos in the service-area clusters XML from review.
hicklin Jun 7, 2024
fea95d4
Used a more feature rich method for defining the cluster's features.
hicklin Jun 7, 2024
2f17ccc
Reordered data-type definitions to match the order in the spec.
hicklin Jun 7, 2024
6bea5e9
Regenerated zap files.
hicklin Jun 7, 2024
e4d5ee8
Merge branch 'master' into Add-xml-definition-for-service-area-cluster
hicklin Jun 7, 2024
a9012f1
Added github issue to a comment.
hicklin Jun 18, 2024
b343f80
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 18, 2024
60c831c
Merge branch 'Add-common-definitions-for-Home-Location' into Add-xml-…
hicklin Jun 18, 2024
f6816f9
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 20, 2024
cb592f2
Merge branch 'Add-common-definitions-for-Home-Location' into Add-xml-…
hicklin Jun 20, 2024
8fe8493
Renamed namespaces.xml to semantic-tag-namespace-enums.xml.
hicklin Jun 24, 2024
7d03706
Merge branch 'master' into Add-common-definitions-for-Home-Location
hicklin Jun 24, 2024
9a48e48
Merge branch 'Add-common-definitions-for-Home-Location' into Add-xml-…
hicklin Jun 24, 2024
12d2543
Missed some rename locations.
hicklin Jun 24, 2024
e624fdc
Merge branch 'Add-common-definitions-for-Home-Location' into Add-xml-…
hicklin Jun 24, 2024
1915406
Added the Service Area cluster as an optional cluster to the Robotic …
hicklin Jun 25, 2024
babd124
Merge branch 'master' into Add-service-area-cluster-to-rvc-device-typ…
hicklin Jun 26, 2024
dd6b34c
Regenerated zap files after sync with upstream.
hicklin Jun 26, 2024
f327faa
Merge branch 'refs/heads/master' into Add-service-area-cluster-to-rvc…
hicklin Jun 26, 2024
0e23d2a
Regenerated zap files after sync with upstream.
hicklin Jun 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2325,6 +2325,7 @@ limitations under the License.
<include cluster="RVC Run Mode" client="false" server="true" clientLocked="true" serverLocked="true"></include>
<include cluster="RVC Clean Mode" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="RVC Operational State" client="false" server="true" clientLocked="true" serverLocked="true"></include>
<include cluster="Service Area" client="false" server="false" clientLocked="true" serverLocked="false"></include>
</clusters>
</deviceType>
<deviceType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
class ServiceAreaClusterHomeLocationStruct(
val locationName: String,
val floorNumber: Int?,
val areaType: UInt?
val areaType: UInt?,
) {
override fun toString(): String = buildString {
append("ServiceAreaClusterHomeLocationStruct {\n")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ServiceAreaClusterLocationInfoStruct(
val locationInfo: ServiceAreaClusterHomeLocationStruct?,
val landmarkTag: UInt?,
val positionTag: UInt?,
val surfaceTag: UInt?
val surfaceTag: UInt?,
) {
override fun toString(): String = buildString {
append("ServiceAreaClusterLocationInfoStruct {\n")
Expand Down Expand Up @@ -76,7 +76,7 @@ class ServiceAreaClusterLocationInfoStruct(
if (!tlvReader.isNull()) {
ServiceAreaClusterHomeLocationStruct.fromTlv(
ContextSpecificTag(TAG_LOCATION_INFO),
tlvReader
tlvReader,
)
} else {
tlvReader.getNull(ContextSpecificTag(TAG_LOCATION_INFO))
Expand Down Expand Up @@ -110,7 +110,7 @@ class ServiceAreaClusterLocationInfoStruct(
locationInfo,
landmarkTag,
positionTag,
surfaceTag
surfaceTag,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
class ServiceAreaClusterLocationStruct(
val locationID: ULong,
val mapID: UInt?,
val locationInfo: ServiceAreaClusterLocationInfoStruct
val locationInfo: ServiceAreaClusterLocationInfoStruct,
) {
override fun toString(): String = buildString {
append("ServiceAreaClusterLocationStruct {\n")
Expand Down Expand Up @@ -67,7 +67,7 @@ class ServiceAreaClusterLocationStruct(
val locationInfo =
ServiceAreaClusterLocationInfoStruct.fromTlv(
ContextSpecificTag(TAG_LOCATION_INFO),
tlvReader
tlvReader,
)

tlvReader.exitContainer()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ServiceAreaClusterProgressStruct(
val locationID: ULong,
val status: UInt,
val totalOperationalTime: Optional<ULong>?,
val estimatedTime: Optional<ULong>?
val estimatedTime: Optional<ULong>?,
) {
override fun toString(): String = buildString {
append("ServiceAreaClusterProgressStruct {\n")
Expand Down Expand Up @@ -102,7 +102,7 @@ class ServiceAreaClusterProgressStruct(
locationID,
status,
totalOperationalTime,
estimatedTime
estimatedTime,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e

suspend fun selectLocations(
newLocations: List<UInt>?,
timedInvokeTimeout: Duration? = null
timedInvokeTimeout: Duration? = null,
): SelectLocationsResponse {
val commandId: UInt = 0u

Expand All @@ -170,7 +170,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
InvokeRequest(
CommandPath(endpointId, clusterId = CLUSTER_ID, commandId),
tlvPayload = tlvWriter.getEncoded(),
timedRequest = timedInvokeTimeout
timedRequest = timedInvokeTimeout,
)

val response: InvokeResponse = controller.invoke(request)
Expand Down Expand Up @@ -230,7 +230,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
InvokeRequest(
CommandPath(endpointId, clusterId = CLUSTER_ID, commandId),
tlvPayload = tlvWriter.getEncoded(),
timedRequest = timedInvokeTimeout
timedRequest = timedInvokeTimeout,
)

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

suspend fun subscribeSupportedLocationsAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<SupportedLocationsAttributeSubscriptionState> {
val ATTRIBUTE_ID: UInt = 0u
val attributePaths =
Expand All @@ -330,7 +330,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

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

suspend fun subscribeSupportedMapsAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<SupportedMapsAttributeSubscriptionState> {
val ATTRIBUTE_ID: UInt = 1u
val attributePaths =
Expand All @@ -432,7 +432,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

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

suspend fun subscribeSelectedLocationsAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<SelectedLocationsAttributeSubscriptionState> {
val ATTRIBUTE_ID: UInt = 2u
val attributePaths =
Expand All @@ -537,7 +537,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

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

suspend fun subscribeCurrentLocationAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<CurrentLocationAttributeSubscriptionState> {
val ATTRIBUTE_ID: UInt = 3u
val attributePaths =
Expand All @@ -642,7 +642,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

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

suspend fun subscribeEstimatedEndTimeAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<EstimatedEndTimeAttributeSubscriptionState> {
val ATTRIBUTE_ID: UInt = 4u
val attributePaths =
Expand All @@ -745,7 +745,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

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

suspend fun subscribeProgressAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<ProgressAttributeSubscriptionState> {
val ATTRIBUTE_ID: UInt = 5u
val attributePaths =
Expand All @@ -854,7 +854,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

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

suspend fun subscribeGeneratedCommandListAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<GeneratedCommandListAttributeSubscriptionState> {
val ATTRIBUTE_ID: UInt = 65528u
val attributePaths =
Expand All @@ -958,7 +958,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

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

suspend fun subscribeAcceptedCommandListAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<AcceptedCommandListAttributeSubscriptionState> {
val ATTRIBUTE_ID: UInt = 65529u
val attributePaths =
Expand All @@ -1055,7 +1055,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

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

suspend fun subscribeEventListAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<EventListAttributeSubscriptionState> {
val ATTRIBUTE_ID: UInt = 65530u
val attributePaths =
Expand All @@ -1152,7 +1152,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

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

suspend fun subscribeAttributeListAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<AttributeListAttributeSubscriptionState> {
val ATTRIBUTE_ID: UInt = 65531u
val attributePaths =
Expand All @@ -1247,7 +1247,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

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

suspend fun subscribeFeatureMapAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<UIntSubscriptionState> {
val ATTRIBUTE_ID: UInt = 65532u
val attributePaths =
Expand All @@ -1335,7 +1335,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

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

suspend fun subscribeClusterRevisionAttribute(
minInterval: Int,
maxInterval: Int
maxInterval: Int,
): Flow<UShortSubscriptionState> {
val ATTRIBUTE_ID: UInt = 65533u
val attributePaths =
Expand All @@ -1416,7 +1416,7 @@ class ServiceAreaCluster(private val controller: MatterController, private val e
eventPaths = emptyList(),
attributePaths = attributePaths,
minInterval = Duration.ofSeconds(minInterval.toLong()),
maxInterval = Duration.ofSeconds(maxInterval.toLong())
maxInterval = Duration.ofSeconds(maxInterval.toLong()),
)

return controller.subscribe(subscribeRequest).transform { subscriptionState ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
class ServiceAreaClusterHomeLocationStruct(
val locationName: String,
val floorNumber: Short?,
val areaType: UByte?
val areaType: UByte?,
) {
override fun toString(): String = buildString {
append("ServiceAreaClusterHomeLocationStruct {\n")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ServiceAreaClusterLocationInfoStruct(
val locationInfo: ServiceAreaClusterHomeLocationStruct?,
val landmarkTag: UByte?,
val positionTag: UByte?,
val surfaceTag: UByte?
val surfaceTag: UByte?,
) {
override fun toString(): String = buildString {
append("ServiceAreaClusterLocationInfoStruct {\n")
Expand Down Expand Up @@ -76,7 +76,7 @@ class ServiceAreaClusterLocationInfoStruct(
if (!tlvReader.isNull()) {
ServiceAreaClusterHomeLocationStruct.fromTlv(
ContextSpecificTag(TAG_LOCATION_INFO),
tlvReader
tlvReader,
)
} else {
tlvReader.getNull(ContextSpecificTag(TAG_LOCATION_INFO))
Expand Down Expand Up @@ -110,7 +110,7 @@ class ServiceAreaClusterLocationInfoStruct(
locationInfo,
landmarkTag,
positionTag,
surfaceTag
surfaceTag,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
class ServiceAreaClusterLocationStruct(
val locationID: UInt,
val mapID: UByte?,
val locationInfo: ServiceAreaClusterLocationInfoStruct
val locationInfo: ServiceAreaClusterLocationInfoStruct,
) {
override fun toString(): String = buildString {
append("ServiceAreaClusterLocationStruct {\n")
Expand Down Expand Up @@ -67,7 +67,7 @@ class ServiceAreaClusterLocationStruct(
val locationInfo =
ServiceAreaClusterLocationInfoStruct.fromTlv(
ContextSpecificTag(TAG_LOCATION_INFO),
tlvReader
tlvReader,
)

tlvReader.exitContainer()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ServiceAreaClusterProgressStruct(
val locationID: UInt,
val status: UByte,
val totalOperationalTime: Optional<UInt>?,
val estimatedTime: Optional<UInt>?
val estimatedTime: Optional<UInt>?,
) {
override fun toString(): String = buildString {
append("ServiceAreaClusterProgressStruct {\n")
Expand Down Expand Up @@ -102,7 +102,7 @@ class ServiceAreaClusterProgressStruct(
locationID,
status,
totalOperationalTime,
estimatedTime
estimatedTime,
)
}
}
Expand Down
Loading