From c3222b582f92eb209055b2f31afa383e74fd74ba Mon Sep 17 00:00:00 2001 From: Austin Hsieh <77706079+austinh0@users.noreply.github.com> Date: Thu, 13 Jan 2022 05:41:42 -0800 Subject: [PATCH] Rename duplicate Application struct in ApplicationBasic and ApplicationLauncher clusters. (#13510) --- .../ApplicationBasicManager.cpp | 4 +-- .../ApplicationBasicManager.h | 2 +- .../ApplicationLauncherManager.cpp | 11 ++++---- .../ApplicationLauncherManager.h | 14 +++++----- examples/tv-app/linux/AppImpl.cpp | 4 +-- examples/tv-app/linux/AppImpl.h | 4 +-- .../ApplicationBasicManager.cpp | 4 +-- .../ApplicationBasicManager.h | 2 +- .../ApplicationLauncherManager.cpp | 11 ++++---- .../ApplicationLauncherManager.h | 14 +++++----- .../application-basic-delegate.h | 16 +++++------ .../application-basic-server.cpp | 2 +- .../application-launcher-delegate.h | 10 +++---- src/app/util/ContentApp.h | 4 +-- src/app/util/ContentAppPlatform.cpp | 2 +- src/app/util/ContentAppPlatform.h | 8 +++--- .../chip/application-basic-cluster.xml | 4 +-- .../chip/application-launcher-cluster.xml | 10 +++---- .../java/zap-generated/CHIPClusters-JNI.cpp | 6 ++-- .../python/chip/clusters/Objects.py | 28 +++++++++---------- .../CHIPAttributeTLVValueDecoder.mm | 8 ++---- .../CHIP/zap-generated/CHIPClustersObjc.mm | 6 ---- .../zap-generated/CHIPCommandPayloadsObjc.h | 6 ++-- .../zap-generated/CHIPCommandPayloadsObjc.mm | 6 ++-- .../CHIP/zap-generated/CHIPStructsObjc.h | 6 ++-- .../CHIP/zap-generated/CHIPStructsObjc.mm | 6 ++-- .../app-common/zap-generated/af-structs.h | 15 +++++++--- .../zap-generated/cluster-objects.cpp | 8 +++--- .../zap-generated/cluster-objects.h | 28 +++++++++---------- .../zap-generated/cluster/Commands.h | 8 +++--- .../chip-tool/zap-generated/test/Commands.h | 6 ---- 31 files changed, 128 insertions(+), 135 deletions(-) diff --git a/examples/tv-app/android/include/application-basic/ApplicationBasicManager.cpp b/examples/tv-app/android/include/application-basic/ApplicationBasicManager.cpp index 1a979da92efcc7..2751e03974d79c 100644 --- a/examples/tv-app/android/include/application-basic/ApplicationBasicManager.cpp +++ b/examples/tv-app/android/include/application-basic/ApplicationBasicManager.cpp @@ -41,9 +41,9 @@ uint16_t ApplicationBasicManager::HandleGetProductId() return 1; } -chip::app::Clusters::ApplicationBasic::Structs::Application::Type ApplicationBasicManager::HandleGetApplication() +chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::Type ApplicationBasicManager::HandleGetApplication() { - chip::app::Clusters::ApplicationBasic::Structs::Application::Type application; + chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::Type application; application.catalogVendorId = 123; application.applicationId = chip::CharSpan("applicationId", strlen("applicationId")); return application; diff --git a/examples/tv-app/android/include/application-basic/ApplicationBasicManager.h b/examples/tv-app/android/include/application-basic/ApplicationBasicManager.h index e907fc8891861e..ec8904fa581ff8 100644 --- a/examples/tv-app/android/include/application-basic/ApplicationBasicManager.h +++ b/examples/tv-app/android/include/application-basic/ApplicationBasicManager.h @@ -27,7 +27,7 @@ class ApplicationBasicManager : public chip::app::Clusters::ApplicationBasic::De uint16_t HandleGetVendorId() override; chip::CharSpan HandleGetApplicationName() override; uint16_t HandleGetProductId() override; - chip::app::Clusters::ApplicationBasic::Structs::Application::Type HandleGetApplication() override; + chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::Type HandleGetApplication() override; chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum HandleGetStatus() override; chip::CharSpan HandleGetApplicationVersion() override; std::list HandleGetAllowedVendorList() override; diff --git a/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp b/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp index f6a8afc0ae8ee7..6767137f73baae 100644 --- a/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp +++ b/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp @@ -36,7 +36,8 @@ std::list ApplicationLauncherManager::HandleGetCatalogList() } Commands::LauncherResponse::Type ApplicationLauncherManager::HandleLaunchApp( - const chip::CharSpan & data, const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) + const chip::CharSpan & data, + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) { // TODO: Insert code here Commands::LauncherResponse::Type response; @@ -45,8 +46,8 @@ Commands::LauncherResponse::Type ApplicationLauncherManager::HandleLaunchApp( return response; } -Commands::LauncherResponse::Type -ApplicationLauncherManager::HandleStopApp(const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) +Commands::LauncherResponse::Type ApplicationLauncherManager::HandleStopApp( + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) { // TODO: Insert code here Commands::LauncherResponse::Type response; @@ -55,8 +56,8 @@ ApplicationLauncherManager::HandleStopApp(const chip::app::Clusters::Application return response; } -Commands::LauncherResponse::Type -ApplicationLauncherManager::HandleHideApp(const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) +Commands::LauncherResponse::Type ApplicationLauncherManager::HandleHideApp( + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) { // TODO: Insert code here Commands::LauncherResponse::Type response; diff --git a/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.h b/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.h index c01c3e243d66d1..122b03e865c15a 100644 --- a/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.h +++ b/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.h @@ -27,11 +27,11 @@ class ApplicationLauncherManager : public chip::app::Clusters::ApplicationLaunch chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type HandleGetCurrentApp() override; std::list HandleGetCatalogList() override; - chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type - HandleLaunchApp(const chip::CharSpan & data, - const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) override; - chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type - HandleStopApp(const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) override; - chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type - HandleHideApp(const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) override; + chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type HandleLaunchApp( + const chip::CharSpan & data, + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) override; + chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type HandleStopApp( + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) override; + chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type HandleHideApp( + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) override; }; diff --git a/examples/tv-app/linux/AppImpl.cpp b/examples/tv-app/linux/AppImpl.cpp index dd2d2569ef641e..06c82a8531b962 100644 --- a/examples/tv-app/linux/AppImpl.cpp +++ b/examples/tv-app/linux/AppImpl.cpp @@ -191,7 +191,7 @@ uint32_t AccountLoginImpl::GetSetupPIN(const char * tempAccountId) } chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type -ApplicationLauncherImpl::LaunchApp(Application application, std::string data) +ApplicationLauncherImpl::LaunchApp(ApplicationLauncherApplication application, std::string data) { std::string appId(application.applicationId.data(), application.applicationId.size()); ChipLogProgress(DeviceLayer, @@ -239,7 +239,7 @@ ContentApp * ContentAppFactoryImpl::LoadContentAppByVendorId(uint16_t vendorId) return nullptr; } -ContentApp * ContentAppFactoryImpl::LoadContentAppByAppId(Application application) +ContentApp * ContentAppFactoryImpl::LoadContentAppByAppId(ApplicationLauncherApplication application) { std::string appId(application.applicationId.data(), application.applicationId.size()); ChipLogProgress(DeviceLayer, diff --git a/examples/tv-app/linux/AppImpl.h b/examples/tv-app/linux/AppImpl.h index 4512c514156409..81150ef0d19be6 100644 --- a/examples/tv-app/linux/AppImpl.h +++ b/examples/tv-app/linux/AppImpl.h @@ -98,7 +98,7 @@ class DLL_EXPORT ApplicationLauncherImpl : public ApplicationLauncher public: virtual ~ApplicationLauncherImpl() {} - chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type LaunchApp(Application application, + chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type LaunchApp(ApplicationLauncherApplication application, std::string data) override; protected: @@ -175,7 +175,7 @@ class DLL_EXPORT ContentAppFactoryImpl : public ContentAppFactory virtual ~ContentAppFactoryImpl() {} ContentApp * LoadContentAppByVendorId(uint16_t vendorId); - ContentApp * LoadContentAppByAppId(Application application); + ContentApp * LoadContentAppByAppId(ApplicationLauncherApplication application); protected: ContentAppImpl mContentApps[APP_LIBRARY_SIZE] = { ContentAppImpl("Vendor1", 1, "App1", 11, "Version1"), diff --git a/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.cpp b/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.cpp index 1a979da92efcc7..2751e03974d79c 100644 --- a/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.cpp +++ b/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.cpp @@ -41,9 +41,9 @@ uint16_t ApplicationBasicManager::HandleGetProductId() return 1; } -chip::app::Clusters::ApplicationBasic::Structs::Application::Type ApplicationBasicManager::HandleGetApplication() +chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::Type ApplicationBasicManager::HandleGetApplication() { - chip::app::Clusters::ApplicationBasic::Structs::Application::Type application; + chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::Type application; application.catalogVendorId = 123; application.applicationId = chip::CharSpan("applicationId", strlen("applicationId")); return application; diff --git a/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h b/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h index e907fc8891861e..ec8904fa581ff8 100644 --- a/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h +++ b/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h @@ -27,7 +27,7 @@ class ApplicationBasicManager : public chip::app::Clusters::ApplicationBasic::De uint16_t HandleGetVendorId() override; chip::CharSpan HandleGetApplicationName() override; uint16_t HandleGetProductId() override; - chip::app::Clusters::ApplicationBasic::Structs::Application::Type HandleGetApplication() override; + chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::Type HandleGetApplication() override; chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum HandleGetStatus() override; chip::CharSpan HandleGetApplicationVersion() override; std::list HandleGetAllowedVendorList() override; diff --git a/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp b/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp index f6a8afc0ae8ee7..6767137f73baae 100644 --- a/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp +++ b/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp @@ -36,7 +36,8 @@ std::list ApplicationLauncherManager::HandleGetCatalogList() } Commands::LauncherResponse::Type ApplicationLauncherManager::HandleLaunchApp( - const chip::CharSpan & data, const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) + const chip::CharSpan & data, + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) { // TODO: Insert code here Commands::LauncherResponse::Type response; @@ -45,8 +46,8 @@ Commands::LauncherResponse::Type ApplicationLauncherManager::HandleLaunchApp( return response; } -Commands::LauncherResponse::Type -ApplicationLauncherManager::HandleStopApp(const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) +Commands::LauncherResponse::Type ApplicationLauncherManager::HandleStopApp( + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) { // TODO: Insert code here Commands::LauncherResponse::Type response; @@ -55,8 +56,8 @@ ApplicationLauncherManager::HandleStopApp(const chip::app::Clusters::Application return response; } -Commands::LauncherResponse::Type -ApplicationLauncherManager::HandleHideApp(const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) +Commands::LauncherResponse::Type ApplicationLauncherManager::HandleHideApp( + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) { // TODO: Insert code here Commands::LauncherResponse::Type response; diff --git a/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.h b/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.h index ece3bd36d69523..14ed65ce00b52d 100644 --- a/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.h +++ b/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.h @@ -27,11 +27,11 @@ class ApplicationLauncherManager : public chip::app::Clusters::ApplicationLaunch chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type HandleGetCurrentApp() override; std::list HandleGetCatalogList() override; - chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type - HandleLaunchApp(const chip::CharSpan & data, - const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) override; - chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type - HandleStopApp(const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) override; - chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type - HandleHideApp(const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) override; + chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type HandleLaunchApp( + const chip::CharSpan & data, + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) override; + chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type HandleStopApp( + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) override; + chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type HandleHideApp( + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) override; }; diff --git a/src/app/clusters/application-basic-server/application-basic-delegate.h b/src/app/clusters/application-basic-server/application-basic-delegate.h index cc53f85c999dd0..e2641dabbad38f 100644 --- a/src/app/clusters/application-basic-server/application-basic-delegate.h +++ b/src/app/clusters/application-basic-server/application-basic-delegate.h @@ -34,14 +34,14 @@ namespace ApplicationBasic { class Delegate { public: - virtual chip::CharSpan HandleGetVendorName() = 0; - virtual uint16_t HandleGetVendorId() = 0; - virtual chip::CharSpan HandleGetApplicationName() = 0; - virtual uint16_t HandleGetProductId() = 0; - virtual chip::app::Clusters::ApplicationBasic::Structs::Application::Type HandleGetApplication() = 0; - virtual ApplicationStatusEnum HandleGetStatus() = 0; - virtual chip::CharSpan HandleGetApplicationVersion() = 0; - virtual std::list HandleGetAllowedVendorList() = 0; + virtual chip::CharSpan HandleGetVendorName() = 0; + virtual uint16_t HandleGetVendorId() = 0; + virtual chip::CharSpan HandleGetApplicationName() = 0; + virtual uint16_t HandleGetProductId() = 0; + virtual chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::Type HandleGetApplication() = 0; + virtual ApplicationStatusEnum HandleGetStatus() = 0; + virtual chip::CharSpan HandleGetApplicationVersion() = 0; + virtual std::list HandleGetAllowedVendorList() = 0; virtual ~Delegate() = default; }; diff --git a/src/app/clusters/application-basic-server/application-basic-server.cpp b/src/app/clusters/application-basic-server/application-basic-server.cpp index 6615c28b61d4f9..eed05cff95faed 100644 --- a/src/app/clusters/application-basic-server/application-basic-server.cpp +++ b/src/app/clusters/application-basic-server/application-basic-server.cpp @@ -179,7 +179,7 @@ CHIP_ERROR ApplicationBasicAttrAccess::ReadProductIdAttribute(app::AttributeValu CHIP_ERROR ApplicationBasicAttrAccess::ReadApplicationAttribute(app::AttributeValueEncoder & aEncoder, Delegate * delegate) { - Structs::Application::Type application = delegate->HandleGetApplication(); + Structs::ApplicationBasicApplication::Type application = delegate->HandleGetApplication(); return aEncoder.Encode(application); } diff --git a/src/app/clusters/application-launcher-server/application-launcher-delegate.h b/src/app/clusters/application-launcher-server/application-launcher-delegate.h index 7d6ff13c06a2f9..f8a7d80f56e36a 100644 --- a/src/app/clusters/application-launcher-server/application-launcher-delegate.h +++ b/src/app/clusters/application-launcher-server/application-launcher-delegate.h @@ -37,13 +37,13 @@ class Delegate virtual chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type HandleGetCurrentApp() = 0; virtual std::list HandleGetCatalogList() = 0; + virtual Commands::LauncherResponse::Type HandleLaunchApp( + const chip::CharSpan & data, + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) = 0; virtual Commands::LauncherResponse::Type - HandleLaunchApp(const chip::CharSpan & data, - const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) = 0; + HandleStopApp(const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) = 0; virtual Commands::LauncherResponse::Type - HandleStopApp(const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) = 0; - virtual Commands::LauncherResponse::Type - HandleHideApp(const chip::app::Clusters::ApplicationLauncher::Structs::Application::Type & application) = 0; + HandleHideApp(const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type & application) = 0; virtual ~Delegate() = default; }; diff --git a/src/app/util/ContentApp.h b/src/app/util/ContentApp.h index 1c9a9ab1a46815..a931aeb4d0c343 100644 --- a/src/app/util/ContentApp.h +++ b/src/app/util/ContentApp.h @@ -91,8 +91,8 @@ class DLL_EXPORT ApplicationLauncher : public ContentAppCluster public: virtual ~ApplicationLauncher() = default; - virtual app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type LaunchApp(Application application, - std::string data) = 0; + virtual app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Type + LaunchApp(ApplicationLauncherApplication application, std::string data) = 0; EmberAfStatus HandleReadAttribute(chip::AttributeId attributeId, uint8_t * buffer, uint16_t maxReadLength) override; EmberAfStatus HandleWriteAttribute(chip::AttributeId attributeId, uint8_t * buffer) override; diff --git a/src/app/util/ContentAppPlatform.cpp b/src/app/util/ContentAppPlatform.cpp index d4b18158a6f33a..be91bd437438ed 100644 --- a/src/app/util/ContentAppPlatform.cpp +++ b/src/app/util/ContentAppPlatform.cpp @@ -235,7 +235,7 @@ ContentApp * AppPlatform::GetLoadContentAppByVendorId(uint16_t vendorId) return NULL; } -ContentApp * AppPlatform::GetLoadContentAppByAppId(Application application) +ContentApp * AppPlatform::GetLoadContentAppByAppId(ApplicationLauncherApplication application) { ChipLogProgress(DeviceLayer, "GetLoadContentAppByAppId()"); if (mContentAppFactory != NULL) diff --git a/src/app/util/ContentAppPlatform.h b/src/app/util/ContentAppPlatform.h index 81de4ebc62b6e2..5f891e3216501c 100644 --- a/src/app/util/ContentAppPlatform.h +++ b/src/app/util/ContentAppPlatform.h @@ -37,9 +37,9 @@ namespace AppPlatform { class DLL_EXPORT ContentAppFactory { public: - virtual ~ContentAppFactory() = default; - virtual ContentApp * LoadContentAppByVendorId(uint16_t vendorId) = 0; - virtual ContentApp * LoadContentAppByAppId(Application application) = 0; + virtual ~ContentAppFactory() = default; + virtual ContentApp * LoadContentAppByVendorId(uint16_t vendorId) = 0; + virtual ContentApp * LoadContentAppByAppId(ApplicationLauncherApplication application) = 0; }; class DLL_EXPORT AppPlatform @@ -63,7 +63,7 @@ class DLL_EXPORT AppPlatform // load and unload by vendor id void UnloadContentAppByVendorId(uint16_t vendorId); ContentApp * GetLoadContentAppByVendorId(uint16_t vendorId); - ContentApp * GetLoadContentAppByAppId(Application application); + ContentApp * GetLoadContentAppByAppId(ApplicationLauncherApplication application); // helpful method to get a Content App by endpoint in order to perform attribute or command ops ContentApp * GetContentAppByEndpointId(chip::EndpointId id); diff --git a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml index 359d541304d983..cf5f66e39dedd7 100644 --- a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml @@ -28,13 +28,13 @@ limitations under the License. vendor id application name product id - application app + application app application status application version allowed vendor list - + diff --git a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml index 0baa9f4e964998..d83fcc6ecb5dd4 100644 --- a/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml @@ -31,17 +31,17 @@ limitations under the License. Upon receipt, this SHALL launch the specified app with optional data. The TV Device SHALL launch and bring to foreground the identified application in the command if the application is not already launched and in foreground. The TV Device SHALL update state attribute on the Application Basic cluster of the Endpoint corresponding to the launched application. This command returns a Launch Response. - + Upon receipt on a Video Player endpoint this SHALL stop the specified application if it is running. - + Upon receipt on a Video Player endpoint this SHALL hide the specified application if it is running and visible. - + @@ -54,11 +54,11 @@ limitations under the License. - + - + diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp index 3dc9e361960549..65f41fd0a28a6b 100644 --- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp @@ -712,7 +712,7 @@ JNI_METHOD(void, ApplicationLauncherCluster, hideAppRequest) chip::app::Clusters::ApplicationLauncher::Commands::HideAppRequest::Type request; - request.application = chip::app::Clusters::ApplicationLauncher::Structs::Application::Type(); + request.application = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type(); std::unique_ptr @@ -763,7 +763,7 @@ JNI_METHOD(void, ApplicationLauncherCluster, launchAppRequest) chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppRequest::Type request; request.data = chip::JniUtfString(env, static_cast(data)).charSpan(); - request.application = chip::app::Clusters::ApplicationLauncher::Structs::Application::Type(); + request.application = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type(); std::unique_ptr @@ -813,7 +813,7 @@ JNI_METHOD(void, ApplicationLauncherCluster, stopAppRequest) chip::app::Clusters::ApplicationLauncher::Commands::StopAppRequest::Type request; - request.application = chip::app::Clusters::ApplicationLauncher::Structs::Application::Type(); + request.application = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::Type(); std::unique_ptr diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 2b0a02d13883f6..652f4e7e8ee5be 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -29131,7 +29131,7 @@ class StatusEnum(IntEnum): class Structs: @dataclass - class Application(ClusterObject): + class ApplicationLauncherApplication(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -29149,11 +29149,11 @@ class ApplicationEP(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="application", Tag=1, Type=ApplicationLauncher.Structs.Application), + ClusterObjectFieldDescriptor(Label="application", Tag=1, Type=ApplicationLauncher.Structs.ApplicationLauncherApplication), ClusterObjectFieldDescriptor(Label="endpoint", Tag=2, Type=str), ]) - application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application()) + application: 'ApplicationLauncher.Structs.ApplicationLauncherApplication' = field(default_factory=lambda: ApplicationLauncher.Structs.ApplicationLauncherApplication()) endpoint: 'str' = "" @@ -29170,11 +29170,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="data", Tag=0, Type=str), - ClusterObjectFieldDescriptor(Label="application", Tag=1, Type=ApplicationLauncher.Structs.Application), + ClusterObjectFieldDescriptor(Label="application", Tag=1, Type=ApplicationLauncher.Structs.ApplicationLauncherApplication), ]) data: 'str' = "" - application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application()) + application: 'ApplicationLauncher.Structs.ApplicationLauncherApplication' = field(default_factory=lambda: ApplicationLauncher.Structs.ApplicationLauncherApplication()) @dataclass class StopAppRequest(ClusterCommand): @@ -29186,10 +29186,10 @@ class StopAppRequest(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application), + ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.ApplicationLauncherApplication), ]) - application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application()) + application: 'ApplicationLauncher.Structs.ApplicationLauncherApplication' = field(default_factory=lambda: ApplicationLauncher.Structs.ApplicationLauncherApplication()) @dataclass class HideAppRequest(ClusterCommand): @@ -29201,10 +29201,10 @@ class HideAppRequest(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application), + ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.ApplicationLauncherApplication), ]) - application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application()) + application: 'ApplicationLauncher.Structs.ApplicationLauncherApplication' = field(default_factory=lambda: ApplicationLauncher.Structs.ApplicationLauncherApplication()) @dataclass class LauncherResponse(ClusterCommand): @@ -29319,7 +29319,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="vendorId", Tag=0x00000001, Type=uint), ClusterObjectFieldDescriptor(Label="applicationName", Tag=0x00000002, Type=str), ClusterObjectFieldDescriptor(Label="productId", Tag=0x00000003, Type=uint), - ClusterObjectFieldDescriptor(Label="applicationApp", Tag=0x00000004, Type=ApplicationBasic.Structs.Application), + ClusterObjectFieldDescriptor(Label="applicationApp", Tag=0x00000004, Type=ApplicationBasic.Structs.ApplicationBasicApplication), ClusterObjectFieldDescriptor(Label="applicationStatus", Tag=0x00000005, Type=ApplicationBasic.Enums.ApplicationStatusEnum), ClusterObjectFieldDescriptor(Label="applicationVersion", Tag=0x00000006, Type=str), ClusterObjectFieldDescriptor(Label="allowedVendorList", Tag=0x00000007, Type=typing.List[uint]), @@ -29332,7 +29332,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: vendorId: 'uint' = None applicationName: 'str' = None productId: 'uint' = None - applicationApp: 'ApplicationBasic.Structs.Application' = None + applicationApp: 'ApplicationBasic.Structs.ApplicationBasicApplication' = None applicationStatus: 'ApplicationBasic.Enums.ApplicationStatusEnum' = None applicationVersion: 'str' = None allowedVendorList: 'typing.List[uint]' = None @@ -29350,7 +29350,7 @@ class ApplicationStatusEnum(IntEnum): class Structs: @dataclass - class Application(ClusterObject): + class ApplicationBasicApplication(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -29442,9 +29442,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=ApplicationBasic.Structs.Application) + return ClusterObjectFieldDescriptor(Type=ApplicationBasic.Structs.ApplicationBasicApplication) - value: 'ApplicationBasic.Structs.Application' = field(default_factory=lambda: ApplicationBasic.Structs.Application()) + value: 'ApplicationBasic.Structs.ApplicationBasicApplication' = field(default_factory=lambda: ApplicationBasic.Structs.ApplicationBasicApplication()) @dataclass class ApplicationStatus(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index 4bdb997075acae..717d51799d3ddf 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -371,13 +371,9 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader if (*aError != CHIP_NO_ERROR) { return nil; } - CHIPApplicationBasicClusterApplication * _Nonnull value; - value = [CHIPApplicationBasicClusterApplication new]; + CHIPApplicationBasicClusterApplicationBasicApplication * _Nonnull value; + value = [CHIPApplicationBasicClusterApplicationBasicApplication new]; value.catalogVendorId = [NSNumber numberWithUnsignedShort:cppValue.catalogVendorId]; - value.catalogVendorId = [NSNumber numberWithUnsignedShort:cppValue.catalogVendorId]; - value.applicationId = [[NSString alloc] initWithBytes:cppValue.applicationId.data() - length:cppValue.applicationId.size() - encoding:NSUTF8StringEncoding]; value.applicationId = [[NSString alloc] initWithBytes:cppValue.applicationId.data() length:cppValue.applicationId.size() encoding:NSUTF8StringEncoding]; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index 6c432127b44ac5..db4a324646ca5c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -775,8 +775,6 @@ - (void)hideAppRequestWithParams:(CHIPApplicationLauncherClusterHideAppRequestPa ListFreer listFreer; ApplicationLauncher::Commands::HideAppRequest::Type request; request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue; - request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue; - request.application.applicationId = [self asCharSpan:params.application.applicationId]; request.application.applicationId = [self asCharSpan:params.application.applicationId]; new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge( @@ -795,8 +793,6 @@ - (void)launchAppRequestWithParams:(CHIPApplicationLauncherClusterLaunchAppReque ApplicationLauncher::Commands::LaunchAppRequest::Type request; request.data = [self asCharSpan:params.data]; request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue; - request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue; - request.application.applicationId = [self asCharSpan:params.application.applicationId]; request.application.applicationId = [self asCharSpan:params.application.applicationId]; new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge( @@ -814,8 +810,6 @@ - (void)stopAppRequestWithParams:(CHIPApplicationLauncherClusterStopAppRequestPa ListFreer listFreer; ApplicationLauncher::Commands::StopAppRequest::Type request; request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue; - request.application.catalogVendorId = params.application.catalogVendorId.unsignedShortValue; - request.application.applicationId = [self asCharSpan:params.application.applicationId]; request.application.applicationId = [self asCharSpan:params.application.applicationId]; new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge( diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h index 089485bf995a66..db45f98d666fd4 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h @@ -1642,17 +1642,17 @@ NS_ASSUME_NONNULL_BEGIN @interface CHIPApplicationLauncherClusterLaunchAppRequestParams : NSObject @property (strong, nonatomic) NSString * _Nonnull data; -@property (strong, nonatomic) CHIPApplicationLauncherClusterApplication * _Nonnull application; +@property (strong, nonatomic) CHIPApplicationLauncherClusterApplicationLauncherApplication * _Nonnull application; - (instancetype)init; @end @interface CHIPApplicationLauncherClusterStopAppRequestParams : NSObject -@property (strong, nonatomic) CHIPApplicationLauncherClusterApplication * _Nonnull application; +@property (strong, nonatomic) CHIPApplicationLauncherClusterApplicationLauncherApplication * _Nonnull application; - (instancetype)init; @end @interface CHIPApplicationLauncherClusterHideAppRequestParams : NSObject -@property (strong, nonatomic) CHIPApplicationLauncherClusterApplication * _Nonnull application; +@property (strong, nonatomic) CHIPApplicationLauncherClusterApplicationLauncherApplication * _Nonnull application; - (instancetype)init; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm index bef15fd467df48..6bcc517761272a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm @@ -3495,7 +3495,7 @@ - (instancetype)init _data = @""; - _application = [CHIPApplicationLauncherClusterApplication new]; + _application = [CHIPApplicationLauncherClusterApplicationLauncherApplication new]; } return self; } @@ -3506,7 +3506,7 @@ - (instancetype)init { if (self = [super init]) { - _application = [CHIPApplicationLauncherClusterApplication new]; + _application = [CHIPApplicationLauncherClusterApplicationLauncherApplication new]; } return self; } @@ -3517,7 +3517,7 @@ - (instancetype)init { if (self = [super init]) { - _application = [CHIPApplicationLauncherClusterApplication new]; + _application = [CHIPApplicationLauncherClusterApplicationLauncherApplication new]; } return self; } diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h index a0e2fa8d42d9fa..c0c45f64b14210 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h @@ -387,19 +387,19 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPApplicationLauncherClusterApplication : NSObject +@interface CHIPApplicationLauncherClusterApplicationLauncherApplication : NSObject @property (strong, nonatomic) NSNumber * _Nonnull catalogVendorId; @property (strong, nonatomic) NSString * _Nonnull applicationId; - (instancetype)init; @end @interface CHIPApplicationLauncherClusterApplicationEP : NSObject -@property (strong, nonatomic) CHIPApplicationLauncherClusterApplication * _Nonnull application; +@property (strong, nonatomic) CHIPApplicationLauncherClusterApplicationLauncherApplication * _Nonnull application; @property (strong, nonatomic) NSString * _Nonnull endpoint; - (instancetype)init; @end -@interface CHIPApplicationBasicClusterApplication : NSObject +@interface CHIPApplicationBasicClusterApplicationBasicApplication : NSObject @property (strong, nonatomic) NSNumber * _Nonnull catalogVendorId; @property (strong, nonatomic) NSString * _Nonnull applicationId; - (instancetype)init; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm index ceed1a9f390e45..71ca356ef4a8a8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm @@ -792,7 +792,7 @@ - (instancetype)init } @end -@implementation CHIPApplicationLauncherClusterApplication +@implementation CHIPApplicationLauncherClusterApplicationLauncherApplication - (instancetype)init { if (self = [super init]) { @@ -810,7 +810,7 @@ - (instancetype)init { if (self = [super init]) { - _application = [CHIPApplicationLauncherClusterApplication new]; + _application = [CHIPApplicationLauncherClusterApplicationLauncherApplication new]; _endpoint = @""; } @@ -818,7 +818,7 @@ - (instancetype)init } @end -@implementation CHIPApplicationBasicClusterApplication +@implementation CHIPApplicationBasicClusterApplicationBasicApplication - (instancetype)init { if (self = [super init]) { diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h index e110534ecd3198..969850e80f7526 100644 --- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h +++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h @@ -132,17 +132,17 @@ typedef struct _BrandingInformation StyleInformation waterMark; } BrandingInformation; -// Struct for Application -typedef struct _Application +// Struct for ApplicationLauncherApplication +typedef struct _ApplicationLauncherApplication { uint16_t catalogVendorId; chip::CharSpan applicationId; -} Application; +} ApplicationLauncherApplication; // Struct for ApplicationEP typedef struct _ApplicationEP { - Application application; + ApplicationLauncherApplication application; chip::CharSpan endpoint; } ApplicationEP; @@ -175,6 +175,13 @@ typedef struct _ActionStruct uint8_t Status; } ActionStruct; +// Struct for ApplicationBasicApplication +typedef struct _ApplicationBasicApplication +{ + uint16_t catalogVendorId; + chip::CharSpan applicationId; +} ApplicationBasicApplication; + // Struct for BasicCommissioningInfoType typedef struct _BasicCommissioningInfoType { 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 64567e22e6ccc1..434c297a8fb0c0 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 @@ -21019,7 +21019,7 @@ namespace Events { } // namespace AudioOutput namespace ApplicationLauncher { namespace Structs { -namespace Application { +namespace ApplicationLauncherApplication { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21058,7 +21058,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace Application +} // namespace ApplicationLauncherApplication namespace ApplicationEP { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -21282,7 +21282,7 @@ namespace Events { } // namespace ApplicationLauncher namespace ApplicationBasic { namespace Structs { -namespace Application { +namespace ApplicationBasicApplication { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21321,7 +21321,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace Application +} // namespace ApplicationBasicApplication } // namespace Structs namespace Commands { 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 61baa294f9ec8f..21153d7c5137cf 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 @@ -32642,7 +32642,7 @@ enum class ChannelFeature : uint32_t }; namespace Structs { -namespace Application { +namespace ApplicationLauncherApplication { enum class Fields { kCatalogVendorId = 1, @@ -32661,7 +32661,7 @@ struct Type using DecodableType = Type; -} // namespace Application +} // namespace ApplicationLauncherApplication namespace ApplicationEP { enum class Fields { @@ -32672,7 +32672,7 @@ enum class Fields struct Type { public: - Structs::Application::Type application; + Structs::ApplicationLauncherApplication::Type application; chip::CharSpan endpoint; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -32725,7 +32725,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } chip::CharSpan data; - Structs::Application::Type application; + Structs::ApplicationLauncherApplication::Type application; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -32741,7 +32741,7 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } chip::CharSpan data; - Structs::Application::DecodableType application; + Structs::ApplicationLauncherApplication::DecodableType application; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace LaunchAppRequest @@ -32758,7 +32758,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::StopAppRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - Structs::Application::Type application; + Structs::ApplicationLauncherApplication::Type application; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -32773,7 +32773,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::StopAppRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - Structs::Application::DecodableType application; + Structs::ApplicationLauncherApplication::DecodableType application; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace StopAppRequest @@ -32790,7 +32790,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::HideAppRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - Structs::Application::Type application; + Structs::ApplicationLauncherApplication::Type application; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -32805,7 +32805,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::HideAppRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - Structs::Application::DecodableType application; + Structs::ApplicationLauncherApplication::DecodableType application; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace HideAppRequest @@ -32937,7 +32937,7 @@ enum class ApplicationStatusEnum : uint8_t }; namespace Structs { -namespace Application { +namespace ApplicationBasicApplication { enum class Fields { kCatalogVendorId = 1, @@ -32956,7 +32956,7 @@ struct Type using DecodableType = Type; -} // namespace Application +} // namespace ApplicationBasicApplication } // namespace Structs namespace Attributes { @@ -33012,9 +33012,9 @@ struct TypeInfo namespace ApplicationApp { struct TypeInfo { - using Type = chip::app::Clusters::ApplicationBasic::Structs::Application::Type; - using DecodableType = chip::app::Clusters::ApplicationBasic::Structs::Application::DecodableType; - using DecodableArgType = const chip::app::Clusters::ApplicationBasic::Structs::Application::DecodableType &; + using Type = chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::Type; + using DecodableType = chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType; + using DecodableArgType = const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType &; static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ApplicationApp::Id; } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 335266ee370af5..e60a5369481651 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -130,11 +130,11 @@ CHIP_ERROR LogValue(const char * label, size_t indent, CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ApplicationLauncher::Structs::Application::DecodableType & value); + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ApplicationBasic::Structs::Application::DecodableType & value); + const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, @@ -2152,7 +2152,7 @@ CHIP_ERROR LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ApplicationLauncher::Structs::Application::DecodableType & value) + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApplication::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -2199,7 +2199,7 @@ CHIP_ERROR LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ApplicationBasic::Structs::Application::DecodableType & value) + const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 42f249f4f27b9a..ee9f04e9bf6dd5 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -36736,8 +36736,6 @@ class TV_ApplicationLauncherCluster : public TestCommand request.data = chip::Span("datagarbage: not in length on purpose", 4); request.application.catalogVendorId = 123U; - request.application.catalogVendorId = 123U; - request.application.applicationId = chip::Span("applicationIdgarbage: not in length on purpose", 13); request.application.applicationId = chip::Span("applicationIdgarbage: not in length on purpose", 13); auto success = [](void * context, const typename RequestType::ResponseType & data) { @@ -36770,10 +36768,8 @@ class TV_ApplicationLauncherCluster : public TestCommand RequestType request; - request.application.catalogVendorId = 123U; request.application.catalogVendorId = 123U; request.application.applicationId = chip::Span("applicationIdgarbage: not in length on purpose", 13); - request.application.applicationId = chip::Span("applicationIdgarbage: not in length on purpose", 13); auto success = [](void * context, const typename RequestType::ResponseType & data) { (static_cast(context))->OnSuccessResponse_3(data.status, data.data); @@ -36806,8 +36802,6 @@ class TV_ApplicationLauncherCluster : public TestCommand RequestType request; request.application.catalogVendorId = 123U; - request.application.catalogVendorId = 123U; - request.application.applicationId = chip::Span("applicationIdgarbage: not in length on purpose", 13); request.application.applicationId = chip::Span("applicationIdgarbage: not in length on purpose", 13); auto success = [](void * context, const typename RequestType::ResponseType & data) {