ZAP-generated Matter TV Casting Attribute and Cluster objects

pgregorr-amazon · Mar 1, 2024 · 5b8eccd · 5b8eccd
1 parent 5c8f7f1
commit 5b8eccd
Show file tree

Hide file tree

Showing 38 changed files with 4,905 additions and 2,739 deletions.
diff --git a/...-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge.xcodeproj/project.pbxproj b/...-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge.xcodeproj/project.pbxproj
@@ -7,10 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		39589F162B91556B00BE040C /* MCStructsObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = 39589F152B91556B00BE040C /* MCStructsObjc.h */; };
+		39589F182B91557700BE040C /* MCStructsObjc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39589F172B91557700BE040C /* MCStructsObjc.mm */; };
 		39BF57C52B8CFF790081653C /* MCAttributeObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = 39BF57C42B8CFF790081653C /* MCAttributeObjects.h */; };
 		39BF57C72B8CFFB90081653C /* MCAttributeObjects.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39BF57C62B8CFFB90081653C /* MCAttributeObjects.mm */; };
 		39BF57C92B8D66540081653C /* NSStringSpanConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 39BF57C82B8D66540081653C /* NSStringSpanConversion.h */; };
 		39BF57CB2B8E54F80081653C /* NSDataSpanConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 39BF57CA2B8E54F80081653C /* NSDataSpanConversion.h */; };
+		39BF57CD2B8FC0EF0081653C /* MCClusterObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = 39BF57CC2B8FC0EF0081653C /* MCClusterObjects.h */; };
+		39BF57CF2B8FC1030081653C /* MCClusterObjects.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39BF57CE2B8FC1030081653C /* MCClusterObjects.mm */; };
 		3C0474062B3F7E5F0012AE95 /* MCEndpointFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C0474052B3F7E5F0012AE95 /* MCEndpointFilter.h */; };
 		3C04740C2B4604CF0012AE95 /* MCCryptoUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C04740B2B4604CF0012AE95 /* MCCryptoUtils.h */; };
 		3C04740E2B4605B40012AE95 /* MCCryptoUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C04740D2B4605B40012AE95 /* MCCryptoUtils.mm */; };
@@ -38,8 +42,6 @@
 		3C4F52282B51DB3000BB8A10 /* MCCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C4F52272B51DB3000BB8A10 /* MCCommand.h */; };
 		3C4F522A2B51DFAE00BB8A10 /* MCCommand_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C4F52292B51DFAE00BB8A10 /* MCCommand_Internal.h */; };
 		3C4F522C2B51E02800BB8A10 /* MCCommand.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4F522B2B51E02800BB8A10 /* MCCommand.mm */; };
-		3C4F52342B57338B00BB8A10 /* MCClusterObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C4F52332B57338B00BB8A10 /* MCClusterObjects.h */; };
-		3C4F52362B5733A200BB8A10 /* MCClusterObjects.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4F52352B5733A200BB8A10 /* MCClusterObjects.mm */; };
 		3C621CA12B5F6CF8005CDBA3 /* MCCommandObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C621CA02B5F6CF8005CDBA3 /* MCCommandObjects.h */; };
 		3C621CA32B5F6D08005CDBA3 /* MCCommandObjects.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C621CA22B5F6D08005CDBA3 /* MCCommandObjects.mm */; };
 		3C621CA52B605A6A005CDBA3 /* MCAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C621CA42B605A6A005CDBA3 /* MCAttribute.h */; };
@@ -82,10 +84,14 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		39589F152B91556B00BE040C /* MCStructsObjc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCStructsObjc.h; sourceTree = "<group>"; };
+		39589F172B91557700BE040C /* MCStructsObjc.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCStructsObjc.mm; sourceTree = "<group>"; };
 		39BF57C42B8CFF790081653C /* MCAttributeObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCAttributeObjects.h; sourceTree = "<group>"; };
 		39BF57C62B8CFFB90081653C /* MCAttributeObjects.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCAttributeObjects.mm; sourceTree = "<group>"; };
 		39BF57C82B8D66540081653C /* NSStringSpanConversion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSStringSpanConversion.h; sourceTree = "<group>"; };
 		39BF57CA2B8E54F80081653C /* NSDataSpanConversion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSDataSpanConversion.h; sourceTree = "<group>"; };
+		39BF57CC2B8FC0EF0081653C /* MCClusterObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCClusterObjects.h; sourceTree = "<group>"; };
+		39BF57CE2B8FC1030081653C /* MCClusterObjects.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCClusterObjects.mm; sourceTree = "<group>"; };
 		3C0474052B3F7E5F0012AE95 /* MCEndpointFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCEndpointFilter.h; sourceTree = "<group>"; };
 		3C04740B2B4604CF0012AE95 /* MCCryptoUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCryptoUtils.h; sourceTree = "<group>"; };
 		3C04740D2B4605B40012AE95 /* MCCryptoUtils.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCCryptoUtils.mm; sourceTree = "<group>"; };
@@ -118,8 +124,6 @@
 		3C4F52272B51DB3000BB8A10 /* MCCommand.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCommand.h; sourceTree = "<group>"; };
 		3C4F52292B51DFAE00BB8A10 /* MCCommand_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCommand_Internal.h; sourceTree = "<group>"; };
 		3C4F522B2B51E02800BB8A10 /* MCCommand.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCCommand.mm; sourceTree = "<group>"; };
-		3C4F52332B57338B00BB8A10 /* MCClusterObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCClusterObjects.h; sourceTree = "<group>"; };
-		3C4F52352B5733A200BB8A10 /* MCClusterObjects.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCClusterObjects.mm; sourceTree = "<group>"; };
 		3C621CA02B5F6CF8005CDBA3 /* MCCommandObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCommandObjects.h; sourceTree = "<group>"; };
 		3C621CA22B5F6D08005CDBA3 /* MCCommandObjects.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCCommandObjects.mm; sourceTree = "<group>"; };
 		3C621CA42B605A6A005CDBA3 /* MCAttribute.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCAttribute.h; sourceTree = "<group>"; };
@@ -186,6 +190,10 @@
 			children = (
 				39BF57C42B8CFF790081653C /* MCAttributeObjects.h */,
 				39BF57C62B8CFFB90081653C /* MCAttributeObjects.mm */,
