Skip to content

Commit 60edbf5

Browse files
pgregorr-amazonpgregorr-amazon
authored
ZAP-generated Matter TV Casting Cluster Commands (project-chip#32626)
* ZAP-generated Matter TV Casting Cluster Commands * Addressed comments by sharadb-amazon * Excluding zap-generated files from restyling CI check * Addressed comments by bzbarsky-apple part1 * Addressed comments by bzbarsky-apple part2 unlinked availability.yaml * Addressed comments by bzbarsky-apple part3 unused options
1 parent a32136f commit 60edbf5

37 files changed

+5865
-9108
lines changed

‎.restyled.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ exclude:
7474
- "examples/chef/sample_app_util/test_files/*.yaml"
7575
- "examples/chef/zzz_generated/**/*"
7676
- "examples/platform/nxp/k32w/k32w0/scripts/demo_generated_certs/**/*"
77+
- "examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/*" # zap-generated files
7778
- "integrations/cloudbuild/*.yaml" # uglier long command line content
7879
- "scripts/run_codegen_targets.sh" # shellharden breaks for loops over command outputs
7980
- "scripts/tagging/tag_new_release.sh" # shellharden breaks parameter passing

‎examples/tv-casting-app/APIs.md

+17-8
Original file line numberDiff line numberDiff line change
@@ -905,17 +905,26 @@ Once the Casting Client has selected an `Endpoint`, it is ready to
905905
[issue commands](#issuing-commands) to it, [read](#read-operations) current
906906
playback state, and [subscribe](#subscriptions) to playback events.
907907
908-
Refer to the following platform specific files for a list of clusters, command
909-
and attributes supported by the Matter TV Casting library:
908+
On Linux refer to the following platform specific files:
910909
911-
1. Linux:
910+
1. For a list of clusters, commands and attributes supported by the Matter TV
911+
Casting library:
912912
[tv-casting-common/clusters/Clusters.h](tv-casting-common/clusters/Clusters.h)
913+
2. For the IDs and request / response types to use with these APIs:
914+
[/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h](/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h)
913915
914-
Refer to the following platform specific files for the IDs and request /
915-
response types to use with these APIs:
916+
On iOS refer to the following platform specific files:
916917
917-
1. Linux:
918-
[/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h](/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h)
918+
1. For a list of clusters, commands and attributes supported by the Matter TV
919+
Casting library:
920+
[/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCClusterObjects.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCClusterObjects.h)
921+
2. For the IDs and request / response types to use with the commands:
922+
[/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandObjects.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandObjects.h)
923+
and
924+
[/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandPayloads.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandPayloads.h)
925+
3. For attribute [read operations](#read-operations) and
926+
[subscriptions](#subscriptions):
927+
[/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCAttributeObjects.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCAttributeObjects.h)
919928
920929
### Issuing Commands
921930
@@ -998,7 +1007,7 @@ if(launchURLCommand == nil)
9981007
}
9991008
10001009
// create the LaunchURL request
1001-
let request: MCContentLauncherClusterLaunchURLRequest = MCContentLauncherClusterLaunchURLRequest()
1010+
let request: MCContentLauncherClusterLaunchURLParams = MCContentLauncherClusterLaunchURLParams()
10021011
request.contentURL = contentUrl
10031012
request.displayString = displayString
10041013

‎examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge.xcodeproj/project.pbxproj

+26-16
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
39589F162B91556B00BE040C /* MCStructsObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = 39589F152B91556B00BE040C /* MCStructsObjc.h */; };
11-
39589F182B91557700BE040C /* MCStructsObjc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39589F172B91557700BE040C /* MCStructsObjc.mm */; };
10+
39589F162B91556B00BE040C /* MCInteractionModelStructs.h in Headers */ = {isa = PBXBuildFile; fileRef = 39589F152B91556B00BE040C /* MCInteractionModelStructs.h */; };
11+
39589F182B91557700BE040C /* MCInteractionModelStructs.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39589F172B91557700BE040C /* MCInteractionModelStructs.mm */; };
1212
39BF57C52B8CFF790081653C /* MCAttributeObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = 39BF57C42B8CFF790081653C /* MCAttributeObjects.h */; };
1313
39BF57C72B8CFFB90081653C /* MCAttributeObjects.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39BF57C62B8CFFB90081653C /* MCAttributeObjects.mm */; };
1414
39BF57C92B8D66540081653C /* NSStringSpanConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 39BF57C82B8D66540081653C /* NSStringSpanConversion.h */; };
1515
39BF57CB2B8E54F80081653C /* NSDataSpanConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 39BF57CA2B8E54F80081653C /* NSDataSpanConversion.h */; };
1616
39BF57CD2B8FC0EF0081653C /* MCClusterObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = 39BF57CC2B8FC0EF0081653C /* MCClusterObjects.h */; };
1717
39BF57CF2B8FC1030081653C /* MCClusterObjects.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39BF57CE2B8FC1030081653C /* MCClusterObjects.mm */; };
18+
39D4D2502B97942D00BF3CFE /* MCCommandObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = 39D4D24F2B97942D00BF3CFE /* MCCommandObjects.h */; };
19+
39D4D2522B97943D00BF3CFE /* MCCommandObjects.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39D4D2512B97943D00BF3CFE /* MCCommandObjects.mm */; };
20+
39DB29E92B9A3B1D0071334A /* MCCommandPayloads.h in Headers */ = {isa = PBXBuildFile; fileRef = 39DB29E82B9A3B1D0071334A /* MCCommandPayloads.h */; };
21+
39DB29EB2B9A3B2D0071334A /* MCCommandPayloads.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39DB29EA2B9A3B2D0071334A /* MCCommandPayloads.mm */; };
1822
3C0474062B3F7E5F0012AE95 /* MCEndpointFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C0474052B3F7E5F0012AE95 /* MCEndpointFilter.h */; };
1923
3C04740C2B4604CF0012AE95 /* MCCryptoUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C04740B2B4604CF0012AE95 /* MCCryptoUtils.h */; };
2024
3C04740E2B4605B40012AE95 /* MCCryptoUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C04740D2B4605B40012AE95 /* MCCryptoUtils.mm */; };
@@ -42,8 +46,6 @@
4246
3C4F52282B51DB3000BB8A10 /* MCCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C4F52272B51DB3000BB8A10 /* MCCommand.h */; };
4347
3C4F522A2B51DFAE00BB8A10 /* MCCommand_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C4F52292B51DFAE00BB8A10 /* MCCommand_Internal.h */; };
4448
3C4F522C2B51E02800BB8A10 /* MCCommand.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4F522B2B51E02800BB8A10 /* MCCommand.mm */; };
45-
3C621CA12B5F6CF8005CDBA3 /* MCCommandObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C621CA02B5F6CF8005CDBA3 /* MCCommandObjects.h */; };
46-
3C621CA32B5F6D08005CDBA3 /* MCCommandObjects.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C621CA22B5F6D08005CDBA3 /* MCCommandObjects.mm */; };
4749
3C621CA52B605A6A005CDBA3 /* MCAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C621CA42B605A6A005CDBA3 /* MCAttribute.h */; };
4850
3C621CA72B605AA1005CDBA3 /* MCObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C621CA62B605AA1005CDBA3 /* MCObserver.h */; };
4951
3C621CA92B605C52005CDBA3 /* MCAttribute_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C621CA82B605C52005CDBA3 /* MCAttribute_Internal.h */; };
@@ -84,14 +86,19 @@
8486
/* End PBXBuildFile section */
8587

