From e290858b1a8284d07599bd9f88e93501aa1a45f8 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 18 Jan 2023 18:18:36 -0500 Subject: [PATCH] Regenerate generated files. --- .../all-clusters-app.matter | 31 +-- .../all-clusters-minimal-app.matter | 31 +-- .../placeholder/linux/apps/app1/config.matter | 82 +++--- .../placeholder/linux/apps/app2/config.matter | 82 +++--- examples/tv-app/tv-common/tv-app.matter | 41 +-- .../tv-casting-common/tv-casting-app.matter | 39 +-- .../data_model/controller-clusters.matter | 41 +-- .../java/zap-generated/CHIPCallbackTypes.h | 4 +- .../zap-generated/CHIPInvokeCallbacks.cpp | 39 +-- .../java/zap-generated/CHIPInvokeCallbacks.h | 10 +- .../chip/devicecontroller/ChipClusters.java | 26 +- .../chip/devicecontroller/ChipStructs.java | 80 +++--- .../devicecontroller/ClusterInfoMapping.java | 26 +- .../python/chip/clusters/Objects.py | 65 ++--- .../CHIP/zap-generated/MTRBaseClusters.h | 15 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 61 ++--- .../CHIP/zap-generated/MTRCallbackBridge.h | 19 +- .../CHIP/zap-generated/MTRCallbackBridge.mm | 6 +- .../CHIP/zap-generated/MTRClusterConstants.h | 4 +- .../CHIP/zap-generated/MTRClusters.h | 4 +- .../CHIP/zap-generated/MTRClusters.mm | 57 ++-- .../zap-generated/MTRCommandPayloadsObjc.h | 17 +- .../zap-generated/MTRCommandPayloadsObjc.mm | 9 +- .../CHIP/zap-generated/MTRStructsObjc.h | 80 +++--- .../CHIP/zap-generated/MTRStructsObjc.mm | 58 ++-- .../app-common/zap-generated/callback.h | 6 +- .../zap-generated/cluster-enums-check.h | 3 +- .../app-common/zap-generated/cluster-enums.h | 3 +- .../zap-generated/cluster-objects.cpp | 34 +-- .../zap-generated/cluster-objects.h | 72 ++--- .../app-common/zap-generated/ids/Commands.h | 4 +- .../zap-generated/cluster/Commands.h | 4 +- .../cluster/ComplexArgumentParser.cpp | 52 ++-- .../cluster/ComplexArgumentParser.h | 25 +- .../cluster/logging/DataModelLogger.cpp | 33 +-- .../cluster/logging/DataModelLogger.h | 14 +- .../chip-tool/zap-generated/test/Commands.h | 35 +-- .../zap-generated/cluster/Commands.h | 116 ++++---- .../zap-generated/test/Commands.h | 247 ++++++++++-------- 39 files changed, 846 insertions(+), 729 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 8d34771fbf0ab3..e2a27c7a7aee44 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -3469,6 +3469,7 @@ server cluster ContentLauncher = 1290 { kSport = 10; kSportsTeam = 11; kType = 12; + kVideo = 13; } bitmap ContentLauncherFeature : BITMAP32 { @@ -3481,37 +3482,37 @@ server cluster ContentLauncher = 1290 { kHls = 0x2; } - struct ContentSearch { - Parameter parameterList[] = 0; + struct ContentSearchStruct { + ParameterStruct parameterList[] = 0; } - struct Parameter { + struct ParameterStruct { ParameterEnum type = 0; char_string value = 1; - optional AdditionalInfo externalIDList[] = 2; + optional AdditionalInfoStruct externalIDList[] = 2; } - struct AdditionalInfo { + struct AdditionalInfoStruct { char_string name = 0; char_string value = 1; } - struct BrandingInformation { + struct BrandingInformationStruct { char_string providerName = 0; - optional StyleInformation background = 1; - optional StyleInformation logo = 2; - optional StyleInformation progressBar = 3; - optional StyleInformation splash = 4; - optional StyleInformation waterMark = 5; + optional StyleInformationStruct background = 1; + optional StyleInformationStruct logo = 2; + optional StyleInformationStruct progressBar = 3; + optional StyleInformationStruct splash = 4; + optional StyleInformationStruct waterMark = 5; } - struct StyleInformation { - optional char_string imageUrl = 0; + struct StyleInformationStruct { + optional char_string imageURL = 0; optional char_string color = 1; - optional Dimension size = 2; + optional DimensionStruct size = 2; } - struct Dimension { + struct DimensionStruct { double width = 0; double height = 1; MetricTypeEnum metric = 2; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index a8744b0bf38980..d972d664fdae7f 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -2819,6 +2819,7 @@ server cluster ContentLauncher = 1290 { kSport = 10; kSportsTeam = 11; kType = 12; + kVideo = 13; } bitmap ContentLauncherFeature : BITMAP32 { @@ -2831,37 +2832,37 @@ server cluster ContentLauncher = 1290 { kHls = 0x2; } - struct ContentSearch { - Parameter parameterList[] = 0; + struct ContentSearchStruct { + ParameterStruct parameterList[] = 0; } - struct Parameter { + struct ParameterStruct { ParameterEnum type = 0; char_string value = 1; - optional AdditionalInfo externalIDList[] = 2; + optional AdditionalInfoStruct externalIDList[] = 2; } - struct AdditionalInfo { + struct AdditionalInfoStruct { char_string name = 0; char_string value = 1; } - struct BrandingInformation { + struct BrandingInformationStruct { char_string providerName = 0; - optional StyleInformation background = 1; - optional StyleInformation logo = 2; - optional StyleInformation progressBar = 3; - optional StyleInformation splash = 4; - optional StyleInformation waterMark = 5; + optional StyleInformationStruct background = 1; + optional StyleInformationStruct logo = 2; + optional StyleInformationStruct progressBar = 3; + optional StyleInformationStruct splash = 4; + optional StyleInformationStruct waterMark = 5; } - struct StyleInformation { - optional char_string imageUrl = 0; + struct StyleInformationStruct { + optional char_string imageURL = 0; optional char_string color = 1; - optional Dimension size = 2; + optional DimensionStruct size = 2; } - struct Dimension { + struct DimensionStruct { double width = 0; double height = 1; MetricTypeEnum metric = 2; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 1a6215df5c2ec1..edf4aed790aad1 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -2502,6 +2502,7 @@ client cluster ContentLauncher = 1290 { kSport = 10; kSportsTeam = 11; kType = 12; + kVideo = 13; } bitmap ContentLauncherFeature : BITMAP32 { @@ -2514,37 +2515,37 @@ client cluster ContentLauncher = 1290 { kHls = 0x2; } - struct ContentSearch { - Parameter parameterList[] = 0; + struct ContentSearchStruct { + ParameterStruct parameterList[] = 0; } - struct Parameter { + struct ParameterStruct { ParameterEnum type = 0; char_string value = 1; - optional AdditionalInfo externalIDList[] = 2; + optional AdditionalInfoStruct externalIDList[] = 2; } - struct AdditionalInfo { + struct AdditionalInfoStruct { char_string name = 0; char_string value = 1; } - struct BrandingInformation { + struct BrandingInformationStruct { char_string providerName = 0; - optional StyleInformation background = 1; - optional StyleInformation logo = 2; - optional StyleInformation progressBar = 3; - optional StyleInformation splash = 4; - optional StyleInformation waterMark = 5; + optional StyleInformationStruct background = 1; + optional StyleInformationStruct logo = 2; + optional StyleInformationStruct progressBar = 3; + optional StyleInformationStruct splash = 4; + optional StyleInformationStruct waterMark = 5; } - struct StyleInformation { - optional char_string imageUrl = 0; + struct StyleInformationStruct { + optional char_string imageURL = 0; optional char_string color = 1; - optional Dimension size = 2; + optional DimensionStruct size = 2; } - struct Dimension { + struct DimensionStruct { double width = 0; double height = 1; MetricTypeEnum metric = 2; @@ -2559,7 +2560,7 @@ client cluster ContentLauncher = 1290 { readonly attribute int16u clusterRevision = 65533; request struct LaunchContentRequest { - ContentSearch search = 0; + ContentSearchStruct search = 0; BOOLEAN autoPlay = 1; optional CHAR_STRING data = 2; } @@ -2567,16 +2568,16 @@ client cluster ContentLauncher = 1290 { request struct LaunchURLRequest { CHAR_STRING contentURL = 0; optional CHAR_STRING displayString = 1; - optional BrandingInformation brandingInformation = 2; + optional BrandingInformationStruct brandingInformation = 2; } - response struct LaunchResponse = 2 { + response struct LauncherResponse = 2 { ContentLaunchStatusEnum status = 0; optional CHAR_STRING data = 1; } - command LaunchContent(LaunchContentRequest): LaunchResponse = 0; - command LaunchURL(LaunchURLRequest): LaunchResponse = 1; + command LaunchContent(LaunchContentRequest): LauncherResponse = 0; + command LaunchURL(LaunchURLRequest): LauncherResponse = 1; } server cluster ContentLauncher = 1290 { @@ -2605,6 +2606,7 @@ server cluster ContentLauncher = 1290 { kSport = 10; kSportsTeam = 11; kType = 12; + kVideo = 13; } bitmap ContentLauncherFeature : BITMAP32 { @@ -2617,37 +2619,37 @@ server cluster ContentLauncher = 1290 { kHls = 0x2; } - struct ContentSearch { - Parameter parameterList[] = 0; + struct ContentSearchStruct { + ParameterStruct parameterList[] = 0; } - struct Parameter { + struct ParameterStruct { ParameterEnum type = 0; char_string value = 1; - optional AdditionalInfo externalIDList[] = 2; + optional AdditionalInfoStruct externalIDList[] = 2; } - struct AdditionalInfo { + struct AdditionalInfoStruct { char_string name = 0; char_string value = 1; } - struct BrandingInformation { + struct BrandingInformationStruct { char_string providerName = 0; - optional StyleInformation background = 1; - optional StyleInformation logo = 2; - optional StyleInformation progressBar = 3; - optional StyleInformation splash = 4; - optional StyleInformation waterMark = 5; + optional StyleInformationStruct background = 1; + optional StyleInformationStruct logo = 2; + optional StyleInformationStruct progressBar = 3; + optional StyleInformationStruct splash = 4; + optional StyleInformationStruct waterMark = 5; } - struct StyleInformation { - optional char_string imageUrl = 0; + struct StyleInformationStruct { + optional char_string imageURL = 0; optional char_string color = 1; - optional Dimension size = 2; + optional DimensionStruct size = 2; } - struct Dimension { + struct DimensionStruct { double width = 0; double height = 1; MetricTypeEnum metric = 2; @@ -2662,7 +2664,7 @@ server cluster ContentLauncher = 1290 { readonly attribute int16u clusterRevision = 65533; request struct LaunchContentRequest { - ContentSearch search = 0; + ContentSearchStruct search = 0; BOOLEAN autoPlay = 1; optional CHAR_STRING data = 2; } @@ -2670,16 +2672,16 @@ server cluster ContentLauncher = 1290 { request struct LaunchURLRequest { CHAR_STRING contentURL = 0; optional CHAR_STRING displayString = 1; - optional BrandingInformation brandingInformation = 2; + optional BrandingInformationStruct brandingInformation = 2; } - response struct LaunchResponse = 2 { + response struct LauncherResponse = 2 { ContentLaunchStatusEnum status = 0; optional CHAR_STRING data = 1; } - command LaunchContent(LaunchContentRequest): LaunchResponse = 0; - command LaunchURL(LaunchURLRequest): LaunchResponse = 1; + command LaunchContent(LaunchContentRequest): LauncherResponse = 0; + command LaunchURL(LaunchURLRequest): LauncherResponse = 1; } client cluster ApplicationBasic = 1293 { diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 4c3e0a9eabcace..619978a24acf5d 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -2479,6 +2479,7 @@ client cluster ContentLauncher = 1290 { kSport = 10; kSportsTeam = 11; kType = 12; + kVideo = 13; } bitmap ContentLauncherFeature : BITMAP32 { @@ -2491,37 +2492,37 @@ client cluster ContentLauncher = 1290 { kHls = 0x2; } - struct ContentSearch { - Parameter parameterList[] = 0; + struct ContentSearchStruct { + ParameterStruct parameterList[] = 0; } - struct Parameter { + struct ParameterStruct { ParameterEnum type = 0; char_string value = 1; - optional AdditionalInfo externalIDList[] = 2; + optional AdditionalInfoStruct externalIDList[] = 2; } - struct AdditionalInfo { + struct AdditionalInfoStruct { char_string name = 0; char_string value = 1; } - struct BrandingInformation { + struct BrandingInformationStruct { char_string providerName = 0; - optional StyleInformation background = 1; - optional StyleInformation logo = 2; - optional StyleInformation progressBar = 3; - optional StyleInformation splash = 4; - optional StyleInformation waterMark = 5; + optional StyleInformationStruct background = 1; + optional StyleInformationStruct logo = 2; + optional StyleInformationStruct progressBar = 3; + optional StyleInformationStruct splash = 4; + optional StyleInformationStruct waterMark = 5; } - struct StyleInformation { - optional char_string imageUrl = 0; + struct StyleInformationStruct { + optional char_string imageURL = 0; optional char_string color = 1; - optional Dimension size = 2; + optional DimensionStruct size = 2; } - struct Dimension { + struct DimensionStruct { double width = 0; double height = 1; MetricTypeEnum metric = 2; @@ -2536,7 +2537,7 @@ client cluster ContentLauncher = 1290 { readonly attribute int16u clusterRevision = 65533; request struct LaunchContentRequest { - ContentSearch search = 0; + ContentSearchStruct search = 0; BOOLEAN autoPlay = 1; optional CHAR_STRING data = 2; } @@ -2544,16 +2545,16 @@ client cluster ContentLauncher = 1290 { request struct LaunchURLRequest { CHAR_STRING contentURL = 0; optional CHAR_STRING displayString = 1; - optional BrandingInformation brandingInformation = 2; + optional BrandingInformationStruct brandingInformation = 2; } - response struct LaunchResponse = 2 { + response struct LauncherResponse = 2 { ContentLaunchStatusEnum status = 0; optional CHAR_STRING data = 1; } - command LaunchContent(LaunchContentRequest): LaunchResponse = 0; - command LaunchURL(LaunchURLRequest): LaunchResponse = 1; + command LaunchContent(LaunchContentRequest): LauncherResponse = 0; + command LaunchURL(LaunchURLRequest): LauncherResponse = 1; } server cluster ContentLauncher = 1290 { @@ -2582,6 +2583,7 @@ server cluster ContentLauncher = 1290 { kSport = 10; kSportsTeam = 11; kType = 12; + kVideo = 13; } bitmap ContentLauncherFeature : BITMAP32 { @@ -2594,37 +2596,37 @@ server cluster ContentLauncher = 1290 { kHls = 0x2; } - struct ContentSearch { - Parameter parameterList[] = 0; + struct ContentSearchStruct { + ParameterStruct parameterList[] = 0; } - struct Parameter { + struct ParameterStruct { ParameterEnum type = 0; char_string value = 1; - optional AdditionalInfo externalIDList[] = 2; + optional AdditionalInfoStruct externalIDList[] = 2; } - struct AdditionalInfo { + struct AdditionalInfoStruct { char_string name = 0; char_string value = 1; } - struct BrandingInformation { + struct BrandingInformationStruct { char_string providerName = 0; - optional StyleInformation background = 1; - optional StyleInformation logo = 2; - optional StyleInformation progressBar = 3; - optional StyleInformation splash = 4; - optional StyleInformation waterMark = 5; + optional StyleInformationStruct background = 1; + optional StyleInformationStruct logo = 2; + optional StyleInformationStruct progressBar = 3; + optional StyleInformationStruct splash = 4; + optional StyleInformationStruct waterMark = 5; } - struct StyleInformation { - optional char_string imageUrl = 0; + struct StyleInformationStruct { + optional char_string imageURL = 0; optional char_string color = 1; - optional Dimension size = 2; + optional DimensionStruct size = 2; } - struct Dimension { + struct DimensionStruct { double width = 0; double height = 1; MetricTypeEnum metric = 2; @@ -2639,7 +2641,7 @@ server cluster ContentLauncher = 1290 { readonly attribute int16u clusterRevision = 65533; request struct LaunchContentRequest { - ContentSearch search = 0; + ContentSearchStruct search = 0; BOOLEAN autoPlay = 1; optional CHAR_STRING data = 2; } @@ -2647,16 +2649,16 @@ server cluster ContentLauncher = 1290 { request struct LaunchURLRequest { CHAR_STRING contentURL = 0; optional CHAR_STRING displayString = 1; - optional BrandingInformation brandingInformation = 2; + optional BrandingInformationStruct brandingInformation = 2; } - response struct LaunchResponse = 2 { + response struct LauncherResponse = 2 { ContentLaunchStatusEnum status = 0; optional CHAR_STRING data = 1; } - command LaunchContent(LaunchContentRequest): LaunchResponse = 0; - command LaunchURL(LaunchURLRequest): LaunchResponse = 1; + command LaunchContent(LaunchContentRequest): LauncherResponse = 0; + command LaunchURL(LaunchURLRequest): LauncherResponse = 1; } client cluster ApplicationBasic = 1293 { diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 2266f26d42446f..86aea3f748b91e 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1923,6 +1923,7 @@ server cluster ContentLauncher = 1290 { kSport = 10; kSportsTeam = 11; kType = 12; + kVideo = 13; } bitmap ContentLauncherFeature : BITMAP32 { @@ -1935,37 +1936,37 @@ server cluster ContentLauncher = 1290 { kHls = 0x2; } - struct ContentSearch { - Parameter parameterList[] = 0; + struct ContentSearchStruct { + ParameterStruct parameterList[] = 0; } - struct Parameter { + struct ParameterStruct { ParameterEnum type = 0; char_string value = 1; - optional AdditionalInfo externalIDList[] = 2; + optional AdditionalInfoStruct externalIDList[] = 2; } - struct AdditionalInfo { + struct AdditionalInfoStruct { char_string name = 0; char_string value = 1; } - struct BrandingInformation { + struct BrandingInformationStruct { char_string providerName = 0; - optional StyleInformation background = 1; - optional StyleInformation logo = 2; - optional StyleInformation progressBar = 3; - optional StyleInformation splash = 4; - optional StyleInformation waterMark = 5; + optional StyleInformationStruct background = 1; + optional StyleInformationStruct logo = 2; + optional StyleInformationStruct progressBar = 3; + optional StyleInformationStruct splash = 4; + optional StyleInformationStruct waterMark = 5; } - struct StyleInformation { - optional char_string imageUrl = 0; + struct StyleInformationStruct { + optional char_string imageURL = 0; optional char_string color = 1; - optional Dimension size = 2; + optional DimensionStruct size = 2; } - struct Dimension { + struct DimensionStruct { double width = 0; double height = 1; MetricTypeEnum metric = 2; @@ -1977,7 +1978,7 @@ server cluster ContentLauncher = 1290 { readonly attribute int16u clusterRevision = 65533; request struct LaunchContentRequest { - ContentSearch search = 0; + ContentSearchStruct search = 0; BOOLEAN autoPlay = 1; optional CHAR_STRING data = 2; } @@ -1985,16 +1986,16 @@ server cluster ContentLauncher = 1290 { request struct LaunchURLRequest { CHAR_STRING contentURL = 0; optional CHAR_STRING displayString = 1; - optional BrandingInformation brandingInformation = 2; + optional BrandingInformationStruct brandingInformation = 2; } - response struct LaunchResponse = 2 { + response struct LauncherResponse = 2 { ContentLaunchStatusEnum status = 0; optional CHAR_STRING data = 1; } - command LaunchContent(LaunchContentRequest): LaunchResponse = 0; - command LaunchURL(LaunchURLRequest): LaunchResponse = 1; + command LaunchContent(LaunchContentRequest): LauncherResponse = 0; + command LaunchURL(LaunchURLRequest): LauncherResponse = 1; } server cluster AudioOutput = 1291 { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index b1a5a9d8ee7c3d..e48ccbe5204116 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -1978,6 +1978,7 @@ client cluster ContentLauncher = 1290 { kSport = 10; kSportsTeam = 11; kType = 12; + kVideo = 13; } bitmap ContentLauncherFeature : BITMAP32 { @@ -1990,37 +1991,37 @@ client cluster ContentLauncher = 1290 { kHls = 0x2; } - struct ContentSearch { - Parameter parameterList[] = 0; + struct ContentSearchStruct { + ParameterStruct parameterList[] = 0; } - struct Parameter { + struct ParameterStruct { ParameterEnum type = 0; char_string value = 1; - optional AdditionalInfo externalIDList[] = 2; + optional AdditionalInfoStruct externalIDList[] = 2; } - struct AdditionalInfo { + struct AdditionalInfoStruct { char_string name = 0; char_string value = 1; } - struct BrandingInformation { + struct BrandingInformationStruct { char_string providerName = 0; - optional StyleInformation background = 1; - optional StyleInformation logo = 2; - optional StyleInformation progressBar = 3; - optional StyleInformation splash = 4; - optional StyleInformation waterMark = 5; + optional StyleInformationStruct background = 1; + optional StyleInformationStruct logo = 2; + optional StyleInformationStruct progressBar = 3; + optional StyleInformationStruct splash = 4; + optional StyleInformationStruct waterMark = 5; } - struct StyleInformation { - optional char_string imageUrl = 0; + struct StyleInformationStruct { + optional char_string imageURL = 0; optional char_string color = 1; - optional Dimension size = 2; + optional DimensionStruct size = 2; } - struct Dimension { + struct DimensionStruct { double width = 0; double height = 1; MetricTypeEnum metric = 2; @@ -2031,7 +2032,7 @@ client cluster ContentLauncher = 1290 { readonly attribute int16u clusterRevision = 65533; request struct LaunchContentRequest { - ContentSearch search = 0; + ContentSearchStruct search = 0; BOOLEAN autoPlay = 1; optional CHAR_STRING data = 2; } @@ -2039,11 +2040,11 @@ client cluster ContentLauncher = 1290 { request struct LaunchURLRequest { CHAR_STRING contentURL = 0; optional CHAR_STRING displayString = 1; - optional BrandingInformation brandingInformation = 2; + optional BrandingInformationStruct brandingInformation = 2; } - command LaunchContent(LaunchContentRequest): LaunchResponse = 0; - command LaunchURL(LaunchURLRequest): LaunchResponse = 1; + command LaunchContent(LaunchContentRequest): LauncherResponse = 0; + command LaunchURL(LaunchURLRequest): LauncherResponse = 1; } client cluster AudioOutput = 1291 { diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index e0f2c08b869331..babdab807d75b5 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3881,6 +3881,7 @@ client cluster ContentLauncher = 1290 { kSport = 10; kSportsTeam = 11; kType = 12; + kVideo = 13; } bitmap ContentLauncherFeature : BITMAP32 { @@ -3893,37 +3894,37 @@ client cluster ContentLauncher = 1290 { kHls = 0x2; } - struct ContentSearch { - Parameter parameterList[] = 0; + struct ContentSearchStruct { + ParameterStruct parameterList[] = 0; } - struct Parameter { + struct ParameterStruct { ParameterEnum type = 0; char_string value = 1; - optional AdditionalInfo externalIDList[] = 2; + optional AdditionalInfoStruct externalIDList[] = 2; } - struct AdditionalInfo { + struct AdditionalInfoStruct { char_string name = 0; char_string value = 1; } - struct BrandingInformation { + struct BrandingInformationStruct { char_string providerName = 0; - optional StyleInformation background = 1; - optional StyleInformation logo = 2; - optional StyleInformation progressBar = 3; - optional StyleInformation splash = 4; - optional StyleInformation waterMark = 5; + optional StyleInformationStruct background = 1; + optional StyleInformationStruct logo = 2; + optional StyleInformationStruct progressBar = 3; + optional StyleInformationStruct splash = 4; + optional StyleInformationStruct waterMark = 5; } - struct StyleInformation { - optional char_string imageUrl = 0; + struct StyleInformationStruct { + optional char_string imageURL = 0; optional char_string color = 1; - optional Dimension size = 2; + optional DimensionStruct size = 2; } - struct Dimension { + struct DimensionStruct { double width = 0; double height = 1; MetricTypeEnum metric = 2; @@ -3938,7 +3939,7 @@ client cluster ContentLauncher = 1290 { readonly attribute int16u clusterRevision = 65533; request struct LaunchContentRequest { - ContentSearch search = 0; + ContentSearchStruct search = 0; BOOLEAN autoPlay = 1; optional CHAR_STRING data = 2; } @@ -3946,16 +3947,16 @@ client cluster ContentLauncher = 1290 { request struct LaunchURLRequest { CHAR_STRING contentURL = 0; optional CHAR_STRING displayString = 1; - optional BrandingInformation brandingInformation = 2; + optional BrandingInformationStruct brandingInformation = 2; } - response struct LaunchResponse = 2 { + response struct LauncherResponse = 2 { ContentLaunchStatusEnum status = 0; optional CHAR_STRING data = 1; } - command LaunchContent(LaunchContentRequest): LaunchResponse = 0; - command LaunchURL(LaunchURLRequest): LaunchResponse = 1; + command LaunchContent(LaunchContentRequest): LauncherResponse = 0; + command LaunchURL(LaunchURLRequest): LauncherResponse = 1; } client cluster AudioOutput = 1291 { diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h index 324a990836c2fb..0e23f45e9e3ec4 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -1652,8 +1652,8 @@ typedef void (*CHIPKeypadInputClusterFeatureMapAttributeCallbackType)( void *, chip::app::Clusters::KeypadInput::Attributes::FeatureMap::TypeInfo::DecodableArgType); typedef void (*CHIPKeypadInputClusterClusterRevisionAttributeCallbackType)( void *, chip::app::Clusters::KeypadInput::Attributes::ClusterRevision::TypeInfo::DecodableArgType); -typedef void (*CHIPContentLauncherClusterLaunchResponseCallbackType)( - void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType &); +typedef void (*CHIPContentLauncherClusterLauncherResponseCallbackType)( + void *, const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType &); typedef void (*CHIPContentLauncherClusterAcceptHeaderAttributeCallbackType)( void *, const chip::app::Clusters::ContentLauncher::Attributes::AcceptHeader::TypeInfo::DecodableType &); diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index 9543a2a5a4351a..9bdd3318216c9f 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -3528,8 +3528,8 @@ void CHIPKeypadInputClusterSendKeyResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, status); } -CHIPContentLauncherClusterLaunchResponseCallback::CHIPContentLauncherClusterLaunchResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPContentLauncherClusterLauncherResponseCallback::CHIPContentLauncherClusterLauncherResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3545,7 +3545,7 @@ CHIPContentLauncherClusterLaunchResponseCallback::CHIPContentLauncherClusterLaun } } -CHIPContentLauncherClusterLaunchResponseCallback::~CHIPContentLauncherClusterLaunchResponseCallback() +CHIPContentLauncherClusterLauncherResponseCallback::~CHIPContentLauncherClusterLauncherResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3556,8 +3556,8 @@ CHIPContentLauncherClusterLaunchResponseCallback::~CHIPContentLauncherClusterLau env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPContentLauncherClusterLaunchResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & dataResponse) +void CHIPContentLauncherClusterLauncherResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -3567,9 +3567,10 @@ void CHIPContentLauncherClusterLaunchResponseCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; @@ -3580,25 +3581,25 @@ void CHIPContentLauncherClusterLaunchResponseCallback::CallbackFn( &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject status; - std::string statusClassName = "java/lang/Integer"; - std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(statusClassName.c_str(), statusCtorSignature.c_str(), - static_cast(dataResponse.status), status); - jobject data; + jobject Status; + std::string StatusClassName = "java/lang/Integer"; + std::string StatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), + static_cast(dataResponse.status), Status); + jobject Data; if (!dataResponse.data.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, data); + chip::JniReferences::GetInstance().CreateOptional(nullptr, Data); } else { - jobject dataInsideOptional; - dataInsideOptional = + jobject DataInsideOptional; + DataInsideOptional = env->NewStringUTF(std::string(dataResponse.data.Value().data(), dataResponse.data.Value().size()).c_str()); - chip::JniReferences::GetInstance().CreateOptional(dataInsideOptional, data); + chip::JniReferences::GetInstance().CreateOptional(DataInsideOptional, Data); } - env->CallVoidMethod(javaCallbackRef, javaMethod, status, data); + env->CallVoidMethod(javaCallbackRef, javaMethod, Status, Data); } CHIPApplicationLauncherClusterLauncherResponseCallback::CHIPApplicationLauncherClusterLauncherResponseCallback( jobject javaCallback) : diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h index 4605d5f20dbb1f..c2afb210443d7b 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h @@ -552,16 +552,16 @@ class CHIPKeypadInputClusterSendKeyResponseCallback : public Callback::Callback< jobject javaCallbackRef; }; -class CHIPContentLauncherClusterLaunchResponseCallback - : public Callback::Callback +class CHIPContentLauncherClusterLauncherResponseCallback + : public Callback::Callback { public: - CHIPContentLauncherClusterLaunchResponseCallback(jobject javaCallback); + CHIPContentLauncherClusterLauncherResponseCallback(jobject javaCallback); - ~CHIPContentLauncherClusterLaunchResponseCallback(); + ~CHIPContentLauncherClusterLauncherResponseCallback(); static void CallbackFn(void * context, - const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data); + const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType & data); private: jobject javaCallbackRef; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 57cb2ad43791f7..598597239f5c03 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -20584,16 +20584,16 @@ public ContentLauncherCluster(long devicePtr, int endpointId) { public native long initWithDevice(long devicePtr, int endpointId); public void launchContent( - LaunchResponseCallback callback, - ChipStructs.ContentLauncherClusterContentSearch search, + LauncherResponseCallback callback, + ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional data) { launchContent(chipClusterPtr, callback, search, autoPlay, data, null); } public void launchContent( - LaunchResponseCallback callback, - ChipStructs.ContentLauncherClusterContentSearch search, + LauncherResponseCallback callback, + ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional data, int timedInvokeTimeoutMs) { @@ -20601,18 +20601,18 @@ public void launchContent( } public void launchURL( - LaunchResponseCallback callback, + LauncherResponseCallback callback, String contentURL, Optional displayString, - Optional brandingInformation) { + Optional brandingInformation) { launchURL(chipClusterPtr, callback, contentURL, displayString, brandingInformation, null); } public void launchURL( - LaunchResponseCallback callback, + LauncherResponseCallback callback, String contentURL, Optional displayString, - Optional brandingInformation, + Optional brandingInformation, int timedInvokeTimeoutMs) { launchURL( chipClusterPtr, @@ -20625,21 +20625,21 @@ public void launchURL( private native void launchContent( long chipClusterPtr, - LaunchResponseCallback Callback, - ChipStructs.ContentLauncherClusterContentSearch search, + LauncherResponseCallback Callback, + ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional data, @Nullable Integer timedInvokeTimeoutMs); private native void launchURL( long chipClusterPtr, - LaunchResponseCallback Callback, + LauncherResponseCallback Callback, String contentURL, Optional displayString, - Optional brandingInformation, + Optional brandingInformation, @Nullable Integer timedInvokeTimeoutMs); - public interface LaunchResponseCallback { + public interface LauncherResponseCallback { void onSuccess(Integer status, Optional data); void onError(Exception error); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index 2df9af288aa989..c487dc7a64f967 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1537,12 +1537,12 @@ public String toString() { } } - public static class ContentLauncherClusterDimension { + public static class ContentLauncherClusterDimensionStruct { public Double width; public Double height; public Integer metric; - public ContentLauncherClusterDimension(Double width, Double height, Integer metric) { + public ContentLauncherClusterDimensionStruct(Double width, Double height, Integer metric) { this.width = width; this.height = height; this.metric = metric; @@ -1551,7 +1551,7 @@ public ContentLauncherClusterDimension(Double width, Double height, Integer metr @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ContentLauncherClusterDimension {\n"); + output.append("ContentLauncherClusterDimensionStruct {\n"); output.append("\twidth: "); output.append(width); output.append("\n"); @@ -1566,11 +1566,11 @@ public String toString() { } } - public static class ContentLauncherClusterAdditionalInfo { + public static class ContentLauncherClusterAdditionalInfoStruct { public String name; public String value; - public ContentLauncherClusterAdditionalInfo(String name, String value) { + public ContentLauncherClusterAdditionalInfoStruct(String name, String value) { this.name = name; this.value = value; } @@ -1578,7 +1578,7 @@ public ContentLauncherClusterAdditionalInfo(String name, String value) { @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ContentLauncherClusterAdditionalInfo {\n"); + output.append("ContentLauncherClusterAdditionalInfoStruct {\n"); output.append("\tname: "); output.append(name); output.append("\n"); @@ -1590,15 +1590,17 @@ public String toString() { } } - public static class ContentLauncherClusterParameter { + public static class ContentLauncherClusterParameterStruct { public Integer type; public String value; - public Optional> externalIDList; + public Optional> + externalIDList; - public ContentLauncherClusterParameter( + public ContentLauncherClusterParameterStruct( Integer type, String value, - Optional> externalIDList) { + Optional> + externalIDList) { this.type = type; this.value = value; this.externalIDList = externalIDList; @@ -1607,7 +1609,7 @@ public ContentLauncherClusterParameter( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ContentLauncherClusterParameter {\n"); + output.append("ContentLauncherClusterParameterStruct {\n"); output.append("\ttype: "); output.append(type); output.append("\n"); @@ -1622,18 +1624,18 @@ public String toString() { } } - public static class ContentLauncherClusterContentSearch { - public ArrayList parameterList; + public static class ContentLauncherClusterContentSearchStruct { + public ArrayList parameterList; - public ContentLauncherClusterContentSearch( - ArrayList parameterList) { + public ContentLauncherClusterContentSearchStruct( + ArrayList parameterList) { this.parameterList = parameterList; } @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ContentLauncherClusterContentSearch {\n"); + output.append("ContentLauncherClusterContentSearchStruct {\n"); output.append("\tparameterList: "); output.append(parameterList); output.append("\n"); @@ -1642,16 +1644,16 @@ public String toString() { } } - public static class ContentLauncherClusterStyleInformation { - public Optional imageUrl; + public static class ContentLauncherClusterStyleInformationStruct { + public Optional imageURL; public Optional color; - public Optional size; + public Optional size; - public ContentLauncherClusterStyleInformation( - Optional imageUrl, + public ContentLauncherClusterStyleInformationStruct( + Optional imageURL, Optional color, - Optional size) { - this.imageUrl = imageUrl; + Optional size) { + this.imageURL = imageURL; this.color = color; this.size = size; } @@ -1659,9 +1661,9 @@ public ContentLauncherClusterStyleInformation( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ContentLauncherClusterStyleInformation {\n"); - output.append("\timageUrl: "); - output.append(imageUrl); + output.append("ContentLauncherClusterStyleInformationStruct {\n"); + output.append("\timageURL: "); + output.append(imageURL); output.append("\n"); output.append("\tcolor: "); output.append(color); @@ -1674,21 +1676,21 @@ public String toString() { } } - public static class ContentLauncherClusterBrandingInformation { + public static class ContentLauncherClusterBrandingInformationStruct { public String providerName; - public Optional background; - public Optional logo; - public Optional progressBar; - public Optional splash; - public Optional waterMark; + public Optional background; + public Optional logo; + public Optional progressBar; + public Optional splash; + public Optional waterMark; - public ContentLauncherClusterBrandingInformation( + public ContentLauncherClusterBrandingInformationStruct( String providerName, - Optional background, - Optional logo, - Optional progressBar, - Optional splash, - Optional waterMark) { + Optional background, + Optional logo, + Optional progressBar, + Optional splash, + Optional waterMark) { this.providerName = providerName; this.background = background; this.logo = logo; @@ -1700,7 +1702,7 @@ public ContentLauncherClusterBrandingInformation( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ContentLauncherClusterBrandingInformation {\n"); + output.append("ContentLauncherClusterBrandingInformationStruct {\n"); output.append("\tproviderName: "); output.append(providerName); output.append("\n"); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index a75245a45e0dbe..b1417c3aa8bc0d 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -6099,8 +6099,8 @@ public void onError(Exception ex) { } } - public static class DelegatedLaunchResponseCallback - implements ChipClusters.ContentLauncherCluster.LaunchResponseCallback, + public static class DelegatedLauncherResponseCallback + implements ChipClusters.ContentLauncherCluster.LauncherResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -6110,12 +6110,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer status, Optional data) { + public void onSuccess(Integer Status, Optional Data) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer"); - responseValues.put(statusResponseValue, status); - CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional"); - responseValues.put(dataResponseValue, data); + CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); + responseValues.put(StatusResponseValue, Status); + CommandResponseInfo DataResponseValue = new CommandResponseInfo("Data", "Optional"); + responseValues.put(DataResponseValue, Data); callback.onSuccess(responseValues); } @@ -11617,13 +11617,13 @@ public Map> getCommandMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.ContentLauncherCluster) cluster) .launchContent( - (ChipClusters.ContentLauncherCluster.LaunchResponseCallback) callback, - (ChipStructs.ContentLauncherClusterContentSearch) + (ChipClusters.ContentLauncherCluster.LauncherResponseCallback) callback, + (ChipStructs.ContentLauncherClusterContentSearchStruct) commandArguments.get("search"), (Boolean) commandArguments.get("autoPlay"), (Optional) commandArguments.get("data")); }, - () -> new DelegatedLaunchResponseCallback(), + () -> new DelegatedLauncherResponseCallback(), contentLauncherlaunchContentCommandParams); contentLauncherClusterInteractionInfoMap.put( "launchContent", contentLauncherlaunchContentInteractionInfo); @@ -11644,13 +11644,13 @@ public Map> getCommandMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.ContentLauncherCluster) cluster) .launchURL( - (ChipClusters.ContentLauncherCluster.LaunchResponseCallback) callback, + (ChipClusters.ContentLauncherCluster.LauncherResponseCallback) callback, (String) commandArguments.get("contentURL"), (Optional) commandArguments.get("displayString"), - (Optional) + (Optional) commandArguments.get("brandingInformation")); }, - () -> new DelegatedLaunchResponseCallback(), + () -> new DelegatedLauncherResponseCallback(), contentLauncherlaunchURLCommandParams); contentLauncherClusterInteractionInfoMap.put( "launchURL", contentLauncherlaunchURLInteractionInfo); diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 55b5ee1ddc401d..466b57d2212936 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -24182,11 +24182,12 @@ class ParameterEnum(MatterIntEnum): kSport = 0x0A kSportsTeam = 0x0B kType = 0x0C + kVideo = 0x0D # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving and unknown # enum value. This specific should never be transmitted. - kUnknownEnumValue = 13, + kUnknownEnumValue = 14, class Bitmaps: @@ -24201,7 +24202,7 @@ class SupportedStreamingProtocol(IntFlag): class Structs: @dataclass - class Dimension(ClusterObject): + class DimensionStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -24216,7 +24217,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: metric: 'ContentLauncher.Enums.MetricTypeEnum' = 0 @dataclass - class AdditionalInfo(ClusterObject): + class AdditionalInfoStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -24229,66 +24230,66 @@ def descriptor(cls) -> ClusterObjectDescriptor: value: 'str' = "" @dataclass - class Parameter(ClusterObject): + class ParameterStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="type", Tag=0, Type=ContentLauncher.Enums.ParameterEnum), ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=str), - ClusterObjectFieldDescriptor(Label="externalIDList", Tag=2, Type=typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfo]]), + ClusterObjectFieldDescriptor(Label="externalIDList", Tag=2, Type=typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfoStruct]]), ]) type: 'ContentLauncher.Enums.ParameterEnum' = 0 value: 'str' = "" - externalIDList: 'typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfo]]' = None + externalIDList: 'typing.Optional[typing.List[ContentLauncher.Structs.AdditionalInfoStruct]]' = None @dataclass - class ContentSearch(ClusterObject): + class ContentSearchStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="parameterList", Tag=0, Type=typing.List[ContentLauncher.Structs.Parameter]), + ClusterObjectFieldDescriptor(Label="parameterList", Tag=0, Type=typing.List[ContentLauncher.Structs.ParameterStruct]), ]) - parameterList: 'typing.List[ContentLauncher.Structs.Parameter]' = field(default_factory=lambda: []) + parameterList: 'typing.List[ContentLauncher.Structs.ParameterStruct]' = field(default_factory=lambda: []) @dataclass - class StyleInformation(ClusterObject): + class StyleInformationStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="imageUrl", Tag=0, Type=typing.Optional[str]), + ClusterObjectFieldDescriptor(Label="imageURL", Tag=0, Type=typing.Optional[str]), ClusterObjectFieldDescriptor(Label="color", Tag=1, Type=typing.Optional[str]), - ClusterObjectFieldDescriptor(Label="size", Tag=2, Type=typing.Optional[ContentLauncher.Structs.Dimension]), + ClusterObjectFieldDescriptor(Label="size", Tag=2, Type=typing.Optional[ContentLauncher.Structs.DimensionStruct]), ]) - imageUrl: 'typing.Optional[str]' = None + imageURL: 'typing.Optional[str]' = None color: 'typing.Optional[str]' = None - size: 'typing.Optional[ContentLauncher.Structs.Dimension]' = None + size: 'typing.Optional[ContentLauncher.Structs.DimensionStruct]' = None @dataclass - class BrandingInformation(ClusterObject): + class BrandingInformationStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="providerName", Tag=0, Type=str), - ClusterObjectFieldDescriptor(Label="background", Tag=1, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]), - ClusterObjectFieldDescriptor(Label="logo", Tag=2, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]), - ClusterObjectFieldDescriptor(Label="progressBar", Tag=3, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]), - ClusterObjectFieldDescriptor(Label="splash", Tag=4, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]), - ClusterObjectFieldDescriptor(Label="waterMark", Tag=5, Type=typing.Optional[ContentLauncher.Structs.StyleInformation]), + ClusterObjectFieldDescriptor(Label="background", Tag=1, Type=typing.Optional[ContentLauncher.Structs.StyleInformationStruct]), + ClusterObjectFieldDescriptor(Label="logo", Tag=2, Type=typing.Optional[ContentLauncher.Structs.StyleInformationStruct]), + ClusterObjectFieldDescriptor(Label="progressBar", Tag=3, Type=typing.Optional[ContentLauncher.Structs.StyleInformationStruct]), + ClusterObjectFieldDescriptor(Label="splash", Tag=4, Type=typing.Optional[ContentLauncher.Structs.StyleInformationStruct]), + ClusterObjectFieldDescriptor(Label="waterMark", Tag=5, Type=typing.Optional[ContentLauncher.Structs.StyleInformationStruct]), ]) providerName: 'str' = "" - background: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None - logo: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None - progressBar: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None - splash: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None - waterMark: 'typing.Optional[ContentLauncher.Structs.StyleInformation]' = None + background: 'typing.Optional[ContentLauncher.Structs.StyleInformationStruct]' = None + logo: 'typing.Optional[ContentLauncher.Structs.StyleInformationStruct]' = None + progressBar: 'typing.Optional[ContentLauncher.Structs.StyleInformationStruct]' = None + splash: 'typing.Optional[ContentLauncher.Structs.StyleInformationStruct]' = None + waterMark: 'typing.Optional[ContentLauncher.Structs.StyleInformationStruct]' = None @@ -24298,18 +24299,18 @@ class LaunchContent(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050A command_id: typing.ClassVar[int] = 0x00000000 is_client: typing.ClassVar[bool] = True - response_type: typing.ClassVar[str] = 'LaunchResponse' + response_type: typing.ClassVar[str] = 'LauncherResponse' @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="search", Tag=0, Type=ContentLauncher.Structs.ContentSearch), + ClusterObjectFieldDescriptor(Label="search", Tag=0, Type=ContentLauncher.Structs.ContentSearchStruct), ClusterObjectFieldDescriptor(Label="autoPlay", Tag=1, Type=bool), ClusterObjectFieldDescriptor(Label="data", Tag=2, Type=typing.Optional[str]), ]) - search: 'ContentLauncher.Structs.ContentSearch' = field(default_factory=lambda: ContentLauncher.Structs.ContentSearch()) + search: 'ContentLauncher.Structs.ContentSearchStruct' = field(default_factory=lambda: ContentLauncher.Structs.ContentSearchStruct()) autoPlay: 'bool' = False data: 'typing.Optional[str]' = None @@ -24318,7 +24319,7 @@ class LaunchURL(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050A command_id: typing.ClassVar[int] = 0x00000001 is_client: typing.ClassVar[bool] = True - response_type: typing.ClassVar[str] = 'LaunchResponse' + response_type: typing.ClassVar[str] = 'LauncherResponse' @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: @@ -24326,15 +24327,15 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields = [ ClusterObjectFieldDescriptor(Label="contentURL", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="displayString", Tag=1, Type=typing.Optional[str]), - ClusterObjectFieldDescriptor(Label="brandingInformation", Tag=2, Type=typing.Optional[ContentLauncher.Structs.BrandingInformation]), + ClusterObjectFieldDescriptor(Label="brandingInformation", Tag=2, Type=typing.Optional[ContentLauncher.Structs.BrandingInformationStruct]), ]) contentURL: 'str' = "" displayString: 'typing.Optional[str]' = None - brandingInformation: 'typing.Optional[ContentLauncher.Structs.BrandingInformation]' = None + brandingInformation: 'typing.Optional[ContentLauncher.Structs.BrandingInformationStruct]' = None @dataclass - class LaunchResponse(ClusterCommand): + class LauncherResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050A command_id: typing.ClassVar[int] = 0x00000002 is_client: typing.ClassVar[bool] = False diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index ab65a9ab93ae7b..bb5eb166a35de8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -12964,7 +12964,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) * Upon receipt, this SHALL launch the specified content with optional search criteria. */ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params - completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, + completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; /** * Command LaunchURL @@ -12972,7 +12972,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) * Upon receipt, this SHALL launch content from the specified URL. */ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params - completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, + completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (void)readAttributeAcceptHeaderWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion @@ -19159,8 +19159,14 @@ typedef NS_ENUM(uint8_t, MTRContentLauncherContentLaunchStatus) { } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_ENUM(uint8_t, MTRContentLauncherMetricType) { - MTRContentLauncherMetricTypePIXELS API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRContentLauncherMetricTypePERCENTAGE API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, + MTRContentLauncherMetricTypePixels MTR_NEWLY_AVAILABLE = 0x00, + MTRContentLauncherMetricTypePIXELS API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherMetricTypePixels") + = 0x00, + MTRContentLauncherMetricTypePercentage MTR_NEWLY_AVAILABLE = 0x01, + MTRContentLauncherMetricTypePERCENTAGE API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherMetricTypePercentage") + = 0x01, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_ENUM(uint8_t, MTRContentLauncherParameter) { @@ -19177,6 +19183,7 @@ typedef NS_ENUM(uint8_t, MTRContentLauncherParameter) { MTRContentLauncherParameterSport API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0A, MTRContentLauncherParameterSportsTeam API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0B, MTRContentLauncherParameterType API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0C, + MTRContentLauncherParameterVideo MTR_NEWLY_AVAILABLE = 0x0D, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_OPTIONS(uint32_t, MTRContentLauncherFeature) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 40e42897be7eb8..f7cbea77c6078d 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -87479,16 +87479,16 @@ - (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)en } - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params - completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, + completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion { // Make a copy of params before we go async. params = [params copy]; - auto * bridge = new MTRContentLauncherClusterLaunchResponseCallbackBridge(self.callbackQueue, completion, + auto * bridge = new MTRContentLauncherClusterLauncherResponseCallbackBridge(self.callbackQueue, completion, ^(ExchangeManager & exchangeManager, const SessionHandle & session, - ContentLauncherClusterLaunchResponseCallbackType successCb, MTRErrorCallback failureCb, + ContentLauncherClusterLauncherResponseCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { - auto * typedBridge = static_cast(bridge); + auto * typedBridge = static_cast(bridge); chip::Optional timedInvokeTimeoutMs; ListFreer listFreer; ContentLauncher::Commands::LaunchContent::Type request; @@ -87507,11 +87507,11 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) } listFreer.add(listHolder_1); for (size_t i_1 = 0; i_1 < params.search.parameterList.count; ++i_1) { - if (![params.search.parameterList[i_1] isKindOfClass:[MTRContentLauncherClusterParameter class]]) { + if (![params.search.parameterList[i_1] isKindOfClass:[MTRContentLauncherClusterParameterStruct class]]) { // Wrong kind of value. return CHIP_ERROR_INVALID_ARGUMENT; } - auto element_1 = (MTRContentLauncherClusterParameter *) params.search.parameterList[i_1]; + auto element_1 = (MTRContentLauncherClusterParameterStruct *) params.search.parameterList[i_1]; listHolder_1->mList[i_1].type = static_castmList[i_1].type)>>( element_1.type.unsignedCharValue); @@ -87529,11 +87529,12 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) listFreer.add(listHolder_4); for (size_t i_4 = 0; i_4 < element_1.externalIDList.count; ++i_4) { if (![element_1.externalIDList[i_4] - isKindOfClass:[MTRContentLauncherClusterAdditionalInfo class]]) { + isKindOfClass:[MTRContentLauncherClusterAdditionalInfoStruct class]]) { // Wrong kind of value. return CHIP_ERROR_INVALID_ARGUMENT; } - auto element_4 = (MTRContentLauncherClusterAdditionalInfo *) element_1.externalIDList[i_4]; + auto element_4 + = (MTRContentLauncherClusterAdditionalInfoStruct *) element_1.externalIDList[i_4]; listHolder_4->mList[i_4].name = [self asCharSpan:element_4.name]; listHolder_4->mList[i_4].value = [self asCharSpan:element_4.value]; } @@ -87562,16 +87563,16 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) } - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params - completion: - (void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completion + completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, + NSError * _Nullable error))completion { // Make a copy of params before we go async. params = [params copy]; - auto * bridge = new MTRContentLauncherClusterLaunchResponseCallbackBridge(self.callbackQueue, completion, + auto * bridge = new MTRContentLauncherClusterLauncherResponseCallbackBridge(self.callbackQueue, completion, ^(ExchangeManager & exchangeManager, const SessionHandle & session, - ContentLauncherClusterLaunchResponseCallbackType successCb, MTRErrorCallback failureCb, + ContentLauncherClusterLauncherResponseCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { - auto * typedBridge = static_cast(bridge); + auto * typedBridge = static_cast(bridge); chip::Optional timedInvokeTimeoutMs; ListFreer listFreer; ContentLauncher::Commands::LaunchURL::Type request; @@ -87590,9 +87591,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params definedValue_0.providerName = [self asCharSpan:params.brandingInformation.providerName]; if (params.brandingInformation.background != nil) { auto & definedValue_2 = definedValue_0.background.Emplace(); - if (params.brandingInformation.background.imageUrl != nil) { - auto & definedValue_4 = definedValue_2.imageUrl.Emplace(); - definedValue_4 = [self asCharSpan:params.brandingInformation.background.imageUrl]; + if (params.brandingInformation.background.imageURL != nil) { + auto & definedValue_4 = definedValue_2.imageURL.Emplace(); + definedValue_4 = [self asCharSpan:params.brandingInformation.background.imageURL]; } if (params.brandingInformation.background.color != nil) { auto & definedValue_4 = definedValue_2.color.Emplace(); @@ -87608,9 +87609,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params } if (params.brandingInformation.logo != nil) { auto & definedValue_2 = definedValue_0.logo.Emplace(); - if (params.brandingInformation.logo.imageUrl != nil) { - auto & definedValue_4 = definedValue_2.imageUrl.Emplace(); - definedValue_4 = [self asCharSpan:params.brandingInformation.logo.imageUrl]; + if (params.brandingInformation.logo.imageURL != nil) { + auto & definedValue_4 = definedValue_2.imageURL.Emplace(); + definedValue_4 = [self asCharSpan:params.brandingInformation.logo.imageURL]; } if (params.brandingInformation.logo.color != nil) { auto & definedValue_4 = definedValue_2.color.Emplace(); @@ -87626,9 +87627,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params } if (params.brandingInformation.progressBar != nil) { auto & definedValue_2 = definedValue_0.progressBar.Emplace(); - if (params.brandingInformation.progressBar.imageUrl != nil) { - auto & definedValue_4 = definedValue_2.imageUrl.Emplace(); - definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.imageUrl]; + if (params.brandingInformation.progressBar.imageURL != nil) { + auto & definedValue_4 = definedValue_2.imageURL.Emplace(); + definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.imageURL]; } if (params.brandingInformation.progressBar.color != nil) { auto & definedValue_4 = definedValue_2.color.Emplace(); @@ -87644,9 +87645,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params } if (params.brandingInformation.splash != nil) { auto & definedValue_2 = definedValue_0.splash.Emplace(); - if (params.brandingInformation.splash.imageUrl != nil) { - auto & definedValue_4 = definedValue_2.imageUrl.Emplace(); - definedValue_4 = [self asCharSpan:params.brandingInformation.splash.imageUrl]; + if (params.brandingInformation.splash.imageURL != nil) { + auto & definedValue_4 = definedValue_2.imageURL.Emplace(); + definedValue_4 = [self asCharSpan:params.brandingInformation.splash.imageURL]; } if (params.brandingInformation.splash.color != nil) { auto & definedValue_4 = definedValue_2.color.Emplace(); @@ -87662,9 +87663,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params } if (params.brandingInformation.waterMark != nil) { auto & definedValue_2 = definedValue_0.waterMark.Emplace(); - if (params.brandingInformation.waterMark.imageUrl != nil) { - auto & definedValue_4 = definedValue_2.imageUrl.Emplace(); - definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.imageUrl]; + if (params.brandingInformation.waterMark.imageURL != nil) { + auto & definedValue_4 = definedValue_2.imageURL.Emplace(); + definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.imageURL]; } if (params.brandingInformation.waterMark.color != nil) { auto & definedValue_4 = definedValue_2.color.Emplace(); @@ -88041,7 +88042,7 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) NSError * _Nullable error))completionHandler { [self launchContentWithParams:params - completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error) { + completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. completionHandler(static_cast(data), error); }]; @@ -88051,7 +88052,7 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params (void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completionHandler { [self launchURLWithParams:params - completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error) { + completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. completionHandler(static_cast(data), error); }]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 9f0baf21b4e1ac..63f95d459a95e4 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -107,8 +107,8 @@ typedef void (*MediaPlaybackClusterPlaybackResponseCallbackType)( void *, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType &); typedef void (*KeypadInputClusterSendKeyResponseCallbackType)( void *, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType &); -typedef void (*ContentLauncherClusterLaunchResponseCallbackType)( - void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType &); +typedef void (*ContentLauncherClusterLauncherResponseCallbackType)( + void *, const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType &); typedef void (*ApplicationLauncherClusterLauncherResponseCallbackType)( void *, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType &); typedef void (*AccountLoginClusterGetSetupPINResponseCallbackType)( @@ -11418,18 +11418,19 @@ class MTRKeypadInputClusterSendKeyResponseCallbackBridge : public MTRCallbackBri const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & data); }; -class MTRContentLauncherClusterLaunchResponseCallbackBridge - : public MTRCallbackBridge +class MTRContentLauncherClusterLauncherResponseCallbackBridge + : public MTRCallbackBridge { public: - MTRContentLauncherClusterLaunchResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRContentLauncherClusterLauncherResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRContentLauncherClusterLaunchResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRContentLauncherClusterLauncherResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data); + const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType & data); }; class MTRApplicationLauncherClusterLauncherResponseCallbackBridge diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index ae44cd81bd8991..c384f1cee3156f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -12441,10 +12441,10 @@ DispatchSuccess(context, response); }; -void MTRContentLauncherClusterLaunchResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data) +void MTRContentLauncherClusterLauncherResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType & data) { - auto * response = [MTRContentLauncherClusterLaunchResponseParams new]; + auto * response = [MTRContentLauncherClusterLauncherResponseParams new]; { response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 174440d0c82f7f..105e5f182ebe4c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -6494,13 +6494,13 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) { MTR_NEWLY_DEPRECATED("Please use MTRCommandIDTypeClusterContentLauncherCommandLaunchURLID") = 0x00000001, MTRClusterContentLauncherCommandLaunchResponseID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use MTRCommandIDTypeClusterContentLauncherCommandLaunchResponseID") + MTR_NEWLY_DEPRECATED("Please use MTRCommandIDTypeClusterContentLauncherCommandLauncherResponseID") = 0x00000002, // Cluster ContentLauncher commands MTRCommandIDTypeClusterContentLauncherCommandLaunchContentID MTR_NEWLY_AVAILABLE = 0x00000000, MTRCommandIDTypeClusterContentLauncherCommandLaunchURLID MTR_NEWLY_AVAILABLE = 0x00000001, - MTRCommandIDTypeClusterContentLauncherCommandLaunchResponseID MTR_NEWLY_AVAILABLE = 0x00000002, + MTRCommandIDTypeClusterContentLauncherCommandLauncherResponseID MTR_NEWLY_AVAILABLE = 0x00000002, // Cluster AudioOutput deprecated command id names MTRClusterAudioOutputCommandSelectOutputID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 8339e86709ddd0..03391c6f887fec 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -5110,12 +5110,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs - completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, + completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs - completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, + completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (NSDictionary *)readAttributeAcceptHeaderWithParams:(MTRReadParams * _Nullable)params diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index c5589bcdae0234..515aaeee8fc6c4 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -22829,7 +22829,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params expectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs - completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, + completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion { NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, @@ -22846,7 +22846,7 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; - auto * bridge = new MTRContentLauncherClusterLaunchResponseCallbackBridge( + auto * bridge = new MTRContentLauncherClusterLauncherResponseCallbackBridge( self.device.queue, ^(id _Nullable value, NSError * _Nullable error) { MTRClustersLogCompletion(logPrefix, value, error); @@ -22856,7 +22856,7 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, - ContentLauncherClusterLaunchResponseCallbackType successCb, MTRErrorCallback failureCb, + ContentLauncherClusterLauncherResponseCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { chip::Optional timedInvokeTimeoutMs; ListFreer listFreer; @@ -22874,11 +22874,12 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) } listFreer.add(listHolder_1); for (size_t i_1 = 0; i_1 < params.search.parameterList.count; ++i_1) { - if (![params.search.parameterList[i_1] isKindOfClass:[MTRContentLauncherClusterParameter class]]) { + if (![params.search.parameterList[i_1] + isKindOfClass:[MTRContentLauncherClusterParameterStruct class]]) { // Wrong kind of value. return CHIP_ERROR_INVALID_ARGUMENT; } - auto element_1 = (MTRContentLauncherClusterParameter *) params.search.parameterList[i_1]; + auto element_1 = (MTRContentLauncherClusterParameterStruct *) params.search.parameterList[i_1]; listHolder_1->mList[i_1].type = static_castmList[i_1].type)>>( element_1.type.unsignedCharValue); @@ -22896,12 +22897,12 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) listFreer.add(listHolder_4); for (size_t i_4 = 0; i_4 < element_1.externalIDList.count; ++i_4) { if (![element_1.externalIDList[i_4] - isKindOfClass:[MTRContentLauncherClusterAdditionalInfo class]]) { + isKindOfClass:[MTRContentLauncherClusterAdditionalInfoStruct class]]) { // Wrong kind of value. return CHIP_ERROR_INVALID_ARGUMENT; } auto element_4 - = (MTRContentLauncherClusterAdditionalInfo *) element_1.externalIDList[i_4]; + = (MTRContentLauncherClusterAdditionalInfoStruct *) element_1.externalIDList[i_4]; listHolder_4->mList[i_4].name = [self asCharSpan:element_4.name]; listHolder_4->mList[i_4].value = [self asCharSpan:element_4.value]; } @@ -22945,8 +22946,8 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params expectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs - completion: - (void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completion + completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, + NSError * _Nullable error))completion { NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, (unsigned int) MTRClusterIDTypeContentLauncherID, @@ -22962,7 +22963,7 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; - auto * bridge = new MTRContentLauncherClusterLaunchResponseCallbackBridge( + auto * bridge = new MTRContentLauncherClusterLauncherResponseCallbackBridge( self.device.queue, ^(id _Nullable value, NSError * _Nullable error) { MTRClustersLogCompletion(logPrefix, value, error); @@ -22972,7 +22973,7 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, - ContentLauncherClusterLaunchResponseCallbackType successCb, MTRErrorCallback failureCb, + ContentLauncherClusterLauncherResponseCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { chip::Optional timedInvokeTimeoutMs; ListFreer listFreer; @@ -22990,9 +22991,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params definedValue_0.providerName = [self asCharSpan:params.brandingInformation.providerName]; if (params.brandingInformation.background != nil) { auto & definedValue_2 = definedValue_0.background.Emplace(); - if (params.brandingInformation.background.imageUrl != nil) { - auto & definedValue_4 = definedValue_2.imageUrl.Emplace(); - definedValue_4 = [self asCharSpan:params.brandingInformation.background.imageUrl]; + if (params.brandingInformation.background.imageURL != nil) { + auto & definedValue_4 = definedValue_2.imageURL.Emplace(); + definedValue_4 = [self asCharSpan:params.brandingInformation.background.imageURL]; } if (params.brandingInformation.background.color != nil) { auto & definedValue_4 = definedValue_2.color.Emplace(); @@ -23008,9 +23009,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params } if (params.brandingInformation.logo != nil) { auto & definedValue_2 = definedValue_0.logo.Emplace(); - if (params.brandingInformation.logo.imageUrl != nil) { - auto & definedValue_4 = definedValue_2.imageUrl.Emplace(); - definedValue_4 = [self asCharSpan:params.brandingInformation.logo.imageUrl]; + if (params.brandingInformation.logo.imageURL != nil) { + auto & definedValue_4 = definedValue_2.imageURL.Emplace(); + definedValue_4 = [self asCharSpan:params.brandingInformation.logo.imageURL]; } if (params.brandingInformation.logo.color != nil) { auto & definedValue_4 = definedValue_2.color.Emplace(); @@ -23026,9 +23027,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params } if (params.brandingInformation.progressBar != nil) { auto & definedValue_2 = definedValue_0.progressBar.Emplace(); - if (params.brandingInformation.progressBar.imageUrl != nil) { - auto & definedValue_4 = definedValue_2.imageUrl.Emplace(); - definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.imageUrl]; + if (params.brandingInformation.progressBar.imageURL != nil) { + auto & definedValue_4 = definedValue_2.imageURL.Emplace(); + definedValue_4 = [self asCharSpan:params.brandingInformation.progressBar.imageURL]; } if (params.brandingInformation.progressBar.color != nil) { auto & definedValue_4 = definedValue_2.color.Emplace(); @@ -23044,9 +23045,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params } if (params.brandingInformation.splash != nil) { auto & definedValue_2 = definedValue_0.splash.Emplace(); - if (params.brandingInformation.splash.imageUrl != nil) { - auto & definedValue_4 = definedValue_2.imageUrl.Emplace(); - definedValue_4 = [self asCharSpan:params.brandingInformation.splash.imageUrl]; + if (params.brandingInformation.splash.imageURL != nil) { + auto & definedValue_4 = definedValue_2.imageURL.Emplace(); + definedValue_4 = [self asCharSpan:params.brandingInformation.splash.imageURL]; } if (params.brandingInformation.splash.color != nil) { auto & definedValue_4 = definedValue_2.color.Emplace(); @@ -23062,9 +23063,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params } if (params.brandingInformation.waterMark != nil) { auto & definedValue_2 = definedValue_0.waterMark.Emplace(); - if (params.brandingInformation.waterMark.imageUrl != nil) { - auto & definedValue_4 = definedValue_2.imageUrl.Emplace(); - definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.imageUrl]; + if (params.brandingInformation.waterMark.imageURL != nil) { + auto & definedValue_4 = definedValue_2.imageURL.Emplace(); + definedValue_4 = [self asCharSpan:params.brandingInformation.waterMark.imageURL]; } if (params.brandingInformation.waterMark.color != nil) { auto & definedValue_4 = definedValue_2.color.Emplace(); @@ -23195,7 +23196,7 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) [self launchContentWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs - completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error) { + completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. completionHandler(static_cast(data), error); }]; @@ -23209,7 +23210,7 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params [self launchURLWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs - completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error) { + completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) { // Cast is safe because subclass does not add any selectors. completionHandler(static_cast(data), error); }]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 31885d524ffdbe..cbceadc75311b6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -4805,7 +4805,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRContentLauncherClusterLaunchContentParams : NSObject @property (nonatomic, copy) - MTRContentLauncherClusterContentSearch * _Nonnull search API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRContentLauncherClusterContentSearchStruct * _Nonnull search API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @property (nonatomic, copy) NSNumber * _Nonnull autoPlay API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -4834,7 +4834,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSString * _Nullable displayString API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) MTRContentLauncherClusterBrandingInformation * _Nullable brandingInformation API_AVAILABLE( +@property (nonatomic, copy) MTRContentLauncherClusterBrandingInformationStruct * _Nullable brandingInformation API_AVAILABLE( ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); /** * Controls whether the command is a timed command (using Timed Invoke). @@ -4853,12 +4853,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; @end -API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRContentLauncherClusterLaunchResponseParams : NSObject +MTR_NEWLY_AVAILABLE +@interface MTRContentLauncherClusterLauncherResponseParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull status MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSString * _Nullable data API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSString * _Nullable data MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -4877,6 +4877,11 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); @end +API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) +MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterLauncherResponseParams") +@interface MTRContentLauncherClusterLaunchResponseParams : MTRContentLauncherClusterLauncherResponseParams +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRAudioOutputClusterSelectOutputParams : NSObject diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index d897cf6be7ca78..d0c9a097427591 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -6703,7 +6703,7 @@ - (instancetype)init { if (self = [super init]) { - _search = [MTRContentLauncherClusterContentSearch new]; + _search = [MTRContentLauncherClusterContentSearchStruct new]; _autoPlay = @(0); @@ -6768,7 +6768,7 @@ - (NSString *)description } @end -@implementation MTRContentLauncherClusterLaunchResponseParams +@implementation MTRContentLauncherClusterLauncherResponseParams - (instancetype)init { if (self = [super init]) { @@ -6783,7 +6783,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRContentLauncherClusterLaunchResponseParams alloc] init]; + auto other = [[MTRContentLauncherClusterLauncherResponseParams alloc] init]; other.status = self.status; other.data = self.data; @@ -6799,6 +6799,9 @@ - (NSString *)description return descriptionString; } +@end + +@implementation MTRContentLauncherClusterLaunchResponseParams @end @implementation MTRAudioOutputClusterSelectOutputParams - (instancetype)init diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index a3700cfe2ceacf..6498f66f5d6f48 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -820,52 +820,72 @@ MTR_NEWLY_DEPRECATED("Please use MTRMediaInputClusterInputInfoStruct") @interface MTRMediaInputClusterInputInfo : MTRMediaInputClusterInputInfoStruct @end +MTR_NEWLY_AVAILABLE +@interface MTRContentLauncherClusterDimensionStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull width MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull height MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull metric MTR_NEWLY_AVAILABLE; +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRContentLauncherClusterDimension : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull width API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull height API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull metric API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterDimensionStruct") +@interface MTRContentLauncherClusterDimension : MTRContentLauncherClusterDimensionStruct +@end +MTR_NEWLY_AVAILABLE +@interface MTRContentLauncherClusterAdditionalInfoStruct : NSObject +@property (nonatomic, copy) NSString * _Nonnull name MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nonnull value MTR_NEWLY_AVAILABLE; @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRContentLauncherClusterAdditionalInfo : NSObject -@property (nonatomic, copy) NSString * _Nonnull name API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSString * _Nonnull value API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterAdditionalInfoStruct") +@interface MTRContentLauncherClusterAdditionalInfo : MTRContentLauncherClusterAdditionalInfoStruct +@end +MTR_NEWLY_AVAILABLE +@interface MTRContentLauncherClusterParameterStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull type MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nonnull value MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSArray * _Nullable externalIDList MTR_NEWLY_AVAILABLE; @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRContentLauncherClusterParameter : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull type API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSString * _Nonnull value API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSArray * _Nullable externalIDList API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterParameterStruct") +@interface MTRContentLauncherClusterParameter : MTRContentLauncherClusterParameterStruct +@end +MTR_NEWLY_AVAILABLE +@interface MTRContentLauncherClusterContentSearchStruct : NSObject +@property (nonatomic, copy) NSArray * _Nonnull parameterList MTR_NEWLY_AVAILABLE; @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRContentLauncherClusterContentSearch : NSObject -@property (nonatomic, copy) NSArray * _Nonnull parameterList API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterContentSearchStruct") +@interface MTRContentLauncherClusterContentSearch : MTRContentLauncherClusterContentSearchStruct +@end +MTR_NEWLY_AVAILABLE +@interface MTRContentLauncherClusterStyleInformationStruct : NSObject +@property (nonatomic, copy) NSString * _Nullable imageURL MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nullable imageUrl MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nullable color MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) MTRContentLauncherClusterDimensionStruct * _Nullable size MTR_NEWLY_AVAILABLE; @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRContentLauncherClusterStyleInformation : NSObject -@property (nonatomic, copy) NSString * _Nullable imageUrl API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSString * _Nullable color API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) - MTRContentLauncherClusterDimension * _Nullable size API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterStyleInformationStruct") +@interface MTRContentLauncherClusterStyleInformation : MTRContentLauncherClusterStyleInformationStruct +@end +MTR_NEWLY_AVAILABLE +@interface MTRContentLauncherClusterBrandingInformationStruct : NSObject +@property (nonatomic, copy) NSString * _Nonnull providerName MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) MTRContentLauncherClusterStyleInformationStruct * _Nullable background MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) MTRContentLauncherClusterStyleInformationStruct * _Nullable logo MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) MTRContentLauncherClusterStyleInformationStruct * _Nullable progressBar MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) MTRContentLauncherClusterStyleInformationStruct * _Nullable splash MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) MTRContentLauncherClusterStyleInformationStruct * _Nullable waterMark MTR_NEWLY_AVAILABLE; @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) -@interface MTRContentLauncherClusterBrandingInformation : NSObject -@property (nonatomic, copy) NSString * _Nonnull providerName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) MTRContentLauncherClusterStyleInformation * _Nullable background API_AVAILABLE( - ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) - MTRContentLauncherClusterStyleInformation * _Nullable logo API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) MTRContentLauncherClusterStyleInformation * _Nullable progressBar API_AVAILABLE( - ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) - MTRContentLauncherClusterStyleInformation * _Nullable splash API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) - MTRContentLauncherClusterStyleInformation * _Nullable waterMark API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +MTR_NEWLY_DEPRECATED("Please use MTRContentLauncherClusterBrandingInformationStruct") +@interface MTRContentLauncherClusterBrandingInformation : MTRContentLauncherClusterBrandingInformationStruct @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index eb5aa85344830c..d114a75d50f6d3 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -3417,7 +3417,7 @@ - (NSString *)description @implementation MTRMediaInputClusterInputInfo : MTRMediaInputClusterInputInfoStruct @end -@implementation MTRContentLauncherClusterDimension +@implementation MTRContentLauncherClusterDimensionStruct - (instancetype)init { if (self = [super init]) { @@ -3433,7 +3433,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRContentLauncherClusterDimension alloc] init]; + auto other = [[MTRContentLauncherClusterDimensionStruct alloc] init]; other.width = self.width; other.height = self.height; @@ -3451,7 +3451,10 @@ - (NSString *)description @end -@implementation MTRContentLauncherClusterAdditionalInfo +@implementation MTRContentLauncherClusterDimension : MTRContentLauncherClusterDimensionStruct +@end + +@implementation MTRContentLauncherClusterAdditionalInfoStruct - (instancetype)init { if (self = [super init]) { @@ -3465,7 +3468,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRContentLauncherClusterAdditionalInfo alloc] init]; + auto other = [[MTRContentLauncherClusterAdditionalInfoStruct alloc] init]; other.name = self.name; other.value = self.value; @@ -3482,7 +3485,10 @@ - (NSString *)description @end -@implementation MTRContentLauncherClusterParameter +@implementation MTRContentLauncherClusterAdditionalInfo : MTRContentLauncherClusterAdditionalInfoStruct +@end + +@implementation MTRContentLauncherClusterParameterStruct - (instancetype)init { if (self = [super init]) { @@ -3498,7 +3504,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRContentLauncherClusterParameter alloc] init]; + auto other = [[MTRContentLauncherClusterParameterStruct alloc] init]; other.type = self.type; other.value = self.value; @@ -3516,7 +3522,10 @@ - (NSString *)description @end -@implementation MTRContentLauncherClusterContentSearch +@implementation MTRContentLauncherClusterParameter : MTRContentLauncherClusterParameterStruct +@end + +@implementation MTRContentLauncherClusterContentSearchStruct - (instancetype)init { if (self = [super init]) { @@ -3528,7 +3537,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRContentLauncherClusterContentSearch alloc] init]; + auto other = [[MTRContentLauncherClusterContentSearchStruct alloc] init]; other.parameterList = self.parameterList; @@ -3544,12 +3553,15 @@ - (NSString *)description @end -@implementation MTRContentLauncherClusterStyleInformation +@implementation MTRContentLauncherClusterContentSearch : MTRContentLauncherClusterContentSearchStruct +@end + +@implementation MTRContentLauncherClusterStyleInformationStruct - (instancetype)init { if (self = [super init]) { - _imageUrl = nil; + _imageURL = nil; _color = nil; @@ -3560,9 +3572,9 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRContentLauncherClusterStyleInformation alloc] init]; + auto other = [[MTRContentLauncherClusterStyleInformationStruct alloc] init]; - other.imageUrl = self.imageUrl; + other.imageURL = self.imageURL; other.color = self.color; other.size = self.size; @@ -3572,13 +3584,26 @@ - (id)copyWithZone:(NSZone * _Nullable)zone - (NSString *)description { NSString * descriptionString = [NSString - stringWithFormat:@"<%@: imageUrl:%@; color:%@; size:%@; >", NSStringFromClass([self class]), _imageUrl, _color, _size]; + stringWithFormat:@"<%@: imageURL:%@; color:%@; size:%@; >", NSStringFromClass([self class]), _imageURL, _color, _size]; return descriptionString; } +- (void)setImageUrl:(NSString * _Nullable)imageUrl +{ + self.imageURL = imageUrl; +} + +- (NSString * _Nullable)imageUrl +{ + return self.imageURL; +} + @end -@implementation MTRContentLauncherClusterBrandingInformation +@implementation MTRContentLauncherClusterStyleInformation : MTRContentLauncherClusterStyleInformationStruct +@end + +@implementation MTRContentLauncherClusterBrandingInformationStruct - (instancetype)init { if (self = [super init]) { @@ -3600,7 +3625,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRContentLauncherClusterBrandingInformation alloc] init]; + auto other = [[MTRContentLauncherClusterBrandingInformationStruct alloc] init]; other.providerName = self.providerName; other.background = self.background; @@ -3622,6 +3647,9 @@ - (NSString *)description @end +@implementation MTRContentLauncherClusterBrandingInformation : MTRContentLauncherClusterBrandingInformationStruct +@end + @implementation MTRAudioOutputClusterOutputInfo - (instancetype)init { diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index 4edc55370c5644..3046378ebdab01 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -8718,10 +8718,10 @@ bool emberAfContentLauncherClusterLaunchURLCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::ContentLauncher::Commands::LaunchURL::DecodableType & commandData); /** - * @brief Content Launcher Cluster LaunchResponse Command callback (from server) + * @brief Content Launcher Cluster LauncherResponse Command callback (from server) */ -bool emberAfContentLauncherClusterLaunchResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status, chip::CharSpan data); +bool emberAfContentLauncherClusterLauncherResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + uint8_t Status, chip::CharSpan Data); /** * @brief Audio Output Cluster SelectOutput Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index 961a9a172331ad..80d01abffd9bb2 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -2041,9 +2041,10 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ContentLauncher::Parame case EnumType::kSport: case EnumType::kSportsTeam: case EnumType::kType: + case EnumType::kVideo: return val; default: - return static_cast(13); + return static_cast(14); } } diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 06216eea7929f9..aba44070a5c52c 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -2629,11 +2629,12 @@ enum class ParameterEnum : uint8_t kSport = 0x0A, kSportsTeam = 0x0B, kType = 0x0C, + kVideo = 0x0D, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown // enum value. This specific should never be transmitted. - kUnknownEnumValue = 13, + kUnknownEnumValue = 14, }; // Bitmap for ContentLauncherFeature diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 8fa6f3957765e3..adc2330d3c8d45 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -16773,7 +16773,7 @@ namespace Events {} // namespace Events } // namespace KeypadInput namespace ContentLauncher { namespace Structs { -namespace Dimension { +namespace DimensionStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -16820,8 +16820,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace Dimension -namespace AdditionalInfo { +} // namespace DimensionStruct +namespace AdditionalInfoStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -16864,8 +16864,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace AdditionalInfo -namespace Parameter { +} // namespace AdditionalInfoStruct +namespace ParameterStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -16912,8 +16912,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace Parameter -namespace ContentSearch { +} // namespace ParameterStruct +namespace ContentSearchStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -16952,13 +16952,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ContentSearch -namespace StyleInformation { +} // namespace ContentSearchStruct +namespace StyleInformationStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kImageUrl)), imageUrl)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kImageURL)), imageURL)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColor)), color)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSize)), size)); ReturnErrorOnFailure(writer.EndContainer(outer)); @@ -16980,8 +16980,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kImageUrl): - ReturnErrorOnFailure(DataModel::Decode(reader, imageUrl)); + case to_underlying(Fields::kImageURL): + ReturnErrorOnFailure(DataModel::Decode(reader, imageURL)); break; case to_underlying(Fields::kColor): ReturnErrorOnFailure(DataModel::Decode(reader, color)); @@ -17000,8 +17000,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace StyleInformation -namespace BrandingInformation { +} // namespace StyleInformationStruct +namespace BrandingInformationStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -17060,7 +17060,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace BrandingInformation +} // namespace BrandingInformationStruct } // namespace Structs namespace Commands { @@ -17155,7 +17155,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace LaunchURL. -namespace LaunchResponse { +namespace LauncherResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -17195,7 +17195,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace LaunchResponse. +} // namespace LauncherResponse. } // namespace Commands namespace Attributes { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 565809fbe38ce2..d7d541a3c15170 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -22135,7 +22135,7 @@ struct TypeInfo } // namespace KeypadInput namespace ContentLauncher { namespace Structs { -namespace Dimension { +namespace DimensionStruct { enum class Fields { kWidth = 0, @@ -22159,8 +22159,8 @@ struct Type using DecodableType = Type; -} // namespace Dimension -namespace AdditionalInfo { +} // namespace DimensionStruct +namespace AdditionalInfoStruct { enum class Fields { kName = 0, @@ -22182,8 +22182,8 @@ struct Type using DecodableType = Type; -} // namespace AdditionalInfo -namespace Parameter { +} // namespace AdditionalInfoStruct +namespace ParameterStruct { enum class Fields { kType = 0, @@ -22196,7 +22196,7 @@ struct Type public: ParameterEnum type = static_cast(0); chip::CharSpan value; - Optional> externalIDList; + Optional> externalIDList; static constexpr bool kIsFabricScoped = false; @@ -22208,15 +22208,15 @@ struct DecodableType public: ParameterEnum type = static_cast(0); chip::CharSpan value; - Optional> externalIDList; + Optional> externalIDList; CHIP_ERROR Decode(TLV::TLVReader & reader); static constexpr bool kIsFabricScoped = false; }; -} // namespace Parameter -namespace ContentSearch { +} // namespace ParameterStruct +namespace ContentSearchStruct { enum class Fields { kParameterList = 0, @@ -22225,7 +22225,7 @@ enum class Fields struct Type { public: - DataModel::List parameterList; + DataModel::List parameterList; static constexpr bool kIsFabricScoped = false; @@ -22235,18 +22235,18 @@ struct Type struct DecodableType { public: - DataModel::DecodableList parameterList; + DataModel::DecodableList parameterList; CHIP_ERROR Decode(TLV::TLVReader & reader); static constexpr bool kIsFabricScoped = false; }; -} // namespace ContentSearch -namespace StyleInformation { +} // namespace ContentSearchStruct +namespace StyleInformationStruct { enum class Fields { - kImageUrl = 0, + kImageURL = 0, kColor = 1, kSize = 2, }; @@ -22254,9 +22254,9 @@ enum class Fields struct Type { public: - Optional imageUrl; + Optional imageURL; Optional color; - Optional size; + Optional size; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -22267,8 +22267,8 @@ struct Type using DecodableType = Type; -} // namespace StyleInformation -namespace BrandingInformation { +} // namespace StyleInformationStruct +namespace BrandingInformationStruct { enum class Fields { kProviderName = 0, @@ -22283,11 +22283,11 @@ struct Type { public: chip::CharSpan providerName; - Optional background; - Optional logo; - Optional progressBar; - Optional splash; - Optional waterMark; + Optional background; + Optional logo; + Optional progressBar; + Optional splash; + Optional waterMark; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -22298,7 +22298,7 @@ struct Type using DecodableType = Type; -} // namespace BrandingInformation +} // namespace BrandingInformationStruct } // namespace Structs namespace Commands { @@ -22314,10 +22314,10 @@ struct Type; struct DecodableType; } // namespace LaunchURL -namespace LaunchResponse { +namespace LauncherResponse { struct Type; struct DecodableType; -} // namespace LaunchResponse +} // namespace LauncherResponse } // namespace Commands @@ -22337,13 +22337,13 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::LaunchContent::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } - Structs::ContentSearch::Type search; + Structs::ContentSearchStruct::Type search; bool autoPlay = static_cast(0); Optional data; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType; + using ResponseType = Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -22354,7 +22354,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::LaunchContent::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } - Structs::ContentSearch::DecodableType search; + Structs::ContentSearchStruct::DecodableType search; bool autoPlay = static_cast(0); Optional data; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -22377,11 +22377,11 @@ struct Type chip::CharSpan contentURL; Optional displayString; - Optional brandingInformation; + Optional brandingInformation; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType; + using ResponseType = Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -22394,11 +22394,11 @@ struct DecodableType chip::CharSpan contentURL; Optional displayString; - Optional brandingInformation; + Optional brandingInformation; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace LaunchURL -namespace LaunchResponse { +namespace LauncherResponse { enum class Fields { kStatus = 0, @@ -22409,7 +22409,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::LaunchResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } ContentLaunchStatusEnum status = static_cast(0); @@ -22425,14 +22425,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::LaunchResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } ContentLaunchStatusEnum status = static_cast(0); Optional data; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace LaunchResponse +}; // namespace LauncherResponse } // namespace Commands namespace Attributes { diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h index 3205ee2707acde..9c9e6f3473eaea 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h @@ -1004,9 +1004,9 @@ namespace LaunchURL { static constexpr CommandId Id = 0x00000001; } // namespace LaunchURL -namespace LaunchResponse { +namespace LauncherResponse { static constexpr CommandId Id = 0x00000002; -} // namespace LaunchResponse +} // namespace LauncherResponse } // namespace Commands } // namespace ContentLauncher diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index f4cbb7a92db5dc..c4c6c77ff6a94f 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -6727,7 +6727,7 @@ class ContentLauncherLaunchContent : public ClusterCommand private: chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest; - TypedComplexArgument mComplex_Search; + TypedComplexArgument mComplex_Search; }; /* @@ -6761,7 +6761,7 @@ class ContentLauncherLaunchURL : public ClusterCommand private: chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest; - TypedComplexArgument> + TypedComplexArgument> mComplex_BrandingInformation; }; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index a7a5a1b22f9b0b..e3f5b183370035 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -137,13 +137,13 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::Actions::Structs::Acti ComplexArgumentParser::Finalize(request.state); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type & request, + chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("AdditionalInfo.name", "name", value.isMember("name"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("AdditionalInfo.value", "value", value.isMember("value"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("AdditionalInfoStruct.name", "name", value.isMember("name"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("AdditionalInfoStruct.value", "value", value.isMember("value"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "name"); @@ -155,7 +155,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type & request) { ComplexArgumentParser::Finalize(request.name); ComplexArgumentParser::Finalize(request.value); @@ -349,12 +349,12 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::PowerSource::Structs:: ComplexArgumentParser::Finalize(request.previous); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type & request, + chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("BrandingInformation.providerName", "providerName", + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("BrandingInformationStruct.providerName", "providerName", value.isMember("providerName"))); char labelWithMember[kMaxLabelLength]; @@ -394,7 +394,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type & request) { ComplexArgumentParser::Finalize(request.providerName); ComplexArgumentParser::Finalize(request.background); @@ -478,13 +478,13 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::Channel::Structs::Chan ComplexArgumentParser::Finalize(request.affiliateCallSign); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & request, + chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("ContentSearch.parameterList", "parameterList", value.isMember("parameterList"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ContentSearchStruct.parameterList", "parameterList", + value.isMember("parameterList"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "parameterList"); @@ -493,7 +493,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type & request) { ComplexArgumentParser::Finalize(request.parameterList); } @@ -550,14 +550,14 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::Descriptor::Structs::D ComplexArgumentParser::Finalize(request.revision); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::ContentLauncher::Structs::Dimension::Type & request, + chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Dimension.width", "width", value.isMember("width"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Dimension.height", "height", value.isMember("height"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Dimension.metric", "metric", value.isMember("metric"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("DimensionStruct.width", "width", value.isMember("width"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("DimensionStruct.height", "height", value.isMember("height"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("DimensionStruct.metric", "metric", value.isMember("metric"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "width"); @@ -572,7 +572,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::Dimension::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::Type & request) { ComplexArgumentParser::Finalize(request.width); ComplexArgumentParser::Finalize(request.height); @@ -1551,13 +1551,13 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::AudioOutput::Structs:: ComplexArgumentParser::Finalize(request.name); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::ContentLauncher::Structs::Parameter::Type & request, + chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Parameter.type", "type", value.isMember("type"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Parameter.value", "value", value.isMember("value"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ParameterStruct.type", "type", value.isMember("type"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ParameterStruct.value", "value", value.isMember("value"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "type"); @@ -1575,7 +1575,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::Parameter::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type & request) { ComplexArgumentParser::Finalize(request.type); ComplexArgumentParser::Finalize(request.value); @@ -1811,16 +1811,16 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::UnitTesting::Structs:: ComplexArgumentParser::Finalize(request.h); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::ContentLauncher::Structs::StyleInformation::Type & request, + chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); char labelWithMember[kMaxLabelLength]; - if (value.isMember("imageUrl")) + if (value.isMember("imageURL")) { - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "imageUrl"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.imageUrl, value["imageUrl"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "imageURL"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.imageURL, value["imageURL"])); } if (value.isMember("color")) @@ -1838,9 +1838,9 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return CHIP_NO_ERROR; } -void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::StyleInformation::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::Type & request) { - ComplexArgumentParser::Finalize(request.imageUrl); + ComplexArgumentParser::Finalize(request.imageURL); ComplexArgumentParser::Finalize(request.color); ComplexArgumentParser::Finalize(request.size); } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index 14967e2df584df..d1c9bb3120af17 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -35,10 +35,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Actions::Struct Json::Value & value); static void Finalize(chip::app::Clusters::Actions::Structs::ActionStruct::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type & request); +static void Finalize(chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & request, Json::Value & value); @@ -69,10 +69,11 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::PowerSource::St Json::Value & value); static void Finalize(chip::app::Clusters::PowerSource::Structs::BatFaultChangeType::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type & request, +static CHIP_ERROR Setup(const char * label, + chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type & request); +static void Finalize(chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::Type & request, Json::Value & value); @@ -81,10 +82,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Channel::Struct Json::Value & value); static void Finalize(chip::app::Clusters::Channel::Structs::ChannelInfo::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & request); +static void Finalize(chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request, Json::Value & value); @@ -93,10 +94,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Descriptor::Str Json::Value & value); static void Finalize(chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::Dimension::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::ContentLauncher::Structs::Dimension::Type & request); +static void Finalize(chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::Type & request, Json::Value & value); @@ -185,10 +186,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::AudioOutput::St Json::Value & value); static void Finalize(chip::app::Clusters::AudioOutput::Structs::OutputInfo::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::Parameter::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::ContentLauncher::Structs::Parameter::Type & request); +static void Finalize(chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::Type & request, Json::Value & value); @@ -214,10 +215,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::UnitTesting::St Json::Value & value); static void Finalize(chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::StyleInformation::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::ContentLauncher::Structs::StyleInformation::Type & request); +static void Finalize(chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::AccessControl::Structs::Target::Type & request, Json::Value & value); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 45c397d722cf05..52a73232c7bfff 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -151,8 +151,9 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::DecodableType & value) +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -348,7 +349,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::DecodableType & value) + const chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -476,8 +477,9 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::ContentSearch::DecodableType & value) +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -541,7 +543,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value) + const chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -1646,7 +1648,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::Parameter::DecodableType & value) + const chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -1944,15 +1946,16 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::StyleInformation::DecodableType & value) +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = LogValue("ImageUrl", indent + 1, value.imageUrl); + CHIP_ERROR err = LogValue("ImageURL", indent + 1, value.imageURL); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ImageUrl'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ImageURL'"); return err; } } @@ -4076,7 +4079,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const ContentLauncher::Commands::LaunchResponse::DecodableType & value) + const ContentLauncher::Commands::LauncherResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); @@ -10472,10 +10475,10 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa case ContentLauncher::Id: { switch (path.mCommandId) { - case ContentLauncher::Commands::LaunchResponse::Id: { - ContentLauncher::Commands::LaunchResponse::DecodableType value; + case ContentLauncher::Commands::LauncherResponse::Id: { + ContentLauncher::Commands::LauncherResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("LaunchResponse", 1, value); + return DataModelLogger::LogValue("LauncherResponse", 1, value); } } break; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index 588e919d32e7e2..d45c821ddfec8f 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -27,7 +27,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfoStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ApplicationLauncher::Structs::Application::DecodableType & value); static CHIP_ERROR @@ -44,19 +44,19 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::PowerSource::Structs::BatFaultChangeType::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::BrandingInformationStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::ContentSearch::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::ContentSearchStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::DimensionStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, @@ -104,7 +104,7 @@ LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::Parameter::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, @@ -118,7 +118,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::UnitTesting::Structs::SimpleStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::StyleInformation::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::StyleInformationStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::AccessControl::Structs::Target::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, @@ -361,7 +361,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index a898df02de63f3..2c5cd59d38b898 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -55236,7 +55236,7 @@ class TV_ContentLauncherClusterSuite : public TestCommand case 3: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType value; + chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); VerifyOrReturn(CheckValuePresent("data", value.data)); @@ -55246,7 +55246,7 @@ class TV_ContentLauncherClusterSuite : public TestCommand case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType value; + chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); VerifyOrReturn(CheckValuePresent("data", value.data)); @@ -55297,7 +55297,7 @@ class TV_ContentLauncherClusterSuite : public TestCommand chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type value; { - auto * listHolder_1 = new ListHolder(1); + auto * listHolder_1 = new ListHolder(1); listFreer.add(listHolder_1); listHolder_1->mList[0].type = static_cast(1); @@ -55305,20 +55305,21 @@ class TV_ContentLauncherClusterSuite : public TestCommand listHolder_1->mList[0].externalIDList.Emplace(); { - auto * listHolder_4 = new ListHolder(1); + auto * listHolder_4 = + new ListHolder(1); listFreer.add(listHolder_4); listHolder_4->mList[0].name = chip::Span("namegarbage: not in length on purpose", 4); listHolder_4->mList[0].value = chip::Span("valuegarbage: not in length on purpose", 5); listHolder_1->mList[0].externalIDList.Value() = - chip::app::DataModel::List( + chip::app::DataModel::List( listHolder_4->mList, 1); } value.search.parameterList = - chip::app::DataModel::List(listHolder_1->mList, - 1); + chip::app::DataModel::List( + listHolder_1->mList, 1); } value.autoPlay = true; @@ -55342,8 +55343,8 @@ class TV_ContentLauncherClusterSuite : public TestCommand chip::Span("exampleNamegarbage: not in length on purpose", 11); value.brandingInformation.Value().background.Emplace(); - value.brandingInformation.Value().background.Value().imageUrl.Emplace(); - value.brandingInformation.Value().background.Value().imageUrl.Value() = + value.brandingInformation.Value().background.Value().imageURL.Emplace(); + value.brandingInformation.Value().background.Value().imageURL.Value() = chip::Span("exampleUrlgarbage: not in length on purpose", 10); value.brandingInformation.Value().background.Value().color.Emplace(); value.brandingInformation.Value().background.Value().color.Value() = @@ -55357,8 +55358,8 @@ class TV_ContentLauncherClusterSuite : public TestCommand value.brandingInformation.Value().logo.Emplace(); - value.brandingInformation.Value().logo.Value().imageUrl.Emplace(); - value.brandingInformation.Value().logo.Value().imageUrl.Value() = + value.brandingInformation.Value().logo.Value().imageURL.Emplace(); + value.brandingInformation.Value().logo.Value().imageURL.Value() = chip::Span("exampleUrlgarbage: not in length on purpose", 10); value.brandingInformation.Value().logo.Value().color.Emplace(); value.brandingInformation.Value().logo.Value().color.Value() = @@ -55372,8 +55373,8 @@ class TV_ContentLauncherClusterSuite : public TestCommand value.brandingInformation.Value().progressBar.Emplace(); - value.brandingInformation.Value().progressBar.Value().imageUrl.Emplace(); - value.brandingInformation.Value().progressBar.Value().imageUrl.Value() = + value.brandingInformation.Value().progressBar.Value().imageURL.Emplace(); + value.brandingInformation.Value().progressBar.Value().imageURL.Value() = chip::Span("exampleUrlgarbage: not in length on purpose", 10); value.brandingInformation.Value().progressBar.Value().color.Emplace(); value.brandingInformation.Value().progressBar.Value().color.Value() = @@ -55387,8 +55388,8 @@ class TV_ContentLauncherClusterSuite : public TestCommand value.brandingInformation.Value().splash.Emplace(); - value.brandingInformation.Value().splash.Value().imageUrl.Emplace(); - value.brandingInformation.Value().splash.Value().imageUrl.Value() = + value.brandingInformation.Value().splash.Value().imageURL.Emplace(); + value.brandingInformation.Value().splash.Value().imageURL.Value() = chip::Span("exampleUrlgarbage: not in length on purpose", 10); value.brandingInformation.Value().splash.Value().color.Emplace(); value.brandingInformation.Value().splash.Value().color.Value() = @@ -55402,8 +55403,8 @@ class TV_ContentLauncherClusterSuite : public TestCommand value.brandingInformation.Value().waterMark.Emplace(); - value.brandingInformation.Value().waterMark.Value().imageUrl.Emplace(); - value.brandingInformation.Value().waterMark.Value().imageUrl.Value() = + value.brandingInformation.Value().waterMark.Value().imageURL.Emplace(); + value.brandingInformation.Value().waterMark.Value().imageURL.Value() = chip::Span("exampleUrlgarbage: not in length on purpose", 10); value.brandingInformation.Value().waterMark.Value().color.Emplace(); value.brandingInformation.Value().waterMark.Value().color.Value() = diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 82b58f558c753d..4fd44486fbe80a 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -72536,12 +72536,12 @@ class ContentLauncherLaunchContent : public ClusterCommand { __auto_type * params = [[MTRContentLauncherClusterLaunchContentParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.search = [MTRContentLauncherClusterContentSearch new]; + params.search = [MTRContentLauncherClusterContentSearchStruct new]; { // Scope for our temporary variables auto * array_1 = [NSMutableArray new]; for (auto & entry_1 : mRequest.search.parameterList) { - MTRContentLauncherClusterParameter * newElement_1; - newElement_1 = [MTRContentLauncherClusterParameter new]; + MTRContentLauncherClusterParameterStruct * newElement_1; + newElement_1 = [MTRContentLauncherClusterParameterStruct new]; newElement_1.type = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1.type)]; newElement_1.value = [[NSString alloc] initWithBytes:entry_1.value.data() length:entry_1.value.size() @@ -72550,8 +72550,8 @@ class ContentLauncherLaunchContent : public ClusterCommand { { // Scope for our temporary variables auto * array_4 = [NSMutableArray new]; for (auto & entry_4 : entry_1.externalIDList.Value()) { - MTRContentLauncherClusterAdditionalInfo * newElement_4; - newElement_4 = [MTRContentLauncherClusterAdditionalInfo new]; + MTRContentLauncherClusterAdditionalInfoStruct * newElement_4; + newElement_4 = [MTRContentLauncherClusterAdditionalInfoStruct new]; newElement_4.name = [[NSString alloc] initWithBytes:entry_4.name.data() length:entry_4.name.size() encoding:NSUTF8StringEncoding]; @@ -72581,8 +72581,8 @@ class ContentLauncherLaunchContent : public ClusterCommand { uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { [cluster launchContentWithParams:params - completion:^( - MTRContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable error) { + completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, + NSError * _Nullable error) { NSLog(@"Values: %@", values); responsesNeeded--; if (error != nil) { @@ -72599,7 +72599,7 @@ class ContentLauncherLaunchContent : public ClusterCommand { private: chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest; - TypedComplexArgument mComplex_Search; + TypedComplexArgument mComplex_Search; }; /* @@ -72639,20 +72639,20 @@ class ContentLauncherLaunchURL : public ClusterCommand { params.displayString = nil; } if (mRequest.brandingInformation.HasValue()) { - params.brandingInformation = [MTRContentLauncherClusterBrandingInformation new]; + params.brandingInformation = [MTRContentLauncherClusterBrandingInformationStruct new]; params.brandingInformation.providerName = [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().providerName.data() length:mRequest.brandingInformation.Value().providerName.size() encoding:NSUTF8StringEncoding]; if (mRequest.brandingInformation.Value().background.HasValue()) { - params.brandingInformation.background = [MTRContentLauncherClusterStyleInformation new]; - if (mRequest.brandingInformation.Value().background.Value().imageUrl.HasValue()) { - params.brandingInformation.background.imageUrl = [[NSString alloc] - initWithBytes:mRequest.brandingInformation.Value().background.Value().imageUrl.Value().data() - length:mRequest.brandingInformation.Value().background.Value().imageUrl.Value().size() + params.brandingInformation.background = [MTRContentLauncherClusterStyleInformationStruct new]; + if (mRequest.brandingInformation.Value().background.Value().imageURL.HasValue()) { + params.brandingInformation.background.imageURL = [[NSString alloc] + initWithBytes:mRequest.brandingInformation.Value().background.Value().imageURL.Value().data() + length:mRequest.brandingInformation.Value().background.Value().imageURL.Value().size() encoding:NSUTF8StringEncoding]; } else { - params.brandingInformation.background.imageUrl = nil; + params.brandingInformation.background.imageURL = nil; } if (mRequest.brandingInformation.Value().background.Value().color.HasValue()) { params.brandingInformation.background.color = @@ -72663,7 +72663,7 @@ class ContentLauncherLaunchURL : public ClusterCommand { params.brandingInformation.background.color = nil; } if (mRequest.brandingInformation.Value().background.Value().size.HasValue()) { - params.brandingInformation.background.size = [MTRContentLauncherClusterDimension new]; + params.brandingInformation.background.size = [MTRContentLauncherClusterDimensionStruct new]; params.brandingInformation.background.size.width = [NSNumber numberWithDouble:mRequest.brandingInformation.Value().background.Value().size.Value().width]; params.brandingInformation.background.size.height = @@ -72678,14 +72678,14 @@ class ContentLauncherLaunchURL : public ClusterCommand { params.brandingInformation.background = nil; } if (mRequest.brandingInformation.Value().logo.HasValue()) { - params.brandingInformation.logo = [MTRContentLauncherClusterStyleInformation new]; - if (mRequest.brandingInformation.Value().logo.Value().imageUrl.HasValue()) { - params.brandingInformation.logo.imageUrl = - [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().logo.Value().imageUrl.Value().data() - length:mRequest.brandingInformation.Value().logo.Value().imageUrl.Value().size() + params.brandingInformation.logo = [MTRContentLauncherClusterStyleInformationStruct new]; + if (mRequest.brandingInformation.Value().logo.Value().imageURL.HasValue()) { + params.brandingInformation.logo.imageURL = + [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().logo.Value().imageURL.Value().data() + length:mRequest.brandingInformation.Value().logo.Value().imageURL.Value().size() encoding:NSUTF8StringEncoding]; } else { - params.brandingInformation.logo.imageUrl = nil; + params.brandingInformation.logo.imageURL = nil; } if (mRequest.brandingInformation.Value().logo.Value().color.HasValue()) { params.brandingInformation.logo.color = @@ -72696,7 +72696,7 @@ class ContentLauncherLaunchURL : public ClusterCommand { params.brandingInformation.logo.color = nil; } if (mRequest.brandingInformation.Value().logo.Value().size.HasValue()) { - params.brandingInformation.logo.size = [MTRContentLauncherClusterDimension new]; + params.brandingInformation.logo.size = [MTRContentLauncherClusterDimensionStruct new]; params.brandingInformation.logo.size.width = [NSNumber numberWithDouble:mRequest.brandingInformation.Value().logo.Value().size.Value().width]; params.brandingInformation.logo.size.height = @@ -72711,14 +72711,14 @@ class ContentLauncherLaunchURL : public ClusterCommand { params.brandingInformation.logo = nil; } if (mRequest.brandingInformation.Value().progressBar.HasValue()) { - params.brandingInformation.progressBar = [MTRContentLauncherClusterStyleInformation new]; - if (mRequest.brandingInformation.Value().progressBar.Value().imageUrl.HasValue()) { - params.brandingInformation.progressBar.imageUrl = [[NSString alloc] - initWithBytes:mRequest.brandingInformation.Value().progressBar.Value().imageUrl.Value().data() - length:mRequest.brandingInformation.Value().progressBar.Value().imageUrl.Value().size() + params.brandingInformation.progressBar = [MTRContentLauncherClusterStyleInformationStruct new]; + if (mRequest.brandingInformation.Value().progressBar.Value().imageURL.HasValue()) { + params.brandingInformation.progressBar.imageURL = [[NSString alloc] + initWithBytes:mRequest.brandingInformation.Value().progressBar.Value().imageURL.Value().data() + length:mRequest.brandingInformation.Value().progressBar.Value().imageURL.Value().size() encoding:NSUTF8StringEncoding]; } else { - params.brandingInformation.progressBar.imageUrl = nil; + params.brandingInformation.progressBar.imageURL = nil; } if (mRequest.brandingInformation.Value().progressBar.Value().color.HasValue()) { params.brandingInformation.progressBar.color = [[NSString alloc] @@ -72729,7 +72729,7 @@ class ContentLauncherLaunchURL : public ClusterCommand { params.brandingInformation.progressBar.color = nil; } if (mRequest.brandingInformation.Value().progressBar.Value().size.HasValue()) { - params.brandingInformation.progressBar.size = [MTRContentLauncherClusterDimension new]; + params.brandingInformation.progressBar.size = [MTRContentLauncherClusterDimensionStruct new]; params.brandingInformation.progressBar.size.width = [NSNumber numberWithDouble:mRequest.brandingInformation.Value().progressBar.Value().size.Value().width]; params.brandingInformation.progressBar.size.height = @@ -72744,14 +72744,14 @@ class ContentLauncherLaunchURL : public ClusterCommand { params.brandingInformation.progressBar = nil; } if (mRequest.brandingInformation.Value().splash.HasValue()) { - params.brandingInformation.splash = [MTRContentLauncherClusterStyleInformation new]; - if (mRequest.brandingInformation.Value().splash.Value().imageUrl.HasValue()) { - params.brandingInformation.splash.imageUrl = - [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().splash.Value().imageUrl.Value().data() - length:mRequest.brandingInformation.Value().splash.Value().imageUrl.Value().size() + params.brandingInformation.splash = [MTRContentLauncherClusterStyleInformationStruct new]; + if (mRequest.brandingInformation.Value().splash.Value().imageURL.HasValue()) { + params.brandingInformation.splash.imageURL = + [[NSString alloc] initWithBytes:mRequest.brandingInformation.Value().splash.Value().imageURL.Value().data() + length:mRequest.brandingInformation.Value().splash.Value().imageURL.Value().size() encoding:NSUTF8StringEncoding]; } else { - params.brandingInformation.splash.imageUrl = nil; + params.brandingInformation.splash.imageURL = nil; } if (mRequest.brandingInformation.Value().splash.Value().color.HasValue()) { params.brandingInformation.splash.color = @@ -72762,7 +72762,7 @@ class ContentLauncherLaunchURL : public ClusterCommand { params.brandingInformation.splash.color = nil; } if (mRequest.brandingInformation.Value().splash.Value().size.HasValue()) { - params.brandingInformation.splash.size = [MTRContentLauncherClusterDimension new]; + params.brandingInformation.splash.size = [MTRContentLauncherClusterDimensionStruct new]; params.brandingInformation.splash.size.width = [NSNumber numberWithDouble:mRequest.brandingInformation.Value().splash.Value().size.Value().width]; params.brandingInformation.splash.size.height = @@ -72777,14 +72777,14 @@ class ContentLauncherLaunchURL : public ClusterCommand { params.brandingInformation.splash = nil; } if (mRequest.brandingInformation.Value().waterMark.HasValue()) { - params.brandingInformation.waterMark = [MTRContentLauncherClusterStyleInformation new]; - if (mRequest.brandingInformation.Value().waterMark.Value().imageUrl.HasValue()) { - params.brandingInformation.waterMark.imageUrl = [[NSString alloc] - initWithBytes:mRequest.brandingInformation.Value().waterMark.Value().imageUrl.Value().data() - length:mRequest.brandingInformation.Value().waterMark.Value().imageUrl.Value().size() + params.brandingInformation.waterMark = [MTRContentLauncherClusterStyleInformationStruct new]; + if (mRequest.brandingInformation.Value().waterMark.Value().imageURL.HasValue()) { + params.brandingInformation.waterMark.imageURL = [[NSString alloc] + initWithBytes:mRequest.brandingInformation.Value().waterMark.Value().imageURL.Value().data() + length:mRequest.brandingInformation.Value().waterMark.Value().imageURL.Value().size() encoding:NSUTF8StringEncoding]; } else { - params.brandingInformation.waterMark.imageUrl = nil; + params.brandingInformation.waterMark.imageURL = nil; } if (mRequest.brandingInformation.Value().waterMark.Value().color.HasValue()) { params.brandingInformation.waterMark.color = @@ -72795,7 +72795,7 @@ class ContentLauncherLaunchURL : public ClusterCommand { params.brandingInformation.waterMark.color = nil; } if (mRequest.brandingInformation.Value().waterMark.Value().size.HasValue()) { - params.brandingInformation.waterMark.size = [MTRContentLauncherClusterDimension new]; + params.brandingInformation.waterMark.size = [MTRContentLauncherClusterDimensionStruct new]; params.brandingInformation.waterMark.size.width = [NSNumber numberWithDouble:mRequest.brandingInformation.Value().waterMark.Value().size.Value().width]; params.brandingInformation.waterMark.size.height = @@ -72815,26 +72815,26 @@ class ContentLauncherLaunchURL : public ClusterCommand { uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { - [cluster - launchURLWithParams:params - completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable error) { - NSLog(@"Values: %@", values); - responsesNeeded--; - if (error != nil) { - mError = error; - LogNSError("Error", error); - } - if (responsesNeeded == 0) { - SetCommandExitStatus(mError); - } - }]; + [cluster launchURLWithParams:params + completion:^( + MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) { + NSLog(@"Values: %@", values); + responsesNeeded--; + if (error != nil) { + mError = error; + LogNSError("Error", error); + } + if (responsesNeeded == 0) { + SetCommandExitStatus(mError); + } + }]; } return CHIP_NO_ERROR; } private: chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest; - TypedComplexArgument> + TypedComplexArgument> mComplex_BrandingInformation; }; diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 198e2d05b1d2e6..53c37e5a5fa69c 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -75705,41 +75705,41 @@ class TV_ContentLauncherCluster : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRContentLauncherClusterLaunchContentParams alloc] init]; - params.search = [[MTRContentLauncherClusterContentSearch alloc] init]; + params.search = [[MTRContentLauncherClusterContentSearchStruct alloc] init]; { NSMutableArray * temp_1 = [[NSMutableArray alloc] init]; - temp_1[0] = [[MTRContentLauncherClusterParameter alloc] init]; - ((MTRContentLauncherClusterParameter *) temp_1[0]).type = [NSNumber numberWithUnsignedChar:1U]; - ((MTRContentLauncherClusterParameter *) temp_1[0]).value = @"exampleValue"; + temp_1[0] = [[MTRContentLauncherClusterParameterStruct alloc] init]; + ((MTRContentLauncherClusterParameterStruct *) temp_1[0]).type = [NSNumber numberWithUnsignedChar:1U]; + ((MTRContentLauncherClusterParameterStruct *) temp_1[0]).value = @"exampleValue"; { NSMutableArray * temp_4 = [[NSMutableArray alloc] init]; - temp_4[0] = [[MTRContentLauncherClusterAdditionalInfo alloc] init]; - ((MTRContentLauncherClusterAdditionalInfo *) temp_4[0]).name = @"name"; - ((MTRContentLauncherClusterAdditionalInfo *) temp_4[0]).value = @"value"; + temp_4[0] = [[MTRContentLauncherClusterAdditionalInfoStruct alloc] init]; + ((MTRContentLauncherClusterAdditionalInfoStruct *) temp_4[0]).name = @"name"; + ((MTRContentLauncherClusterAdditionalInfoStruct *) temp_4[0]).value = @"value"; - ((MTRContentLauncherClusterParameter *) temp_1[0]).externalIDList = temp_4; + ((MTRContentLauncherClusterParameterStruct *) temp_1[0]).externalIDList = temp_4; } - ((MTRContentLauncherClusterContentSearch *) params.search).parameterList = temp_1; + ((MTRContentLauncherClusterContentSearchStruct *) params.search).parameterList = temp_1; } params.autoPlay = [NSNumber numberWithBool:true]; params.data = @"exampleData"; [cluster launchContentWithParams:params - completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable err) { + completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) { NSLog(@"Launch Content Command Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); { id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); } { id actualValue = values.data; - VerifyOrReturn(CheckValueAsString("data", actualValue, @"exampleData")); + VerifyOrReturn(CheckValueAsString("Data", actualValue, @"exampleData")); } NextTest(); @@ -75759,191 +75759,222 @@ class TV_ContentLauncherCluster : public TestCommandBridge { __auto_type * params = [[MTRContentLauncherClusterLaunchURLParams alloc] init]; params.contentURL = @"exampleUrl"; params.displayString = @"exampleDisplayString"; - params.brandingInformation = [[MTRContentLauncherClusterBrandingInformation alloc] init]; - ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).providerName = @"exampleName"; - ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).background = - [[MTRContentLauncherClusterStyleInformation alloc] init]; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + params.brandingInformation = [[MTRContentLauncherClusterBrandingInformationStruct alloc] init]; + ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).providerName = @"exampleName"; + ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).background = + [[MTRContentLauncherClusterStyleInformationStruct alloc] init]; + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .background) - .imageUrl + .imageURL = @"exampleUrl"; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .background) .color = @"exampleColor"; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .background) .size - = [[MTRContentLauncherClusterDimension alloc] init]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .background) + = [[MTRContentLauncherClusterDimensionStruct alloc] init]; + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .background) .size) .width = [NSNumber numberWithDouble:0]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .background) + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .background) .size) .height = [NSNumber numberWithDouble:0]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .background) + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .background) .size) .metric = [NSNumber numberWithUnsignedChar:0U]; - ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).logo = - [[MTRContentLauncherClusterStyleInformation alloc] init]; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).logo = + [[MTRContentLauncherClusterStyleInformationStruct alloc] init]; + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .logo) - .imageUrl + .imageURL = @"exampleUrl"; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .logo) .color = @"exampleColor"; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .logo) .size - = [[MTRContentLauncherClusterDimension alloc] init]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .logo) + = [[MTRContentLauncherClusterDimensionStruct alloc] init]; + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .logo) .size) .width = [NSNumber numberWithDouble:0]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .logo) + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .logo) .size) .height = [NSNumber numberWithDouble:0]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .logo) + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .logo) .size) .metric = [NSNumber numberWithUnsignedChar:0U]; - ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).progressBar = - [[MTRContentLauncherClusterStyleInformation alloc] init]; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).progressBar = + [[MTRContentLauncherClusterStyleInformationStruct alloc] init]; + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .progressBar) - .imageUrl + .imageURL = @"exampleUrl"; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .progressBar) .color = @"exampleColor"; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .progressBar) .size - = [[MTRContentLauncherClusterDimension alloc] init]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .progressBar) + = [[MTRContentLauncherClusterDimensionStruct alloc] init]; + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .progressBar) .size) .width = [NSNumber numberWithDouble:0]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .progressBar) + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .progressBar) .size) .height = [NSNumber numberWithDouble:0]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .progressBar) + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .progressBar) .size) .metric = [NSNumber numberWithUnsignedChar:0U]; - ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).splash = - [[MTRContentLauncherClusterStyleInformation alloc] init]; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).splash = + [[MTRContentLauncherClusterStyleInformationStruct alloc] init]; + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .splash) - .imageUrl + .imageURL = @"exampleUrl"; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .splash) .color = @"exampleColor"; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .splash) .size - = [[MTRContentLauncherClusterDimension alloc] init]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .splash) + = [[MTRContentLauncherClusterDimensionStruct alloc] init]; + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .splash) .size) .width = [NSNumber numberWithDouble:0]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .splash) + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .splash) .size) .height = [NSNumber numberWithDouble:0]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .splash) + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .splash) .size) .metric = [NSNumber numberWithUnsignedChar:0U]; - ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation).waterMark = - [[MTRContentLauncherClusterStyleInformation alloc] init]; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterBrandingInformationStruct *) params.brandingInformation).waterMark = + [[MTRContentLauncherClusterStyleInformationStruct alloc] init]; + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .waterMark) - .imageUrl + .imageURL = @"exampleUrl"; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .waterMark) .color = @"exampleColor"; - ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) params.brandingInformation) + ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params.brandingInformation) .waterMark) .size - = [[MTRContentLauncherClusterDimension alloc] init]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .waterMark) + = [[MTRContentLauncherClusterDimensionStruct alloc] init]; + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .waterMark) .size) .width = [NSNumber numberWithDouble:0]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .waterMark) + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .waterMark) .size) .height = [NSNumber numberWithDouble:0]; - ((MTRContentLauncherClusterDimension *) ((MTRContentLauncherClusterStyleInformation *) ((MTRContentLauncherClusterBrandingInformation *) - params.brandingInformation) - .waterMark) + ((MTRContentLauncherClusterDimensionStruct *) ((MTRContentLauncherClusterStyleInformationStruct *) ((MTRContentLauncherClusterBrandingInformationStruct *) + params + .brandingInformation) + .waterMark) .size) .metric = [NSNumber numberWithUnsignedChar:0U]; - [cluster launchURLWithParams:params - completion:^(MTRContentLauncherClusterLaunchResponseParams * _Nullable values, NSError * _Nullable err) { - NSLog(@"Launch URL Command Error: %@", err); + [cluster + launchURLWithParams:params + completion:^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable err) { + NSLog(@"Launch URL Command Error: %@", err); - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - { - id actualValue = values.status; - VerifyOrReturn(CheckValue("status", actualValue, 0U)); - } + { + id actualValue = values.status; + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); + } - { - id actualValue = values.data; - VerifyOrReturn(CheckValueAsString("data", actualValue, @"exampleData")); - } + { + id actualValue = values.data; + VerifyOrReturn(CheckValueAsString("Data", actualValue, @"exampleData")); + } - NextTest(); - }]; + NextTest(); + }]; return CHIP_NO_ERROR; }