+				39BF57CC2B8FC0EF0081653C /* MCClusterObjects.h */,
+				39BF57CE2B8FC1030081653C /* MCClusterObjects.mm */,
+				39589F152B91556B00BE040C /* MCStructsObjc.h */,
+				39589F172B91557700BE040C /* MCStructsObjc.mm */,
 			);
 			path = "zap-generated";
 			sourceTree = "<group>";
@@ -257,8 +265,6 @@
 				3C621CA42B605A6A005CDBA3 /* MCAttribute.h */,
 				3C621CA82B605C52005CDBA3 /* MCAttribute_Internal.h */,
 				3C621CAA2B605C6E005CDBA3 /* MCAttribute.mm */,
-				3C4F52332B57338B00BB8A10 /* MCClusterObjects.h */,
-				3C4F52352B5733A200BB8A10 /* MCClusterObjects.mm */,
 				3C621CA02B5F6CF8005CDBA3 /* MCCommandObjects.h */,
 				3C621CA22B5F6D08005CDBA3 /* MCCommandObjects.mm */,
 				3C4F521F2B507C4A00BB8A10 /* MCEndpointClusterType.h */,
@@ -332,6 +338,7 @@
 				3CD6D01A298CDA2100D7569A /* CommissionerDiscoveryDelegateImpl.h in Headers */,
 				3CF71C0E2A992DA2003A5CE5 /* MCDataSource.h in Headers */,
 				3C4F52142B4F31DC00BB8A10 /* MCDeviceTypeStruct.h in Headers */,
+				39BF57CD2B8FC0EF0081653C /* MCClusterObjects.h in Headers */,
 				3C26AC8C2926FE0C00BA6881 /* DeviceAttestationCredentialsProviderImpl.hpp in Headers */,
 				3C621CA52B605A6A005CDBA3 /* MCAttribute.h in Headers */,
 				3CD73F1C2A9E8396009D82D1 /* MCCommissionableDataProvider.h in Headers */,
@@ -349,8 +356,8 @@
 				3C4F522A2B51DFAE00BB8A10 /* MCCommand_Internal.h in Headers */,
 				3CD73F202A9EA060009D82D1 /* MCDeviceAttestationCredentials.h in Headers */,
 				3CCB8740286A593700771BAD /* CastingServerBridge.h in Headers */,
-				3C4F52342B57338B00BB8A10 /* MCClusterObjects.h in Headers */,
 				3CE5ECCE2A673B30007CF331 /* CommissioningCallbackHandlers.h in Headers */,
+				39589F162B91556B00BE040C /* MCStructsObjc.h in Headers */,
 				3CCB8742286A593700771BAD /* ConversionUtils.hpp in Headers */,
 				3C621CA72B605AA1005CDBA3 /* MCObserver.h in Headers */,
 				3C9437922B3B478E0096E5F4 /* MCErrorUtils.h in Headers */,
@@ -466,7 +473,9 @@
 				3C4E53B228E5184C00F293E8 /* TargetNavigatorTypes.mm in Sources */,
 				3C6920482AA1094000D0F613 /* MCDeviceAttestationCredentialsProvider.mm in Sources */,
 				3CE5ECD02A673E2C007CF331 /* CommissioningCallbackHandlers.m in Sources */,
+				39BF57CF2B8FC1030081653C /* MCClusterObjects.mm in Sources */,
 				3CD73F192A9E68A7009D82D1 /* MCRotatingDeviceIdUniqueIdProvider.mm in Sources */,
+				39589F182B91557700BE040C /* MCStructsObjc.mm in Sources */,
 				3CF8532728E37F1000F07B9F /* MatterError.mm in Sources */,
 				3C4F522C2B51E02800BB8A10 /* MCCommand.mm in Sources */,
 				3C4E53B628E5595A00F293E8 /* ContentLauncherTypes.mm in Sources */,