8688
/* Begin PBXFileReference section */
87-
39589F152B91556B00BE040C /* MCStructsObjc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCStructsObjc.h; sourceTree = "<group>"; };
88-
39589F172B91557700BE040C /* MCStructsObjc.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCStructsObjc.mm; sourceTree = "<group>"; };
89+
39589F152B91556B00BE040C /* MCInteractionModelStructs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCInteractionModelStructs.h; sourceTree = "<group>"; };
90+
39589F172B91557700BE040C /* MCInteractionModelStructs.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCInteractionModelStructs.mm; sourceTree = "<group>"; };
91+
399049A62B9FC4ED000C91F0 /* MCCommandPayloads_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCommandPayloads_Internal.h; sourceTree = "<group>"; };
8992
39BF57C42B8CFF790081653C /* MCAttributeObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCAttributeObjects.h; sourceTree = "<group>"; };
9093
39BF57C62B8CFFB90081653C /* MCAttributeObjects.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCAttributeObjects.mm; sourceTree = "<group>"; };
9194
39BF57C82B8D66540081653C /* NSStringSpanConversion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSStringSpanConversion.h; sourceTree = "<group>"; };
9295
39BF57CA2B8E54F80081653C /* NSDataSpanConversion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSDataSpanConversion.h; sourceTree = "<group>"; };
9396
39BF57CC2B8FC0EF0081653C /* MCClusterObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCClusterObjects.h; sourceTree = "<group>"; };
9497
39BF57CE2B8FC1030081653C /* MCClusterObjects.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCClusterObjects.mm; sourceTree = "<group>"; };
98+
39D4D24F2B97942D00BF3CFE /* MCCommandObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCommandObjects.h; sourceTree = "<group>"; };
99+
39D4D2512B97943D00BF3CFE /* MCCommandObjects.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCCommandObjects.mm; sourceTree = "<group>"; };
100+
39DB29E82B9A3B1D0071334A /* MCCommandPayloads.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCommandPayloads.h; sourceTree = "<group>"; };
101+
39DB29EA2B9A3B2D0071334A /* MCCommandPayloads.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCCommandPayloads.mm; sourceTree = "<group>"; };
95102
3C0474052B3F7E5F0012AE95 /* MCEndpointFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCEndpointFilter.h; sourceTree = "<group>"; };
96103
3C04740B2B4604CF0012AE95 /* MCCryptoUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCryptoUtils.h; sourceTree = "<group>"; };
97104
3C04740D2B4605B40012AE95 /* MCCryptoUtils.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCCryptoUtils.mm; sourceTree = "<group>"; };
@@ -124,8 +131,6 @@
124131
3C4F52272B51DB3000BB8A10 /* MCCommand.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCommand.h; sourceTree = "<group>"; };
125132
3C4F52292B51DFAE00BB8A10 /* MCCommand_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCommand_Internal.h; sourceTree = "<group>"; };
126133
3C4F522B2B51E02800BB8A10 /* MCCommand.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCCommand.mm; sourceTree = "<group>"; };
127-
3C621CA02B5F6CF8005CDBA3 /* MCCommandObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCommandObjects.h; sourceTree = "<group>"; };
128-
3C621CA22B5F6D08005CDBA3 /* MCCommandObjects.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCCommandObjects.mm; sourceTree = "<group>"; };
129134
3C621CA42B605A6A005CDBA3 /* MCAttribute.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCAttribute.h; sourceTree = "<group>"; };
130135
3C621CA62B605AA1005CDBA3 /* MCObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCObserver.h; sourceTree = "<group>"; };
131136
3C621CA82B605C52005CDBA3 /* MCAttribute_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCAttribute_Internal.h; sourceTree = "<group>"; };
@@ -192,8 +197,13 @@
192197
39BF57C62B8CFFB90081653C /* MCAttributeObjects.mm */,
193198
39BF57CC2B8FC0EF0081653C /* MCClusterObjects.h */,
194199
39BF57CE2B8FC1030081653C /* MCClusterObjects.mm */,
195-
39589F152B91556B00BE040C /* MCStructsObjc.h */,
196-
39589F172B91557700BE040C /* MCStructsObjc.mm */,
200+
39589F152B91556B00BE040C /* MCInteractionModelStructs.h */,
201+
39589F172B91557700BE040C /* MCInteractionModelStructs.mm */,
202+
39D4D24F2B97942D00BF3CFE /* MCCommandObjects.h */,
203+
39D4D2512B97943D00BF3CFE /* MCCommandObjects.mm */,
204+
39DB29E82B9A3B1D0071334A /* MCCommandPayloads.h */,
205+
39DB29EA2B9A3B2D0071334A /* MCCommandPayloads.mm */,
206+
399049A62B9FC4ED000C91F0 /* MCCommandPayloads_Internal.h */,
197207
);
198208
path = "zap-generated";
199209
sourceTree = "<group>";
@@ -265,8 +275,6 @@
265275
3C621CA42B605A6A005CDBA3 /* MCAttribute.h */,
266276
3C621CA82B605C52005CDBA3 /* MCAttribute_Internal.h */,
267277
3C621CAA2B605C6E005CDBA3 /* MCAttribute.mm */,
268-
3C621CA02B5F6CF8005CDBA3 /* MCCommandObjects.h */,
269-
3C621CA22B5F6D08005CDBA3 /* MCCommandObjects.mm */,
270278
3C4F521F2B507C4A00BB8A10 /* MCEndpointClusterType.h */,
271279
3C4F52132B4F31DC00BB8A10 /* MCDeviceTypeStruct.h */,
272280
3C4F52152B4F31FA00BB8A10 /* MCDeviceTypeStruct.m */,
@@ -339,11 +347,13 @@
339347
3CF71C0E2A992DA2003A5CE5 /* MCDataSource.h in Headers */,
340348
3C4F52142B4F31DC00BB8A10 /* MCDeviceTypeStruct.h in Headers */,
341349
39BF57CD2B8FC0EF0081653C /* MCClusterObjects.h in Headers */,
350+
39D4D2502B97942D00BF3CFE /* MCCommandObjects.h in Headers */,
342351
3C26AC8C2926FE0C00BA6881 /* DeviceAttestationCredentialsProviderImpl.hpp in Headers */,
343352
3C621CA52B605A6A005CDBA3 /* MCAttribute.h in Headers */,
344353
3CD73F1C2A9E8396009D82D1 /* MCCommissionableDataProvider.h in Headers */,
345354
3C4F521E2B4F4B3B00BB8A10 /* MCEndpoint_Internal.h in Headers */,
346355
39BF57C92B8D66540081653C /* NSStringSpanConversion.h in Headers */,
356+
39DB29E92B9A3B1D0071334A /* MCCommandPayloads.h in Headers */,
347357
3C4F52262B50899700BB8A10 /* MCCluster_Internal.h in Headers */,
348358
3CF71C0A2A992D0D003A5CE5 /* MCCastingApp.h in Headers */,
349359
3C4F521C2B4F4B1B00BB8A10 /* MCCastingPlayer_Internal.h in Headers */,
@@ -357,15 +367,14 @@
357367
3CD73F202A9EA060009D82D1 /* MCDeviceAttestationCredentials.h in Headers */,
358368
3CCB8740286A593700771BAD /* CastingServerBridge.h in Headers */,
359369
3CE5ECCE2A673B30007CF331 /* CommissioningCallbackHandlers.h in Headers */,
360-
39589F162B91556B00BE040C /* MCStructsObjc.h in Headers */,
370+
39589F162B91556B00BE040C /* MCInteractionModelStructs.h in Headers */,
361371
3CCB8742286A593700771BAD /* ConversionUtils.hpp in Headers */,
362372
3C621CA72B605AA1005CDBA3 /* MCObserver.h in Headers */,
363373
3C9437922B3B478E0096E5F4 /* MCErrorUtils.h in Headers */,
364374
3C4F52222B507C9300BB8A10 /* MCCluster.h in Headers */,
365375
3CCB8741286A593700771BAD /* DiscoveredNodeData.h in Headers */,
366376
3C0474062B3F7E5F0012AE95 /* MCEndpointFilter.h in Headers */,
367377
3CCB87212869085400771BAD /* MatterTvCastingBridge.h in Headers */,
368-
3C621CA12B5F6CF8005CDBA3 /* MCCommandObjects.h in Headers */,
369378
3C4F52202B507C4A00BB8A10 /* MCEndpointClusterType.h in Headers */,
370379
3C6920462AA1093300D0F613 /* MCDeviceAttestationCredentialsProvider.h in Headers */,
371380
39BF57C52B8CFF790081653C /* MCAttributeObjects.h in Headers */,
@@ -475,13 +484,13 @@
475484
3CE5ECD02A673E2C007CF331 /* CommissioningCallbackHandlers.m in Sources */,
476485
39BF57CF2B8FC1030081653C /* MCClusterObjects.mm in Sources */,
477486
3CD73F192A9E68A7009D82D1 /* MCRotatingDeviceIdUniqueIdProvider.mm in Sources */,
478-
39589F182B91557700BE040C /* MCStructsObjc.mm in Sources */,
487+
39589F182B91557700BE040C /* MCInteractionModelStructs.mm in Sources */,
488+
39DB29EB2B9A3B2D0071334A /* MCCommandPayloads.mm in Sources */,
479489
3CF8532728E37F1000F07B9F /* MatterError.mm in Sources */,
480490
3C4F522C2B51E02800BB8A10 /* MCCommand.mm in Sources */,
481491
3C4E53B628E5595A00F293E8 /* ContentLauncherTypes.mm in Sources */,
482492
3C81C75028F7A7D3001CB9D1 /* VideoPlayer.m in Sources */,
483493
3CCB8744286A593700771BAD /* ConversionUtils.mm in Sources */,
484-
3C621CA32B5F6D08005CDBA3 /* MCCommandObjects.mm in Sources */,
485494
3CF71C0C2A992D25003A5CE5 /* MCCastingApp.mm in Sources */,
486495
3C621CAB2B605C6E005CDBA3 /* MCAttribute.mm in Sources */,
487496
3C4F52122B4E18ED00BB8A10 /* MCEndpoint.mm in Sources */,
@@ -498,6 +507,7 @@
498507
3C26AC9329282B8100BA6881 /* DeviceAttestationCredentialsHolder.m in Sources */,
499508
3C26AC902927008900BA6881 /* DeviceAttestationCredentialsProviderImpl.mm in Sources */,
500509
3CCB873F286A593700771BAD /* DiscoveredNodeData.mm in Sources */,
510+
39D4D2522B97943D00BF3CFE /* MCCommandObjects.mm in Sources */,
501511
3C4F52162B4F31FA00BB8A10 /* MCDeviceTypeStruct.m in Sources */,
502512
3C2696FB2B4A5FC50026E771 /* MCEndpointFilter.m in Sources */,
503513
3C81C74C28F7A777001CB9D1 /* ContentApp.mm in Sources */,

‎examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCommandObjects.h

-60
This file was deleted.

0 commit comments

Comments
 (0)