@@ -478,7 +487,6 @@
 				3C4F52122B4E18ED00BB8A10 /* MCEndpoint.mm in Sources */,
 				3C4E53B028E4F28100F293E8 /* MediaPlaybackTypes.mm in Sources */,
 				3C04740E2B4605B40012AE95 /* MCCryptoUtils.mm in Sources */,
-				3C4F52362B5733A200BB8A10 /* MCClusterObjects.mm in Sources */,
 				3CD73F1E2A9E83C1009D82D1 /* MCCommissionableDataProvider.mm in Sources */,
 				3CD73F222A9EA078009D82D1 /* MCDeviceAttestationCredentials.mm in Sources */,
 				39BF57C72B8CFFB90081653C /* MCAttributeObjects.mm in Sources */,

diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCluster.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCluster.mm
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-#import "MCClusterObjects.h"
+#import "zap-generated/MCClusterObjects.h"
 #import "MCCluster_Internal.h"
 
 #import "MCEndpoint_Internal.h"

diff --git a/...ples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCClusterObjects.h b/...ples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCClusterObjects.h
diff --git a/...les/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCClusterObjects.mm b/...les/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCClusterObjects.mm
diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCEndpoint.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCEndpoint.mm
@@ -21,7 +21,7 @@
 #import "MCCluster_Internal.h"
 #import "MCDeviceTypeStruct.h"
 
-#import "MCClusterObjects.h"
+#import "zap-generated/MCClusterObjects.h"
 
 #import "clusters/Clusters.h"
 #import "core/Endpoint.h"

diff --git a/...tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MatterTvCastingBridge.h b/...tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MatterTvCastingBridge.h
@@ -32,7 +32,7 @@ FOUNDATION_EXPORT const unsigned char MatterTvCastingBridgeVersionString[];
 #import "MCCastingPlayer.h"
 #import "MCCastingPlayerDiscovery.h"
 #import "MCCluster.h"
-#import "MCClusterObjects.h"
+#import "zap-generated/MCClusterObjects.h"
 #import "MCCommand.h"
 #import "MCCommandObjects.h"
 #import "MCCommissionableData.h"

diff --git a/.../darwin/MatterTvCastingBridge/MatterTvCastingBridge/templates/MCAttributeObjects-src.zapt b/.../darwin/MatterTvCastingBridge/MatterTvCastingBridge/templates/MCAttributeObjects-src.zapt
@@ -13,10 +13,6 @@
 
 #import <Foundation/Foundation.h>
 
-
-
-
-
 {{#zcl_clusters}}
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
 {{#if (isInConfigList name "MatterCastingClusters")}}

diff --git a/...-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/templates/MCAttributeObjects.zapt b/...-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/templates/MCAttributeObjects.zapt
@@ -1,46 +1,13 @@
 {{> header excludeZapComment=false}}
 
+#import "MCStructsObjc.h"
+
 #import "../MCAttribute.h"
 #import <Foundation/Foundation.h>
 
 #ifndef MCAttributeObjects_h
 #define MCAttributeObjects_h
 
-@interface MCMediaPlaybackClusterPlaybackPositionStruct : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull updatedAt;
-@property (nonatomic, copy) NSNumber * _Nullable position;
-@end
-
-@interface MCMediaPlaybackClusterTrackAttributesStruct : NSObject <NSCopying>
-@property (nonatomic, copy) NSString * _Nonnull languageCode;
-@property (nonatomic, copy) NSString * _Nullable displayName;
-@end
-
-@interface MCMediaPlaybackClusterTrackStruct : NSObject <NSCopying>
-@property (nonatomic, copy) NSString * _Nonnull id;
-@property (nonatomic, copy) MCMediaPlaybackClusterTrackAttributesStruct * _Nullable trackAttributes;
-@end
-
-@interface MCApplicationBasicClusterApplicationStruct : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull catalogVendorID;
-@property (nonatomic, copy) NSString * _Nonnull applicationID;
-@end
-
-@interface MCTargetNavigatorClusterTargetInfoStruct : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull identifier;
-@property (nonatomic, copy) NSString * _Nonnull name;
-@end
-
-@interface MCApplicationLauncherClusterApplicationStruct : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull catalogVendorID;
-@property (nonatomic, copy) NSString * _Nonnull applicationID;
-@end
-
-@interface MCApplicationLauncherClusterApplicationEPStruct : NSObject <NSCopying>
-@property (nonatomic, copy) MCApplicationLauncherClusterApplicationStruct * _Nonnull application;
-@property (nonatomic, copy) NSNumber * _Nullable endpoint;
-@end
-
 {{#zcl_clusters}}
 {{#if (isSupported (asUpperCamelCase name))}}
 {{#if (isInConfigList name "MatterCastingClusters")}}

diff --git a/...MatterTvCastingBridge/MatterTvCastingBridge/templates/MCAttributeTLVValueDecoder-src.zapt b/...MatterTvCastingBridge/MatterTvCastingBridge/templates/MCAttributeTLVValueDecoder-src.zapt