diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index e8ce132cf396d4..f645b8384b0c89 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -13933,7 +13933,7 @@ "enabled": 0, "commands": [ { - "name": "ChangeChannel", + "name": "ChangeChannelRequest", "code": 0, "mfgCode": null, "source": "client", @@ -13941,15 +13941,7 @@ "outgoing": 1 }, { - "name": "ChangeChannelByNumber", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 - }, - { - "name": "SkipChannel", + "name": "ChangeChannelByNumberRequest", "code": 2, "mfgCode": null, "source": "client", @@ -13982,16 +13974,7 @@ "define": "CHANNEL_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "ChangeChannelResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "channel list", @@ -14038,6 +14021,36 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -14064,7 +14077,7 @@ "enabled": 0, "commands": [ { - "name": "NavigateTarget", + "name": "NavigateTargetRequest", "code": 0, "mfgCode": null, "source": "client", @@ -14097,16 +14110,7 @@ "define": "TARGET_NAVIGATOR_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "NavigateTargetResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "target navigator list", @@ -14138,6 +14142,36 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -14164,7 +14198,7 @@ "enabled": 0, "commands": [ { - "name": "MediaPlay", + "name": "PlayRequest", "code": 0, "mfgCode": null, "source": "client", @@ -14172,7 +14206,7 @@ "outgoing": 1 }, { - "name": "MediaPause", + "name": "PauseRequest", "code": 1, "mfgCode": null, "source": "client", @@ -14180,7 +14214,7 @@ "outgoing": 1 }, { - "name": "MediaStop", + "name": "StopRequest", "code": 2, "mfgCode": null, "source": "client", @@ -14188,7 +14222,7 @@ "outgoing": 1 }, { - "name": "MediaStartOver", + "name": "StartOverRequest", "code": 3, "mfgCode": null, "source": "client", @@ -14196,7 +14230,7 @@ "outgoing": 1 }, { - "name": "MediaPrevious", + "name": "PreviousRequest", "code": 4, "mfgCode": null, "source": "client", @@ -14204,7 +14238,7 @@ "outgoing": 1 }, { - "name": "MediaNext", + "name": "NextRequest", "code": 5, "mfgCode": null, "source": "client", @@ -14212,7 +14246,7 @@ "outgoing": 1 }, { - "name": "MediaRewind", + "name": "RewindRequest", "code": 6, "mfgCode": null, "source": "client", @@ -14220,7 +14254,7 @@ "outgoing": 1 }, { - "name": "MediaFastForward", + "name": "FastForwardRequest", "code": 7, "mfgCode": null, "source": "client", @@ -14228,7 +14262,7 @@ "outgoing": 1 }, { - "name": "MediaSkipForward", + "name": "SkipForwardRequest", "code": 8, "mfgCode": null, "source": "client", @@ -14236,20 +14270,12 @@ "outgoing": 1 }, { - "name": "MediaSkipBackward", + "name": "SkipBackwardRequest", "code": 9, "mfgCode": null, "source": "client", "incoming": 0, "outgoing": 1 - }, - { - "name": "MediaSeek", - "code": 10, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 } ], "attributes": [ @@ -14277,96 +14303,7 @@ "define": "MEDIA_PLAYBACK_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "MediaPlayResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaPauseResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaStopResponse", - "code": 2, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaStartOverResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaPreviousResponse", - "code": 4, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaNextResponse", - "code": 5, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaRewindResponse", - "code": 6, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaFastForwardResponse", - "code": 7, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaSkipForwardResponse", - "code": 8, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaSkipBackwardResponse", - "code": 9, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaSeekResponse", - "code": 11, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "playback state", @@ -14473,6 +14410,36 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -14499,7 +14466,7 @@ "enabled": 0, "commands": [ { - "name": "SelectInput", + "name": "SelectInputRequest", "code": 0, "mfgCode": null, "source": "client", @@ -14507,7 +14474,7 @@ "outgoing": 1 }, { - "name": "ShowInputStatus", + "name": "ShowInputStatusRequest", "code": 1, "mfgCode": null, "source": "client", @@ -14515,7 +14482,7 @@ "outgoing": 1 }, { - "name": "HideInputStatus", + "name": "HideInputStatusRequest", "code": 2, "mfgCode": null, "source": "client", @@ -14523,7 +14490,7 @@ "outgoing": 1 }, { - "name": "RenameInput", + "name": "RenameInputRequest", "code": 3, "mfgCode": null, "source": "client", @@ -14588,6 +14555,36 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -14675,7 +14672,7 @@ "enabled": 0, "commands": [ { - "name": "SendKey", + "name": "SendKeyRequest", "code": 0, "mfgCode": null, "source": "client", @@ -14708,16 +14705,7 @@ "define": "KEYPAD_INPUT_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "SendKeyResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -14745,7 +14733,7 @@ "enabled": 0, "commands": [ { - "name": "LaunchContent", + "name": "LaunchContentRequest", "code": 0, "mfgCode": null, "source": "client", @@ -14753,7 +14741,7 @@ "outgoing": 1 }, { - "name": "LaunchURL", + "name": "LaunchURLRequest", "code": 1, "mfgCode": null, "source": "client", @@ -14786,24 +14774,7 @@ "define": "CONTENT_LAUNCH_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "LaunchContentResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "LaunchURLResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "accept header list", @@ -14861,7 +14832,7 @@ "enabled": 0, "commands": [ { - "name": "SelectOutput", + "name": "SelectOutputRequest", "code": 0, "mfgCode": null, "source": "client", @@ -14869,7 +14840,7 @@ "outgoing": 1 }, { - "name": "RenameOutput", + "name": "RenameOutputRequest", "code": 1, "mfgCode": null, "source": "client", @@ -14960,7 +14931,7 @@ "enabled": 0, "commands": [ { - "name": "LaunchApp", + "name": "LaunchAppRequest", "code": 0, "mfgCode": null, "source": "client", @@ -14993,16 +14964,7 @@ "define": "APPLICATION_LAUNCHER_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "LaunchAppResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "application launcher list", @@ -15176,6 +15138,21 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "allowed vendor list", + "code": 7, + "mfgCode": null, + "side": "server", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -15202,20 +15179,12 @@ "enabled": 0, "commands": [ { - "name": "GetSetupPIN", + "name": "GetSetupPINRequest", "code": 0, "mfgCode": null, "source": "client", "incoming": 0, "outgoing": 1 - }, - { - "name": "Login", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 } ], "attributes": [ @@ -15243,16 +15212,7 @@ "define": "ACCOUNT_LOGIN_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "GetSetupPINResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -19928,4 +19888,4 @@ } ], "log": [] -} +} \ No newline at end of file diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index c2a6032ef7efa6..9df9f49d2c2020 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -12521,7 +12521,7 @@ "enabled": 0, "commands": [ { - "name": "NavigateTarget", + "name": "NavigateTargetRequest", "code": 0, "mfgCode": null, "source": "client", @@ -13956,4 +13956,4 @@ "deviceIdentifier": 769 } ] -} \ No newline at end of file +} diff --git a/examples/tv-app/android/include/application-basic/Application.h b/examples/tv-app/android/include/application-basic/Application.h index 5de748b900ff38..428301c69833f2 100644 --- a/examples/tv-app/android/include/application-basic/Application.h +++ b/examples/tv-app/android/include/application-basic/Application.h @@ -20,9 +20,13 @@ #include +namespace chip { +namespace app { +namespace Clusters { +namespace ApplicationBasic { struct Application { - using ApplicationBasicStatus = chip::app::Clusters::ApplicationBasic::ApplicationBasicStatus; + using ApplicationBasicStatus = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum; char vendorName[32] = ""; char name[32] = ""; char id[32] = ""; @@ -33,3 +37,7 @@ struct Application uint16_t allowedVendorList[32] = { 123, 456 }; ApplicationBasicStatus status = ApplicationBasicStatus::kStopped; }; +} // namespace ApplicationBasic +} // namespace Clusters +} // namespace app +} // namespace chip diff --git a/examples/tv-app/android/include/application-basic/ApplicationBasicManager.cpp b/examples/tv-app/android/include/application-basic/ApplicationBasicManager.cpp index 74347e45261bc7..46cb642b9a8984 100644 --- a/examples/tv-app/android/include/application-basic/ApplicationBasicManager.cpp +++ b/examples/tv-app/android/include/application-basic/ApplicationBasicManager.cpp @@ -43,7 +43,7 @@ CHIP_ERROR ApplicationBasicManager::Init() return err; } -void ApplicationBasicManager::store(chip::EndpointId endpoint, Application * application) +void ApplicationBasicManager::store(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::Application * application) { uint8_t bufferMemory[64]; MutableByteSpan zclString(bufferMemory); @@ -100,10 +100,10 @@ void ApplicationBasicManager::store(chip::EndpointId endpoint, Application * app } } -Application ApplicationBasicManager::getApplicationForEndpoint(chip::EndpointId endpoint) +chip::app::Clusters::ApplicationBasic::Application ApplicationBasicManager::getApplicationForEndpoint(chip::EndpointId endpoint) { - Application app = {}; - uint16_t size = static_cast(sizeof(app.name)); + chip::app::Clusters::ApplicationBasic::Application app = {}; + uint16_t size = static_cast(sizeof(app.name)); std::string section = "endpoint" + std::to_string(endpoint); @@ -147,7 +147,7 @@ Application ApplicationBasicManager::getApplicationForEndpoint(chip::EndpointId } bool applicationBasicClusterChangeApplicationStatus(chip::EndpointId endpoint, - app::Clusters::ApplicationBasic::ApplicationBasicStatus status) + app::Clusters::ApplicationBasic::ApplicationStatusEnum status) { // TODO: Insert code here ChipLogProgress(Zcl, "Sent an application status change request %d for endpoint %d", to_underlying(status), endpoint); diff --git a/examples/tv-app/android/include/application-basic/ApplicationBasicManager.h b/examples/tv-app/android/include/application-basic/ApplicationBasicManager.h index d8c8d21a51031a..3395247400d6ef 100644 --- a/examples/tv-app/android/include/application-basic/ApplicationBasicManager.h +++ b/examples/tv-app/android/include/application-basic/ApplicationBasicManager.h @@ -29,8 +29,8 @@ class ApplicationBasicManager { public: CHIP_ERROR Init(); - void store(chip::EndpointId endpoint, Application * application); - Application getApplicationForEndpoint(chip::EndpointId endpoint); + void store(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::Application * application); + chip::app::Clusters::ApplicationBasic::Application getApplicationForEndpoint(chip::EndpointId endpoint); static ApplicationBasicManager & GetInstance() { diff --git a/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp b/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp index 7fb9299c68b271..783ef51189be1b 100644 --- a/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp +++ b/examples/tv-app/android/include/application-launcher/ApplicationLauncherManager.cpp @@ -22,6 +22,7 @@ #include #include #include +#include using namespace std; @@ -43,14 +44,14 @@ CHIP_ERROR ApplicationLauncherManager::proxyGetApplicationList(chip::app::Attrib }); } -ApplicationLauncherResponse applicationLauncherClusterLaunchApp(chip::EndpointId endpoint, ApplicationLauncherApp application, +ApplicationLauncherResponse applicationLauncherClusterLaunchApp(chip::EndpointId endpoint, Application application, std::string data) { // TODO: Insert your code ApplicationLauncherResponse response; const char * testData = "data"; response.data = (uint8_t *) testData; - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS; + response.status = chip::to_underlying(chip::app::Clusters::ApplicationLauncher::StatusEnum::kSuccess); // TODO: Update once storing a structure attribute is supported // emberAfWriteServerAttribute(endpoint, ZCL_APPLICATION_LAUNCH_CLUSTER_ID, ZCL_APPLICATION_LAUNCHER_CURRENT_APP_APPLICATION_ID, // (uint8_t *) &application, ZCL_STRUCT_ATTRIBUTE_TYPE); @@ -58,26 +59,24 @@ ApplicationLauncherResponse applicationLauncherClusterLaunchApp(chip::EndpointId return response; } -ApplicationLauncherResponse applicationLauncherClusterStopApp(chip::EndpointId endpoint, ApplicationLauncherApp application, - std::string data) +ApplicationLauncherResponse applicationLauncherClusterStopApp(chip::EndpointId endpoint, Application application, std::string data) { ChipLogProgress(Zcl, "ApplicationLauncherManager::applicationLauncherClusterStopApp"); ApplicationLauncherResponse response; const char * testData = "data"; response.data = (uint8_t *) testData; - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS; + response.status = chip::to_underlying(chip::app::Clusters::ApplicationLauncher::StatusEnum::kSuccess); return response; } -ApplicationLauncherResponse applicationLauncherClusterHideApp(chip::EndpointId endpoint, ApplicationLauncherApp application, - std::string data) +ApplicationLauncherResponse applicationLauncherClusterHideApp(chip::EndpointId endpoint, Application application, std::string data) { ChipLogProgress(Zcl, "ApplicationLauncherManager::applicationLauncherClusterHideApp"); ApplicationLauncherResponse response; const char * testData = "data"; response.data = (uint8_t *) testData; - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS; + response.status = chip::to_underlying(chip::app::Clusters::ApplicationLauncher::StatusEnum::kSuccess); return response; } diff --git a/examples/tv-app/android/include/audio-output/AudioOutputManager.cpp b/examples/tv-app/android/include/audio-output/AudioOutputManager.cpp index f34c779b468f5d..90b953330a6c5d 100644 --- a/examples/tv-app/android/include/audio-output/AudioOutputManager.cpp +++ b/examples/tv-app/android/include/audio-output/AudioOutputManager.cpp @@ -49,11 +49,11 @@ CHIP_ERROR AudioOutputManager::proxyGetListOfAudioOutputInfo(chip::app::Attribut for (int i = 0; i < maximumVectorSize; ++i) { - chip::app::Clusters::AudioOutput::Structs::AudioOutputInfo::Type audioOutputInfo; - audioOutputInfo.outputType = EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI; - audioOutputInfo.name = chip::CharSpan(name, sizeof(name) - 1); - audioOutputInfo.index = static_cast(1 + i); - ReturnErrorOnFailure(encoder.Encode(audioOutputInfo)); + chip::app::Clusters::AudioOutput::Structs::OutputInfo::Type outputInfo; + outputInfo.outputType = chip::app::Clusters::AudioOutput::OutputTypeEnum::kHdmi; + outputInfo.name = chip::CharSpan(name, sizeof(name) - 1); + outputInfo.index = static_cast(1 + i); + ReturnErrorOnFailure(encoder.Encode(outputInfo)); } return CHIP_NO_ERROR; }); diff --git a/examples/tv-app/android/include/cluster-init.cpp b/examples/tv-app/android/include/cluster-init.cpp index 287c7c23cb020c..9acc2ee37aa084 100644 --- a/examples/tv-app/android/include/cluster-init.cpp +++ b/examples/tv-app/android/include/cluster-init.cpp @@ -67,7 +67,7 @@ void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint) err = aManager.Init(); if (CHIP_NO_ERROR == err) { - Application application = aManager.getApplicationForEndpoint(endpoint); + chip::app::Clusters::ApplicationBasic::Application application = aManager.getApplicationForEndpoint(endpoint); aManager.store(endpoint, &application); } else diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp index f6f9c230af6064..36528f3ca9fa60 100644 --- a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp +++ b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp @@ -46,7 +46,7 @@ CHIP_ERROR TargetNavigatorManager::proxyGetTargetInfoList(chip::app::AttributeVa for (int i = 0; i < maximumVectorSize; ++i) { - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::Type targetInfo; + chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type targetInfo; targetInfo.name = chip::CharSpan(name, sizeof(name) - 1); targetInfo.identifier = static_cast(1 + i); ReturnErrorOnFailure(encoder.Encode(targetInfo)); @@ -61,6 +61,6 @@ TargetNavigatorResponse targetNavigatorClusterNavigateTarget(chip::EndpointId en TargetNavigatorResponse response; const char * testData = "data response"; response.data = (uint8_t *) testData; - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS; + response.status = chip::to_underlying(chip::app::Clusters::TargetNavigator::StatusEnum::kSuccess); return response; } diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp index c61afeb1c09823..9a8a80d48544d5 100644 --- a/examples/tv-app/android/java/ChannelManager.cpp +++ b/examples/tv-app/android/java/ChannelManager.cpp @@ -223,7 +223,7 @@ CHIP_ERROR ChannelManager::getChannelLineup(chip::app::AttributeValueEncoder & a VerifyOrExit(env != NULL, err = CHIP_JNI_ERROR_NO_ENV); { - chip::app::Clusters::Channel::Structs::ChannelLineupInfo::Type channelLineupInfo; + chip::app::Clusters::Channel::Structs::LineupInfo::Type lineupInfo; jobject channelLineupObject = env->CallObjectMethod(mChannelManagerObject, mGetLineupMethod); jclass channelLineupClazz = env->GetObjectClass(channelLineupObject); @@ -233,7 +233,7 @@ CHIP_ERROR ChannelManager::getChannelLineup(chip::app::AttributeValueEncoder & a if (joperatorName != NULL) { JniUtfString operatorName(env, joperatorName); - channelLineupInfo.operatorName = operatorName.charSpan(); + lineupInfo.operatorName = operatorName.charSpan(); } jfieldID lineupNameFild = env->GetFieldID(channelLineupClazz, "lineupName", "Ljava/lang/String;"); @@ -241,7 +241,7 @@ CHIP_ERROR ChannelManager::getChannelLineup(chip::app::AttributeValueEncoder & a if (jlineupName != NULL) { JniUtfString lineupName(env, jlineupName); - channelLineupInfo.lineupName = lineupName.charSpan(); + lineupInfo.lineupName = lineupName.charSpan(); } jfieldID postalCodeFild = env->GetFieldID(channelLineupClazz, "postalCode", "Ljava/lang/String;"); @@ -249,14 +249,14 @@ CHIP_ERROR ChannelManager::getChannelLineup(chip::app::AttributeValueEncoder & a if (jpostalCode != NULL) { JniUtfString postalCode(env, jpostalCode); - channelLineupInfo.postalCode = postalCode.charSpan(); + lineupInfo.postalCode = postalCode.charSpan(); } - jfieldID lineupInfoTypeFild = env->GetFieldID(channelLineupClazz, "lineupInfoType", "I"); - jint jlineupInfoType = (env->GetIntField(channelLineupObject, lineupInfoTypeFild)); - channelLineupInfo.lineupInfoType = static_cast(jlineupInfoType); + jfieldID lineupInfoTypeFild = env->GetFieldID(channelLineupClazz, "lineupInfoTypeEnum", "I"); + jint jlineupInfoType = (env->GetIntField(channelLineupObject, lineupInfoTypeFild)); + lineupInfo.lineupInfoType = static_cast(jlineupInfoType); - ReturnErrorOnFailure(aEncoder.Encode(channelLineupInfo)); + ReturnErrorOnFailure(aEncoder.Encode(lineupInfo)); return CHIP_NO_ERROR; } diff --git a/examples/tv-app/android/java/ContentLauncherManager.cpp b/examples/tv-app/android/java/ContentLauncherManager.cpp index 984e9631861860..57afcc4b304ef6 100644 --- a/examples/tv-app/android/java/ContentLauncherManager.cpp +++ b/examples/tv-app/android/java/ContentLauncherManager.cpp @@ -45,11 +45,10 @@ using namespace chip; ContentLauncherManager ContentLauncherManager::sInstance; -ContentLaunchResponse ContentLauncherManager::HandleLaunchContent(chip::EndpointId endpointId, - const std::list & parameterList, - bool autoplay, const chip::CharSpan & data) +LaunchResponse ContentLauncherManager::HandleLaunchContent(chip::EndpointId endpointId, const std::list & parameterList, + bool autoplay, const chip::CharSpan & data) { - ContentLaunchResponse response; + LaunchResponse response; CHIP_ERROR err = CHIP_NO_ERROR; JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -86,7 +85,7 @@ ContentLaunchResponse ContentLauncherManager::HandleLaunchContent(chip::Endpoint jstring jdataStr = (jstring) env->GetObjectField(resp, dataFid); JniUtfString dataStr(env, jdataStr); - response.status = static_cast(status); + response.status = static_cast(status); response.data = dataStr.charSpan(); } @@ -100,11 +99,10 @@ ContentLaunchResponse ContentLauncherManager::HandleLaunchContent(chip::Endpoint return response; } -ContentLaunchResponse -ContentLauncherManager::HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString, - const std::list & brandingInformation) +LaunchResponse ContentLauncherManager::HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString, + const std::list & brandingInformation) { - ContentLaunchResponse response; + LaunchResponse response; CHIP_ERROR err = CHIP_NO_ERROR; JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -142,7 +140,7 @@ ContentLauncherManager::HandleLaunchUrl(const chip::CharSpan & contentUrl, const jstring jdataStr = (jstring) env->GetObjectField(resp, dataFid); JniUtfString dataStr(env, jdataStr); - response.status = static_cast(status); + response.status = static_cast(status); response.data = dataStr.charSpan(); } @@ -260,7 +258,7 @@ void ContentLauncherManager::InitializeWithObjects(jobject managerObject) mLaunchContentMethod = env->GetMethodID( ContentLauncherClass, "launchContent", - "([Lcom/tcl/chip/tvapp/ContentLaunchSearchParameter;ZLjava/lang/String;)Lcom/tcl/chip/tvapp/ContentLaunchResponse;"); + "([Lcom/tcl/chip/tvapp/ContentLaunchSearchParameter;ZLjava/lang/String;)Lcom/tcl/chip/tvapp/LaunchResponse;"); if (mLaunchContentMethod == nullptr) { ChipLogError(Zcl, "Failed to access MediaInputManager 'launchContent' method"); @@ -269,7 +267,7 @@ void ContentLauncherManager::InitializeWithObjects(jobject managerObject) mLaunchUrlMethod = env->GetMethodID(ContentLauncherClass, "launchUrl", "(Ljava/lang/String;Ljava/lang/String;Lcom/tcl/chip/tvapp/" - "ContentLaunchBrandingInformation;)Lcom/tcl/chip/tvapp/ContentLaunchResponse;"); + "ContentLaunchBrandingInformation;)Lcom/tcl/chip/tvapp/LaunchResponse;"); if (mLaunchUrlMethod == nullptr) { ChipLogError(AppServer, "Failed to access 'launchUrl' method"); diff --git a/examples/tv-app/android/java/ContentLauncherManager.h b/examples/tv-app/android/java/ContentLauncherManager.h index 4a7345ef51bb1e..1e82e9234b29a1 100644 --- a/examples/tv-app/android/java/ContentLauncherManager.h +++ b/examples/tv-app/android/java/ContentLauncherManager.h @@ -31,10 +31,10 @@ class ContentLauncherManager : public chip::app::Clusters::ContentLauncher::Dele public: void InitializeWithObjects(jobject managerObject); - ContentLaunchResponse HandleLaunchContent(chip::EndpointId endpointId, const std::list & parameterList, - bool autoplay, const chip::CharSpan & data) override; - ContentLaunchResponse HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString, - const std::list & brandingInformation) override; + LaunchResponse HandleLaunchContent(chip::EndpointId endpointId, const std::list & parameterList, bool autoplay, + const chip::CharSpan & data) override; + LaunchResponse HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString, + const std::list & brandingInformation) override; std::list HandleGetAcceptHeaderList() override; uint32_t HandleGetSupportedStreamingProtocols() override; diff --git a/examples/tv-app/android/java/KeypadInputManager.cpp b/examples/tv-app/android/java/KeypadInputManager.cpp index acb6878ff20d37..1bdc3594bb089c 100644 --- a/examples/tv-app/android/java/KeypadInputManager.cpp +++ b/examples/tv-app/android/java/KeypadInputManager.cpp @@ -28,18 +28,18 @@ using namespace chip; KeypadInputManager KeypadInputManager::sInstance; -EmberAfKeypadInputStatus keypadInputClusterSendKey(EmberAfKeypadInputCecKeyCode keyCode) +chip::app::Clusters::KeypadInput::StatusEnum keypadInputClusterSendKey(chip::app::Clusters::KeypadInput::CecKeyCode keyCode) { return KeypadInputMgr().SendKey(keyCode); } -EmberAfKeypadInputStatus KeypadInputManager::SendKey(EmberAfKeypadInputCecKeyCode keyCode) +chip::app::Clusters::KeypadInput::StatusEnum KeypadInputManager::SendKey(chip::app::Clusters::KeypadInput::CecKeyCode keyCode) { jint ret = -1; CHIP_ERROR err = CHIP_NO_ERROR; JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - ChipLogProgress(Zcl, "Received keypadInputClusterSendKey: %d", keyCode); + ChipLogProgress(Zcl, "Received keypadInputClusterSendKey: %c", to_underlying(keyCode)); VerifyOrExit(mKeypadInputManagerObject != nullptr, err = CHIP_ERROR_INCORRECT_STATE); VerifyOrExit(mSendKeyMethod != nullptr, err = CHIP_ERROR_INCORRECT_STATE); VerifyOrExit(env != NULL, err = CHIP_JNI_ERROR_NO_ENV); @@ -51,10 +51,10 @@ EmberAfKeypadInputStatus KeypadInputManager::SendKey(EmberAfKeypadInputCecKeyCod exit: if (err != CHIP_NO_ERROR) { - return EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS; + return chip::app::Clusters::KeypadInput::StatusEnum::kSuccess; } - return static_cast(ret); + return static_cast(ret); } void KeypadInputManager::InitializeWithObjects(jobject managerObject) diff --git a/examples/tv-app/android/java/KeypadInputManager.h b/examples/tv-app/android/java/KeypadInputManager.h index 44a91cea66180d..fbddb56e4fc1b1 100644 --- a/examples/tv-app/android/java/KeypadInputManager.h +++ b/examples/tv-app/android/java/KeypadInputManager.h @@ -19,6 +19,7 @@ #pragma once #include +#include #include #include @@ -26,7 +27,7 @@ class KeypadInputManager { public: void InitializeWithObjects(jobject managerObject); - EmberAfKeypadInputStatus SendKey(EmberAfKeypadInputCecKeyCode keyCode); + chip::app::Clusters::KeypadInput::StatusEnum SendKey(chip::app::Clusters::KeypadInput::CecKeyCode keyCode); private: friend KeypadInputManager & KeypadInputMgr(); diff --git a/examples/tv-app/android/java/MediaInputManager.cpp b/examples/tv-app/android/java/MediaInputManager.cpp index 2a8ad6402be785..6b64afa6bd4059 100644 --- a/examples/tv-app/android/java/MediaInputManager.cpp +++ b/examples/tv-app/android/java/MediaInputManager.cpp @@ -116,7 +116,7 @@ CHIP_ERROR MediaInputManager::GetInputList(app::AttributeValueEncoder & aEncoder jint size = env->GetArrayLength(inputArray); for (int i = 0; i < size; i++) { - app::Clusters::MediaInput::Structs::MediaInputInfo::Type mediaInput; + app::Clusters::MediaInput::Structs::InputInfo::Type mediaInput; jobject inputObj = env->GetObjectArrayElement(inputArray, i); jclass inputClass = env->GetObjectClass(inputObj); @@ -127,7 +127,7 @@ CHIP_ERROR MediaInputManager::GetInputList(app::AttributeValueEncoder & aEncoder jfieldID typeId = env->GetFieldID(inputClass, "type", "I"); jint type = env->GetIntField(inputObj, typeId); - mediaInput.inputType = static_cast(type); + mediaInput.inputType = static_cast(type); jfieldID nameId = env->GetFieldID(inputClass, "name", "Ljava/lang/String;"); jstring jname = static_cast(env->GetObjectField(inputObj, nameId)); @@ -308,7 +308,7 @@ void MediaInputManager::InitializeWithObjects(jobject managerObject) jclass MediaInputManagerClass = env->GetObjectClass(managerObject); VerifyOrReturn(MediaInputManagerClass != nullptr, ChipLogError(Zcl, "Failed to get MediaInputManager Java class")); - mGetInputListMethod = env->GetMethodID(MediaInputManagerClass, "getInputList", "()[Lcom/tcl/chip/tvapp/MediaInputInfo;"); + mGetInputListMethod = env->GetMethodID(MediaInputManagerClass, "getInputList", "()[Lcom/tcl/chip/tvapp/InputInfo;"); if (mGetInputListMethod == nullptr) { ChipLogError(Zcl, "Failed to access MediaInputManager 'getInputList' method"); diff --git a/examples/tv-app/android/java/MediaPlaybackManager.cpp b/examples/tv-app/android/java/MediaPlaybackManager.cpp index df6ff8e878f34a..e11ec6f5b989f0 100644 --- a/examples/tv-app/android/java/MediaPlaybackManager.cpp +++ b/examples/tv-app/android/java/MediaPlaybackManager.cpp @@ -98,8 +98,8 @@ void emberAfMediaPlaybackClusterInitCallback(EndpointId endpoint) } } -EmberAfMediaPlaybackStatus mediaPlaybackClusterSendMediaPlaybackRequest(MediaPlaybackRequest mediaPlaybackRequest, - uint64_t deltaPositionMilliseconds) +chip::app::Clusters::MediaPlayback::StatusEnum +mediaPlaybackClusterSendMediaPlaybackRequest(MediaPlaybackRequest mediaPlaybackRequest, uint64_t deltaPositionMilliseconds) { return MediaPlaybackMgr().Request(mediaPlaybackRequest, deltaPositionMilliseconds); } @@ -180,8 +180,8 @@ CHIP_ERROR MediaPlaybackManager::GetAttribute(chip::app::AttributeValueEncoder & return err; } -EmberAfMediaPlaybackStatus MediaPlaybackManager::Request(MediaPlaybackRequest mediaPlaybackRequest, - uint64_t deltaPositionMilliseconds) +chip::app::Clusters::MediaPlayback::StatusEnum MediaPlaybackManager::Request(MediaPlaybackRequest mediaPlaybackRequest, + uint64_t deltaPositionMilliseconds) { jint ret = -1; CHIP_ERROR err = CHIP_NO_ERROR; @@ -201,14 +201,14 @@ EmberAfMediaPlaybackStatus MediaPlaybackManager::Request(MediaPlaybackRequest me ChipLogError(AppServer, "Java exception in MediaPlaybackManager::GetAttribute"); env->ExceptionDescribe(); env->ExceptionClear(); - return EMBER_ZCL_MEDIA_PLAYBACK_STATUS_INVALID_STATE_FOR_COMMAND; + return chip::app::Clusters::MediaPlayback::StatusEnum::kInvalidStateForCommand; } exit: if (err != CHIP_NO_ERROR) { - return EMBER_ZCL_MEDIA_PLAYBACK_STATUS_INVALID_STATE_FOR_COMMAND; + return chip::app::Clusters::MediaPlayback::StatusEnum::kInvalidStateForCommand; } - return static_cast(ret); + return static_cast(ret); } diff --git a/examples/tv-app/android/java/MediaPlaybackManager.h b/examples/tv-app/android/java/MediaPlaybackManager.h index 018c9cba8c8041..48b3b957109986 100644 --- a/examples/tv-app/android/java/MediaPlaybackManager.h +++ b/examples/tv-app/android/java/MediaPlaybackManager.h @@ -30,7 +30,8 @@ class MediaPlaybackManager public: void InitializeWithObjects(jobject managerObject); CHIP_ERROR GetAttribute(chip::app::AttributeValueEncoder & aEncoder, int attributeId); - EmberAfMediaPlaybackStatus Request(MediaPlaybackRequest mediaPlaybackRequest, uint64_t deltaPositionMilliseconds); + chip::app::Clusters::MediaPlayback::StatusEnum Request(MediaPlaybackRequest mediaPlaybackRequest, + uint64_t deltaPositionMilliseconds); private: friend MediaPlaybackManager & MediaPlaybackMgr(); diff --git a/examples/tv-app/linux/AppImpl.cpp b/examples/tv-app/linux/AppImpl.cpp index 2f43c406f04358..74a3cf8b0e1c6e 100644 --- a/examples/tv-app/linux/AppImpl.cpp +++ b/examples/tv-app/linux/AppImpl.cpp @@ -57,7 +57,6 @@ static const int kNameSize = 32; // Current ZCL implementation of Struct uses a max-size array of 254 bytes static const int kDescriptorAttributeArraySize = 254; -static const int kFixedLabelAttributeArraySize = 254; // Device types for dynamic endpoints: TODO Need a generated file from ZAP to define these! // (taken from chip-devices.xml) @@ -191,7 +190,7 @@ uint32_t AccountLoginImpl::GetSetupPIN(const char * tempAccountId) return mSetupPIN; } -ApplicationLauncherResponse ApplicationLauncherImpl::LaunchApp(ApplicationLauncherApp application, std::string data) +ApplicationLauncherResponse ApplicationLauncherImpl::LaunchApp(Application application, std::string data) { std::string appId(application.applicationId.data(), application.applicationId.size()); ChipLogProgress(DeviceLayer, @@ -202,20 +201,19 @@ ApplicationLauncherResponse ApplicationLauncherImpl::LaunchApp(ApplicationLaunch ApplicationLauncherResponse response; const char * testData = "data"; response.data = (uint8_t *) testData; - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS; + response.status = to_underlying(chip::app::Clusters::ApplicationLauncher::StatusEnum::kSuccess); return response; } -ContentLaunchResponse ContentLauncherImpl::LaunchContent(std::list parameterList, bool autoplay, - std::string data) +LaunchResponse ContentLauncherImpl::LaunchContent(std::list parameterList, bool autoplay, std::string data) { ChipLogProgress(DeviceLayer, "ContentLauncherImpl: LaunchContent autoplay=%d data=\"%s\"", autoplay ? 1 : 0, data.c_str()); - ContentLaunchResponse response; + LaunchResponse response; response.err = CHIP_NO_ERROR; response.data = "Example app data"; - response.status = EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS; + response.status = chip::app::Clusters::ContentLauncher::StatusEnum::kSuccess; return response; } @@ -241,7 +239,7 @@ ContentApp * ContentAppFactoryImpl::LoadContentAppByVendorId(uint16_t vendorId) return nullptr; } -ContentApp * ContentAppFactoryImpl::LoadContentAppByAppId(ApplicationLauncherApp application) +ContentApp * ContentAppFactoryImpl::LoadContentAppByAppId(Application 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 201730c014e000..c188b0b37bcccd 100644 --- a/examples/tv-app/linux/AppImpl.h +++ b/examples/tv-app/linux/AppImpl.h @@ -44,10 +44,10 @@ class DLL_EXPORT ApplicationBasicImpl : public ApplicationBasic inline uint16_t GetVendorId() override { return mVendorId; }; inline const char * GetApplicationName() override { return mApplicationName; }; inline uint16_t GetProductId() override { return mProductId; }; - inline app::Clusters::ApplicationBasic::ApplicationBasicStatus GetApplicationStatus() override { return mApplicationStatus; }; + inline app::Clusters::ApplicationBasic::ApplicationStatusEnum GetApplicationStatus() override { return mApplicationStatus; }; inline const char * GetApplicationVersion() override { return mApplicationVersion; }; - inline void SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationBasicStatus applicationStatus) override + inline void SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationStatusEnum applicationStatus) override { mApplicationStatus = applicationStatus; }; @@ -67,8 +67,8 @@ class DLL_EXPORT ApplicationBasicImpl : public ApplicationBasic uint16_t mVendorId; char mApplicationName[kApplicationNameSize]; uint16_t mProductId; - app::Clusters::ApplicationBasic::ApplicationBasicStatus mApplicationStatus = - app::Clusters::ApplicationBasic::ApplicationBasicStatus::kStopped; + app::Clusters::ApplicationBasic::ApplicationStatusEnum mApplicationStatus = + app::Clusters::ApplicationBasic::ApplicationStatusEnum::kStopped; char mApplicationVersion[kApplicationVersionSize]; }; @@ -98,7 +98,7 @@ class DLL_EXPORT ApplicationLauncherImpl : public ApplicationLauncher public: virtual ~ApplicationLauncherImpl() {} - ApplicationLauncherResponse LaunchApp(ApplicationLauncherApp application, std::string data) override; + ApplicationLauncherResponse LaunchApp(Application application, std::string data) override; protected: }; @@ -108,7 +108,7 @@ class DLL_EXPORT ContentLauncherImpl : public ContentLauncher public: virtual ~ContentLauncherImpl() {} - ContentLaunchResponse LaunchContent(std::list parameterList, bool autoplay, std::string data) override; + LaunchResponse LaunchContent(std::list parameterList, bool autoplay, std::string data) override; protected: }; @@ -173,7 +173,7 @@ class DLL_EXPORT ContentAppFactoryImpl : public ContentAppFactory virtual ~ContentAppFactoryImpl() {} ContentApp * LoadContentAppByVendorId(uint16_t vendorId); - ContentApp * LoadContentAppByAppId(ApplicationLauncherApp application); + ContentApp * LoadContentAppByAppId(Application application); protected: ContentAppImpl mContentApps[APP_LIBRARY_SIZE] = { ContentAppImpl("Vendor1", 1, "App1", 11, "Version1"), diff --git a/examples/tv-app/linux/include/application-basic/Application.h b/examples/tv-app/linux/include/application-basic/Application.h index 5de748b900ff38..428301c69833f2 100644 --- a/examples/tv-app/linux/include/application-basic/Application.h +++ b/examples/tv-app/linux/include/application-basic/Application.h @@ -20,9 +20,13 @@ #include +namespace chip { +namespace app { +namespace Clusters { +namespace ApplicationBasic { struct Application { - using ApplicationBasicStatus = chip::app::Clusters::ApplicationBasic::ApplicationBasicStatus; + using ApplicationBasicStatus = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum; char vendorName[32] = ""; char name[32] = ""; char id[32] = ""; @@ -33,3 +37,7 @@ struct Application uint16_t allowedVendorList[32] = { 123, 456 }; ApplicationBasicStatus status = ApplicationBasicStatus::kStopped; }; +} // namespace ApplicationBasic +} // namespace Clusters +} // namespace app +} // namespace chip diff --git a/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.cpp b/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.cpp index 598b38e0ede5b2..29555ac7290a9e 100644 --- a/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.cpp +++ b/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.cpp @@ -45,7 +45,7 @@ CHIP_ERROR ApplicationBasicManager::Init() return err; } -void ApplicationBasicManager::store(chip::EndpointId endpoint, Application * application) +void ApplicationBasicManager::store(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::Application * application) { uint8_t bufferMemory[64]; MutableByteSpan zclString(bufferMemory); @@ -102,10 +102,10 @@ void ApplicationBasicManager::store(chip::EndpointId endpoint, Application * app } } -Application ApplicationBasicManager::getApplicationForEndpoint(chip::EndpointId endpoint) +chip::app::Clusters::ApplicationBasic::Application ApplicationBasicManager::getApplicationForEndpoint(chip::EndpointId endpoint) { - Application app = {}; - uint16_t size = static_cast(sizeof(app.name)); + chip::app::Clusters::ApplicationBasic::Application app = {}; + uint16_t size = static_cast(sizeof(app.name)); std::string section = "endpoint" + std::to_string(endpoint); @@ -153,26 +153,3 @@ Application ApplicationBasicManager::getApplicationForEndpoint(chip::EndpointId return app; } - -bool applicationBasicClusterChangeApplicationStatus(chip::EndpointId endpoint, - app::Clusters::ApplicationBasic::ApplicationBasicStatus status) -{ - ChipLogProgress(Zcl, "Sent an application status change request %d for endpoint %d", to_underlying(status), endpoint); - -#if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED - ContentApp * app = chip::AppPlatform::AppPlatform::GetInstance().GetContentAppByEndpointId(endpoint); - if (app == NULL) - { - if (endpoint == 3) - { - // TODO: Fix hardcoded app endpoints 3-5, fix test cases - return true; - } - ChipLogProgress(Zcl, "No app for endpoint %d", endpoint); - return false; - } - app->GetApplicationBasic()->SetApplicationStatus(status); -#endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED - - return true; -} diff --git a/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h b/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h index d8c8d21a51031a..3395247400d6ef 100644 --- a/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h +++ b/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h @@ -29,8 +29,8 @@ class ApplicationBasicManager { public: CHIP_ERROR Init(); - void store(chip::EndpointId endpoint, Application * application); - Application getApplicationForEndpoint(chip::EndpointId endpoint); + void store(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::Application * application); + chip::app::Clusters::ApplicationBasic::Application getApplicationForEndpoint(chip::EndpointId endpoint); static ApplicationBasicManager & GetInstance() { diff --git a/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp b/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp index 7b0880ea99d6c5..6b7d24e7d9adb3 100644 --- a/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp +++ b/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp @@ -47,7 +47,7 @@ CHIP_ERROR ApplicationLauncherManager::proxyGetApplicationList(chip::EndpointId }); } -ApplicationLauncherResponse applicationLauncherClusterLaunchApp(chip::EndpointId endpoint, ApplicationLauncherApp application, +ApplicationLauncherResponse applicationLauncherClusterLaunchApp(chip::EndpointId endpoint, Application application, std::string data) { ChipLogProgress(Zcl, "ApplicationLauncherManager::applicationLauncherClusterLaunchApp endpoint=%d", emberAfCurrentEndpoint()); @@ -74,7 +74,7 @@ ApplicationLauncherResponse applicationLauncherClusterLaunchApp(chip::EndpointId response.data = (uint8_t *) testData; // must return success for tests to pass // response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE; - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS; + response.status = chip::to_underlying(chip::app::Clusters::ApplicationLauncher::StatusEnum::kSuccess); // TODO: Update once storing a structure attribute is supported // emberAfWriteServerAttribute(endpoint, ZCL_APPLICATION_LAUNCH_CLUSTER_ID, ZCL_APPLICATION_LAUNCHER_CURRENT_APP_APPLICATION_ID, // (uint8_t *) &application, ZCL_STRUCT_ATTRIBUTE_TYPE); @@ -82,26 +82,24 @@ ApplicationLauncherResponse applicationLauncherClusterLaunchApp(chip::EndpointId return response; } -ApplicationLauncherResponse applicationLauncherClusterStopApp(chip::EndpointId endpoint, ApplicationLauncherApp application, - std::string data) +ApplicationLauncherResponse applicationLauncherClusterStopApp(chip::EndpointId endpoint, Application application, std::string data) { ChipLogProgress(Zcl, "ApplicationLauncherManager::applicationLauncherClusterStopApp"); ApplicationLauncherResponse response; const char * testData = "data"; response.data = (uint8_t *) testData; - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS; + response.status = chip::to_underlying(chip::app::Clusters::ApplicationLauncher::StatusEnum::kSuccess); return response; } -ApplicationLauncherResponse applicationLauncherClusterHideApp(chip::EndpointId endpoint, ApplicationLauncherApp application, - std::string data) +ApplicationLauncherResponse applicationLauncherClusterHideApp(chip::EndpointId endpoint, Application application, std::string data) { ChipLogProgress(Zcl, "ApplicationLauncherManager::applicationLauncherClusterHideApp"); ApplicationLauncherResponse response; const char * testData = "data"; response.data = (uint8_t *) testData; - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS; + response.status = chip::to_underlying(chip::app::Clusters::ApplicationLauncher::StatusEnum::kSuccess); return response; } diff --git a/examples/tv-app/linux/include/audio-output/AudioOutputManager.cpp b/examples/tv-app/linux/include/audio-output/AudioOutputManager.cpp index 1eb815b0e37a54..4ec01918b5222b 100644 --- a/examples/tv-app/linux/include/audio-output/AudioOutputManager.cpp +++ b/examples/tv-app/linux/include/audio-output/AudioOutputManager.cpp @@ -50,11 +50,11 @@ CHIP_ERROR AudioOutputManager::proxyGetListOfAudioOutputInfo(chip::EndpointId mE for (int i = 0; i < maximumVectorSize; ++i) { - chip::app::Clusters::AudioOutput::Structs::AudioOutputInfo::Type audioOutputInfo; - audioOutputInfo.outputType = EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI; - audioOutputInfo.name = chip::CharSpan(name, sizeof(name) - 1); - audioOutputInfo.index = static_cast(1 + i); - ReturnErrorOnFailure(encoder.Encode(audioOutputInfo)); + chip::app::Clusters::AudioOutput::Structs::OutputInfo::Type outputInfo; + outputInfo.outputType = chip::app::Clusters::AudioOutput::OutputTypeEnum::kHdmi; + outputInfo.name = chip::CharSpan(name, sizeof(name) - 1); + outputInfo.index = static_cast(1 + i); + ReturnErrorOnFailure(encoder.Encode(outputInfo)); } return CHIP_NO_ERROR; }); diff --git a/examples/tv-app/linux/include/cluster-init.cpp b/examples/tv-app/linux/include/cluster-init.cpp index 552491f964c18b..ad572d5645d952 100644 --- a/examples/tv-app/linux/include/cluster-init.cpp +++ b/examples/tv-app/linux/include/cluster-init.cpp @@ -71,7 +71,7 @@ void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint) err = aManager.Init(); if (CHIP_NO_ERROR == err) { - Application application = aManager.getApplicationForEndpoint(endpoint); + chip::app::Clusters::ApplicationBasic::Application application = aManager.getApplicationForEndpoint(endpoint); aManager.store(endpoint, &application); } else diff --git a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp index 17e5d5ef8d4080..a45066f5ba5283 100644 --- a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp +++ b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp @@ -38,9 +38,8 @@ using namespace std; using namespace chip::AppPlatform; -ContentLaunchResponse ContentLauncherManager::HandleLaunchContent(chip::EndpointId endpointId, - const std::list & parameterList, - bool autoplay, const chip::CharSpan & data) +LaunchResponse ContentLauncherManager::HandleLaunchContent(chip::EndpointId endpointId, const std::list & parameterList, + bool autoplay, const chip::CharSpan & data) { ChipLogProgress(Zcl, "ContentLauncherManager::HandleLaunchContent "); string dataString(data.data(), data.size()); @@ -54,16 +53,15 @@ ContentLaunchResponse ContentLauncherManager::HandleLaunchContent(chip::Endpoint #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED // TODO: Insert code here - ContentLaunchResponse response; + LaunchResponse response; response.err = CHIP_NO_ERROR; response.data = chip::CharSpan("exampleData", strlen("exampleData")); - response.status = EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS; + response.status = chip::app::Clusters::ContentLauncher::StatusEnum::kSuccess; return response; } -ContentLaunchResponse -ContentLauncherManager::HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString, - const std::list & brandingInformation) +LaunchResponse ContentLauncherManager::HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString, + const std::list & brandingInformation) { ChipLogProgress(Zcl, "ContentLauncherManager::HandleLaunchUrl"); @@ -71,10 +69,10 @@ ContentLauncherManager::HandleLaunchUrl(const chip::CharSpan & contentUrl, const string displayStringString(displayString.data(), displayString.size()); // TODO: Insert code here - ContentLaunchResponse response; + LaunchResponse response; response.err = CHIP_NO_ERROR; response.data = chip::CharSpan("exampleData", strlen("exampleData")); - response.status = EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS; + response.status = chip::app::Clusters::ContentLauncher::StatusEnum::kSuccess; return response; } diff --git a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h index 8ca6981e46591f..c9dbe270e5859c 100644 --- a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h +++ b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h @@ -30,10 +30,10 @@ class ContentLauncherManager : public chip::app::Clusters::ContentLauncher::Delegate { public: - ContentLaunchResponse HandleLaunchContent(chip::EndpointId endpointId, const std::list & parameterList, - bool autoplay, const chip::CharSpan & data) override; - ContentLaunchResponse HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString, - const std::list & brandingInformation) override; + LaunchResponse HandleLaunchContent(chip::EndpointId endpointId, const std::list & parameterList, bool autoplay, + const chip::CharSpan & data) override; + LaunchResponse HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString, + const std::list & brandingInformation) override; std::list HandleGetAcceptHeaderList() override; uint32_t HandleGetSupportedStreamingProtocols() override; }; diff --git a/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp b/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp index 58a39ab91bb6b4..dd586636ebb691 100644 --- a/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp +++ b/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp @@ -18,6 +18,7 @@ #include "KeypadInputManager.h" +#include #include #include @@ -41,8 +42,8 @@ CHIP_ERROR KeypadInputManager::Init() return err; } -EmberAfKeypadInputStatus keypadInputClusterSendKey(EmberAfKeypadInputCecKeyCode keyCode) +chip::app::Clusters::KeypadInput::StatusEnum keypadInputClusterSendKey(chip::app::Clusters::KeypadInput::CecKeyCode keyCode) { // TODO: Insert code here - return EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS; + return chip::app::Clusters::KeypadInput::StatusEnum::kSuccess; } diff --git a/examples/tv-app/linux/include/media-input/MediaInputManager.cpp b/examples/tv-app/linux/include/media-input/MediaInputManager.cpp index 0b42108cad384e..4d72d82b993737 100644 --- a/examples/tv-app/linux/include/media-input/MediaInputManager.cpp +++ b/examples/tv-app/linux/include/media-input/MediaInputManager.cpp @@ -46,12 +46,12 @@ CHIP_ERROR MediaInputManager::proxyGetInputList(chip::EndpointId mEndpointId, ch for (int i = 0; i < maximumVectorSize; ++i) { - chip::app::Clusters::MediaInput::Structs::MediaInputInfo::Type mediaInput; - mediaInput.description = chip::CharSpan(description, sizeof(description) - 1); - mediaInput.name = chip::CharSpan(name, sizeof(name) - 1); - mediaInput.inputType = EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI; - mediaInput.index = static_cast(1 + i); - ReturnErrorOnFailure(encoder.Encode(mediaInput)); + chip::app::Clusters::MediaInput::Structs::InputInfo::Type inputInfo; + inputInfo.description = chip::CharSpan(description, sizeof(description) - 1); + inputInfo.name = chip::CharSpan(name, sizeof(name) - 1); + inputInfo.inputType = chip::app::Clusters::MediaInput::InputTypeEnum::kHdmi; + inputInfo.index = static_cast(1 + i); + ReturnErrorOnFailure(encoder.Encode(inputInfo)); } return CHIP_NO_ERROR; diff --git a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp index 28dcf54a00c8c0..c4b285761c8b42 100644 --- a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp +++ b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp @@ -24,6 +24,7 @@ #include using namespace std; +using namespace chip::app::Clusters::MediaPlayback; CHIP_ERROR MediaPlaybackManager::Init() { @@ -38,8 +39,8 @@ CHIP_ERROR MediaPlaybackManager::Init() return err; } -EmberAfMediaPlaybackStatus MediaPlaybackManager::proxyMediaPlaybackRequest(MediaPlaybackRequest mediaPlaybackRequest, - uint64_t deltaPositionMilliseconds) +StatusEnum MediaPlaybackManager::proxyMediaPlaybackRequest(MediaPlaybackRequest mediaPlaybackRequest, + uint64_t deltaPositionMilliseconds) { switch (mediaPlaybackRequest) { @@ -64,16 +65,16 @@ EmberAfMediaPlaybackStatus MediaPlaybackManager::proxyMediaPlaybackRequest(Media case MEDIA_PLAYBACK_REQUEST_SKIP_BACKWARD: // TODO: Insert code here case MEDIA_PLAYBACK_REQUEST_SEEK: - return EMBER_ZCL_MEDIA_PLAYBACK_STATUS_SUCCESS; + return chip::app::Clusters::MediaPlayback::StatusEnum::kSuccess; break; default: { - return EMBER_ZCL_MEDIA_PLAYBACK_STATUS_SUCCESS; + return chip::app::Clusters::MediaPlayback::StatusEnum::kSuccess; } } } -EmberAfMediaPlaybackStatus mediaPlaybackClusterSendMediaPlaybackRequest(MediaPlaybackRequest mediaPlaybackRequest, - uint64_t deltaPositionMilliseconds) +chip::app::Clusters::MediaPlayback::StatusEnum +mediaPlaybackClusterSendMediaPlaybackRequest(MediaPlaybackRequest mediaPlaybackRequest, uint64_t deltaPositionMilliseconds) { return MediaPlaybackManager().proxyMediaPlaybackRequest(mediaPlaybackRequest, deltaPositionMilliseconds); } diff --git a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.h b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.h index e90601e6d6a99c..a15aa49bcbb415 100644 --- a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.h +++ b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.h @@ -18,6 +18,7 @@ #pragma once +#include #include #include #include @@ -29,8 +30,8 @@ class MediaPlaybackManager public: CHIP_ERROR Init(); void storeNewPlaybackState(chip::EndpointId endpoint, uint8_t newPlaybackState); - EmberAfMediaPlaybackStatus proxyMediaPlaybackRequest(MediaPlaybackRequest mediaPlaybackRequest, - uint64_t deltaPositionMilliseconds); + chip::app::Clusters::MediaPlayback::StatusEnum proxyMediaPlaybackRequest(MediaPlaybackRequest mediaPlaybackRequest, + uint64_t deltaPositionMilliseconds); private: uint8_t oldPlaybackState; diff --git a/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp index 489968c93f3176..dfecfea9b6226e 100644 --- a/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp +++ b/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp @@ -59,7 +59,7 @@ CHIP_ERROR TargetNavigatorManager::proxyGetTargetInfoList(chip::EndpointId endpo { // ReturnErrorOnFailure(encoder.Encode(chip::CharSpan(entry.c_str(), entry.length()))); - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::Type targetInfo; + chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type targetInfo; targetInfo.name = chip::CharSpan(entry.c_str(), entry.length()); targetInfo.identifier = static_cast(i++); ReturnErrorOnFailure(encoder.Encode(targetInfo)); @@ -86,11 +86,11 @@ TargetNavigatorResponse targetNavigatorClusterNavigateTarget(chip::EndpointId en // make sure TV_TargetNavigatorCluster.yaml test suite passes - assumes index starts at 1 if (target == 0 || target > gTargets.size()) { - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE; + response.status = chip::to_underlying(chip::app::Clusters::TargetNavigator::StatusEnum::kAppNotAvailable); } else { - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS; + response.status = chip::to_underlying(chip::app::Clusters::TargetNavigator::StatusEnum::kSuccess); gCurrentTarget = target; } return response; diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index fb854cdb7ff74b..5a54331dc9496e 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -6953,7 +6953,7 @@ "enabled": 0, "commands": [ { - "name": "ChangeChannel", + "name": "ChangeChannelRequest", "code": 0, "mfgCode": null, "source": "client", @@ -6961,20 +6961,20 @@ "outgoing": 1 }, { - "name": "ChangeChannelByNumber", - "code": 1, + "name": "ChangeChannelByNumberRequest", + "code": 2, "mfgCode": null, "source": "client", "incoming": 1, "outgoing": 1 }, { - "name": "SkipChannel", - "code": 2, + "name": "SkipChannelRequest", + "code": 3, "mfgCode": null, "source": "client", "incoming": 1, - "outgoing": 1 + "outgoing": 0 } ], "attributes": [ @@ -7005,11 +7005,11 @@ "commands": [ { "name": "ChangeChannelResponse", - "code": 0, + "code": 1, "mfgCode": null, "source": "server", - "incoming": 1, - "outgoing": 0 + "incoming": 0, + "outgoing": 1 } ], "attributes": [ @@ -7058,6 +7058,36 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -7084,7 +7114,7 @@ "enabled": 0, "commands": [ { - "name": "NavigateTarget", + "name": "NavigateTargetRequest", "code": 0, "mfgCode": null, "source": "client", @@ -7120,11 +7150,11 @@ "commands": [ { "name": "NavigateTargetResponse", - "code": 0, + "code": 1, "mfgCode": null, "source": "server", - "incoming": 1, - "outgoing": 0 + "incoming": 0, + "outgoing": 1 } ], "attributes": [ @@ -7158,6 +7188,36 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -7184,7 +7244,7 @@ "enabled": 0, "commands": [ { - "name": "SelectInput", + "name": "SelectInputRequest", "code": 0, "mfgCode": null, "source": "client", @@ -7192,7 +7252,7 @@ "outgoing": 1 }, { - "name": "ShowInputStatus", + "name": "ShowInputStatusRequest", "code": 1, "mfgCode": null, "source": "client", @@ -7200,7 +7260,7 @@ "outgoing": 1 }, { - "name": "HideInputStatus", + "name": "HideInputStatusRequest", "code": 2, "mfgCode": null, "source": "client", @@ -7208,7 +7268,7 @@ "outgoing": 1 }, { - "name": "RenameInput", + "name": "RenameInputRequest", "code": 3, "mfgCode": null, "source": "client", @@ -7273,6 +7333,36 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -7360,7 +7450,7 @@ "enabled": 0, "commands": [ { - "name": "SendKey", + "name": "SendKeyRequest", "code": 0, "mfgCode": null, "source": "client", @@ -7393,17 +7483,38 @@ "define": "KEYPAD_INPUT_CLUSTER", "side": "server", "enabled": 1, - "commands": [ + "commands": [], + "attributes": [ { - "name": "SendKeyResponse", - "code": 0, + "name": "AttributeList", + "code": 65531, "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -7430,7 +7541,7 @@ "enabled": 0, "commands": [ { - "name": "LaunchContent", + "name": "LaunchContentRequest", "code": 0, "mfgCode": null, "source": "client", @@ -7438,7 +7549,7 @@ "outgoing": 1 }, { - "name": "LaunchURL", + "name": "LaunchURLRequest", "code": 1, "mfgCode": null, "source": "client", @@ -7473,20 +7584,12 @@ "enabled": 1, "commands": [ { - "name": "LaunchContentResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "LaunchURLResponse", - "code": 1, + "name": "LaunchResponse", + "code": 2, "mfgCode": null, "source": "server", - "incoming": 1, - "outgoing": 0 + "incoming": 0, + "outgoing": 1 } ], "attributes": [ @@ -7520,6 +7623,36 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -7546,7 +7679,7 @@ "enabled": 0, "commands": [ { - "name": "LaunchApp", + "name": "LaunchAppRequest", "code": 0, "mfgCode": null, "source": "client", @@ -7554,7 +7687,7 @@ "outgoing": 1 }, { - "name": "StopApp", + "name": "StopAppRequest", "code": 1, "mfgCode": null, "source": "client", @@ -7562,7 +7695,7 @@ "outgoing": 0 }, { - "name": "HideApp", + "name": "HideAppRequest", "code": 2, "mfgCode": null, "source": "client", @@ -7597,12 +7730,12 @@ "enabled": 1, "commands": [ { - "name": "LaunchAppResponse", - "code": 0, + "name": "LauncherResponse", + "code": 3, "mfgCode": null, "source": "server", - "incoming": 1, - "outgoing": 0 + "incoming": 0, + "outgoing": 1 } ], "attributes": [ @@ -7636,6 +7769,36 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -8602,7 +8765,7 @@ "enabled": 0, "commands": [ { - "name": "SelectOutput", + "name": "SelectOutputRequest", "code": 0, "mfgCode": null, "source": "client", @@ -8610,7 +8773,7 @@ "outgoing": 1 }, { - "name": "RenameOutput", + "name": "RenameOutputRequest", "code": 1, "mfgCode": null, "source": "client", @@ -8675,6 +8838,36 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -8821,7 +9014,7 @@ "enabled": 0, "commands": [ { - "name": "MediaPlay", + "name": "PlayRequest", "code": 0, "mfgCode": null, "source": "client", @@ -8829,7 +9022,7 @@ "outgoing": 1 }, { - "name": "MediaPause", + "name": "PauseRequest", "code": 1, "mfgCode": null, "source": "client", @@ -8837,7 +9030,7 @@ "outgoing": 1 }, { - "name": "MediaStop", + "name": "StopRequest", "code": 2, "mfgCode": null, "source": "client", @@ -8845,7 +9038,7 @@ "outgoing": 1 }, { - "name": "MediaStartOver", + "name": "StartOverRequest", "code": 3, "mfgCode": null, "source": "client", @@ -8853,7 +9046,7 @@ "outgoing": 1 }, { - "name": "MediaPrevious", + "name": "PreviousRequest", "code": 4, "mfgCode": null, "source": "client", @@ -8861,7 +9054,7 @@ "outgoing": 1 }, { - "name": "MediaNext", + "name": "NextRequest", "code": 5, "mfgCode": null, "source": "client", @@ -8869,7 +9062,7 @@ "outgoing": 1 }, { - "name": "MediaRewind", + "name": "RewindRequest", "code": 6, "mfgCode": null, "source": "client", @@ -8877,7 +9070,7 @@ "outgoing": 1 }, { - "name": "MediaFastForward", + "name": "FastForwardRequest", "code": 7, "mfgCode": null, "source": "client", @@ -8885,7 +9078,7 @@ "outgoing": 1 }, { - "name": "MediaSkipForward", + "name": "SkipForwardRequest", "code": 8, "mfgCode": null, "source": "client", @@ -8893,7 +9086,7 @@ "outgoing": 1 }, { - "name": "MediaSkipBackward", + "name": "SkipBackwardRequest", "code": 9, "mfgCode": null, "source": "client", @@ -8901,12 +9094,12 @@ "outgoing": 1 }, { - "name": "MediaSeek", - "code": 10, + "name": "SeekRequest", + "code": 11, "mfgCode": null, "source": "client", "incoming": 1, - "outgoing": 1 + "outgoing": 0 } ], "attributes": [ @@ -8936,84 +9129,12 @@ "enabled": 1, "commands": [ { - "name": "MediaPlayResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaPauseResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaStopResponse", - "code": 2, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaStartOverResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaPreviousResponse", - "code": 4, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaNextResponse", - "code": 5, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaRewindResponse", - "code": 6, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaFastForwardResponse", - "code": 7, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaSkipForwardResponse", - "code": 8, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaSkipBackwardResponse", - "code": 9, + "name": "PlaybackResponse", + "code": 10, "mfgCode": null, "source": "server", - "incoming": 1, - "outgoing": 0 + "incoming": 0, + "outgoing": 1 } ], "attributes": [ @@ -9122,6 +9243,36 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -9148,7 +9299,7 @@ "enabled": 0, "commands": [ { - "name": "LaunchContent", + "name": "LaunchContentRequest", "code": 0, "mfgCode": null, "source": "client", @@ -9156,7 +9307,7 @@ "outgoing": 1 }, { - "name": "LaunchURL", + "name": "LaunchURLRequest", "code": 1, "mfgCode": null, "source": "client", @@ -9191,20 +9342,12 @@ "enabled": 1, "commands": [ { - "name": "LaunchContentResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "LaunchURLResponse", - "code": 1, + "name": "LaunchResponse", + "code": 2, "mfgCode": null, "source": "server", - "incoming": 1, - "outgoing": 0 + "incoming": 0, + "outgoing": 1 } ], "attributes": [ @@ -9238,6 +9381,36 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -9262,16 +9435,7 @@ "define": "APPLICATION_BASIC_CLUSTER", "side": "client", "enabled": 0, - "commands": [ - { - "name": "ChangeStatus", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -9353,12 +9517,27 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x00", "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "application app", + "code": 4, + "mfgCode": null, + "side": "server", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "application status", "code": 5, @@ -9389,6 +9568,51 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "allowed vendor list", + "code": 7, + "mfgCode": null, + "side": "server", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -9415,7 +9639,7 @@ "enabled": 0, "commands": [ { - "name": "GetSetupPIN", + "name": "GetSetupPINRequest", "code": 0, "mfgCode": null, "source": "client", @@ -9423,16 +9647,16 @@ "outgoing": 1 }, { - "name": "Login", - "code": 1, + "name": "LoginRequest", + "code": 2, "mfgCode": null, "source": "client", "incoming": 1, - "outgoing": 1 + "outgoing": 0 }, { - "name": "Logout", - "code": 2, + "name": "LogoutRequest", + "code": 3, "mfgCode": null, "source": "client", "incoming": 1, @@ -9467,14 +9691,44 @@ "commands": [ { "name": "GetSetupPINResponse", - "code": 0, + "code": 1, "mfgCode": null, "source": "server", - "incoming": 1, - "outgoing": 0 + "incoming": 0, + "outgoing": 1 } ], "attributes": [ + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -9621,7 +9875,7 @@ "enabled": 0, "commands": [ { - "name": "LaunchContent", + "name": "LaunchContentRequest", "code": 0, "mfgCode": null, "source": "client", @@ -9629,7 +9883,7 @@ "outgoing": 1 }, { - "name": "LaunchURL", + "name": "LaunchURLRequest", "code": 1, "mfgCode": null, "source": "client", @@ -9664,20 +9918,12 @@ "enabled": 1, "commands": [ { - "name": "LaunchContentResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "LaunchURLResponse", - "code": 1, + "name": "LaunchResponse", + "code": 2, "mfgCode": null, "source": "server", - "incoming": 1, - "outgoing": 0 + "incoming": 0, + "outgoing": 1 } ], "attributes": [ @@ -9711,6 +9957,36 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -9823,6 +10099,21 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "application app", + "code": 4, + "mfgCode": null, + "side": "server", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "application status", "code": 5, @@ -9853,6 +10144,51 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "allowed vendor list", + "code": 7, + "mfgCode": null, + "side": "server", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -10085,6 +10421,21 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "application app", + "code": 4, + "mfgCode": null, + "side": "server", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "application status", "code": 5, @@ -10115,6 +10466,51 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "allowed vendor list", + "code": 7, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -10190,5 +10586,6 @@ "endpointVersion": 1, "deviceIdentifier": 36 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/tv-casting-app/linux/main.cpp b/examples/tv-casting-app/linux/main.cpp index 9554e75a3290c9..815b6409de7e53 100644 --- a/examples/tv-casting-app/linux/main.cpp +++ b/examples/tv-casting-app/linux/main.cpp @@ -199,7 +199,7 @@ void InitCommissioningFlow(intptr_t commandArg) } } -void OnContentLauncherSuccessResponse(void * context, const LaunchURLResponse::DecodableType & response) +void OnContentLauncherSuccessResponse(void * context, const LaunchResponse::DecodableType & response) { ChipLogProgress(AppServer, "ContentLauncher: Default Success Response"); } @@ -252,11 +252,10 @@ void DeviceEventCallback(const DeviceLayer::ChipDeviceEvent * event, intptr_t ar ChipLogError(AppServer, "Associate() failed: %" CHIP_ERROR_FORMAT, err.Format()); return; } - LaunchURL::Type request; + LaunchURLRequest::Type request; request.contentURL = chip::CharSpan(kContentUrl, strlen(kContentUrl)); request.displayString = chip::CharSpan(kContentDisplayStr, strlen(kContentDisplayStr)); - request.brandingInformation = chip::app::DataModel::List< - const chip::app::Clusters::ContentLauncher::Structs::ContentLaunchBrandingInformation::Type>(); + request.brandingInformation = chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type(); cluster.InvokeCommand(request, nullptr, OnContentLauncherSuccessResponse, OnContentLauncherFailureResponse); } } diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index e77b690a5b78a0..baffa731a1a644 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -11857,7 +11857,7 @@ "enabled": 1, "commands": [ { - "name": "ChangeChannel", + "name": "ChangeChannelRequest", "code": 0, "mfgCode": null, "source": "client", @@ -11865,16 +11865,16 @@ "outgoing": 1 }, { - "name": "ChangeChannelByNumber", - "code": 1, + "name": "ChangeChannelByNumberRequest", + "code": 2, "mfgCode": null, "source": "client", "incoming": 0, "outgoing": 1 }, { - "name": "SkipChannel", - "code": 2, + "name": "SkipChannelRequest", + "code": 3, "mfgCode": null, "source": "client", "incoming": 0, @@ -11882,6 +11882,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11906,16 +11921,7 @@ "define": "CHANNEL_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "ChangeChannelResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "channel list", @@ -11988,7 +11994,7 @@ "enabled": 1, "commands": [ { - "name": "NavigateTarget", + "name": "NavigateTargetRequest", "code": 0, "mfgCode": null, "source": "client", @@ -11997,6 +12003,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12021,16 +12042,7 @@ "define": "TARGET_NAVIGATOR_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "NavigateTargetResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "target navigator list", @@ -12073,7 +12085,7 @@ "enabled": 1, "commands": [ { - "name": "MediaPlay", + "name": "PlayRequest", "code": 0, "mfgCode": null, "source": "client", @@ -12081,7 +12093,7 @@ "outgoing": 1 }, { - "name": "MediaPause", + "name": "PauseReques", "code": 1, "mfgCode": null, "source": "client", @@ -12089,7 +12101,7 @@ "outgoing": 1 }, { - "name": "MediaStop", + "name": "StopRequest", "code": 2, "mfgCode": null, "source": "client", @@ -12097,7 +12109,7 @@ "outgoing": 1 }, { - "name": "MediaStartOver", + "name": "StartOver", "code": 3, "mfgCode": null, "source": "client", @@ -12105,7 +12117,7 @@ "outgoing": 1 }, { - "name": "MediaPrevious", + "name": "PreviousRequest", "code": 4, "mfgCode": null, "source": "client", @@ -12113,7 +12125,7 @@ "outgoing": 1 }, { - "name": "MediaNext", + "name": "NextRequest", "code": 5, "mfgCode": null, "source": "client", @@ -12121,7 +12133,7 @@ "outgoing": 1 }, { - "name": "MediaRewind", + "name": "RewindRequest", "code": 6, "mfgCode": null, "source": "client", @@ -12129,7 +12141,7 @@ "outgoing": 1 }, { - "name": "MediaFastForward", + "name": "FastForwardRequest", "code": 7, "mfgCode": null, "source": "client", @@ -12137,7 +12149,7 @@ "outgoing": 1 }, { - "name": "MediaSkipForward", + "name": "SkipForwardRequest", "code": 8, "mfgCode": null, "source": "client", @@ -12145,7 +12157,7 @@ "outgoing": 1 }, { - "name": "MediaSkipBackward", + "name": "SkipBackwardRequest", "code": 9, "mfgCode": null, "source": "client", @@ -12153,8 +12165,8 @@ "outgoing": 1 }, { - "name": "MediaSeek", - "code": 10, + "name": "SeekRequest", + "code": 11, "mfgCode": null, "source": "client", "incoming": 0, @@ -12162,6 +12174,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12186,88 +12213,7 @@ "define": "MEDIA_PLAYBACK_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "MediaPlayResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaPauseResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaStopResponse", - "code": 2, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaStartOverResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaPreviousResponse", - "code": 4, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaNextResponse", - "code": 5, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaRewindResponse", - "code": 6, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaFastForwardResponse", - "code": 7, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaSkipForwardResponse", - "code": 8, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaSkipBackwardResponse", - "code": 9, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -12295,7 +12241,7 @@ "enabled": 1, "commands": [ { - "name": "SelectInput", + "name": "SelectInputRequest", "code": 0, "mfgCode": null, "source": "client", @@ -12303,7 +12249,7 @@ "outgoing": 1 }, { - "name": "ShowInputStatus", + "name": "ShowInputStatusRequest", "code": 1, "mfgCode": null, "source": "client", @@ -12311,7 +12257,7 @@ "outgoing": 1 }, { - "name": "HideInputStatus", + "name": "HideInputStatusRequest", "code": 2, "mfgCode": null, "source": "client", @@ -12319,7 +12265,7 @@ "outgoing": 1 }, { - "name": "RenameInput", + "name": "RenameInputRequest", "code": 3, "mfgCode": null, "source": "client", @@ -12328,6 +12274,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12395,7 +12356,7 @@ "enabled": 1, "commands": [ { - "name": "SendKey", + "name": "SendKeyRequest", "code": 0, "mfgCode": null, "source": "client", @@ -12404,6 +12365,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12428,16 +12404,7 @@ "define": "KEYPAD_INPUT_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "SendKeyResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "ClusterRevision", @@ -12465,7 +12432,7 @@ "enabled": 1, "commands": [ { - "name": "LaunchContent", + "name": "LaunchContentRequest", "code": 0, "mfgCode": null, "source": "client", @@ -12473,7 +12440,7 @@ "outgoing": 1 }, { - "name": "LaunchURL", + "name": "LaunchURLRequest", "code": 1, "mfgCode": null, "source": "client", @@ -12482,6 +12449,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12506,24 +12488,7 @@ "define": "CONTENT_LAUNCH_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "LaunchContentResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "LaunchURLResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "accept header list", @@ -12581,7 +12546,7 @@ "enabled": 1, "commands": [ { - "name": "SelectOutput", + "name": "SelectOutputRequest", "code": 0, "mfgCode": null, "source": "client", @@ -12589,7 +12554,7 @@ "outgoing": 1 }, { - "name": "RenameOutput", + "name": "RenameOutputRequest", "code": 1, "mfgCode": null, "source": "client", @@ -12598,6 +12563,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12665,15 +12645,46 @@ "enabled": 1, "commands": [ { - "name": "LaunchApp", + "name": "LaunchAppRequest", "code": 0, "mfgCode": null, "source": "client", "incoming": 0, "outgoing": 1 + }, + { + "name": "StopAppRequest", + "code": 1, + "mfgCode": null, + "source": "client", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "HideAppRequest", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 0, + "outgoing": 1 } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12698,16 +12709,7 @@ "define": "APPLICATION_LAUNCHER_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "LaunchAppResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "application launcher list", @@ -12750,6 +12752,21 @@ "enabled": 1, "commands": [], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12892,7 +12909,7 @@ "enabled": 1, "commands": [ { - "name": "GetSetupPIN", + "name": "GetSetupPINRequest", "code": 0, "mfgCode": null, "source": "client", @@ -12900,8 +12917,16 @@ "outgoing": 1 }, { - "name": "Login", - "code": 1, + "name": "LoginRequest", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "LogoutRequest", + "code": 3, "mfgCode": null, "source": "client", "incoming": 0, @@ -12909,6 +12934,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12933,16 +12973,7 @@ "define": "ACCOUNT_LOGIN_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "GetSetupPINResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], + "commands": [], "attributes": [ { "name": "ClusterRevision", diff --git a/src/app/clusters/account-login-server/account-login-server.cpp b/src/app/clusters/account-login-server/account-login-server.cpp index ac1d845f451126..4a892849b962fe 100644 --- a/src/app/clusters/account-login-server/account-login-server.cpp +++ b/src/app/clusters/account-login-server/account-login-server.cpp @@ -51,8 +51,9 @@ void sendResponse(app::CommandHandler * command, const char * responseSetupPin) } } -bool emberAfAccountLoginClusterGetSetupPINCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::GetSetupPIN::DecodableType & commandData) +bool emberAfAccountLoginClusterGetSetupPINRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::GetSetupPINRequest::DecodableType & commandData) { auto & tempAccountIdentifier = commandData.tempAccountIdentifier; @@ -62,8 +63,8 @@ bool emberAfAccountLoginClusterGetSetupPINCallback(app::CommandHandler * command return true; } -bool emberAfAccountLoginClusterLoginCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::Login::DecodableType & commandData) +bool emberAfAccountLoginClusterLoginRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::LoginRequest::DecodableType & commandData) { auto & tempAccountIdentifier = commandData.tempAccountIdentifier; auto & tempSetupPin = commandData.setupPIN; @@ -80,8 +81,8 @@ bool emberAfAccountLoginClusterLoginCallback(app::CommandHandler * command, cons return true; } -bool emberAfAccountLoginClusterLogoutCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::Logout::DecodableType & commandData) +bool emberAfAccountLoginClusterLogoutRequestCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + const Commands::LogoutRequest::DecodableType & commandData) { bool isLoggedOut = accountLoginClusterLogout(); EmberAfStatus status = isLoggedOut ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_NOT_AUTHORIZED; 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 be5a31a1c11d65..32305ab27d68a4 100644 --- a/src/app/clusters/application-basic-server/application-basic-server.cpp +++ b/src/app/clusters/application-basic-server/application-basic-server.cpp @@ -32,18 +32,6 @@ using namespace chip; using namespace chip::app::Clusters::ApplicationBasic; -bool applicationBasicClusterChangeApplicationStatus(EndpointId endpoint, ApplicationBasicStatus status); - -bool emberAfApplicationBasicClusterChangeStatusCallback(app::CommandHandler * commandObj, - const app::ConcreteCommandPath & commandPath, - const Commands::ChangeStatus::DecodableType & commandData) -{ - auto & newApplicationStatus = commandData.status; - - bool success = applicationBasicClusterChangeApplicationStatus(emberAfCurrentEndpoint(), newApplicationStatus); - EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; - emberAfSendImmediateDefaultResponse(status); - return true; -} +bool applicationBasicClusterChangeApplicationStatus(EndpointId endpoint, ApplicationStatusEnum status); void MatterApplicationBasicPluginServerInitCallback() {} diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp index 92863361707959..c88daf9b6065b6 100644 --- a/src/app/clusters/application-launcher-server/application-launcher-server.cpp +++ b/src/app/clusters/application-launcher-server/application-launcher-server.cpp @@ -34,18 +34,16 @@ using namespace chip; using namespace chip::app::Clusters; using namespace chip::app::Clusters::ApplicationLauncher; -ApplicationLauncherResponse applicationLauncherClusterLaunchApp(EndpointId endpoint, ::ApplicationLauncherApp application, - std::string data); +ApplicationLauncherResponse applicationLauncherClusterLaunchApp(EndpointId endpoint, ::Application application, std::string data); -ApplicationLauncherResponse applicationLauncherClusterStopApp(EndpointId endpoint, ::ApplicationLauncherApp application, - std::string data); +ApplicationLauncherResponse applicationLauncherClusterStopApp(EndpointId endpoint, ::Application application, std::string data); -ApplicationLauncherResponse applicationLauncherClusterHideApp(EndpointId endpoint, ::ApplicationLauncherApp application, - std::string data); +ApplicationLauncherResponse applicationLauncherClusterHideApp(EndpointId endpoint, ::Application application, std::string data); bool emberAfApplicationLauncherClusterLaunchAppCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, - uint8_t *, uint8_t *, Commands::LaunchApp::DecodableType & commandData) + uint8_t *, uint8_t *, + Commands::LaunchAppRequest::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); @@ -64,28 +62,29 @@ void sendResponse(app::CommandHandler * command, app::ConcreteCommandPath path, exit: if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Failed to send LaunchAppResponse. Error:%s", ErrorStr(err)); + ChipLogError(Zcl, "Failed to send LauncherResponse. Error:%s", ErrorStr(err)); } } -::ApplicationLauncherApp getApplicationFromCommand(uint16_t catalogVendorId, CharSpan applicationId) +::Application getApplicationFromCommand(uint16_t catalogVendorId, CharSpan applicationId) { - ::ApplicationLauncherApp application = {}; - application.applicationId = applicationId; - application.catalogVendorId = catalogVendorId; + ::Application application = {}; + application.applicationId = applicationId; + application.catalogVendorId = catalogVendorId; return application; } -bool emberAfApplicationLauncherClusterLaunchAppCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::LaunchApp::DecodableType & commandData) +bool emberAfApplicationLauncherClusterLaunchAppRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::LaunchAppRequest::DecodableType & commandData) { auto & requestData = commandData.data; auto & requestApplicationCatalogVendorId = commandData.application.catalogVendorId; auto & requestApplicationId = commandData.application.applicationId; - app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), ApplicationLauncher::Id, Commands::LaunchAppResponse::Id }; + app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), ApplicationLauncher::Id, Commands::LauncherResponse::Id }; - ::ApplicationLauncherApp application = getApplicationFromCommand(requestApplicationCatalogVendorId, requestApplicationId); + ::Application application = getApplicationFromCommand(requestApplicationCatalogVendorId, requestApplicationId); std::string reqestDataString(requestData.data(), requestData.size()); ApplicationLauncherResponse response = applicationLauncherClusterLaunchApp(emberAfCurrentEndpoint(), application, reqestDataString); @@ -96,15 +95,16 @@ bool emberAfApplicationLauncherClusterLaunchAppCallback(app::CommandHandler * co /** * @brief Application Launcher Cluster StopApp Command callback (from client) */ -bool emberAfApplicationLauncherClusterStopAppCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::StopApp::DecodableType & commandData) +bool emberAfApplicationLauncherClusterStopAppRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::StopAppRequest::DecodableType & commandData) { auto & requestApplicationCatalogVendorId = commandData.application.catalogVendorId; auto & requestApplicationId = commandData.application.applicationId; - app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), ApplicationLauncher::Id, Commands::StopAppResponse::Id }; + app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), ApplicationLauncher::Id, Commands::LauncherResponse::Id }; - ::ApplicationLauncherApp application = getApplicationFromCommand(requestApplicationCatalogVendorId, requestApplicationId); + ::Application application = getApplicationFromCommand(requestApplicationCatalogVendorId, requestApplicationId); ApplicationLauncherResponse response = applicationLauncherClusterStopApp(emberAfCurrentEndpoint(), application, "data"); sendResponse(command, path, response); return true; @@ -112,16 +112,17 @@ bool emberAfApplicationLauncherClusterStopAppCallback(app::CommandHandler * comm /** * @brief Application Launcher Cluster HideApp Command callback (from client) */ -bool emberAfApplicationLauncherClusterHideAppCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::HideApp::DecodableType & commandData) +bool emberAfApplicationLauncherClusterHideAppRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::HideAppRequest::DecodableType & commandData) { auto & requestApplicationCatalogVendorId = commandData.application.catalogVendorId; auto & requestApplicationId = commandData.application.applicationId; - app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), ApplicationLauncher::Id, Commands::HideAppResponse::Id }; + app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), ApplicationLauncher::Id, Commands::LauncherResponse::Id }; - ::ApplicationLauncherApp application = getApplicationFromCommand(requestApplicationCatalogVendorId, requestApplicationId); + ::Application application = getApplicationFromCommand(requestApplicationCatalogVendorId, requestApplicationId); ApplicationLauncherResponse response = applicationLauncherClusterHideApp(emberAfCurrentEndpoint(), application, "data"); sendResponse(command, path, response); return true; diff --git a/src/app/clusters/audio-output-server/audio-output-server.cpp b/src/app/clusters/audio-output-server/audio-output-server.cpp index 8af6fa308eec0d..ac4a56e932d31a 100644 --- a/src/app/clusters/audio-output-server/audio-output-server.cpp +++ b/src/app/clusters/audio-output-server/audio-output-server.cpp @@ -33,8 +33,9 @@ using namespace chip::app::Clusters::AudioOutput; bool audioOutputClusterSelectOutput(uint8_t index); bool audioOutputClusterRenameOutput(uint8_t index, const CharSpan & name); -bool emberAfAudioOutputClusterRenameOutputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::RenameOutput::DecodableType & commandData) +bool emberAfAudioOutputClusterRenameOutputRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::RenameOutputRequest::DecodableType & commandData) { auto & index = commandData.index; auto & name = commandData.name; @@ -45,8 +46,9 @@ bool emberAfAudioOutputClusterRenameOutputCallback(app::CommandHandler * command return true; } -bool emberAfAudioOutputClusterSelectOutputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::SelectOutput::DecodableType & commandData) +bool emberAfAudioOutputClusterSelectOutputRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::SelectOutputRequest::DecodableType & commandData) { auto & index = commandData.index; diff --git a/src/app/clusters/channel-server/channel-server.cpp b/src/app/clusters/channel-server/channel-server.cpp index c3d9629ab93f04..c0f06252489f87 100644 --- a/src/app/clusters/channel-server/channel-server.cpp +++ b/src/app/clusters/channel-server/channel-server.cpp @@ -52,8 +52,8 @@ ::ChannelInfo ChannelClusterChangeChannel(std::string match); bool ChannelClusterChangeChannelByNumber(uint16_t majorNumer, uint16_t minorNumber); bool ChannelClusterSkipChannel(uint16_t count); -bool emberAfChannelClusterChangeChannelCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::ChangeChannel::DecodableType & commandData) +bool emberAfChannelClusterChangeChannelRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::ChangeChannelRequest::DecodableType & commandData) { Commands::ChangeChannelResponse::Type response; response.channelMatch.majorNumber = 1; @@ -61,7 +61,7 @@ bool emberAfChannelClusterChangeChannelCallback(app::CommandHandler * command, c response.channelMatch.name = chip::CharSpan("name", strlen("name")); response.channelMatch.callSign = chip::CharSpan("callSign", strlen("callSign")); response.channelMatch.affiliateCallSign = chip::CharSpan("affiliateCallSign", strlen("affiliateCallSign")); - response.errorType = (ChannelErrorType) 0; + response.errorType = (ErrorTypeEnum) 0; CHIP_ERROR err = command->AddResponseData(commandPath, response); if (err != CHIP_NO_ERROR) @@ -71,8 +71,9 @@ bool emberAfChannelClusterChangeChannelCallback(app::CommandHandler * command, c return true; } -bool emberAfChannelClusterChangeChannelByNumberCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::ChangeChannelByNumber::DecodableType & commandData) +bool emberAfChannelClusterChangeChannelByNumberRequestCallback( + app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::ChangeChannelByNumberRequest::DecodableType & commandData) { auto & majorNumber = commandData.majorNumber; auto & minorNumber = commandData.minorNumber; @@ -83,8 +84,8 @@ bool emberAfChannelClusterChangeChannelByNumberCallback(app::CommandHandler * co return true; } -bool emberAfChannelClusterSkipChannelCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::SkipChannel::DecodableType & commandData) +bool emberAfChannelClusterSkipChannelRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::SkipChannelRequest::DecodableType & commandData) { auto & count = commandData.count; diff --git a/src/app/clusters/content-launch-server/content-launch-delegate.h b/src/app/clusters/content-launch-server/content-launch-delegate.h index 9974b2c2bde0b4..fb86310ca470d1 100644 --- a/src/app/clusters/content-launch-server/content-launch-delegate.h +++ b/src/app/clusters/content-launch-server/content-launch-delegate.h @@ -26,11 +26,11 @@ #include #include -struct ContentLaunchResponse +struct LaunchResponse { CHIP_ERROR err; chip::CharSpan data; - chip::app::Clusters::ContentLauncher::ContentLaunchStatus status; + chip::app::Clusters::ContentLauncher::StatusEnum status; }; namespace chip { @@ -44,12 +44,11 @@ namespace ContentLauncher { class Delegate { public: - virtual ContentLaunchResponse HandleLaunchContent(chip::EndpointId endpointId, - const std::list & parameterList, bool autoplay, - const chip::CharSpan & data) = 0; + virtual LaunchResponse HandleLaunchContent(chip::EndpointId endpointId, const std::list & parameterList, + bool autoplay, const chip::CharSpan & data) = 0; - virtual ContentLaunchResponse HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString, - const std::list & brandingInformation) = 0; + virtual LaunchResponse HandleLaunchUrl(const chip::CharSpan & contentUrl, const chip::CharSpan & displayString, + const std::list & brandingInformation) = 0; virtual std::list HandleGetAcceptHeaderList() = 0; diff --git a/src/app/clusters/content-launch-server/content-launch-server.cpp b/src/app/clusters/content-launch-server/content-launch-server.cpp index 9fe7e6a93806fc..52624611c9b211 100644 --- a/src/app/clusters/content-launch-server/content-launch-server.cpp +++ b/src/app/clusters/content-launch-server/content-launch-server.cpp @@ -174,29 +174,29 @@ CHIP_ERROR ContentLauncherAttrAccess::ReadSupportedStreamingProtocols(app::Attri // ----------------------------------------------------------------------------- // Matter Framework Callbacks Implementation -bool emberAfContentLauncherClusterLaunchContentCallback( +bool emberAfContentLauncherClusterLaunchContentRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::ContentLauncher::Commands::LaunchContent::DecodableType & commandData) + const chip::app::Clusters::ContentLauncher::Commands::LaunchContentRequest::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; - chip::app::Clusters::ContentLauncher::Commands::LaunchContentResponse::Type response; + chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type response; EndpointId endpoint = commandPath.mEndpointId; auto & autoplay = commandData.autoPlay; auto & data = commandData.data; - // TODO: Decode the paramater and pass it to delegate + // TODO: Decode the parameter and pass it to delegate // auto searchIterator = commandData.search.begin(); - std::list parameterList; + std::list parameterList; Delegate * delegate = GetDelegate(endpoint); VerifyOrExit(isDelegateNull(delegate, endpoint) != true, err = CHIP_ERROR_INCORRECT_STATE); { - ContentLaunchResponse resp = delegate->HandleLaunchContent(emberAfCurrentEndpoint(), parameterList, autoplay, data); + LaunchResponse resp = delegate->HandleLaunchContent(emberAfCurrentEndpoint(), parameterList, autoplay, data); VerifyOrExit(resp.err == CHIP_NO_ERROR, err = resp.err); - response.contentLaunchStatus = resp.status; - response.data = resp.data; + response.status = resp.status; + response.data = resp.data; err = commandObj->AddResponseData(commandPath, response); SuccessOrExit(err); @@ -213,29 +213,29 @@ bool emberAfContentLauncherClusterLaunchContentCallback( return true; } -bool emberAfContentLauncherClusterLaunchURLCallback( +bool emberAfContentLauncherClusterLaunchURLRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::ContentLauncher::Commands::LaunchURL::DecodableType & commandData) + const chip::app::Clusters::ContentLauncher::Commands::LaunchURLRequest::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; - chip::app::Clusters::ContentLauncher::Commands::LaunchURLResponse::Type response; + chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type response; EndpointId endpoint = commandPath.mEndpointId; auto & contentUrl = commandData.contentURL; auto & displayString = commandData.displayString; - // TODO: Decode the paramater and pass it to delegate + // TODO: Decode the parameter and pass it to delegate // auto brandingInformationIterator = commandData.brandingInformation.begin(); - std::list brandingInformationList; + std::list brandingInformationList; Delegate * delegate = GetDelegate(endpoint); VerifyOrExit(isDelegateNull(delegate, endpoint) != true, err = CHIP_ERROR_INCORRECT_STATE); { - ContentLaunchResponse resp = delegate->HandleLaunchUrl(contentUrl, displayString, brandingInformationList); + LaunchResponse resp = delegate->HandleLaunchUrl(contentUrl, displayString, brandingInformationList); VerifyOrExit(resp.err == CHIP_NO_ERROR, err = resp.err); - response.contentLaunchStatus = resp.status; - response.data = resp.data; + response.status = resp.status; + response.data = resp.data; err = commandObj->AddResponseData(commandPath, response); SuccessOrExit(err); diff --git a/src/app/clusters/keypad-input-server/keypad-input-server.cpp b/src/app/clusters/keypad-input-server/keypad-input-server.cpp index 026eca546dc61e..b6802e9785febe 100644 --- a/src/app/clusters/keypad-input-server/keypad-input-server.cpp +++ b/src/app/clusters/keypad-input-server/keypad-input-server.cpp @@ -34,9 +34,9 @@ using namespace chip; using namespace chip::app::Clusters; using namespace chip::app::Clusters::KeypadInput; -EmberAfKeypadInputStatus keypadInputClusterSendKey(EmberAfKeypadInputCecKeyCode keyCode); +StatusEnum keypadInputClusterSendKey(CecKeyCode keyCode); -static void sendResponse(app::CommandHandler * command, EmberAfKeypadInputStatus keypadInputStatus) +static void sendResponse(app::CommandHandler * command, StatusEnum keypadInputStatus) { CHIP_ERROR err = CHIP_NO_ERROR; app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), KeypadInput::Id, KeypadInput::Commands::SendKeyResponse::Id }; @@ -55,12 +55,12 @@ static void sendResponse(app::CommandHandler * command, EmberAfKeypadInputStatus } } -bool emberAfKeypadInputClusterSendKeyCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::SendKey::DecodableType & commandData) +bool emberAfKeypadInputClusterSendKeyRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::SendKeyRequest::DecodableType & commandData) { auto & keyCode = commandData.keyCode; - EmberAfKeypadInputStatus status = keypadInputClusterSendKey(static_cast(keyCode)); + StatusEnum status = keypadInputClusterSendKey(static_cast(keyCode)); sendResponse(command, status); return true; } diff --git a/src/app/clusters/media-input-server/media-input-server.cpp b/src/app/clusters/media-input-server/media-input-server.cpp index 8f3149ef899265..95eb498decbfef 100644 --- a/src/app/clusters/media-input-server/media-input-server.cpp +++ b/src/app/clusters/media-input-server/media-input-server.cpp @@ -46,8 +46,8 @@ static void storeCurrentInput(EndpointId endpoint, uint8_t currentInput) } } -bool emberAfMediaInputClusterSelectInputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::SelectInput::DecodableType & commandData) +bool emberAfMediaInputClusterSelectInputRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::SelectInputRequest::DecodableType & commandData) { auto & input = commandData.index; @@ -61,8 +61,9 @@ bool emberAfMediaInputClusterSelectInputCallback(app::CommandHandler * command, return true; } -bool emberAfMediaInputClusterShowInputStatusCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::ShowInputStatus::DecodableType & commandData) +bool emberAfMediaInputClusterShowInputStatusRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::ShowInputStatusRequest::DecodableType & commandData) { bool success = mediaInputClusterShowInputStatus(); EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; @@ -70,8 +71,9 @@ bool emberAfMediaInputClusterShowInputStatusCallback(app::CommandHandler * comma return true; } -bool emberAfMediaInputClusterHideInputStatusCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::HideInputStatus::DecodableType & commandData) +bool emberAfMediaInputClusterHideInputStatusRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::HideInputStatusRequest::DecodableType & commandData) { bool success = mediaInputClusterHideInputStatus(); EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; @@ -79,8 +81,8 @@ bool emberAfMediaInputClusterHideInputStatusCallback(app::CommandHandler * comma return true; } -bool emberAfMediaInputClusterRenameInputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::RenameInput::DecodableType & commandData) +bool emberAfMediaInputClusterRenameInputRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::RenameInputRequest::DecodableType & commandData) { auto & input = commandData.index; auto & name = commandData.name; diff --git a/src/app/clusters/media-playback-server/media-playback-server.cpp b/src/app/clusters/media-playback-server/media-playback-server.cpp index 3574f7822aa505..03480ca6eee4f7 100644 --- a/src/app/clusters/media-playback-server/media-playback-server.cpp +++ b/src/app/clusters/media-playback-server/media-playback-server.cpp @@ -33,10 +33,10 @@ using namespace chip; using namespace chip::app::Clusters; using namespace chip::app::Clusters::MediaPlayback; -EmberAfMediaPlaybackStatus mediaPlaybackClusterSendMediaPlaybackRequest(MediaPlaybackRequest mediaPlaybackRequest, - uint64_t deltaPositionMilliseconds); +StatusEnum mediaPlaybackClusterSendMediaPlaybackRequest(MediaPlaybackRequest mediaPlaybackRequest, + uint64_t deltaPositionMilliseconds); -static void writePlaybackState(EndpointId endpoint, uint8_t playbackState) +static void writePlaybackState(EndpointId endpoint, MediaPlayback::PlaybackStateEnum playbackState) { EmberAfStatus status = Attributes::PlaybackState::Set(endpoint, playbackState); if (status != EMBER_ZCL_STATUS_SUCCESS) @@ -45,9 +45,9 @@ static void writePlaybackState(EndpointId endpoint, uint8_t playbackState) } } -static uint8_t readPlaybackStatus(EndpointId endpoint) +static PlaybackStateEnum readPlaybackStatus(EndpointId endpoint) { - uint8_t playbackState; + chip::app::Clusters::MediaPlayback::PlaybackStateEnum playbackState; EmberAfStatus status = Attributes::PlaybackState::Get(endpoint, &playbackState); if (status != EMBER_ZCL_STATUS_SUCCESS) { @@ -57,9 +57,9 @@ static uint8_t readPlaybackStatus(EndpointId endpoint) return playbackState; } -void storeNewPlaybackState(EndpointId endpoint, uint8_t newPlaybackState) +void storeNewPlaybackState(EndpointId endpoint, MediaPlayback::PlaybackStateEnum newPlaybackState) { - uint8_t mediaPlaybackClusterPlaybackState = readPlaybackStatus(endpoint); + MediaPlayback::PlaybackStateEnum mediaPlaybackClusterPlaybackState = readPlaybackStatus(endpoint); if (mediaPlaybackClusterPlaybackState == newPlaybackState) { @@ -72,7 +72,7 @@ void storeNewPlaybackState(EndpointId endpoint, uint8_t newPlaybackState) } static void sendResponse(app::CommandHandler * command, const char * responseName, CommandId commandId, - EmberAfMediaPlaybackStatus mediaPlaybackStatus) + StatusEnum mediaPlaybackStatus) { CHIP_ERROR err = CHIP_NO_ERROR; app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), MediaPlayback::Id, commandId }; @@ -91,105 +91,105 @@ static void sendResponse(app::CommandHandler * command, const char * responseNam } } -bool emberAfMediaPlaybackClusterMediaPlayCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::MediaPlay::DecodableType & commandData) +bool emberAfMediaPlaybackClusterPlayRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::PlayRequest::DecodableType & commandData) { - EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PLAY, 0); - storeNewPlaybackState(emberAfCurrentEndpoint(), EMBER_ZCL_MEDIA_PLAYBACK_STATE_PLAYING); - sendResponse(command, "MediaPlayResponse", Commands::MediaPlayResponse::Id, status); + StatusEnum status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PLAY, 0); + storeNewPlaybackState(emberAfCurrentEndpoint(), MediaPlayback::PlaybackStateEnum::kPlaying); + sendResponse(command, "MediaPlayResponse", Commands::PlaybackResponse::Id, status); return true; } -bool emberAfMediaPlaybackClusterMediaPauseCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::MediaPause::DecodableType & commandData) +bool emberAfMediaPlaybackClusterPauseRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::PauseRequest::DecodableType & commandData) { - EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PAUSE, 0); - storeNewPlaybackState(emberAfCurrentEndpoint(), EMBER_ZCL_MEDIA_PLAYBACK_STATE_PAUSED); - sendResponse(command, "MediaPauseResponse", Commands::MediaPauseResponse::Id, status); + StatusEnum status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PAUSE, 0); + storeNewPlaybackState(emberAfCurrentEndpoint(), MediaPlayback::PlaybackStateEnum::kPaused); + sendResponse(command, "MediaPauseResponse", Commands::PlaybackResponse::Id, status); return true; } -bool emberAfMediaPlaybackClusterMediaStopCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::MediaStop::DecodableType & commandData) +bool emberAfMediaPlaybackClusterStopRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::StopRequest::DecodableType & commandData) { - EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_STOP, 0); - storeNewPlaybackState(emberAfCurrentEndpoint(), EMBER_ZCL_MEDIA_PLAYBACK_STATE_NOT_PLAYING); - sendResponse(command, "MediaStopResponse", Commands::MediaStopResponse::Id, status); + StatusEnum status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_STOP, 0); + storeNewPlaybackState(emberAfCurrentEndpoint(), MediaPlayback::PlaybackStateEnum::kNotPlaying); + sendResponse(command, "MediaStopResponse", Commands::PlaybackResponse::Id, status); return true; } -bool emberAfMediaPlaybackClusterMediaFastForwardCallback(app::CommandHandler * command, - const app::ConcreteCommandPath & commandPath, - const Commands::MediaFastForward::DecodableType & commandData) +bool emberAfMediaPlaybackClusterFastForwardRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::FastForwardRequest::DecodableType & commandData) { - EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_FAST_FORWARD, 0); - sendResponse(command, "MediaFastForward", Commands::MediaFastForwardResponse::Id, status); + StatusEnum status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_FAST_FORWARD, 0); + sendResponse(command, "MediaFastForward", Commands::PlaybackResponse::Id, status); return true; } -bool emberAfMediaPlaybackClusterMediaPreviousCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::MediaPrevious::DecodableType & commandData) +bool emberAfMediaPlaybackClusterPreviousRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::PreviousRequest::DecodableType & commandData) { - EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PREVIOUS, 0); - sendResponse(command, "MediaPrevious", Commands::MediaPreviousResponse::Id, status); + StatusEnum status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PREVIOUS, 0); + sendResponse(command, "MediaPrevious", Commands::PlaybackResponse::Id, status); return true; } -bool emberAfMediaPlaybackClusterMediaRewindCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::MediaRewind::DecodableType & commandData) +bool emberAfMediaPlaybackClusterRewindRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::RewindRequest::DecodableType & commandData) { - EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_REWIND, 0); - sendResponse(command, "MediaRewind", Commands::MediaRewindResponse::Id, status); + StatusEnum status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_REWIND, 0); + sendResponse(command, "MediaRewind", Commands::PlaybackResponse::Id, status); return true; } -bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback(app::CommandHandler * command, - const app::ConcreteCommandPath & commandPath, - const Commands::MediaSkipBackward::DecodableType & commandData) +bool emberAfMediaPlaybackClusterSkipBackwardRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::SkipBackwardRequest::DecodableType & commandData) { auto & deltaPositionMilliseconds = commandData.deltaPositionMilliseconds; - EmberAfMediaPlaybackStatus status = + StatusEnum status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_SKIP_BACKWARD, deltaPositionMilliseconds); - sendResponse(command, "MediaSkipBackward", Commands::MediaSkipBackwardResponse::Id, status); + sendResponse(command, "MediaSkipBackward", Commands::PlaybackResponse::Id, status); return true; } -bool emberAfMediaPlaybackClusterMediaSkipForwardCallback(app::CommandHandler * command, - const app::ConcreteCommandPath & commandPath, - const Commands::MediaSkipForward::DecodableType & commandData) +bool emberAfMediaPlaybackClusterSkipForwardRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::SkipForwardRequest::DecodableType & commandData) { auto & deltaPositionMilliseconds = commandData.deltaPositionMilliseconds; - EmberAfMediaPlaybackStatus status = + StatusEnum status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_SKIP_FORWARD, deltaPositionMilliseconds); - sendResponse(command, "MediaSkipForward", Commands::MediaSkipForwardResponse::Id, status); + sendResponse(command, "MediaSkipForward", Commands::PlaybackResponse::Id, status); return true; } -bool emberAfMediaPlaybackClusterMediaSeekCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::MediaSeek::DecodableType & commandData) +bool emberAfMediaPlaybackClusterSeekRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::SeekRequest::DecodableType & commandData) { auto & positionMilliseconds = commandData.position; - EmberAfMediaPlaybackStatus status = - mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_SEEK, positionMilliseconds); - sendResponse(command, "MediaSeek", Commands::MediaSeekResponse::Id, status); + StatusEnum status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_SEEK, positionMilliseconds); + sendResponse(command, "MediaSeek", Commands::PlaybackResponse::Id, status); return true; } -bool emberAfMediaPlaybackClusterMediaNextCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::MediaNext::DecodableType & commandData) +bool emberAfMediaPlaybackClusterNextRequestCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + const Commands::NextRequest::DecodableType & commandData) { - EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_NEXT, 0); - sendResponse(command, "MediaNext", Commands::MediaNextResponse::Id, status); + StatusEnum status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_NEXT, 0); + sendResponse(command, "MediaNext", Commands::PlaybackResponse::Id, status); return true; } -bool emberAfMediaPlaybackClusterMediaStartOverCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, - const Commands::MediaStartOver::DecodableType & commandData) +bool emberAfMediaPlaybackClusterStartOverRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::StartOverRequest::DecodableType & commandData) { - EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_START_OVER, 0); - sendResponse(command, "MediaStartOver", Commands::MediaStartOverResponse::Id, status); + StatusEnum status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_START_OVER, 0); + sendResponse(command, "MediaStartOver", Commands::PlaybackResponse::Id, status); return true; } diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp index 7f464c14e13bad..d88ee883edca9e 100644 --- a/src/app/clusters/target-navigator-server/target-navigator-server.cpp +++ b/src/app/clusters/target-navigator-server/target-navigator-server.cpp @@ -52,9 +52,9 @@ void sendResponse(app::CommandHandler * command, TargetNavigatorResponse respons } } -bool emberAfTargetNavigatorClusterNavigateTargetCallback(app::CommandHandler * command, - const app::ConcreteCommandPath & commandPath, - const Commands::NavigateTarget::DecodableType & commandData) +bool emberAfTargetNavigatorClusterNavigateTargetRequestCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, + const Commands::NavigateTargetRequest::DecodableType & commandData) { auto & target = commandData.target; auto & data = commandData.data; diff --git a/src/app/tests/suites/TV_AccountLoginCluster.yaml b/src/app/tests/suites/TV_AccountLoginCluster.yaml index eb7059c4be80c1..7e0f989ddb616e 100644 --- a/src/app/tests/suites/TV_AccountLoginCluster.yaml +++ b/src/app/tests/suites/TV_AccountLoginCluster.yaml @@ -24,7 +24,8 @@ tests: command: "WaitForCommissionee" - label: "Get Setup PIN Command" - command: "GetSetupPIN" + command: "getSetupPINRequest" + timedInteractionTimeoutMs: 10000 arguments: values: - name: "tempAccountIdentifier" @@ -36,7 +37,8 @@ tests: # - name: "setupPIN" # value: "tempPin123" - label: "Login Command" - command: "Login" + command: "loginRequest" + timedInteractionTimeoutMs: 10000 arguments: values: - name: "tempAccountIdentifier" @@ -45,4 +47,5 @@ tests: value: "tempPin123" - label: "Logout Command" - command: "Logout" + command: "logoutRequest" + timedInteractionTimeoutMs: 10000 diff --git a/src/app/tests/suites/TV_ApplicationBasicCluster.yaml b/src/app/tests/suites/TV_ApplicationBasicCluster.yaml index aca78397852bcf..854b3a34a82c44 100644 --- a/src/app/tests/suites/TV_ApplicationBasicCluster.yaml +++ b/src/app/tests/suites/TV_ApplicationBasicCluster.yaml @@ -23,13 +23,6 @@ tests: cluster: "DelayCommands" command: "WaitForCommissionee" - - label: "Change Status Command" - command: "ChangeStatus" - arguments: - values: - - name: "status" - value: 1 - # TODO: Support chars validation - label: "Read attribute vendor name" command: "readAttribute" diff --git a/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml b/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml index d91df598a4790a..d0672a9a924720 100644 --- a/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml +++ b/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml @@ -38,7 +38,7 @@ tests: value: { catalogVendorId: 123, applicationId: "applicationId" } - label: "Launch App Command" - command: "LaunchApp" + command: "launchAppRequest" arguments: values: - name: "data" @@ -53,7 +53,7 @@ tests: value: 0 - label: "Stop App Command" - command: "StopApp" + command: "stopAppRequest" arguments: values: - name: "application" @@ -66,7 +66,7 @@ tests: value: 0 - label: "Hide App Command" - command: "HideApp" + command: "hideAppRequest" arguments: values: - name: "application" diff --git a/src/app/tests/suites/TV_AudioOutputCluster.yaml b/src/app/tests/suites/TV_AudioOutputCluster.yaml index 668e8c38c66ef1..633d5420ab7bc3 100644 --- a/src/app/tests/suites/TV_AudioOutputCluster.yaml +++ b/src/app/tests/suites/TV_AudioOutputCluster.yaml @@ -41,14 +41,14 @@ tests: value: 0 - label: "Select Output Command" - command: "SelectOutput" + command: "selectOutputRequest" arguments: values: - name: "index" value: 1 - label: "Rename Output Command" - command: "RenameOutput" + command: "renameOutputRequest" arguments: values: - name: "index" diff --git a/src/app/tests/suites/TV_ChannelCluster.yaml b/src/app/tests/suites/TV_ChannelCluster.yaml index 0d93b9f1aceea3..eefe82e06587c0 100644 --- a/src/app/tests/suites/TV_ChannelCluster.yaml +++ b/src/app/tests/suites/TV_ChannelCluster.yaml @@ -74,7 +74,7 @@ tests: } - label: "Change Channel Command" - command: "ChangeChannel" + command: "changeChannelRequest" arguments: values: - name: "match" @@ -94,7 +94,7 @@ tests: } - label: "Change Channel By Number Command" - command: "ChangeChannelByNumber" + command: "changeChannelByNumberRequest" arguments: values: - name: "majorNumber" @@ -103,7 +103,7 @@ tests: value: 2 - label: "Skip Channel Command" - command: "SkipChannel" + command: "skipChannelRequest" arguments: values: - name: "count" diff --git a/src/app/tests/suites/TV_ContentLauncherCluster.yaml b/src/app/tests/suites/TV_ContentLauncherCluster.yaml index e2c6b5a38ef526..26c9eff68d165b 100644 --- a/src/app/tests/suites/TV_ContentLauncherCluster.yaml +++ b/src/app/tests/suites/TV_ContentLauncherCluster.yaml @@ -36,7 +36,7 @@ tests: value: 0 - label: "Launch Content Command" - command: "LaunchContent" + command: "launchContentRequest" arguments: values: - name: "autoPlay" @@ -54,11 +54,11 @@ tests: values: - name: "data" value: "exampleData" - - name: "contentLaunchStatus" + - name: "status" value: 0 - label: "Launch URL Command" - command: "LaunchURL" + command: "launchURLRequest" arguments: values: - name: "contentURL" @@ -104,5 +104,5 @@ tests: values: - name: "data" value: "exampleData" - - name: "contentLaunchStatus" + - name: "status" value: 0 diff --git a/src/app/tests/suites/TV_KeypadInputCluster.yaml b/src/app/tests/suites/TV_KeypadInputCluster.yaml index dcd00ab0400b26..c60851fefc27f4 100644 --- a/src/app/tests/suites/TV_KeypadInputCluster.yaml +++ b/src/app/tests/suites/TV_KeypadInputCluster.yaml @@ -24,7 +24,7 @@ tests: command: "WaitForCommissionee" - label: "Send Key Command" - command: "SendKey" + command: "sendKeyRequest" arguments: values: - name: "keyCode" diff --git a/src/app/tests/suites/TV_LowPowerCluster.yaml b/src/app/tests/suites/TV_LowPowerCluster.yaml index f14c9d47c6a713..ae245e5f6f418a 100644 --- a/src/app/tests/suites/TV_LowPowerCluster.yaml +++ b/src/app/tests/suites/TV_LowPowerCluster.yaml @@ -24,4 +24,4 @@ tests: command: "WaitForCommissionee" - label: "Sleep Input Status Command" - command: "Sleep" + command: "sleep" diff --git a/src/app/tests/suites/TV_MediaInputCluster.yaml b/src/app/tests/suites/TV_MediaInputCluster.yaml index 25f28811f6db0e..53a6844431ecf3 100644 --- a/src/app/tests/suites/TV_MediaInputCluster.yaml +++ b/src/app/tests/suites/TV_MediaInputCluster.yaml @@ -50,20 +50,20 @@ tests: value: 0 - label: "Select Input Command" - command: "SelectInput" + command: "selectInputRequest" arguments: values: - name: "index" value: 1 - label: "Hide Input Status Command" - command: "HideInputStatus" + command: "hideInputStatusRequest" - label: "Show Input Status Command" - command: "ShowInputStatus" + command: "showInputStatusRequest" - label: "Rename Input Command" - command: "RenameInput" + command: "renameInputRequest" arguments: values: - name: "index" diff --git a/src/app/tests/suites/TV_MediaPlaybackCluster.yaml b/src/app/tests/suites/TV_MediaPlaybackCluster.yaml index a324f2009a207d..efc7ee3323524b 100644 --- a/src/app/tests/suites/TV_MediaPlaybackCluster.yaml +++ b/src/app/tests/suites/TV_MediaPlaybackCluster.yaml @@ -68,90 +68,90 @@ tests: value: 0 - label: "Media Playback Play Command" - command: "MediaPlay" + command: "playRequest" response: values: - - name: "mediaPlaybackStatus" + - name: "status" value: 0 - label: "Media Playback Pause Command" - command: "MediaPause" + command: "pauseRequest" response: values: - - name: "mediaPlaybackStatus" + - name: "status" value: 0 - label: "Media Playback Stop Command" - command: "MediaStop" + command: "stopRequest" response: values: - - name: "mediaPlaybackStatus" + - name: "status" value: 0 - label: "Media Playback Start Over Command" - command: "MediaStartOver" + command: "startOverRequest" response: values: - - name: "mediaPlaybackStatus" + - name: "status" value: 0 - label: "Media Playback Previous Command" - command: "MediaPrevious" + command: "previousRequest" response: values: - - name: "mediaPlaybackStatus" + - name: "status" value: 0 - label: "Media Playback Next Command" - command: "MediaNext" + command: "nextRequest" response: values: - - name: "mediaPlaybackStatus" + - name: "status" value: 0 - label: "Media Playback Rewind Command" - command: "MediaRewind" + command: "rewindRequest" response: values: - - name: "mediaPlaybackStatus" + - name: "status" value: 0 - label: "Media Playback Fast Forward Command" - command: "MediaFastForward" + command: "fastForwardRequest" response: values: - - name: "mediaPlaybackStatus" + - name: "status" value: 0 - label: "Media Playback Skip Forward Command" - command: "MediaSkipForward" + command: "skipForwardRequest" arguments: values: - name: "deltaPositionMilliseconds" value: 100 response: values: - - name: "mediaPlaybackStatus" + - name: "status" value: 0 - label: "Media Playback Skip Backward Command" - command: "MediaSkipBackward" + command: "skipBackwardRequest" arguments: values: - name: "deltaPositionMilliseconds" value: 100 response: values: - - name: "mediaPlaybackStatus" + - name: "status" value: 0 - label: "Media Playback Seek Command" - command: "MediaSeek" + command: "seekRequest" arguments: values: - name: "position" value: 100 response: values: - - name: "mediaPlaybackStatus" + - name: "status" value: 0 diff --git a/src/app/tests/suites/TV_TargetNavigatorCluster.yaml b/src/app/tests/suites/TV_TargetNavigatorCluster.yaml index 9b167032fe0bf8..eb1c9bde08cfda 100644 --- a/src/app/tests/suites/TV_TargetNavigatorCluster.yaml +++ b/src/app/tests/suites/TV_TargetNavigatorCluster.yaml @@ -39,8 +39,8 @@ tests: response: value: 0 - - label: "Navigate Target Command" - command: "NavigateTarget" + - label: "Navigate Target Request Command" + command: "navigateTargetRequest" arguments: values: - name: "target" diff --git a/src/app/util/ContentApp.cpp b/src/app/util/ContentApp.cpp index e8992cc3cb029a..90afd8bd3d4600 100644 --- a/src/app/util/ContentApp.cpp +++ b/src/app/util/ContentApp.cpp @@ -132,11 +132,11 @@ EmberAfStatus ApplicationBasic::HandleWriteAttribute(chip::AttributeId attribute { if (*buffer) { - SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationBasicStatus::kActiveVisibleFocus); + SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationStatusEnum::kActiveVisibleFocus); } else { - SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationBasicStatus::kActiveVisibleNotFocus); + SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationStatusEnum::kActiveVisibleNotFocus); } } else @@ -228,7 +228,7 @@ CHIP_ERROR TargetNavigator::GetTargetInfoList(chip::app::AttributeValueEncoder & { // ReturnErrorOnFailure(encoder.Encode(chip::CharSpan(entry.c_str(), entry.length()))); - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::Type targetInfo; + chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type targetInfo; targetInfo.name = chip::CharSpan(entry.c_str(), entry.length()); targetInfo.identifier = static_cast(i++); ReturnErrorOnFailure(encoder.Encode(targetInfo)); @@ -246,11 +246,11 @@ TargetNavigatorResponse TargetNavigator::NavigateTarget(uint8_t target, std::str response.data = (uint8_t *) testData; if (target >= mTargets.size()) { - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE; + response.status = to_underlying(app::Clusters::TargetNavigator::StatusEnum::kAppNotAvailable); } else { - response.status = EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS; + response.status = to_underlying(app::Clusters::TargetNavigator::StatusEnum::kSuccess); mCurrentTarget = target; } return response; diff --git a/src/app/util/ContentApp.h b/src/app/util/ContentApp.h index e9572c0d3dc25c..c7e38a33728457 100644 --- a/src/app/util/ContentApp.h +++ b/src/app/util/ContentApp.h @@ -52,13 +52,13 @@ class DLL_EXPORT ApplicationBasic : public ContentAppCluster public: virtual ~ApplicationBasic() = default; - virtual const char * GetVendorName() = 0; - virtual uint16_t GetVendorId() = 0; - virtual const char * GetApplicationName() = 0; - virtual uint16_t GetProductId() = 0; - virtual app::Clusters::ApplicationBasic::ApplicationBasicStatus GetApplicationStatus() = 0; - virtual const char * GetApplicationVersion() = 0; - virtual void SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationBasicStatus applicationStatus) = 0; + virtual const char * GetVendorName() = 0; + virtual uint16_t GetVendorId() = 0; + virtual const char * GetApplicationName() = 0; + virtual uint16_t GetProductId() = 0; + virtual app::Clusters::ApplicationBasic::ApplicationStatusEnum GetApplicationStatus() = 0; + virtual const char * GetApplicationVersion() = 0; + virtual void SetApplicationStatus(app::Clusters::ApplicationBasic::ApplicationStatusEnum applicationStatus) = 0; EmberAfStatus HandleReadAttribute(chip::AttributeId attributeId, uint8_t * buffer, uint16_t maxReadLength) override; EmberAfStatus HandleWriteAttribute(chip::AttributeId attributeId, uint8_t * buffer) override; @@ -91,7 +91,7 @@ class DLL_EXPORT ApplicationLauncher : public ContentAppCluster public: virtual ~ApplicationLauncher() = default; - virtual ApplicationLauncherResponse LaunchApp(ApplicationLauncherApp application, std::string data) = 0; + virtual ApplicationLauncherResponse LaunchApp(Application 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; @@ -102,8 +102,7 @@ class DLL_EXPORT ContentLauncher : public ContentAppCluster public: virtual ~ContentLauncher() = default; - virtual ContentLaunchResponse LaunchContent(std::list parameterList, bool autoplay, - std::string data) = 0; + virtual LaunchResponse LaunchContent(std::list parameterList, bool autoplay, 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 3d2acf41d68550..d4b18158a6f33a 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(ApplicationLauncherApp application) +ContentApp * AppPlatform::GetLoadContentAppByAppId(Application application) { ChipLogProgress(DeviceLayer, "GetLoadContentAppByAppId()"); if (mContentAppFactory != NULL) diff --git a/src/app/util/ContentAppPlatform.h b/src/app/util/ContentAppPlatform.h index 0f64e9532d3298..81de4ebc62b6e2 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(ApplicationLauncherApp application) = 0; + virtual ~ContentAppFactory() = default; + virtual ContentApp * LoadContentAppByVendorId(uint16_t vendorId) = 0; + virtual ContentApp * LoadContentAppByAppId(Application 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(ApplicationLauncherApp application); + ContentApp * GetLoadContentAppByAppId(Application 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/templates/app/helper.js b/src/app/zap-templates/templates/app/helper.js index 8443e8e643326f..504cc2a48a943f 100644 --- a/src/app/zap-templates/templates/app/helper.js +++ b/src/app/zap-templates/templates/app/helper.js @@ -611,9 +611,7 @@ async function getResponseCommandName(responseRef, options) function isWeaklyTypedEnum(label) { return [ - "ApplicationLauncherStatus", "AttributeWritePermission", - "AudioOutputType", "BarrierControlBarrierPosition", "BarrierControlMovingState", "BootReasonType", @@ -645,13 +643,8 @@ function isWeaklyTypedEnum(label) "IdentifyEffectVariant", "IdentifyIdentifyType", "InterfaceType", - "KeypadInputCecKeyCode", - "KeypadInputStatus", "KeypadLockout", "LevelControlOptions", - "MediaInputType", - "MediaPlaybackState", - "MediaPlaybackStatus", "MoveMode", "NetworkFaultType", "NodeOperationalCertStatus", diff --git a/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml index 5109dca5284f92..04a414aa340b42 100644 --- a/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml @@ -25,22 +25,22 @@ limitations under the License. true This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. - + Upon receipt, the Content App checks if the account associated with the client Temp Account Identifier Rotating ID is the same acount that is active on the given Content App. If the accounts are the same, then the Content App includes the Setup PIN in the GetSetupPIN Response. - + Upon receipt, the Content App checks if the account associated with the client’s Temp Account Identifier (Rotating ID) has a current active Setup PIN with the given value. If the Setup PIN is valid for the user account associated with the Temp Account Identifier, then the Content App MAY make that user account active. - + The purpose of this command is to instruct the Content App to clear the current user account. This command SHOULD be used by clients of a Content App to indicate the end of a user session. - + This message is sent in response to the GetSetupPIN Request, and contains the Setup PIN code, or null when the accounts identified in the request does not match the active account of the running Content App. 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 ed1af1ffc2b694..359d541304d983 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,24 +28,19 @@ limitations under the License. vendor id application name product id - application app - application status + application app + application status application version - - - - Upon receipt, this SHALL change the running status of the application. - - + 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 772bd8a06be277..d5e0809dcd9117 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 @@ -26,57 +26,45 @@ limitations under the License. This cluster provides an interface for launching content on a media player device such as a TV or Speaker. application launcher list - application launcher app + application launcher app - + 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. - + - + This command SHALL be generated in response to LaunchApp commands. - - - - - - This command SHALL be generated in response to StopApp commands. - - - - - - This command SHALL be generated in response to HideApp commands. - + - + - + - + - + diff --git a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml index c6a87f87fed805..ba3a44aee75594 100644 --- a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml @@ -25,15 +25,15 @@ limitations under the License. true This cluster provides an interface for controlling the Output on a media device such as a TV. - audio output list + audio output list current audio output - + Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List. - + Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus. @@ -41,14 +41,14 @@ limitations under the License. - + - + - + diff --git a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml index 64c2dd05de2015..b69929d53927ca 100644 --- a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml @@ -25,30 +25,30 @@ limitations under the License. true This cluster provides an interface for controlling the current Channel on a device. - channel list - channel lineup - current channel + channel list + channel lineup + current channel - + Change the channel on the media player to the channel case-insensitive exact matching the value passed as an argument. - + Change the channel on the media plaeyer to the channel with the given Number in the ChannelList attribute. - + This command provides channel up and channel down functionality, but allows channel index jumps of size Count. When the value of the increase or decrease is larger than the number of channels remaining in the given direction, then the behavior SHALL be to return to the beginning (or end) of the channel list and continue. For example, if the current channel is at index 0 and count value of -1 is given, then the current channel should change to the last channel. - + Upon receipt, this SHALL display the active status of the input list on screen. - + @@ -62,20 +62,20 @@ limitations under the License. - + - + - + - + diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml index db2e801b854662..774321b0afab05 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml @@ -29,72 +29,71 @@ limitations under the License. accept header list supported streaming protocols - + Upon receipt, this SHALL launch the specified content with optional search criteria. - + - + Upon receipt, this SHALL launch content from the specified URL. - + - + This command SHALL be generated in response to LaunchContent command. - - - - - - This command SHALL be generated in response to LaunchURL command. - + - + + + + + + - + - + - + - + - + - + - - - - - + + + + + - + @@ -111,18 +110,18 @@ limitations under the License. - + - + - + - + diff --git a/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml index a87cb4e6ae4788..096b22e43d6522 100644 --- a/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml @@ -26,26 +26,26 @@ limitations under the License. This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. - + Upon receipt, this SHALL process a keycode as input to the media device. - + - + This command SHALL be generated in response to a SendKey Request command. - + - + - + diff --git a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml index b75e94bca0b0c0..03f37e0da1e39a 100644 --- a/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml @@ -25,23 +25,23 @@ limitations under the License. true This cluster provides an interface for controlling the Input Selector on a media device such as a TV. - media input list + media input list current media input - + Upon receipt, this SHALL change the input on the media device to the input at a specific index in the Input List. - + Upon receipt, this SHALL display the active status of the input list on screen. - + Upon receipt, this SHALL hide the input list from the screen. - + Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus. @@ -49,15 +49,15 @@ limitations under the License. - + - + - + diff --git a/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml index ca451e2f41dcb1..b7819f3e1665b1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml @@ -26,126 +26,76 @@ limitations under the License. This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. - playback state + playback state start time duration - position + position playback speed seek range end seek range start - + Upon receipt, this SHALL play media. - + Upon receipt, this SHALL pause media. - + Upon receipt, this SHALL stop media. User experience is context-specific. This will often navigate the user back to the location where media was originally launched. - + Upon receipt, this SHALL Start Over with the current media playback item. - + Upon receipt, this SHALL cause the handler to be invoked for "Previous". User experience is context-specific. This will often Go back to the previous media playback item. - + Upon receipt, this SHALL cause the handler to be invoked for "Next". User experience is context-specific. This will often Go forward to the next media playback item. - + Upon receipt, this SHALL Rewind through media. Different Rewind speeds can be used on the TV based upon the number of sequential calls to this function. This is to avoid needing to define every speed now (multiple fast, slow motion, etc). - + Upon receipt, this SHALL Advance through media. Different FF speeds can be used on the TV based upon the number of sequential calls to this function. This is to avoid needing to define every speed now (multiple fast, slow motion, etc). - + Upon receipt, this SHALL Skip forward in the media by the given number of seconds, using the data as follows: - + Upon receipt, this SHALL Skip backward in the media by the given number of seconds, using the data as follows: - + Upon receipt, this SHALL Skip backward in the media by the given number of seconds, using the data as follows: - - Upon receipt, this SHALL play media. - - - - - Upon receipt, this SHALL pause media. - - - - - Upon receipt, this SHALL stop media. User experience is context-specific. This will often navigate the user back to the location where media was originally launched. - - - - - Upon receipt, this SHALL Start Over with the current media playback item. - - - - - Upon receipt, this SHALL cause the handler to be invoked for "Previous". User experience is context-specific. This will often Go back to the previous media playback item. - - - - - Upon receipt, this SHALL cause the handler to be invoked for "Next". User experience is context-specific. This will often Go forward to the next media playback item. - - - - - Upon receipt, this SHALL Rewind through media. Different Rewind speeds can be used on the TV based upon the number of sequential calls to this function. This is to avoid needing to define every speed now (multiple fast, slow motion, etc). - - - - - Upon receipt, this SHALL Advance through media. Different FF speeds can be used on the TV based upon the number of sequential calls to this function. This is to avoid needing to define every speed now (multiple fast, slow motion, etc). - - - - - Upon receipt, this SHALL Skip forward in the media by the given number of seconds, using the data as follows: - - - - - Upon receipt, this SHALL Skip backward in the media by the given number of seconds, using the data as follows: - - - - - Upon receipt, this SHALL change the playback position in the media to the given position using data as follows: - + + This command SHALL be generated in response to various Playback Request commands. + - + - + @@ -153,7 +103,7 @@ limitations under the License. - + diff --git a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml index 1fb16d28ab5740..24477d624342ab 100644 --- a/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/target-navigator-cluster.xml @@ -25,30 +25,30 @@ limitations under the License. true This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. - target navigator list + target navigator list current navigator target - + Upon receipt, this SHALL navigation the UX to the target identified. - + This command SHALL be generated in response to NavigateTarget commands. - + - + - + diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index f8d1086c73f3c3..4b93e00304b3b4 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -10700,6 +10700,21 @@ "enabled": 1, "commands": [], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -10782,7 +10797,7 @@ "enabled": 1, "commands": [ { - "name": "ChangeChannel", + "name": "ChangeChannelRequest", "code": 0, "mfgCode": null, "source": "client", @@ -10790,16 +10805,16 @@ "outgoing": 1 }, { - "name": "ChangeChannelByNumber", - "code": 1, + "name": "ChangeChannelByNumberRequest", + "code": 2, "mfgCode": null, "source": "client", "incoming": 0, "outgoing": 1 }, { - "name": "SkipChannel", - "code": 2, + "name": "SkipChannelRequest", + "code": 3, "mfgCode": null, "source": "client", "incoming": 0, @@ -10834,7 +10849,7 @@ "commands": [ { "name": "ChangeChannelResponse", - "code": 0, + "code": 1, "mfgCode": null, "source": "server", "incoming": 1, @@ -10928,7 +10943,7 @@ "enabled": 1, "commands": [ { - "name": "NavigateTarget", + "name": "NavigateTargetRequest", "code": 0, "mfgCode": null, "source": "client", @@ -10937,6 +10952,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -10964,7 +10994,7 @@ "commands": [ { "name": "NavigateTargetResponse", - "code": 0, + "code": 1, "mfgCode": null, "source": "server", "incoming": 1, @@ -10997,7 +11027,7 @@ "singleton": 0, "bounded": 0, "defaultValue": "0x00", - "reportable": 0, + "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 @@ -11017,6 +11047,21 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11043,7 +11088,7 @@ "enabled": 1, "commands": [ { - "name": "MediaPlay", + "name": "PlayRequest", "code": 0, "mfgCode": null, "source": "client", @@ -11051,7 +11096,7 @@ "outgoing": 1 }, { - "name": "MediaPause", + "name": "PauseRequest", "code": 1, "mfgCode": null, "source": "client", @@ -11059,7 +11104,7 @@ "outgoing": 1 }, { - "name": "MediaStop", + "name": "StopRequest", "code": 2, "mfgCode": null, "source": "client", @@ -11067,7 +11112,7 @@ "outgoing": 1 }, { - "name": "MediaStartOver", + "name": "StartOverRequest", "code": 3, "mfgCode": null, "source": "client", @@ -11075,7 +11120,7 @@ "outgoing": 1 }, { - "name": "MediaPrevious", + "name": "PreviousRequest", "code": 4, "mfgCode": null, "source": "client", @@ -11083,7 +11128,7 @@ "outgoing": 1 }, { - "name": "MediaNext", + "name": "NextRequest", "code": 5, "mfgCode": null, "source": "client", @@ -11091,7 +11136,7 @@ "outgoing": 1 }, { - "name": "MediaRewind", + "name": "RewindRequest", "code": 6, "mfgCode": null, "source": "client", @@ -11099,7 +11144,7 @@ "outgoing": 1 }, { - "name": "MediaFastForward", + "name": "FastForwardRequest", "code": 7, "mfgCode": null, "source": "client", @@ -11107,7 +11152,7 @@ "outgoing": 1 }, { - "name": "MediaSkipForward", + "name": "SkipForwardRequest", "code": 8, "mfgCode": null, "source": "client", @@ -11115,7 +11160,7 @@ "outgoing": 1 }, { - "name": "MediaSkipBackward", + "name": "SkipBackwardRequest", "code": 9, "mfgCode": null, "source": "client", @@ -11123,8 +11168,8 @@ "outgoing": 1 }, { - "name": "MediaSeek", - "code": 10, + "name": "SeekRequest", + "code": 11, "mfgCode": null, "source": "client", "incoming": 0, @@ -11132,6 +11177,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11158,88 +11218,8 @@ "enabled": 0, "commands": [ { - "name": "MediaPlayResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaPauseResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaStopResponse", - "code": 2, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaStartOverResponse", - "code": 3, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaPreviousResponse", - "code": 4, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaNextResponse", - "code": 5, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaRewindResponse", - "code": 6, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaFastForwardResponse", - "code": 7, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaSkipForwardResponse", - "code": 8, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaSkipBackwardResponse", - "code": 9, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MediaSeekResponse", - "code": 11, + "name": "PlaybackResponse", + "code": 10, "mfgCode": null, "source": "server", "incoming": 1, @@ -11367,6 +11347,21 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11393,7 +11388,7 @@ "enabled": 1, "commands": [ { - "name": "SelectInput", + "name": "SelectInputRequest", "code": 0, "mfgCode": null, "source": "client", @@ -11401,7 +11396,7 @@ "outgoing": 1 }, { - "name": "ShowInputStatus", + "name": "ShowInputStatusRequest", "code": 1, "mfgCode": null, "source": "client", @@ -11409,7 +11404,7 @@ "outgoing": 1 }, { - "name": "HideInputStatus", + "name": "HideInputStatusRequest", "code": 2, "mfgCode": null, "source": "client", @@ -11417,7 +11412,7 @@ "outgoing": 1 }, { - "name": "RenameInput", + "name": "RenameInputRequest", "code": 3, "mfgCode": null, "source": "client", @@ -11426,6 +11421,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11497,6 +11507,21 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11532,6 +11557,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11599,7 +11639,7 @@ "enabled": 1, "commands": [ { - "name": "SendKey", + "name": "SendKeyRequest", "code": 0, "mfgCode": null, "source": "client", @@ -11608,6 +11648,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11635,7 +11690,7 @@ "commands": [ { "name": "SendKeyResponse", - "code": 0, + "code": 1, "mfgCode": null, "source": "server", "incoming": 1, @@ -11684,7 +11739,7 @@ "enabled": 1, "commands": [ { - "name": "LaunchContent", + "name": "LaunchContentRequest", "code": 0, "mfgCode": null, "source": "client", @@ -11692,7 +11747,7 @@ "outgoing": 1 }, { - "name": "LaunchURL", + "name": "LaunchURLRequest", "code": 1, "mfgCode": null, "source": "client", @@ -11701,6 +11756,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11727,16 +11797,8 @@ "enabled": 0, "commands": [ { - "name": "LaunchContentResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "LaunchURLResponse", - "code": 1, + "name": "LaunchResponse", + "code": 2, "mfgCode": null, "source": "server", "incoming": 1, @@ -11815,7 +11877,7 @@ "enabled": 1, "commands": [ { - "name": "SelectOutput", + "name": "SelectOutputRequest", "code": 0, "mfgCode": null, "source": "client", @@ -11823,7 +11885,7 @@ "outgoing": 1 }, { - "name": "RenameOutput", + "name": "RenameOutputRequest", "code": 1, "mfgCode": null, "source": "client", @@ -11832,6 +11894,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11929,7 +12006,7 @@ "enabled": 1, "commands": [ { - "name": "LaunchApp", + "name": "LaunchAppRequest", "code": 0, "mfgCode": null, "source": "client", @@ -11937,7 +12014,7 @@ "outgoing": 1 }, { - "name": "StopApp", + "name": "StopAppRequest", "code": 1, "mfgCode": null, "source": "client", @@ -11945,7 +12022,7 @@ "outgoing": 1 }, { - "name": "HideApp", + "name": "HideAppRequest", "code": 2, "mfgCode": null, "source": "client", @@ -11954,6 +12031,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11980,24 +12072,8 @@ "enabled": 0, "commands": [ { - "name": "LaunchAppResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "StopAppResponse", - "code": 1, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "HideAppResponse", - "code": 2, + "name": "LauncherResponse", + "code": 3, "mfgCode": null, "source": "server", "incoming": 1, @@ -12050,6 +12126,21 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12074,17 +12165,23 @@ "define": "APPLICATION_BASIC_CLUSTER", "side": "client", "enabled": 1, - "commands": [ + "commands": [], + "attributes": [ { - "name": "ChangeStatus", - "code": 0, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 - } - ], - "attributes": [ + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12216,6 +12313,21 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "allowed vendor list", + "code": 7, + "mfgCode": null, + "side": "server", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "AttributeList", "code": 65531, @@ -12257,7 +12369,7 @@ "enabled": 1, "commands": [ { - "name": "GetSetupPIN", + "name": "GetSetupPINRequest", "code": 0, "mfgCode": null, "source": "client", @@ -12265,16 +12377,16 @@ "outgoing": 1 }, { - "name": "Login", - "code": 1, + "name": "LoginRequest", + "code": 2, "mfgCode": null, "source": "client", "incoming": 0, "outgoing": 1 }, { - "name": "Logout", - "code": 2, + "name": "LogoutRequest", + "code": 3, "mfgCode": null, "source": "client", "incoming": 0, @@ -12282,6 +12394,21 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 0, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -12309,7 +12436,7 @@ "commands": [ { "name": "GetSetupPINResponse", - "code": 0, + "code": 1, "mfgCode": null, "source": "server", "incoming": 1, @@ -14025,5 +14152,6 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h index 64f5d676992256..3fc0d5c6385238 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -64,16 +64,14 @@ typedef void (*CHIPApplicationBasicClusterApplicationStatusAttributeCallbackType void *, chip::app::Clusters::ApplicationBasic::Attributes::ApplicationStatus::TypeInfo::DecodableArgType); typedef void (*CHIPApplicationBasicClusterApplicationVersionAttributeCallbackType)( void *, chip::app::Clusters::ApplicationBasic::Attributes::ApplicationVersion::TypeInfo::DecodableArgType); +typedef void (*CHIPApplicationBasicClusterAllowedVendorListAttributeCallbackType)( + void *, const chip::app::Clusters::ApplicationBasic::Attributes::AllowedVendorList::TypeInfo::DecodableType &); typedef void (*CHIPApplicationBasicClusterAttributeListAttributeCallbackType)( void *, const chip::app::Clusters::ApplicationBasic::Attributes::AttributeList::TypeInfo::DecodableType &); typedef void (*CHIPApplicationBasicClusterClusterRevisionAttributeCallbackType)( void *, chip::app::Clusters::ApplicationBasic::Attributes::ClusterRevision::TypeInfo::DecodableArgType); -typedef void (*CHIPApplicationLauncherClusterHideAppResponseCallbackType)( - void *, const chip::app::Clusters::ApplicationLauncher::Commands::HideAppResponse::DecodableType &); -typedef void (*CHIPApplicationLauncherClusterLaunchAppResponseCallbackType)( - void *, const chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppResponse::DecodableType &); -typedef void (*CHIPApplicationLauncherClusterStopAppResponseCallbackType)( - void *, const chip::app::Clusters::ApplicationLauncher::Commands::StopAppResponse::DecodableType &); +typedef void (*CHIPApplicationLauncherClusterLauncherResponseCallbackType)( + void *, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType &); typedef void (*CHIPApplicationLauncherClusterApplicationLauncherListAttributeCallbackType)( void *, const chip::app::Clusters::ApplicationLauncher::Attributes::ApplicationLauncherList::TypeInfo::DecodableType &); @@ -303,10 +301,8 @@ typedef void (*CHIPColorControlClusterAttributeListAttributeCallbackType)( void *, const chip::app::Clusters::ColorControl::Attributes::AttributeList::TypeInfo::DecodableType &); typedef void (*CHIPColorControlClusterClusterRevisionAttributeCallbackType)( void *, chip::app::Clusters::ColorControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType); -typedef void (*CHIPContentLauncherClusterLaunchContentResponseCallbackType)( - void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchContentResponse::DecodableType &); -typedef void (*CHIPContentLauncherClusterLaunchURLResponseCallbackType)( - void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchURLResponse::DecodableType &); +typedef void (*CHIPContentLauncherClusterLaunchResponseCallbackType)( + void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType &); typedef void (*CHIPContentLauncherClusterAcceptHeaderListAttributeCallbackType)( void *, const chip::app::Clusters::ContentLauncher::Attributes::AcceptHeaderList::TypeInfo::DecodableType &); @@ -601,28 +597,8 @@ typedef void (*CHIPMediaInputClusterAttributeListAttributeCallbackType)( void *, const chip::app::Clusters::MediaInput::Attributes::AttributeList::TypeInfo::DecodableType &); typedef void (*CHIPMediaInputClusterClusterRevisionAttributeCallbackType)( void *, chip::app::Clusters::MediaInput::Attributes::ClusterRevision::TypeInfo::DecodableArgType); -typedef void (*CHIPMediaPlaybackClusterMediaFastForwardResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaFastForwardResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaNextResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaNextResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaPauseResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaPauseResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaPlayResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaPlayResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaPreviousResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaPreviousResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaRewindResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaRewindResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaSeekResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaSeekResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackwardResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaSkipForwardResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaSkipForwardResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaStartOverResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaStartOverResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaStopResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaStopResponse::DecodableType &); +typedef void (*CHIPMediaPlaybackClusterPlaybackResponseCallbackType)( + void *, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType &); typedef void (*CHIPMediaPlaybackClusterPlaybackStateAttributeCallbackType)( void *, chip::app::Clusters::MediaPlayback::Attributes::PlaybackState::TypeInfo::DecodableArgType); diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp index 63b5ce368bff7c..291208fb681d2a 100644 --- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp @@ -68,14 +68,14 @@ JNI_METHOD(jlong, AccountLoginCluster, initWithDevice)(JNIEnv * env, jobject sel return reinterpret_cast(cppCluster); } -JNI_METHOD(void, AccountLoginCluster, getSetupPIN) +JNI_METHOD(void, AccountLoginCluster, getSetupPINRequest) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; AccountLoginCluster * cppCluster; - chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Type request; + chip::app::Clusters::AccountLogin::Commands::GetSetupPINRequest::Type request; request.tempAccountIdentifier = chip::JniUtfString(env, static_cast(tempAccountIdentifier)).charSpan(); @@ -101,7 +101,7 @@ JNI_METHOD(void, AccountLoginCluster, getSetupPIN) chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); - err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); + err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall, 10000); VerifyOrReturn(err == CHIP_NO_ERROR, AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error invoking command", CHIP_ERROR_INCORRECT_STATE)); @@ -109,14 +109,14 @@ JNI_METHOD(void, AccountLoginCluster, getSetupPIN) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, AccountLoginCluster, login) +JNI_METHOD(void, AccountLoginCluster, loginRequest) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier, jstring setupPIN) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; AccountLoginCluster * cppCluster; - chip::app::Clusters::AccountLogin::Commands::Login::Type request; + chip::app::Clusters::AccountLogin::Commands::LoginRequest::Type request; request.tempAccountIdentifier = chip::JniUtfString(env, static_cast(tempAccountIdentifier)).charSpan(); request.setupPIN = chip::JniUtfString(env, static_cast(setupPIN)).charSpan(); @@ -148,13 +148,13 @@ JNI_METHOD(void, AccountLoginCluster, login) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, AccountLoginCluster, logout)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, AccountLoginCluster, logoutRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; AccountLoginCluster * cppCluster; - chip::app::Clusters::AccountLogin::Commands::Logout::Type request; + chip::app::Clusters::AccountLogin::Commands::LogoutRequest::Type request; std::unique_ptr onSuccess( Platform::New(callback), Platform::Delete); @@ -175,7 +175,7 @@ JNI_METHOD(void, AccountLoginCluster, logout)(JNIEnv * env, jobject self, jlong auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); - err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); + err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall, 10000); VerifyOrReturn(err == CHIP_NO_ERROR, AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error invoking command", CHIP_ERROR_INCORRECT_STATE)); @@ -398,44 +398,6 @@ JNI_METHOD(jlong, ApplicationBasicCluster, initWithDevice)(JNIEnv * env, jobject return reinterpret_cast(cppCluster); } -JNI_METHOD(void, ApplicationBasicCluster, changeStatus) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject status) -{ - chip::DeviceLayer::StackLock lock; - CHIP_ERROR err = CHIP_NO_ERROR; - ApplicationBasicCluster * cppCluster; - - chip::app::Clusters::ApplicationBasic::Commands::ChangeStatus::Type request; - - request.status = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(status)); - - std::unique_ptr onSuccess( - Platform::New(callback), Platform::Delete); - std::unique_ptr onFailure( - Platform::New(callback), Platform::Delete); - VerifyOrReturn(onSuccess.get() != nullptr, - AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY)); - VerifyOrReturn(onFailure.get() != nullptr, - AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY)); - - cppCluster = reinterpret_cast(clusterPtr); - VerifyOrReturn(cppCluster != nullptr, - AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( - env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - - auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); - auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); - - err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); - VerifyOrReturn(err == CHIP_NO_ERROR, - AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error invoking command", - CHIP_ERROR_INCORRECT_STATE)); - - onSuccess.release(); - onFailure.release(); -} JNI_METHOD(void, ApplicationBasicCluster, subscribeVendorNameAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval) { @@ -704,21 +666,21 @@ JNI_METHOD(jlong, ApplicationLauncherCluster, initWithDevice)(JNIEnv * env, jobj return reinterpret_cast(cppCluster); } -JNI_METHOD(void, ApplicationLauncherCluster, hideApp) +JNI_METHOD(void, ApplicationLauncherCluster, hideAppRequest) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject catalogVendorId, jstring applicationId) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; ApplicationLauncherCluster * cppCluster; - chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Type request; + chip::app::Clusters::ApplicationLauncher::Commands::HideAppRequest::Type request; - request.application = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApp::Type(); + request.application = chip::app::Clusters::ApplicationLauncher::Structs::Application::Type(); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -734,7 +696,7 @@ JNI_METHOD(void, ApplicationLauncherCluster, hideApp) env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -745,22 +707,22 @@ JNI_METHOD(void, ApplicationLauncherCluster, hideApp) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, ApplicationLauncherCluster, launchApp) +JNI_METHOD(void, ApplicationLauncherCluster, launchAppRequest) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring data, jobject catalogVendorId, jstring applicationId) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; ApplicationLauncherCluster * cppCluster; - chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Type request; + chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppRequest::Type request; request.data = chip::JniUtfString(env, static_cast(data)).charSpan(); - request.application = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApp::Type(); + request.application = chip::app::Clusters::ApplicationLauncher::Structs::Application::Type(); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -776,7 +738,7 @@ JNI_METHOD(void, ApplicationLauncherCluster, launchApp) env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -787,21 +749,21 @@ JNI_METHOD(void, ApplicationLauncherCluster, launchApp) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, ApplicationLauncherCluster, stopApp) +JNI_METHOD(void, ApplicationLauncherCluster, stopAppRequest) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject catalogVendorId, jstring applicationId) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; ApplicationLauncherCluster * cppCluster; - chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Type request; + chip::app::Clusters::ApplicationLauncher::Commands::StopAppRequest::Type request; - request.application = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApp::Type(); + request.application = chip::app::Clusters::ApplicationLauncher::Structs::Application::Type(); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -817,7 +779,7 @@ JNI_METHOD(void, ApplicationLauncherCluster, stopApp) env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -874,14 +836,14 @@ JNI_METHOD(jlong, AudioOutputCluster, initWithDevice)(JNIEnv * env, jobject self return reinterpret_cast(cppCluster); } -JNI_METHOD(void, AudioOutputCluster, renameOutput) +JNI_METHOD(void, AudioOutputCluster, renameOutputRequest) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject index, jstring name) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; AudioOutputCluster * cppCluster; - chip::app::Clusters::AudioOutput::Commands::RenameOutput::Type request; + chip::app::Clusters::AudioOutput::Commands::RenameOutputRequest::Type request; request.index = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(index)); request.name = chip::JniUtfString(env, static_cast(name)).charSpan(); @@ -913,13 +875,14 @@ JNI_METHOD(void, AudioOutputCluster, renameOutput) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, AudioOutputCluster, selectOutput)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject index) +JNI_METHOD(void, AudioOutputCluster, selectOutputRequest) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject index) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; AudioOutputCluster * cppCluster; - chip::app::Clusters::AudioOutput::Commands::SelectOutput::Type request; + chip::app::Clusters::AudioOutput::Commands::SelectOutputRequest::Type request; request.index = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(index)); @@ -3228,19 +3191,22 @@ JNI_METHOD(jlong, ChannelCluster, initWithDevice)(JNIEnv * env, jobject self, jl return reinterpret_cast(cppCluster); } -JNI_METHOD(void, ChannelCluster, changeChannel)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring match) +JNI_METHOD(void, ChannelCluster, changeChannelByNumberRequest) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject majorNumber, jobject minorNumber) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; ChannelCluster * cppCluster; - chip::app::Clusters::Channel::Commands::ChangeChannel::Type request; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumberRequest::Type request; - request.match = chip::JniUtfString(env, static_cast(match)).charSpan(); + request.majorNumber = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(majorNumber)); + request.minorNumber = + static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(minorNumber)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr onSuccess( + Platform::New(callback), Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -3255,8 +3221,7 @@ JNI_METHOD(void, ChannelCluster, changeChannel)(JNIEnv * env, jobject self, jlon AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -3267,22 +3232,20 @@ JNI_METHOD(void, ChannelCluster, changeChannel)(JNIEnv * env, jobject self, jlon onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, ChannelCluster, changeChannelByNumber) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject majorNumber, jobject minorNumber) +JNI_METHOD(void, ChannelCluster, changeChannelRequest) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring match) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; ChannelCluster * cppCluster; - chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type request; + chip::app::Clusters::Channel::Commands::ChangeChannelRequest::Type request; - request.majorNumber = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(majorNumber)); - request.minorNumber = - static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(minorNumber)); + request.match = chip::JniUtfString(env, static_cast(match)).charSpan(); - std::unique_ptr onSuccess( - Platform::New(callback), Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -3297,7 +3260,8 @@ JNI_METHOD(void, ChannelCluster, changeChannelByNumber) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -3308,13 +3272,13 @@ JNI_METHOD(void, ChannelCluster, changeChannelByNumber) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, ChannelCluster, skipChannel)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject count) +JNI_METHOD(void, ChannelCluster, skipChannelRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject count) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; ChannelCluster * cppCluster; - chip::app::Clusters::Channel::Commands::SkipChannel::Type request; + chip::app::Clusters::Channel::Commands::SkipChannelRequest::Type request; request.count = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(count)); @@ -6732,25 +6696,22 @@ JNI_METHOD(jlong, ContentLauncherCluster, initWithDevice)(JNIEnv * env, jobject return reinterpret_cast(cppCluster); } -JNI_METHOD(void, ContentLauncherCluster, launchContent) -(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject autoPlay, jstring data, jobject type, jstring value, - jobject externalIDList) +JNI_METHOD(void, ContentLauncherCluster, launchContentRequest) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject autoPlay, jstring data, jobject parameterList) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; ContentLauncherCluster * cppCluster; - chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type request; + chip::app::Clusters::ContentLauncher::Commands::LaunchContentRequest::Type request; request.autoPlay = static_cast(chip::JniReferences::GetInstance().BooleanToPrimitive(autoPlay)); request.data = chip::JniUtfString(env, static_cast(data)).charSpan(); - request.search = - chip::app::DataModel::List(); + request.search = chip::app::DataModel::List(); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -6766,7 +6727,7 @@ JNI_METHOD(void, ContentLauncherCluster, launchContent) env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -6777,7 +6738,7 @@ JNI_METHOD(void, ContentLauncherCluster, launchContent) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, ContentLauncherCluster, launchURL) +JNI_METHOD(void, ContentLauncherCluster, launchURLRequest) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring contentURL, jstring displayString, jstring providerName, jobject background, jobject logo, jobject progressBar, jobject splash, jobject waterMark) { @@ -6785,17 +6746,15 @@ JNI_METHOD(void, ContentLauncherCluster, launchURL) CHIP_ERROR err = CHIP_NO_ERROR; ContentLauncherCluster * cppCluster; - chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type request; + chip::app::Clusters::ContentLauncher::Commands::LaunchURLRequest::Type request; - request.contentURL = chip::JniUtfString(env, static_cast(contentURL)).charSpan(); - request.displayString = chip::JniUtfString(env, static_cast(displayString)).charSpan(); - request.brandingInformation = - chip::app::DataModel::List(); + request.contentURL = chip::JniUtfString(env, static_cast(contentURL)).charSpan(); + request.displayString = chip::JniUtfString(env, static_cast(displayString)).charSpan(); + request.brandingInformation = chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::Type(); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -6811,7 +6770,7 @@ JNI_METHOD(void, ContentLauncherCluster, launchURL) env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -10703,13 +10662,14 @@ JNI_METHOD(jlong, KeypadInputCluster, initWithDevice)(JNIEnv * env, jobject self return reinterpret_cast(cppCluster); } -JNI_METHOD(void, KeypadInputCluster, sendKey)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject keyCode) +JNI_METHOD(void, KeypadInputCluster, sendKeyRequest) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject keyCode) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; KeypadInputCluster * cppCluster; - chip::app::Clusters::KeypadInput::Commands::SendKey::Type request; + chip::app::Clusters::KeypadInput::Commands::SendKeyRequest::Type request; request.keyCode = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(keyCode)); @@ -12056,13 +12016,13 @@ JNI_METHOD(jlong, MediaInputCluster, initWithDevice)(JNIEnv * env, jobject self, return reinterpret_cast(cppCluster); } -JNI_METHOD(void, MediaInputCluster, hideInputStatus)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, MediaInputCluster, hideInputStatusRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaInputCluster * cppCluster; - chip::app::Clusters::MediaInput::Commands::HideInputStatus::Type request; + chip::app::Clusters::MediaInput::Commands::HideInputStatusRequest::Type request; std::unique_ptr onSuccess( Platform::New(callback), Platform::Delete); @@ -12091,14 +12051,14 @@ JNI_METHOD(void, MediaInputCluster, hideInputStatus)(JNIEnv * env, jobject self, onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaInputCluster, renameInput) +JNI_METHOD(void, MediaInputCluster, renameInputRequest) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject index, jstring name) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaInputCluster * cppCluster; - chip::app::Clusters::MediaInput::Commands::RenameInput::Type request; + chip::app::Clusters::MediaInput::Commands::RenameInputRequest::Type request; request.index = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(index)); request.name = chip::JniUtfString(env, static_cast(name)).charSpan(); @@ -12130,13 +12090,14 @@ JNI_METHOD(void, MediaInputCluster, renameInput) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaInputCluster, selectInput)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject index) +JNI_METHOD(void, MediaInputCluster, selectInputRequest) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject index) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaInputCluster * cppCluster; - chip::app::Clusters::MediaInput::Commands::SelectInput::Type request; + chip::app::Clusters::MediaInput::Commands::SelectInputRequest::Type request; request.index = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(index)); @@ -12167,13 +12128,13 @@ JNI_METHOD(void, MediaInputCluster, selectInput)(JNIEnv * env, jobject self, jlo onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaInputCluster, showInputStatus)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, MediaInputCluster, showInputStatusRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaInputCluster * cppCluster; - chip::app::Clusters::MediaInput::Commands::ShowInputStatus::Type request; + chip::app::Clusters::MediaInput::Commands::ShowInputStatusRequest::Type request; std::unique_ptr onSuccess( Platform::New(callback), Platform::Delete); @@ -12285,18 +12246,17 @@ JNI_METHOD(jlong, MediaPlaybackCluster, initWithDevice)(JNIEnv * env, jobject se return reinterpret_cast(cppCluster); } -JNI_METHOD(void, MediaPlaybackCluster, mediaFastForward)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, MediaPlaybackCluster, fastForwardRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaPlaybackCluster * cppCluster; - chip::app::Clusters::MediaPlayback::Commands::MediaFastForward::Type request; + chip::app::Clusters::MediaPlayback::Commands::FastForwardRequest::Type request; - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -12312,7 +12272,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaFastForward)(JNIEnv * env, jobject s env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -12323,18 +12283,17 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaFastForward)(JNIEnv * env, jobject s onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaPlaybackCluster, mediaNext)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, MediaPlaybackCluster, nextRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaPlaybackCluster * cppCluster; - chip::app::Clusters::MediaPlayback::Commands::MediaNext::Type request; + chip::app::Clusters::MediaPlayback::Commands::NextRequest::Type request; - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -12350,7 +12309,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaNext)(JNIEnv * env, jobject self, jl env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -12361,18 +12320,17 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaNext)(JNIEnv * env, jobject self, jl onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaPlaybackCluster, mediaPause)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, MediaPlaybackCluster, pauseRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaPlaybackCluster * cppCluster; - chip::app::Clusters::MediaPlayback::Commands::MediaPause::Type request; + chip::app::Clusters::MediaPlayback::Commands::PauseRequest::Type request; - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -12388,7 +12346,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPause)(JNIEnv * env, jobject self, j env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -12399,18 +12357,17 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPause)(JNIEnv * env, jobject self, j onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaPlaybackCluster, mediaPlay)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, MediaPlaybackCluster, playRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaPlaybackCluster * cppCluster; - chip::app::Clusters::MediaPlayback::Commands::MediaPlay::Type request; + chip::app::Clusters::MediaPlayback::Commands::PlayRequest::Type request; - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -12426,7 +12383,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPlay)(JNIEnv * env, jobject self, jl env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -12437,18 +12394,17 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPlay)(JNIEnv * env, jobject self, jl onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaPlaybackCluster, mediaPrevious)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, MediaPlaybackCluster, previousRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaPlaybackCluster * cppCluster; - chip::app::Clusters::MediaPlayback::Commands::MediaPrevious::Type request; + chip::app::Clusters::MediaPlayback::Commands::PreviousRequest::Type request; - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -12464,7 +12420,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPrevious)(JNIEnv * env, jobject self env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -12475,18 +12431,17 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPrevious)(JNIEnv * env, jobject self onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaPlaybackCluster, mediaRewind)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, MediaPlaybackCluster, rewindRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaPlaybackCluster * cppCluster; - chip::app::Clusters::MediaPlayback::Commands::MediaRewind::Type request; + chip::app::Clusters::MediaPlayback::Commands::RewindRequest::Type request; - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -12502,7 +12457,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaRewind)(JNIEnv * env, jobject self, env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -12513,20 +12468,20 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaRewind)(JNIEnv * env, jobject self, onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaPlaybackCluster, mediaSeek)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject position) +JNI_METHOD(void, MediaPlaybackCluster, seekRequest) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject position) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaPlaybackCluster * cppCluster; - chip::app::Clusters::MediaPlayback::Commands::MediaSeek::Type request; + chip::app::Clusters::MediaPlayback::Commands::SeekRequest::Type request; request.position = static_cast(chip::JniReferences::GetInstance().LongToPrimitive(position)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -12542,7 +12497,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSeek)(JNIEnv * env, jobject self, jl env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -12553,22 +12508,21 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSeek)(JNIEnv * env, jobject self, jl onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaPlaybackCluster, mediaSkipBackward) +JNI_METHOD(void, MediaPlaybackCluster, skipBackwardRequest) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject deltaPositionMilliseconds) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaPlaybackCluster * cppCluster; - chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackward::Type request; + chip::app::Clusters::MediaPlayback::Commands::SkipBackwardRequest::Type request; request.deltaPositionMilliseconds = static_cast( chip::JniReferences::GetInstance().LongToPrimitive(deltaPositionMilliseconds)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -12583,8 +12537,8 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSkipBackward) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = chip::Callback::Callback::FromCancelable( - onSuccess->Cancel()); + auto successFn = + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -12595,22 +12549,21 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSkipBackward) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaPlaybackCluster, mediaSkipForward) +JNI_METHOD(void, MediaPlaybackCluster, skipForwardRequest) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject deltaPositionMilliseconds) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaPlaybackCluster * cppCluster; - chip::app::Clusters::MediaPlayback::Commands::MediaSkipForward::Type request; + chip::app::Clusters::MediaPlayback::Commands::SkipForwardRequest::Type request; request.deltaPositionMilliseconds = static_cast( chip::JniReferences::GetInstance().LongToPrimitive(deltaPositionMilliseconds)); - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -12626,7 +12579,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSkipForward) env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -12637,18 +12590,17 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSkipForward) onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaPlaybackCluster, mediaStartOver)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, MediaPlaybackCluster, startOverRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaPlaybackCluster * cppCluster; - chip::app::Clusters::MediaPlayback::Commands::MediaStartOver::Type request; + chip::app::Clusters::MediaPlayback::Commands::StartOverRequest::Type request; - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -12664,7 +12616,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStartOver)(JNIEnv * env, jobject sel env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -12675,18 +12627,17 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStartOver)(JNIEnv * env, jobject sel onSuccess.release(); onFailure.release(); } -JNI_METHOD(void, MediaPlaybackCluster, mediaStop)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +JNI_METHOD(void, MediaPlaybackCluster, stopRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; MediaPlaybackCluster * cppCluster; - chip::app::Clusters::MediaPlayback::Commands::MediaStop::Type request; + chip::app::Clusters::MediaPlayback::Commands::StopRequest::Type request; - std::unique_ptr - onSuccess(Platform::New(callback), - Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -12702,7 +12653,7 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStop)(JNIEnv * env, jobject self, jl env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); auto successFn = - chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -18252,14 +18203,14 @@ JNI_METHOD(jlong, TargetNavigatorCluster, initWithDevice)(JNIEnv * env, jobject return reinterpret_cast(cppCluster); } -JNI_METHOD(void, TargetNavigatorCluster, navigateTarget) +JNI_METHOD(void, TargetNavigatorCluster, navigateTargetRequest) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject target, jstring data) { chip::DeviceLayer::StackLock lock; CHIP_ERROR err = CHIP_NO_ERROR; TargetNavigatorCluster * cppCluster; - chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Type request; + chip::app::Clusters::TargetNavigator::Commands::NavigateTargetRequest::Type request; request.target = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(target)); request.data = chip::JniUtfString(env, static_cast(data)).charSpan(); @@ -18294,6 +18245,44 @@ JNI_METHOD(void, TargetNavigatorCluster, navigateTarget) onSuccess.release(); onFailure.release(); } +JNI_METHOD(void, TargetNavigatorCluster, subscribeCurrentNavigatorTargetAttribute) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval) +{ + chip::DeviceLayer::StackLock lock; + std::unique_ptr onSuccess( + Platform::New(callback, true), chip::Platform::Delete); + VerifyOrReturn(onSuccess.get() != nullptr, + chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( + env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); + + std::unique_ptr onFailure( + Platform::New(callback), chip::Platform::Delete); + VerifyOrReturn(onFailure.get() != nullptr, + chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( + env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); + + CHIP_ERROR err = CHIP_NO_ERROR; + TargetNavigatorCluster * cppCluster = reinterpret_cast(clusterPtr); + VerifyOrReturn(cppCluster != nullptr, + chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( + env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); + + using TypeInfo = chip::app::Clusters::TargetNavigator::Attributes::CurrentNavigatorTarget::TypeInfo; + auto successFn = + chip::Callback::Callback::FromCancelable( + onSuccess->Cancel()); + auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); + + err = cppCluster->SubscribeAttribute(onSuccess->mContext, successFn->mCall, failureFn->mCall, + static_cast(minInterval), static_cast(maxInterval), + CHIPInt8uAttributeCallback::OnSubscriptionEstablished); + VerifyOrReturn(err == CHIP_NO_ERROR, + chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( + env, callback, "Error subscribing to attribute", err)); + + onSuccess.release(); + onFailure.release(); +} JNI_METHOD(void, TargetNavigatorCluster, subscribeClusterRevisionAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval) { diff --git a/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp index 0838fb6d911368..61a2d6a5479c33 100644 --- a/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp @@ -643,6 +643,44 @@ JNI_METHOD(void, ApplicationBasicCluster, readApplicationVersionAttribute) onFailure.release(); } +JNI_METHOD(void, ApplicationBasicCluster, readAllowedVendorListAttribute) +(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) +{ + chip::DeviceLayer::StackLock lock; + using TypeInfo = chip::app::Clusters::ApplicationBasic::Attributes::AllowedVendorList::TypeInfo; + std::unique_ptr + onSuccess(chip::Platform::New(callback, false), + chip::Platform::Delete); + VerifyOrReturn(onSuccess.get() != nullptr, + chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( + env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY)); + + std::unique_ptr onFailure( + chip::Platform::New(callback), chip::Platform::Delete); + VerifyOrReturn(onFailure.get() != nullptr, + chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( + env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); + + CHIP_ERROR err = CHIP_NO_ERROR; + chip::Controller::ApplicationBasicCluster * cppCluster = + reinterpret_cast(clusterPtr); + VerifyOrReturn(cppCluster != nullptr, + chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( + env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); + + auto successFn = chip::Callback::Callback::FromCancelable( + onSuccess->Cancel()); + auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); + err = cppCluster->ReadAttribute(onSuccess->mContext, successFn->mCall, failureFn->mCall); + VerifyOrReturn( + err == CHIP_NO_ERROR, + chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error reading attribute", err)); + + onSuccess.release(); + onFailure.release(); +} + JNI_METHOD(void, ApplicationBasicCluster, readAttributeListAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback) { diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index 68c28826fb38f2..cad7ccea47c054 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -88,141 +88,9 @@ void CHIPAccountLoginClusterGetSetupPINResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, setupPIN); } -CHIPApplicationLauncherClusterHideAppResponseCallback::CHIPApplicationLauncherClusterHideAppResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPApplicationLauncherClusterHideAppResponseCallback::~CHIPApplicationLauncherClusterHideAppResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPApplicationLauncherClusterHideAppResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::ApplicationLauncher::Commands::HideAppResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/String;)V", - &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(), dataResponse.status, status); - jobject data; - - chip::UtfString dataUtfString(env, dataResponse.data); - data = dataUtfString.jniValue(); - - env->CallVoidMethod(javaCallbackRef, javaMethod, status, data); -} -CHIPApplicationLauncherClusterLaunchAppResponseCallback::CHIPApplicationLauncherClusterLaunchAppResponseCallback( +CHIPApplicationLauncherClusterLauncherResponseCallback::CHIPApplicationLauncherClusterLauncherResponseCallback( jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPApplicationLauncherClusterLaunchAppResponseCallback::~CHIPApplicationLauncherClusterLaunchAppResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPApplicationLauncherClusterLaunchAppResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/String;)V", - &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(), dataResponse.status, status); - jobject data; - - chip::UtfString dataUtfString(env, dataResponse.data); - data = dataUtfString.jniValue(); - - env->CallVoidMethod(javaCallbackRef, javaMethod, status, data); -} -CHIPApplicationLauncherClusterStopAppResponseCallback::CHIPApplicationLauncherClusterStopAppResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -238,7 +106,7 @@ CHIPApplicationLauncherClusterStopAppResponseCallback::CHIPApplicationLauncherCl } } -CHIPApplicationLauncherClusterStopAppResponseCallback::~CHIPApplicationLauncherClusterStopAppResponseCallback() +CHIPApplicationLauncherClusterLauncherResponseCallback::~CHIPApplicationLauncherClusterLauncherResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -249,8 +117,8 @@ CHIPApplicationLauncherClusterStopAppResponseCallback::~CHIPApplicationLauncherC env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPApplicationLauncherClusterStopAppResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::ApplicationLauncher::Commands::StopAppResponse::DecodableType & dataResponse) +void CHIPApplicationLauncherClusterLauncherResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -260,10 +128,10 @@ void CHIPApplicationLauncherClusterStopAppResponseCallback::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; @@ -278,7 +146,7 @@ void CHIPApplicationLauncherClusterStopAppResponseCallback::CallbackFn( std::string statusClassName = "java/lang/Integer"; std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( + chip::JniReferences::GetInstance().CreateBoxedObject( statusClassName.c_str(), statusCtorSignature.c_str(), dataResponse.status, status); jobject data; @@ -345,81 +213,13 @@ void CHIPChannelClusterChangeChannelResponseCallback::CallbackFn( std::string errorTypeClassName = "java/lang/Integer"; std::string errorTypeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( + chip::JniReferences::GetInstance().CreateBoxedObject( errorTypeClassName.c_str(), errorTypeCtorSignature.c_str(), dataResponse.errorType, errorType); env->CallVoidMethod(javaCallbackRef, javaMethod, channelMatch, errorType); } -CHIPContentLauncherClusterLaunchContentResponseCallback::CHIPContentLauncherClusterLaunchContentResponseCallback( - jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPContentLauncherClusterLaunchContentResponseCallback::~CHIPContentLauncherClusterLaunchContentResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPContentLauncherClusterLaunchContentResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchContentResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/lang/String;)V", - &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject contentLaunchStatus; - - std::string contentLaunchStatusClassName = "java/lang/Integer"; - std::string contentLaunchStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - contentLaunchStatusClassName.c_str(), contentLaunchStatusCtorSignature.c_str(), dataResponse.contentLaunchStatus, - contentLaunchStatus); - jobject data; - - chip::UtfString dataUtfString(env, dataResponse.data); - data = dataUtfString.jniValue(); - - env->CallVoidMethod(javaCallbackRef, javaMethod, contentLaunchStatus, data); -} -CHIPContentLauncherClusterLaunchURLResponseCallback::CHIPContentLauncherClusterLaunchURLResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPContentLauncherClusterLaunchResponseCallback::CHIPContentLauncherClusterLaunchResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -435,7 +235,7 @@ CHIPContentLauncherClusterLaunchURLResponseCallback::CHIPContentLauncherClusterL } } -CHIPContentLauncherClusterLaunchURLResponseCallback::~CHIPContentLauncherClusterLaunchURLResponseCallback() +CHIPContentLauncherClusterLaunchResponseCallback::~CHIPContentLauncherClusterLaunchResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -446,8 +246,8 @@ CHIPContentLauncherClusterLaunchURLResponseCallback::~CHIPContentLauncherCluster env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPContentLauncherClusterLaunchURLResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchURLResponse::DecodableType & dataResponse) +void CHIPContentLauncherClusterLaunchResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -457,10 +257,9 @@ void CHIPContentLauncherClusterLaunchURLResponseCallback::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; @@ -471,19 +270,18 @@ void CHIPContentLauncherClusterLaunchURLResponseCallback::CallbackFn( &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject contentLaunchStatus; + jobject status; - std::string contentLaunchStatusClassName = "java/lang/Integer"; - std::string contentLaunchStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - contentLaunchStatusClassName.c_str(), contentLaunchStatusCtorSignature.c_str(), dataResponse.contentLaunchStatus, - contentLaunchStatus); + std::string statusClassName = "java/lang/Integer"; + std::string statusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + statusClassName.c_str(), statusCtorSignature.c_str(), dataResponse.status, status); jobject data; chip::UtfString dataUtfString(env, dataResponse.data); data = dataUtfString.jniValue(); - env->CallVoidMethod(javaCallbackRef, javaMethod, contentLaunchStatus, data); + env->CallVoidMethod(javaCallbackRef, javaMethod, status, data); } CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) @@ -1538,76 +1336,13 @@ void CHIPKeypadInputClusterSendKeyResponseCallback::CallbackFn( std::string statusClassName = "java/lang/Integer"; std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( + chip::JniReferences::GetInstance().CreateBoxedObject( statusClassName.c_str(), statusCtorSignature.c_str(), dataResponse.status, status); env->CallVoidMethod(javaCallbackRef, javaMethod, status); } -CHIPMediaPlaybackClusterMediaFastForwardResponseCallback::CHIPMediaPlaybackClusterMediaFastForwardResponseCallback( - jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPMediaPlaybackClusterMediaFastForwardResponseCallback::~CHIPMediaPlaybackClusterMediaFastForwardResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPMediaPlaybackClusterMediaFastForwardResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaFastForwardResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject mediaPlaybackStatus; - - std::string mediaPlaybackStatusClassName = "java/lang/Integer"; - std::string mediaPlaybackStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - mediaPlaybackStatusClassName.c_str(), mediaPlaybackStatusCtorSignature.c_str(), dataResponse.mediaPlaybackStatus, - mediaPlaybackStatus); - - env->CallVoidMethod(javaCallbackRef, javaMethod, mediaPlaybackStatus); -} -CHIPMediaPlaybackClusterMediaNextResponseCallback::CHIPMediaPlaybackClusterMediaNextResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPMediaPlaybackClusterPlaybackResponseCallback::CHIPMediaPlaybackClusterPlaybackResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -1623,7 +1358,7 @@ CHIPMediaPlaybackClusterMediaNextResponseCallback::CHIPMediaPlaybackClusterMedia } } -CHIPMediaPlaybackClusterMediaNextResponseCallback::~CHIPMediaPlaybackClusterMediaNextResponseCallback() +CHIPMediaPlaybackClusterPlaybackResponseCallback::~CHIPMediaPlaybackClusterPlaybackResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -1634,8 +1369,8 @@ CHIPMediaPlaybackClusterMediaNextResponseCallback::~CHIPMediaPlaybackClusterMedi env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPMediaPlaybackClusterMediaNextResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaNextResponse::DecodableType & dataResponse) +void CHIPMediaPlaybackClusterPlaybackResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -1645,10 +1380,9 @@ void CHIPMediaPlaybackClusterMediaNextResponseCallback::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; @@ -1658,576 +1392,14 @@ void CHIPMediaPlaybackClusterMediaNextResponseCallback::CallbackFn( err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject mediaPlaybackStatus; - - std::string mediaPlaybackStatusClassName = "java/lang/Integer"; - std::string mediaPlaybackStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - mediaPlaybackStatusClassName.c_str(), mediaPlaybackStatusCtorSignature.c_str(), dataResponse.mediaPlaybackStatus, - mediaPlaybackStatus); - - env->CallVoidMethod(javaCallbackRef, javaMethod, mediaPlaybackStatus); -} -CHIPMediaPlaybackClusterMediaPauseResponseCallback::CHIPMediaPlaybackClusterMediaPauseResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPMediaPlaybackClusterMediaPauseResponseCallback::~CHIPMediaPlaybackClusterMediaPauseResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPMediaPlaybackClusterMediaPauseResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaPauseResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; + jobject status; - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); + std::string statusClassName = "java/lang/Integer"; + std::string statusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + statusClassName.c_str(), statusCtorSignature.c_str(), dataResponse.status, status); - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject mediaPlaybackStatus; - - std::string mediaPlaybackStatusClassName = "java/lang/Integer"; - std::string mediaPlaybackStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - mediaPlaybackStatusClassName.c_str(), mediaPlaybackStatusCtorSignature.c_str(), dataResponse.mediaPlaybackStatus, - mediaPlaybackStatus); - - env->CallVoidMethod(javaCallbackRef, javaMethod, mediaPlaybackStatus); -} -CHIPMediaPlaybackClusterMediaPlayResponseCallback::CHIPMediaPlaybackClusterMediaPlayResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPMediaPlaybackClusterMediaPlayResponseCallback::~CHIPMediaPlaybackClusterMediaPlayResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPMediaPlaybackClusterMediaPlayResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaPlayResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject mediaPlaybackStatus; - - std::string mediaPlaybackStatusClassName = "java/lang/Integer"; - std::string mediaPlaybackStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - mediaPlaybackStatusClassName.c_str(), mediaPlaybackStatusCtorSignature.c_str(), dataResponse.mediaPlaybackStatus, - mediaPlaybackStatus); - - env->CallVoidMethod(javaCallbackRef, javaMethod, mediaPlaybackStatus); -} -CHIPMediaPlaybackClusterMediaPreviousResponseCallback::CHIPMediaPlaybackClusterMediaPreviousResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPMediaPlaybackClusterMediaPreviousResponseCallback::~CHIPMediaPlaybackClusterMediaPreviousResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPMediaPlaybackClusterMediaPreviousResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaPreviousResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject mediaPlaybackStatus; - - std::string mediaPlaybackStatusClassName = "java/lang/Integer"; - std::string mediaPlaybackStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - mediaPlaybackStatusClassName.c_str(), mediaPlaybackStatusCtorSignature.c_str(), dataResponse.mediaPlaybackStatus, - mediaPlaybackStatus); - - env->CallVoidMethod(javaCallbackRef, javaMethod, mediaPlaybackStatus); -} -CHIPMediaPlaybackClusterMediaRewindResponseCallback::CHIPMediaPlaybackClusterMediaRewindResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPMediaPlaybackClusterMediaRewindResponseCallback::~CHIPMediaPlaybackClusterMediaRewindResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPMediaPlaybackClusterMediaRewindResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaRewindResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject mediaPlaybackStatus; - - std::string mediaPlaybackStatusClassName = "java/lang/Integer"; - std::string mediaPlaybackStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - mediaPlaybackStatusClassName.c_str(), mediaPlaybackStatusCtorSignature.c_str(), dataResponse.mediaPlaybackStatus, - mediaPlaybackStatus); - - env->CallVoidMethod(javaCallbackRef, javaMethod, mediaPlaybackStatus); -} -CHIPMediaPlaybackClusterMediaSeekResponseCallback::CHIPMediaPlaybackClusterMediaSeekResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPMediaPlaybackClusterMediaSeekResponseCallback::~CHIPMediaPlaybackClusterMediaSeekResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPMediaPlaybackClusterMediaSeekResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaSeekResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject mediaPlaybackStatus; - - std::string mediaPlaybackStatusClassName = "java/lang/Integer"; - std::string mediaPlaybackStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - mediaPlaybackStatusClassName.c_str(), mediaPlaybackStatusCtorSignature.c_str(), dataResponse.mediaPlaybackStatus, - mediaPlaybackStatus); - - env->CallVoidMethod(javaCallbackRef, javaMethod, mediaPlaybackStatus); -} -CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback::CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback( - jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback::~CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackwardResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject mediaPlaybackStatus; - - std::string mediaPlaybackStatusClassName = "java/lang/Integer"; - std::string mediaPlaybackStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - mediaPlaybackStatusClassName.c_str(), mediaPlaybackStatusCtorSignature.c_str(), dataResponse.mediaPlaybackStatus, - mediaPlaybackStatus); - - env->CallVoidMethod(javaCallbackRef, javaMethod, mediaPlaybackStatus); -} -CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback::CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback( - jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback::~CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaSkipForwardResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject mediaPlaybackStatus; - - std::string mediaPlaybackStatusClassName = "java/lang/Integer"; - std::string mediaPlaybackStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - mediaPlaybackStatusClassName.c_str(), mediaPlaybackStatusCtorSignature.c_str(), dataResponse.mediaPlaybackStatus, - mediaPlaybackStatus); - - env->CallVoidMethod(javaCallbackRef, javaMethod, mediaPlaybackStatus); -} -CHIPMediaPlaybackClusterMediaStartOverResponseCallback::CHIPMediaPlaybackClusterMediaStartOverResponseCallback( - jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPMediaPlaybackClusterMediaStartOverResponseCallback::~CHIPMediaPlaybackClusterMediaStartOverResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPMediaPlaybackClusterMediaStartOverResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaStartOverResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject mediaPlaybackStatus; - - std::string mediaPlaybackStatusClassName = "java/lang/Integer"; - std::string mediaPlaybackStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - mediaPlaybackStatusClassName.c_str(), mediaPlaybackStatusCtorSignature.c_str(), dataResponse.mediaPlaybackStatus, - mediaPlaybackStatus); - - env->CallVoidMethod(javaCallbackRef, javaMethod, mediaPlaybackStatus); -} -CHIPMediaPlaybackClusterMediaStopResponseCallback::CHIPMediaPlaybackClusterMediaStopResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPMediaPlaybackClusterMediaStopResponseCallback::~CHIPMediaPlaybackClusterMediaStopResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPMediaPlaybackClusterMediaStopResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaStopResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - 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; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject mediaPlaybackStatus; - - std::string mediaPlaybackStatusClassName = "java/lang/Integer"; - std::string mediaPlaybackStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - mediaPlaybackStatusClassName.c_str(), mediaPlaybackStatusCtorSignature.c_str(), dataResponse.mediaPlaybackStatus, - mediaPlaybackStatus); - - env->CallVoidMethod(javaCallbackRef, javaMethod, mediaPlaybackStatus); + env->CallVoidMethod(javaCallbackRef, javaMethod, status); } CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::CHIPNetworkCommissioningClusterConnectNetworkResponseCallback( jobject javaCallback) : @@ -3451,7 +2623,7 @@ void CHIPTargetNavigatorClusterNavigateTargetResponseCallback::CallbackFn( std::string statusClassName = "java/lang/Integer"; std::string statusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( + chip::JniReferences::GetInstance().CreateBoxedObject( statusClassName.c_str(), statusCtorSignature.c_str(), dataResponse.status, status); jobject data; diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h index 6d1e9a2545856f..79fade03a2f5f6 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h @@ -39,46 +39,16 @@ class CHIPAccountLoginClusterGetSetupPINResponseCallback jobject javaCallbackRef; }; -class CHIPApplicationLauncherClusterHideAppResponseCallback - : public Callback::Callback +class CHIPApplicationLauncherClusterLauncherResponseCallback + : public Callback::Callback { public: - CHIPApplicationLauncherClusterHideAppResponseCallback(jobject javaCallback); + CHIPApplicationLauncherClusterLauncherResponseCallback(jobject javaCallback); - ~CHIPApplicationLauncherClusterHideAppResponseCallback(); + ~CHIPApplicationLauncherClusterLauncherResponseCallback(); static void CallbackFn(void * context, - const chip::app::Clusters::ApplicationLauncher::Commands::HideAppResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPApplicationLauncherClusterLaunchAppResponseCallback - : public Callback::Callback -{ -public: - CHIPApplicationLauncherClusterLaunchAppResponseCallback(jobject javaCallback); - - ~CHIPApplicationLauncherClusterLaunchAppResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPApplicationLauncherClusterStopAppResponseCallback - : public Callback::Callback -{ -public: - CHIPApplicationLauncherClusterStopAppResponseCallback(jobject javaCallback); - - ~CHIPApplicationLauncherClusterStopAppResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::ApplicationLauncher::Commands::StopAppResponse::DecodableType & data); + const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & data); private: jobject javaCallbackRef; @@ -99,31 +69,16 @@ class CHIPChannelClusterChangeChannelResponseCallback jobject javaCallbackRef; }; -class CHIPContentLauncherClusterLaunchContentResponseCallback - : public Callback::Callback -{ -public: - CHIPContentLauncherClusterLaunchContentResponseCallback(jobject javaCallback); - - ~CHIPContentLauncherClusterLaunchContentResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::ContentLauncher::Commands::LaunchContentResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPContentLauncherClusterLaunchURLResponseCallback - : public Callback::Callback +class CHIPContentLauncherClusterLaunchResponseCallback + : public Callback::Callback { public: - CHIPContentLauncherClusterLaunchURLResponseCallback(jobject javaCallback); + CHIPContentLauncherClusterLaunchResponseCallback(jobject javaCallback); - ~CHIPContentLauncherClusterLaunchURLResponseCallback(); + ~CHIPContentLauncherClusterLaunchResponseCallback(); static void CallbackFn(void * context, - const chip::app::Clusters::ContentLauncher::Commands::LaunchURLResponse::DecodableType & data); + const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data); private: jobject javaCallbackRef; @@ -347,166 +302,16 @@ class CHIPKeypadInputClusterSendKeyResponseCallback : public Callback::Callback< jobject javaCallbackRef; }; -class CHIPMediaPlaybackClusterMediaFastForwardResponseCallback - : public Callback::Callback -{ -public: - CHIPMediaPlaybackClusterMediaFastForwardResponseCallback(jobject javaCallback); - - ~CHIPMediaPlaybackClusterMediaFastForwardResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaFastForwardResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPMediaPlaybackClusterMediaNextResponseCallback - : public Callback::Callback -{ -public: - CHIPMediaPlaybackClusterMediaNextResponseCallback(jobject javaCallback); - - ~CHIPMediaPlaybackClusterMediaNextResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaNextResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPMediaPlaybackClusterMediaPauseResponseCallback - : public Callback::Callback -{ -public: - CHIPMediaPlaybackClusterMediaPauseResponseCallback(jobject javaCallback); - - ~CHIPMediaPlaybackClusterMediaPauseResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaPauseResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPMediaPlaybackClusterMediaPlayResponseCallback - : public Callback::Callback -{ -public: - CHIPMediaPlaybackClusterMediaPlayResponseCallback(jobject javaCallback); - - ~CHIPMediaPlaybackClusterMediaPlayResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaPlayResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPMediaPlaybackClusterMediaPreviousResponseCallback - : public Callback::Callback -{ -public: - CHIPMediaPlaybackClusterMediaPreviousResponseCallback(jobject javaCallback); - - ~CHIPMediaPlaybackClusterMediaPreviousResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaPreviousResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPMediaPlaybackClusterMediaRewindResponseCallback - : public Callback::Callback -{ -public: - CHIPMediaPlaybackClusterMediaRewindResponseCallback(jobject javaCallback); - - ~CHIPMediaPlaybackClusterMediaRewindResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaRewindResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPMediaPlaybackClusterMediaSeekResponseCallback - : public Callback::Callback -{ -public: - CHIPMediaPlaybackClusterMediaSeekResponseCallback(jobject javaCallback); - - ~CHIPMediaPlaybackClusterMediaSeekResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaSeekResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback - : public Callback::Callback -{ -public: - CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback(jobject javaCallback); - - ~CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackwardResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback - : public Callback::Callback -{ -public: - CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback(jobject javaCallback); - - ~CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaSkipForwardResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPMediaPlaybackClusterMediaStartOverResponseCallback - : public Callback::Callback -{ -public: - CHIPMediaPlaybackClusterMediaStartOverResponseCallback(jobject javaCallback); - - ~CHIPMediaPlaybackClusterMediaStartOverResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaStartOverResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPMediaPlaybackClusterMediaStopResponseCallback - : public Callback::Callback +class CHIPMediaPlaybackClusterPlaybackResponseCallback + : public Callback::Callback { public: - CHIPMediaPlaybackClusterMediaStopResponseCallback(jobject javaCallback); + CHIPMediaPlaybackClusterPlaybackResponseCallback(jobject javaCallback); - ~CHIPMediaPlaybackClusterMediaStopResponseCallback(); + ~CHIPMediaPlaybackClusterPlaybackResponseCallback(); static void CallbackFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaStopResponse::DecodableType & data); + const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & data); private: jobject javaCallbackRef; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index bc948f4c32434c..829956173e9dc6 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -1253,6 +1253,96 @@ void CHIPAdministratorCommissioningAttributeListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } +CHIPApplicationBasicAllowedVendorListAttributeCallback::CHIPApplicationBasicAllowedVendorListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), + keepAlive(keepAlive) +{ + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + return; + } + + javaCallbackRef = env->NewGlobalRef(javaCallback); + if (javaCallbackRef == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + } +} + +CHIPApplicationBasicAllowedVendorListAttributeCallback::~CHIPApplicationBasicAllowedVendorListAttributeCallback() +{ + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not delete global reference for Java callback"); + return; + } + env->DeleteGlobalRef(javaCallbackRef); +} + +void CHIPApplicationBasicAllowedVendorListAttributeCallback::CallbackFn( + void * context, const chip::app::DataModel::DecodableList & list) +{ + chip::DeviceLayer::StackUnlock unlock; + CHIP_ERROR err = CHIP_NO_ERROR; + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + jobject javaCallbackRef; + + VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); + + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); + + // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. + javaCallbackRef = cppCallback.get()->javaCallbackRef; + VerifyOrReturn(javaCallbackRef != nullptr, + ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); + + jclass arrayListClass; + err = chip::JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass); + VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList")); + chip::JniClass arrayListJniClass(arrayListClass); + jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "", "()V"); + jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z"); + VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, + ChipLogError(Zcl, "Error finding Java ArrayList methods")); + jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor); + VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList")); + + jmethodID javaMethod; + err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod); + VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); + + auto iter = list.begin(); + while (iter.Next()) + { + auto & entry = iter.GetValue(); + bool entryNull = false; + chip::VendorId entryValue = entry; + + jobject entryObject = nullptr; + if (!entryNull) + { + jclass entryTypeCls; + chip::JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls); + chip::JniClass jniClass(entryTypeCls); + jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "", "(I)V"); + entryObject = env->NewObject(entryTypeCls, entryTypeCtor, entryValue); + } + + env->CallBooleanMethod(arrayListObj, arrayListAddMethod, entryObject); + } + VerifyOrReturn( + iter.GetStatus() == CHIP_NO_ERROR, + ChipLogError(Zcl, "Error decoding AllowedVendorListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format())); + + env->ExceptionClear(); + env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); +} + CHIPApplicationBasicAttributeListAttributeCallback::CHIPApplicationBasicAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), @@ -1555,7 +1645,7 @@ CHIPAudioOutputAudioOutputListAttributeCallback::~CHIPAudioOutputAudioOutputList void CHIPAudioOutputAudioOutputListAttributeCallback::CallbackFn( void * context, - const chip::app::DataModel::DecodableList & list) + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -1621,7 +1711,7 @@ void CHIPAudioOutputAudioOutputListAttributeCallback::CallbackFn( bool outputTypeNull = false; bool outputTypeHasValue = true; - chip::app::Clusters::AudioOutput::AudioOutputType outputTypeValue = entry.outputType; + chip::app::Clusters::AudioOutput::OutputTypeEnum outputTypeValue = entry.outputType; jobject outputType = nullptr; if (!outputTypeNull && outputTypeHasValue) @@ -6593,7 +6683,7 @@ CHIPMediaInputMediaInputListAttributeCallback::~CHIPMediaInputMediaInputListAttr void CHIPMediaInputMediaInputListAttributeCallback::CallbackFn( void * context, - const chip::app::DataModel::DecodableList & list) + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -6659,7 +6749,7 @@ void CHIPMediaInputMediaInputListAttributeCallback::CallbackFn( bool inputTypeNull = false; bool inputTypeHasValue = true; - chip::app::Clusters::MediaInput::MediaInputType inputTypeValue = entry.inputType; + chip::app::Clusters::MediaInput::InputTypeEnum inputTypeValue = entry.inputType; jobject inputType = nullptr; if (!inputTypeNull && inputTypeHasValue) @@ -9513,8 +9603,7 @@ CHIPTargetNavigatorTargetNavigatorListAttributeCallback::~CHIPTargetNavigatorTar void CHIPTargetNavigatorTargetNavigatorListAttributeCallback::CallbackFn( void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & list) + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index 2182ba5b1f617a..87312f1e70e1e4 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -574,6 +574,36 @@ class CHIPAdministratorCommissioningAttributeListAttributeCallback bool keepAlive; }; +class CHIPApplicationBasicAllowedVendorListAttributeCallback + : public chip::Callback::Callback +{ +public: + CHIPApplicationBasicAllowedVendorListAttributeCallback(jobject javaCallback, bool keepAlive = false); + + ~CHIPApplicationBasicAllowedVendorListAttributeCallback(); + + static void maybeDestroy(CHIPApplicationBasicAllowedVendorListAttributeCallback * callback) + { + if (!callback->keepAlive) + { + callback->Cancel(); + chip::Platform::Delete(callback); + } + } + + static void CallbackFn(void * context, const chip::app::DataModel::DecodableList & list); + static void OnSubscriptionEstablished(void * context) + { + CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( + reinterpret_cast(context)->javaCallbackRef); + VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); + }; + +private: + jobject javaCallbackRef; + bool keepAlive; +}; + class CHIPApplicationBasicAttributeListAttributeCallback : public chip::Callback::Callback { @@ -683,8 +713,7 @@ class CHIPAudioOutputAudioOutputListAttributeCallback static void CallbackFn( void * context, - const chip::app::DataModel::DecodableList & - list); + const chip::app::DataModel::DecodableList & list); static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( @@ -2327,7 +2356,7 @@ class CHIPMediaInputMediaInputListAttributeCallback static void CallbackFn( void * context, - const chip::app::DataModel::DecodableList & list); + const chip::app::DataModel::DecodableList & list); static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( @@ -3239,9 +3268,9 @@ class CHIPTargetNavigatorTargetNavigatorListAttributeCallback } } - static void CallbackFn(void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & list); + static void CallbackFn( + void * context, + const chip::app::DataModel::DecodableList & list); static void OnSubscriptionEstablished(void * context) { CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 0d702ede09e965..e125f787d2a5d9 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -242,29 +242,30 @@ public static long clusterId() { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void getSetupPIN(GetSetupPINResponseCallback callback, String tempAccountIdentifier) { - getSetupPIN(chipClusterPtr, callback, tempAccountIdentifier); + public void getSetupPINRequest( + GetSetupPINResponseCallback callback, String tempAccountIdentifier) { + getSetupPINRequest(chipClusterPtr, callback, tempAccountIdentifier); } - public void login( + public void loginRequest( DefaultClusterCallback callback, String tempAccountIdentifier, String setupPIN) { - login(chipClusterPtr, callback, tempAccountIdentifier, setupPIN); + loginRequest(chipClusterPtr, callback, tempAccountIdentifier, setupPIN); } - public void logout(DefaultClusterCallback callback) { - logout(chipClusterPtr, callback); + public void logoutRequest(DefaultClusterCallback callback) { + logoutRequest(chipClusterPtr, callback); } - private native void getSetupPIN( + private native void getSetupPINRequest( long chipClusterPtr, GetSetupPINResponseCallback Callback, String tempAccountIdentifier); - private native void login( + private native void loginRequest( long chipClusterPtr, DefaultClusterCallback Callback, String tempAccountIdentifier, String setupPIN); - private native void logout(long chipClusterPtr, DefaultClusterCallback Callback); + private native void logoutRequest(long chipClusterPtr, DefaultClusterCallback Callback); public interface GetSetupPINResponseCallback { void onSuccess(String setupPIN); @@ -430,12 +431,13 @@ public static long clusterId() { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void changeStatus(DefaultClusterCallback callback, Integer status) { - changeStatus(chipClusterPtr, callback, status); - } + public interface AllowedVendorListAttributeCallback { + void onSuccess(List valueList); + + void onError(Exception ex); - private native void changeStatus( - long chipClusterPtr, DefaultClusterCallback Callback, Integer status); + default void onSubscriptionEstablished() {} + } public interface AttributeListAttributeCallback { void onSuccess(List valueList); @@ -499,6 +501,10 @@ public void subscribeApplicationVersionAttribute( subscribeApplicationVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval); } + public void readAllowedVendorListAttribute(AllowedVendorListAttributeCallback callback) { + readAllowedVendorListAttribute(chipClusterPtr, callback); + } + public void readAttributeListAttribute(AttributeListAttributeCallback callback) { readAttributeListAttribute(chipClusterPtr, callback); } @@ -557,6 +563,9 @@ private native void subscribeApplicationVersionAttribute( int minInterval, int maxInterval); + private native void readAllowedVendorListAttribute( + long chipClusterPtr, AllowedVendorListAttributeCallback callback); + private native void readAttributeListAttribute( long chipClusterPtr, AttributeListAttributeCallback callback); @@ -579,56 +588,44 @@ public static long clusterId() { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void hideApp( - HideAppResponseCallback callback, Integer catalogVendorId, String applicationId) { - hideApp(chipClusterPtr, callback, catalogVendorId, applicationId); + public void hideAppRequest( + LauncherResponseCallback callback, Integer catalogVendorId, String applicationId) { + hideAppRequest(chipClusterPtr, callback, catalogVendorId, applicationId); } - public void launchApp( - LaunchAppResponseCallback callback, + public void launchAppRequest( + LauncherResponseCallback callback, String data, Integer catalogVendorId, String applicationId) { - launchApp(chipClusterPtr, callback, data, catalogVendorId, applicationId); + launchAppRequest(chipClusterPtr, callback, data, catalogVendorId, applicationId); } - public void stopApp( - StopAppResponseCallback callback, Integer catalogVendorId, String applicationId) { - stopApp(chipClusterPtr, callback, catalogVendorId, applicationId); + public void stopAppRequest( + LauncherResponseCallback callback, Integer catalogVendorId, String applicationId) { + stopAppRequest(chipClusterPtr, callback, catalogVendorId, applicationId); } - private native void hideApp( + private native void hideAppRequest( long chipClusterPtr, - HideAppResponseCallback Callback, + LauncherResponseCallback Callback, Integer catalogVendorId, String applicationId); - private native void launchApp( + private native void launchAppRequest( long chipClusterPtr, - LaunchAppResponseCallback Callback, + LauncherResponseCallback Callback, String data, Integer catalogVendorId, String applicationId); - private native void stopApp( + private native void stopAppRequest( long chipClusterPtr, - StopAppResponseCallback Callback, + LauncherResponseCallback Callback, Integer catalogVendorId, String applicationId); - public interface HideAppResponseCallback { - void onSuccess(Integer status, String data); - - void onError(Exception error); - } - - public interface LaunchAppResponseCallback { - void onSuccess(Integer status, String data); - - void onError(Exception error); - } - - public interface StopAppResponseCallback { + public interface LauncherResponseCallback { void onSuccess(Integer status, String data); void onError(Exception error); @@ -693,18 +690,18 @@ public static long clusterId() { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void renameOutput(DefaultClusterCallback callback, Integer index, String name) { - renameOutput(chipClusterPtr, callback, index, name); + public void renameOutputRequest(DefaultClusterCallback callback, Integer index, String name) { + renameOutputRequest(chipClusterPtr, callback, index, name); } - public void selectOutput(DefaultClusterCallback callback, Integer index) { - selectOutput(chipClusterPtr, callback, index); + public void selectOutputRequest(DefaultClusterCallback callback, Integer index) { + selectOutputRequest(chipClusterPtr, callback, index); } - private native void renameOutput( + private native void renameOutputRequest( long chipClusterPtr, DefaultClusterCallback Callback, Integer index, String name); - private native void selectOutput( + private native void selectOutputRequest( long chipClusterPtr, DefaultClusterCallback Callback, Integer index); public static class AudioOutputListAttribute { @@ -1901,29 +1898,29 @@ public static long clusterId() { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void changeChannel(ChangeChannelResponseCallback callback, String match) { - changeChannel(chipClusterPtr, callback, match); - } - - public void changeChannelByNumber( + public void changeChannelByNumberRequest( DefaultClusterCallback callback, Integer majorNumber, Integer minorNumber) { - changeChannelByNumber(chipClusterPtr, callback, majorNumber, minorNumber); + changeChannelByNumberRequest(chipClusterPtr, callback, majorNumber, minorNumber); } - public void skipChannel(DefaultClusterCallback callback, Integer count) { - skipChannel(chipClusterPtr, callback, count); + public void changeChannelRequest(ChangeChannelResponseCallback callback, String match) { + changeChannelRequest(chipClusterPtr, callback, match); } - private native void changeChannel( - long chipClusterPtr, ChangeChannelResponseCallback Callback, String match); + public void skipChannelRequest(DefaultClusterCallback callback, Integer count) { + skipChannelRequest(chipClusterPtr, callback, count); + } - private native void changeChannelByNumber( + private native void changeChannelByNumberRequest( long chipClusterPtr, DefaultClusterCallback Callback, Integer majorNumber, Integer minorNumber); - private native void skipChannel( + private native void changeChannelRequest( + long chipClusterPtr, ChangeChannelResponseCallback Callback, String match); + + private native void skipChannelRequest( long chipClusterPtr, DefaultClusterCallback Callback, Integer count); public interface ChangeChannelResponseCallback { @@ -3379,46 +3376,31 @@ public static long clusterId() { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void launchContent( - LaunchContentResponseCallback callback, - Boolean autoPlay, - String data, - Integer type, - String value) { - launchContent(chipClusterPtr, callback, autoPlay, data, type, value); + public void launchContentRequest( + LaunchResponseCallback callback, Boolean autoPlay, String data) { + launchContentRequest(chipClusterPtr, callback, autoPlay, data); } - public void launchURL( - LaunchURLResponseCallback callback, + public void launchURLRequest( + LaunchResponseCallback callback, String contentURL, String displayString, String providerName) { - launchURL(chipClusterPtr, callback, contentURL, displayString, providerName); + launchURLRequest(chipClusterPtr, callback, contentURL, displayString, providerName); } - private native void launchContent( - long chipClusterPtr, - LaunchContentResponseCallback Callback, - Boolean autoPlay, - String data, - Integer type, - String value); + private native void launchContentRequest( + long chipClusterPtr, LaunchResponseCallback Callback, Boolean autoPlay, String data); - private native void launchURL( + private native void launchURLRequest( long chipClusterPtr, - LaunchURLResponseCallback Callback, + LaunchResponseCallback Callback, String contentURL, String displayString, String providerName); - public interface LaunchContentResponseCallback { - void onSuccess(Integer contentLaunchStatus, String data); - - void onError(Exception error); - } - - public interface LaunchURLResponseCallback { - void onSuccess(Integer contentLaunchStatus, String data); + public interface LaunchResponseCallback { + void onSuccess(Integer status, String data); void onError(Exception error); } @@ -5730,11 +5712,11 @@ public static long clusterId() { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void sendKey(SendKeyResponseCallback callback, Integer keyCode) { - sendKey(chipClusterPtr, callback, keyCode); + public void sendKeyRequest(SendKeyResponseCallback callback, Integer keyCode) { + sendKeyRequest(chipClusterPtr, callback, keyCode); } - private native void sendKey( + private native void sendKeyRequest( long chipClusterPtr, SendKeyResponseCallback Callback, Integer keyCode); public interface SendKeyResponseCallback { @@ -6284,31 +6266,33 @@ public static long clusterId() { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void hideInputStatus(DefaultClusterCallback callback) { - hideInputStatus(chipClusterPtr, callback); + public void hideInputStatusRequest(DefaultClusterCallback callback) { + hideInputStatusRequest(chipClusterPtr, callback); } - public void renameInput(DefaultClusterCallback callback, Integer index, String name) { - renameInput(chipClusterPtr, callback, index, name); + public void renameInputRequest(DefaultClusterCallback callback, Integer index, String name) { + renameInputRequest(chipClusterPtr, callback, index, name); } - public void selectInput(DefaultClusterCallback callback, Integer index) { - selectInput(chipClusterPtr, callback, index); + public void selectInputRequest(DefaultClusterCallback callback, Integer index) { + selectInputRequest(chipClusterPtr, callback, index); } - public void showInputStatus(DefaultClusterCallback callback) { - showInputStatus(chipClusterPtr, callback); + public void showInputStatusRequest(DefaultClusterCallback callback) { + showInputStatusRequest(chipClusterPtr, callback); } - private native void hideInputStatus(long chipClusterPtr, DefaultClusterCallback Callback); + private native void hideInputStatusRequest( + long chipClusterPtr, DefaultClusterCallback Callback); - private native void renameInput( + private native void renameInputRequest( long chipClusterPtr, DefaultClusterCallback Callback, Integer index, String name); - private native void selectInput( + private native void selectInputRequest( long chipClusterPtr, DefaultClusterCallback Callback, Integer index); - private native void showInputStatus(long chipClusterPtr, DefaultClusterCallback Callback); + private native void showInputStatusRequest( + long chipClusterPtr, DefaultClusterCallback Callback); public static class MediaInputListAttribute { public Integer index; @@ -6420,145 +6404,79 @@ public static long clusterId() { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void mediaFastForward(MediaFastForwardResponseCallback callback) { - mediaFastForward(chipClusterPtr, callback); + public void fastForwardRequest(PlaybackResponseCallback callback) { + fastForwardRequest(chipClusterPtr, callback); } - public void mediaNext(MediaNextResponseCallback callback) { - mediaNext(chipClusterPtr, callback); + public void nextRequest(PlaybackResponseCallback callback) { + nextRequest(chipClusterPtr, callback); } - public void mediaPause(MediaPauseResponseCallback callback) { - mediaPause(chipClusterPtr, callback); + public void pauseRequest(PlaybackResponseCallback callback) { + pauseRequest(chipClusterPtr, callback); } - public void mediaPlay(MediaPlayResponseCallback callback) { - mediaPlay(chipClusterPtr, callback); + public void playRequest(PlaybackResponseCallback callback) { + playRequest(chipClusterPtr, callback); } - public void mediaPrevious(MediaPreviousResponseCallback callback) { - mediaPrevious(chipClusterPtr, callback); + public void previousRequest(PlaybackResponseCallback callback) { + previousRequest(chipClusterPtr, callback); } - public void mediaRewind(MediaRewindResponseCallback callback) { - mediaRewind(chipClusterPtr, callback); + public void rewindRequest(PlaybackResponseCallback callback) { + rewindRequest(chipClusterPtr, callback); } - public void mediaSeek(MediaSeekResponseCallback callback, Long position) { - mediaSeek(chipClusterPtr, callback, position); + public void seekRequest(PlaybackResponseCallback callback, Long position) { + seekRequest(chipClusterPtr, callback, position); } - public void mediaSkipBackward( - MediaSkipBackwardResponseCallback callback, Long deltaPositionMilliseconds) { - mediaSkipBackward(chipClusterPtr, callback, deltaPositionMilliseconds); + public void skipBackwardRequest( + PlaybackResponseCallback callback, Long deltaPositionMilliseconds) { + skipBackwardRequest(chipClusterPtr, callback, deltaPositionMilliseconds); } - public void mediaSkipForward( - MediaSkipForwardResponseCallback callback, Long deltaPositionMilliseconds) { - mediaSkipForward(chipClusterPtr, callback, deltaPositionMilliseconds); + public void skipForwardRequest( + PlaybackResponseCallback callback, Long deltaPositionMilliseconds) { + skipForwardRequest(chipClusterPtr, callback, deltaPositionMilliseconds); } - public void mediaStartOver(MediaStartOverResponseCallback callback) { - mediaStartOver(chipClusterPtr, callback); + public void startOverRequest(PlaybackResponseCallback callback) { + startOverRequest(chipClusterPtr, callback); } - public void mediaStop(MediaStopResponseCallback callback) { - mediaStop(chipClusterPtr, callback); + public void stopRequest(PlaybackResponseCallback callback) { + stopRequest(chipClusterPtr, callback); } - private native void mediaFastForward( - long chipClusterPtr, MediaFastForwardResponseCallback Callback); - - private native void mediaNext(long chipClusterPtr, MediaNextResponseCallback Callback); - - private native void mediaPause(long chipClusterPtr, MediaPauseResponseCallback Callback); + private native void fastForwardRequest(long chipClusterPtr, PlaybackResponseCallback Callback); - private native void mediaPlay(long chipClusterPtr, MediaPlayResponseCallback Callback); + private native void nextRequest(long chipClusterPtr, PlaybackResponseCallback Callback); - private native void mediaPrevious(long chipClusterPtr, MediaPreviousResponseCallback Callback); + private native void pauseRequest(long chipClusterPtr, PlaybackResponseCallback Callback); - private native void mediaRewind(long chipClusterPtr, MediaRewindResponseCallback Callback); + private native void playRequest(long chipClusterPtr, PlaybackResponseCallback Callback); - private native void mediaSeek( - long chipClusterPtr, MediaSeekResponseCallback Callback, Long position); + private native void previousRequest(long chipClusterPtr, PlaybackResponseCallback Callback); - private native void mediaSkipBackward( - long chipClusterPtr, - MediaSkipBackwardResponseCallback Callback, - Long deltaPositionMilliseconds); - - private native void mediaSkipForward( - long chipClusterPtr, - MediaSkipForwardResponseCallback Callback, - Long deltaPositionMilliseconds); + private native void rewindRequest(long chipClusterPtr, PlaybackResponseCallback Callback); - private native void mediaStartOver( - long chipClusterPtr, MediaStartOverResponseCallback Callback); + private native void seekRequest( + long chipClusterPtr, PlaybackResponseCallback Callback, Long position); - private native void mediaStop(long chipClusterPtr, MediaStopResponseCallback Callback); + private native void skipBackwardRequest( + long chipClusterPtr, PlaybackResponseCallback Callback, Long deltaPositionMilliseconds); - public interface MediaFastForwardResponseCallback { - void onSuccess(Integer mediaPlaybackStatus); + private native void skipForwardRequest( + long chipClusterPtr, PlaybackResponseCallback Callback, Long deltaPositionMilliseconds); - void onError(Exception error); - } + private native void startOverRequest(long chipClusterPtr, PlaybackResponseCallback Callback); - public interface MediaNextResponseCallback { - void onSuccess(Integer mediaPlaybackStatus); + private native void stopRequest(long chipClusterPtr, PlaybackResponseCallback Callback); - void onError(Exception error); - } - - public interface MediaPauseResponseCallback { - void onSuccess(Integer mediaPlaybackStatus); - - void onError(Exception error); - } - - public interface MediaPlayResponseCallback { - void onSuccess(Integer mediaPlaybackStatus); - - void onError(Exception error); - } - - public interface MediaPreviousResponseCallback { - void onSuccess(Integer mediaPlaybackStatus); - - void onError(Exception error); - } - - public interface MediaRewindResponseCallback { - void onSuccess(Integer mediaPlaybackStatus); - - void onError(Exception error); - } - - public interface MediaSeekResponseCallback { - void onSuccess(Integer mediaPlaybackStatus); - - void onError(Exception error); - } - - public interface MediaSkipBackwardResponseCallback { - void onSuccess(Integer mediaPlaybackStatus); - - void onError(Exception error); - } - - public interface MediaSkipForwardResponseCallback { - void onSuccess(Integer mediaPlaybackStatus); - - void onError(Exception error); - } - - public interface MediaStartOverResponseCallback { - void onSuccess(Integer mediaPlaybackStatus); - - void onError(Exception error); - } - - public interface MediaStopResponseCallback { - void onSuccess(Integer mediaPlaybackStatus); + public interface PlaybackResponseCallback { + void onSuccess(Integer status); void onError(Exception error); } @@ -9441,12 +9359,12 @@ public static long clusterId() { @Override public native long initWithDevice(long devicePtr, int endpointId); - public void navigateTarget( + public void navigateTargetRequest( NavigateTargetResponseCallback callback, Integer target, String data) { - navigateTarget(chipClusterPtr, callback, target, data); + navigateTargetRequest(chipClusterPtr, callback, target, data); } - private native void navigateTarget( + private native void navigateTargetRequest( long chipClusterPtr, NavigateTargetResponseCallback Callback, Integer target, String data); public interface NavigateTargetResponseCallback { @@ -9503,6 +9421,11 @@ public void readCurrentNavigatorTargetAttribute(IntegerAttributeCallback callbac readCurrentNavigatorTargetAttribute(chipClusterPtr, callback); } + public void subscribeCurrentNavigatorTargetAttribute( + IntegerAttributeCallback callback, int minInterval, int maxInterval) { + subscribeCurrentNavigatorTargetAttribute(chipClusterPtr, callback, minInterval, maxInterval); + } + public void readAttributeListAttribute(AttributeListAttributeCallback callback) { readAttributeListAttribute(chipClusterPtr, callback); } @@ -9522,6 +9445,9 @@ private native void readTargetNavigatorListAttribute( private native void readCurrentNavigatorTargetAttribute( long chipClusterPtr, IntegerAttributeCallback callback); + private native void subscribeCurrentNavigatorTargetAttribute( + long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); + private native void readAttributeListAttribute( long chipClusterPtr, AttributeListAttributeCallback callback); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index dc416282ef8867..aabc135a13f3e1 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -373,8 +373,8 @@ public void onError(Exception ex) { } } - public static class DelegatedApplicationBasicClusterAttributeListAttributeCallback - implements ChipClusters.ApplicationBasicCluster.AttributeListAttributeCallback, + public static class DelegatedApplicationBasicClusterAllowedVendorListAttributeCallback + implements ChipClusters.ApplicationBasicCluster.AllowedVendorListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -386,7 +386,8 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess(List valueList) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); + CommandResponseInfo commandResponseInfo = + new CommandResponseInfo("valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); @@ -398,8 +399,8 @@ public void onError(Exception ex) { } } - public static class DelegatedHideAppResponseCallback - implements ChipClusters.ApplicationLauncherCluster.HideAppResponseCallback, + public static class DelegatedApplicationBasicClusterAttributeListAttributeCallback + implements ChipClusters.ApplicationBasicCluster.AttributeListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -409,49 +410,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer status, String data) { + public void onSuccess(List valueList) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "String"); - responseValues.put(dataResponseValue, data); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedLaunchAppResponseCallback - implements ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); - @Override - public void onSuccess(Integer status, String data) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); - responseValues.put(statusResponseValue, status); - CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "String"); - responseValues.put(dataResponseValue, data); + responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } @Override - public void onError(Exception error) { - callback.onFailure(error); + public void onError(Exception ex) { + callback.onFailure(ex); } } - public static class DelegatedStopAppResponseCallback - implements ChipClusters.ApplicationLauncherCluster.StopAppResponseCallback, + public static class DelegatedLauncherResponseCallback + implements ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -915,35 +889,8 @@ public void onError(Exception ex) { } } - public static class DelegatedLaunchContentResponseCallback - implements ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer contentLaunchStatus, String data) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo contentLaunchStatusResponseValue = - new CommandResponseInfo("contentLaunchStatus", "int"); - responseValues.put(contentLaunchStatusResponseValue, contentLaunchStatus); - CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "String"); - responseValues.put(dataResponseValue, data); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedLaunchURLResponseCallback - implements ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback, + public static class DelegatedLaunchResponseCallback + implements ChipClusters.ContentLauncherCluster.LaunchResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -953,11 +900,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer contentLaunchStatus, String data) { + public void onSuccess(Integer status, String data) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo contentLaunchStatusResponseValue = - new CommandResponseInfo("contentLaunchStatus", "int"); - responseValues.put(contentLaunchStatusResponseValue, contentLaunchStatus); + CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); + responseValues.put(statusResponseValue, status); CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "String"); responseValues.put(dataResponseValue, data); callback.onSuccess(responseValues); @@ -2231,258 +2177,8 @@ public void onError(Exception ex) { } } - public static class DelegatedMediaFastForwardResponseCallback - implements ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer mediaPlaybackStatus) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo mediaPlaybackStatusResponseValue = - new CommandResponseInfo("mediaPlaybackStatus", "int"); - responseValues.put(mediaPlaybackStatusResponseValue, mediaPlaybackStatus); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedMediaNextResponseCallback - implements ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer mediaPlaybackStatus) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo mediaPlaybackStatusResponseValue = - new CommandResponseInfo("mediaPlaybackStatus", "int"); - responseValues.put(mediaPlaybackStatusResponseValue, mediaPlaybackStatus); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedMediaPauseResponseCallback - implements ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer mediaPlaybackStatus) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo mediaPlaybackStatusResponseValue = - new CommandResponseInfo("mediaPlaybackStatus", "int"); - responseValues.put(mediaPlaybackStatusResponseValue, mediaPlaybackStatus); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedMediaPlayResponseCallback - implements ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer mediaPlaybackStatus) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo mediaPlaybackStatusResponseValue = - new CommandResponseInfo("mediaPlaybackStatus", "int"); - responseValues.put(mediaPlaybackStatusResponseValue, mediaPlaybackStatus); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedMediaPreviousResponseCallback - implements ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer mediaPlaybackStatus) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo mediaPlaybackStatusResponseValue = - new CommandResponseInfo("mediaPlaybackStatus", "int"); - responseValues.put(mediaPlaybackStatusResponseValue, mediaPlaybackStatus); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedMediaRewindResponseCallback - implements ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer mediaPlaybackStatus) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo mediaPlaybackStatusResponseValue = - new CommandResponseInfo("mediaPlaybackStatus", "int"); - responseValues.put(mediaPlaybackStatusResponseValue, mediaPlaybackStatus); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedMediaSeekResponseCallback - implements ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer mediaPlaybackStatus) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo mediaPlaybackStatusResponseValue = - new CommandResponseInfo("mediaPlaybackStatus", "int"); - responseValues.put(mediaPlaybackStatusResponseValue, mediaPlaybackStatus); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedMediaSkipBackwardResponseCallback - implements ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer mediaPlaybackStatus) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo mediaPlaybackStatusResponseValue = - new CommandResponseInfo("mediaPlaybackStatus", "int"); - responseValues.put(mediaPlaybackStatusResponseValue, mediaPlaybackStatus); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedMediaSkipForwardResponseCallback - implements ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer mediaPlaybackStatus) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo mediaPlaybackStatusResponseValue = - new CommandResponseInfo("mediaPlaybackStatus", "int"); - responseValues.put(mediaPlaybackStatusResponseValue, mediaPlaybackStatus); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedMediaStartOverResponseCallback - implements ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer mediaPlaybackStatus) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo mediaPlaybackStatusResponseValue = - new CommandResponseInfo("mediaPlaybackStatus", "int"); - responseValues.put(mediaPlaybackStatusResponseValue, mediaPlaybackStatus); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - - public static class DelegatedMediaStopResponseCallback - implements ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback, + public static class DelegatedPlaybackResponseCallback + implements ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -2492,11 +2188,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer mediaPlaybackStatus) { + public void onSuccess(Integer status) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo mediaPlaybackStatusResponseValue = - new CommandResponseInfo("mediaPlaybackStatus", "int"); - responseValues.put(mediaPlaybackStatusResponseValue, mediaPlaybackStatus); + CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "int"); + responseValues.put(statusResponseValue, status); callback.onSuccess(responseValues); } @@ -4853,62 +4548,66 @@ public Map> getCommandMap() { Map accessControlClusterInteractionInfoMap = new LinkedHashMap<>(); commandMap.put("accessControl", accessControlClusterInteractionInfoMap); Map accountLoginClusterInteractionInfoMap = new LinkedHashMap<>(); - Map accountLogingetSetupPINCommandParams = + Map accountLogingetSetupPINRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo = + CommandParameterInfo accountLogingetSetupPINRequesttempAccountIdentifierCommandParameterInfo = new CommandParameterInfo("tempAccountIdentifier", String.class); - accountLogingetSetupPINCommandParams.put( - "tempAccountIdentifier", accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo); + accountLogingetSetupPINRequestCommandParams.put( + "tempAccountIdentifier", + accountLogingetSetupPINRequesttempAccountIdentifierCommandParameterInfo); // Populate commands - InteractionInfo accountLogingetSetupPINInteractionInfo = + InteractionInfo accountLogingetSetupPINRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.AccountLoginCluster) cluster) - .getSetupPIN( + .getSetupPINRequest( (ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback) callback, (String) commandArguments.get("tempAccountIdentifier")); }, () -> new DelegatedGetSetupPINResponseCallback(), - accountLogingetSetupPINCommandParams); + accountLogingetSetupPINRequestCommandParams); accountLoginClusterInteractionInfoMap.put( - "getSetupPIN", accountLogingetSetupPINInteractionInfo); - Map accountLoginloginCommandParams = + "getSetupPINRequest", accountLogingetSetupPINRequestInteractionInfo); + Map accountLoginloginRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo = + CommandParameterInfo accountLoginloginRequesttempAccountIdentifierCommandParameterInfo = new CommandParameterInfo("tempAccountIdentifier", String.class); - accountLoginloginCommandParams.put( - "tempAccountIdentifier", accountLoginlogintempAccountIdentifierCommandParameterInfo); + accountLoginloginRequestCommandParams.put( + "tempAccountIdentifier", accountLoginloginRequesttempAccountIdentifierCommandParameterInfo); - CommandParameterInfo accountLoginloginsetupPINCommandParameterInfo = + CommandParameterInfo accountLoginloginRequestsetupPINCommandParameterInfo = new CommandParameterInfo("setupPIN", String.class); - accountLoginloginCommandParams.put("setupPIN", accountLoginloginsetupPINCommandParameterInfo); + accountLoginloginRequestCommandParams.put( + "setupPIN", accountLoginloginRequestsetupPINCommandParameterInfo); // Populate commands - InteractionInfo accountLoginloginInteractionInfo = + InteractionInfo accountLoginloginRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.AccountLoginCluster) cluster) - .login( + .loginRequest( (DefaultClusterCallback) callback, (String) commandArguments.get("tempAccountIdentifier"), (String) commandArguments.get("setupPIN")); }, () -> new DelegatedDefaultClusterCallback(), - accountLoginloginCommandParams); - accountLoginClusterInteractionInfoMap.put("login", accountLoginloginInteractionInfo); - Map accountLoginlogoutCommandParams = + accountLoginloginRequestCommandParams); + accountLoginClusterInteractionInfoMap.put( + "loginRequest", accountLoginloginRequestInteractionInfo); + Map accountLoginlogoutRequestCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo accountLoginlogoutInteractionInfo = + InteractionInfo accountLoginlogoutRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.AccountLoginCluster) cluster) - .logout((DefaultClusterCallback) callback); + .logoutRequest((DefaultClusterCallback) callback); }, () -> new DelegatedDefaultClusterCallback(), - accountLoginlogoutCommandParams); - accountLoginClusterInteractionInfoMap.put("logout", accountLoginlogoutInteractionInfo); + accountLoginlogoutRequestCommandParams); + accountLoginClusterInteractionInfoMap.put( + "logoutRequest", accountLoginlogoutRequestInteractionInfo); commandMap.put("accountLogin", accountLoginClusterInteractionInfoMap); Map administratorCommissioningClusterInteractionInfoMap = new LinkedHashMap<>(); @@ -5014,159 +4713,140 @@ public Map> getCommandMap() { commandMap.put( "administratorCommissioning", administratorCommissioningClusterInteractionInfoMap); Map applicationBasicClusterInteractionInfoMap = new LinkedHashMap<>(); - Map applicationBasicchangeStatusCommandParams = - new LinkedHashMap(); - CommandParameterInfo applicationBasicchangeStatusstatusCommandParameterInfo = - new CommandParameterInfo("status", int.class); - applicationBasicchangeStatusCommandParams.put( - "status", applicationBasicchangeStatusstatusCommandParameterInfo); - - // Populate commands - InteractionInfo applicationBasicchangeStatusInteractionInfo = - new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.ApplicationBasicCluster) cluster) - .changeStatus( - (DefaultClusterCallback) callback, (Integer) commandArguments.get("status")); - }, - () -> new DelegatedDefaultClusterCallback(), - applicationBasicchangeStatusCommandParams); - applicationBasicClusterInteractionInfoMap.put( - "changeStatus", applicationBasicchangeStatusInteractionInfo); commandMap.put("applicationBasic", applicationBasicClusterInteractionInfoMap); Map applicationLauncherClusterInteractionInfoMap = new LinkedHashMap<>(); - Map applicationLauncherhideAppCommandParams = + Map applicationLauncherhideAppRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo applicationLauncherhideAppcatalogVendorIdCommandParameterInfo = + CommandParameterInfo applicationLauncherhideAppRequestcatalogVendorIdCommandParameterInfo = new CommandParameterInfo("catalogVendorId", int.class); - applicationLauncherhideAppCommandParams.put( - "catalogVendorId", applicationLauncherhideAppcatalogVendorIdCommandParameterInfo); + applicationLauncherhideAppRequestCommandParams.put( + "catalogVendorId", applicationLauncherhideAppRequestcatalogVendorIdCommandParameterInfo); - CommandParameterInfo applicationLauncherhideAppapplicationIdCommandParameterInfo = + CommandParameterInfo applicationLauncherhideAppRequestapplicationIdCommandParameterInfo = new CommandParameterInfo("applicationId", String.class); - applicationLauncherhideAppCommandParams.put( - "applicationId", applicationLauncherhideAppapplicationIdCommandParameterInfo); + applicationLauncherhideAppRequestCommandParams.put( + "applicationId", applicationLauncherhideAppRequestapplicationIdCommandParameterInfo); // Populate commands - InteractionInfo applicationLauncherhideAppInteractionInfo = + InteractionInfo applicationLauncherhideAppRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ApplicationLauncherCluster) cluster) - .hideApp( - (ChipClusters.ApplicationLauncherCluster.HideAppResponseCallback) callback, + .hideAppRequest( + (ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback, (Integer) commandArguments.get("catalogVendorId"), (String) commandArguments.get("applicationId")); }, - () -> new DelegatedHideAppResponseCallback(), - applicationLauncherhideAppCommandParams); + () -> new DelegatedLauncherResponseCallback(), + applicationLauncherhideAppRequestCommandParams); applicationLauncherClusterInteractionInfoMap.put( - "hideApp", applicationLauncherhideAppInteractionInfo); - Map applicationLauncherlaunchAppCommandParams = + "hideAppRequest", applicationLauncherhideAppRequestInteractionInfo); + Map applicationLauncherlaunchAppRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo applicationLauncherlaunchAppdataCommandParameterInfo = + CommandParameterInfo applicationLauncherlaunchAppRequestdataCommandParameterInfo = new CommandParameterInfo("data", String.class); - applicationLauncherlaunchAppCommandParams.put( - "data", applicationLauncherlaunchAppdataCommandParameterInfo); + applicationLauncherlaunchAppRequestCommandParams.put( + "data", applicationLauncherlaunchAppRequestdataCommandParameterInfo); - CommandParameterInfo applicationLauncherlaunchAppcatalogVendorIdCommandParameterInfo = + CommandParameterInfo applicationLauncherlaunchAppRequestcatalogVendorIdCommandParameterInfo = new CommandParameterInfo("catalogVendorId", int.class); - applicationLauncherlaunchAppCommandParams.put( - "catalogVendorId", applicationLauncherlaunchAppcatalogVendorIdCommandParameterInfo); + applicationLauncherlaunchAppRequestCommandParams.put( + "catalogVendorId", applicationLauncherlaunchAppRequestcatalogVendorIdCommandParameterInfo); - CommandParameterInfo applicationLauncherlaunchAppapplicationIdCommandParameterInfo = + CommandParameterInfo applicationLauncherlaunchAppRequestapplicationIdCommandParameterInfo = new CommandParameterInfo("applicationId", String.class); - applicationLauncherlaunchAppCommandParams.put( - "applicationId", applicationLauncherlaunchAppapplicationIdCommandParameterInfo); + applicationLauncherlaunchAppRequestCommandParams.put( + "applicationId", applicationLauncherlaunchAppRequestapplicationIdCommandParameterInfo); // Populate commands - InteractionInfo applicationLauncherlaunchAppInteractionInfo = + InteractionInfo applicationLauncherlaunchAppRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ApplicationLauncherCluster) cluster) - .launchApp( - (ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback) callback, + .launchAppRequest( + (ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback, (String) commandArguments.get("data"), (Integer) commandArguments.get("catalogVendorId"), (String) commandArguments.get("applicationId")); }, - () -> new DelegatedLaunchAppResponseCallback(), - applicationLauncherlaunchAppCommandParams); + () -> new DelegatedLauncherResponseCallback(), + applicationLauncherlaunchAppRequestCommandParams); applicationLauncherClusterInteractionInfoMap.put( - "launchApp", applicationLauncherlaunchAppInteractionInfo); - Map applicationLauncherstopAppCommandParams = + "launchAppRequest", applicationLauncherlaunchAppRequestInteractionInfo); + Map applicationLauncherstopAppRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo applicationLauncherstopAppcatalogVendorIdCommandParameterInfo = + CommandParameterInfo applicationLauncherstopAppRequestcatalogVendorIdCommandParameterInfo = new CommandParameterInfo("catalogVendorId", int.class); - applicationLauncherstopAppCommandParams.put( - "catalogVendorId", applicationLauncherstopAppcatalogVendorIdCommandParameterInfo); + applicationLauncherstopAppRequestCommandParams.put( + "catalogVendorId", applicationLauncherstopAppRequestcatalogVendorIdCommandParameterInfo); - CommandParameterInfo applicationLauncherstopAppapplicationIdCommandParameterInfo = + CommandParameterInfo applicationLauncherstopAppRequestapplicationIdCommandParameterInfo = new CommandParameterInfo("applicationId", String.class); - applicationLauncherstopAppCommandParams.put( - "applicationId", applicationLauncherstopAppapplicationIdCommandParameterInfo); + applicationLauncherstopAppRequestCommandParams.put( + "applicationId", applicationLauncherstopAppRequestapplicationIdCommandParameterInfo); // Populate commands - InteractionInfo applicationLauncherstopAppInteractionInfo = + InteractionInfo applicationLauncherstopAppRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ApplicationLauncherCluster) cluster) - .stopApp( - (ChipClusters.ApplicationLauncherCluster.StopAppResponseCallback) callback, + .stopAppRequest( + (ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback, (Integer) commandArguments.get("catalogVendorId"), (String) commandArguments.get("applicationId")); }, - () -> new DelegatedStopAppResponseCallback(), - applicationLauncherstopAppCommandParams); + () -> new DelegatedLauncherResponseCallback(), + applicationLauncherstopAppRequestCommandParams); applicationLauncherClusterInteractionInfoMap.put( - "stopApp", applicationLauncherstopAppInteractionInfo); + "stopAppRequest", applicationLauncherstopAppRequestInteractionInfo); commandMap.put("applicationLauncher", applicationLauncherClusterInteractionInfoMap); Map audioOutputClusterInteractionInfoMap = new LinkedHashMap<>(); - Map audioOutputrenameOutputCommandParams = + Map audioOutputrenameOutputRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo = + CommandParameterInfo audioOutputrenameOutputRequestindexCommandParameterInfo = new CommandParameterInfo("index", int.class); - audioOutputrenameOutputCommandParams.put( - "index", audioOutputrenameOutputindexCommandParameterInfo); + audioOutputrenameOutputRequestCommandParams.put( + "index", audioOutputrenameOutputRequestindexCommandParameterInfo); - CommandParameterInfo audioOutputrenameOutputnameCommandParameterInfo = + CommandParameterInfo audioOutputrenameOutputRequestnameCommandParameterInfo = new CommandParameterInfo("name", String.class); - audioOutputrenameOutputCommandParams.put( - "name", audioOutputrenameOutputnameCommandParameterInfo); + audioOutputrenameOutputRequestCommandParams.put( + "name", audioOutputrenameOutputRequestnameCommandParameterInfo); // Populate commands - InteractionInfo audioOutputrenameOutputInteractionInfo = + InteractionInfo audioOutputrenameOutputRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.AudioOutputCluster) cluster) - .renameOutput( + .renameOutputRequest( (DefaultClusterCallback) callback, (Integer) commandArguments.get("index"), (String) commandArguments.get("name")); }, () -> new DelegatedDefaultClusterCallback(), - audioOutputrenameOutputCommandParams); + audioOutputrenameOutputRequestCommandParams); audioOutputClusterInteractionInfoMap.put( - "renameOutput", audioOutputrenameOutputInteractionInfo); - Map audioOutputselectOutputCommandParams = + "renameOutputRequest", audioOutputrenameOutputRequestInteractionInfo); + Map audioOutputselectOutputRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo = + CommandParameterInfo audioOutputselectOutputRequestindexCommandParameterInfo = new CommandParameterInfo("index", int.class); - audioOutputselectOutputCommandParams.put( - "index", audioOutputselectOutputindexCommandParameterInfo); + audioOutputselectOutputRequestCommandParams.put( + "index", audioOutputselectOutputRequestindexCommandParameterInfo); // Populate commands - InteractionInfo audioOutputselectOutputInteractionInfo = + InteractionInfo audioOutputselectOutputRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.AudioOutputCluster) cluster) - .selectOutput( + .selectOutputRequest( (DefaultClusterCallback) callback, (Integer) commandArguments.get("index")); }, () -> new DelegatedDefaultClusterCallback(), - audioOutputselectOutputCommandParams); + audioOutputselectOutputRequestCommandParams); audioOutputClusterInteractionInfoMap.put( - "selectOutput", audioOutputselectOutputInteractionInfo); + "selectOutputRequest", audioOutputselectOutputRequestInteractionInfo); commandMap.put("audioOutput", audioOutputClusterInteractionInfoMap); Map barrierControlClusterInteractionInfoMap = new LinkedHashMap<>(); Map barrierControlbarrierControlGoToPercentCommandParams = @@ -5639,67 +5319,71 @@ public Map> getCommandMap() { new LinkedHashMap<>(); commandMap.put("bridgedDeviceBasic", bridgedDeviceBasicClusterInteractionInfoMap); Map channelClusterInteractionInfoMap = new LinkedHashMap<>(); - Map channelchangeChannelCommandParams = + Map channelchangeChannelByNumberRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo channelchangeChannelmatchCommandParameterInfo = - new CommandParameterInfo("match", String.class); - channelchangeChannelCommandParams.put("match", channelchangeChannelmatchCommandParameterInfo); - - // Populate commands - InteractionInfo channelchangeChannelInteractionInfo = - new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.ChannelCluster) cluster) - .changeChannel( - (ChipClusters.ChannelCluster.ChangeChannelResponseCallback) callback, - (String) commandArguments.get("match")); - }, - () -> new DelegatedChangeChannelResponseCallback(), - channelchangeChannelCommandParams); - channelClusterInteractionInfoMap.put("changeChannel", channelchangeChannelInteractionInfo); - Map channelchangeChannelByNumberCommandParams = - new LinkedHashMap(); - CommandParameterInfo channelchangeChannelByNumbermajorNumberCommandParameterInfo = + CommandParameterInfo channelchangeChannelByNumberRequestmajorNumberCommandParameterInfo = new CommandParameterInfo("majorNumber", int.class); - channelchangeChannelByNumberCommandParams.put( - "majorNumber", channelchangeChannelByNumbermajorNumberCommandParameterInfo); + channelchangeChannelByNumberRequestCommandParams.put( + "majorNumber", channelchangeChannelByNumberRequestmajorNumberCommandParameterInfo); - CommandParameterInfo channelchangeChannelByNumberminorNumberCommandParameterInfo = + CommandParameterInfo channelchangeChannelByNumberRequestminorNumberCommandParameterInfo = new CommandParameterInfo("minorNumber", int.class); - channelchangeChannelByNumberCommandParams.put( - "minorNumber", channelchangeChannelByNumberminorNumberCommandParameterInfo); + channelchangeChannelByNumberRequestCommandParams.put( + "minorNumber", channelchangeChannelByNumberRequestminorNumberCommandParameterInfo); // Populate commands - InteractionInfo channelchangeChannelByNumberInteractionInfo = + InteractionInfo channelchangeChannelByNumberRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ChannelCluster) cluster) - .changeChannelByNumber( + .changeChannelByNumberRequest( (DefaultClusterCallback) callback, (Integer) commandArguments.get("majorNumber"), (Integer) commandArguments.get("minorNumber")); }, () -> new DelegatedDefaultClusterCallback(), - channelchangeChannelByNumberCommandParams); + channelchangeChannelByNumberRequestCommandParams); + channelClusterInteractionInfoMap.put( + "changeChannelByNumberRequest", channelchangeChannelByNumberRequestInteractionInfo); + Map channelchangeChannelRequestCommandParams = + new LinkedHashMap(); + CommandParameterInfo channelchangeChannelRequestmatchCommandParameterInfo = + new CommandParameterInfo("match", String.class); + channelchangeChannelRequestCommandParams.put( + "match", channelchangeChannelRequestmatchCommandParameterInfo); + + // Populate commands + InteractionInfo channelchangeChannelRequestInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.ChannelCluster) cluster) + .changeChannelRequest( + (ChipClusters.ChannelCluster.ChangeChannelResponseCallback) callback, + (String) commandArguments.get("match")); + }, + () -> new DelegatedChangeChannelResponseCallback(), + channelchangeChannelRequestCommandParams); channelClusterInteractionInfoMap.put( - "changeChannelByNumber", channelchangeChannelByNumberInteractionInfo); - Map channelskipChannelCommandParams = + "changeChannelRequest", channelchangeChannelRequestInteractionInfo); + Map channelskipChannelRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo channelskipChannelcountCommandParameterInfo = + CommandParameterInfo channelskipChannelRequestcountCommandParameterInfo = new CommandParameterInfo("count", int.class); - channelskipChannelCommandParams.put("count", channelskipChannelcountCommandParameterInfo); + channelskipChannelRequestCommandParams.put( + "count", channelskipChannelRequestcountCommandParameterInfo); // Populate commands - InteractionInfo channelskipChannelInteractionInfo = + InteractionInfo channelskipChannelRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ChannelCluster) cluster) - .skipChannel( + .skipChannelRequest( (DefaultClusterCallback) callback, (Integer) commandArguments.get("count")); }, () -> new DelegatedDefaultClusterCallback(), - channelskipChannelCommandParams); - channelClusterInteractionInfoMap.put("skipChannel", channelskipChannelInteractionInfo); + channelskipChannelRequestCommandParams); + channelClusterInteractionInfoMap.put( + "skipChannelRequest", channelskipChannelRequestInteractionInfo); commandMap.put("channel", channelClusterInteractionInfoMap); Map colorControlClusterInteractionInfoMap = new LinkedHashMap<>(); Map colorControlcolorLoopSetCommandParams = @@ -6518,76 +6202,64 @@ public Map> getCommandMap() { "stopMoveStep", colorControlstopMoveStepInteractionInfo); commandMap.put("colorControl", colorControlClusterInteractionInfoMap); Map contentLauncherClusterInteractionInfoMap = new LinkedHashMap<>(); - Map contentLauncherlaunchContentCommandParams = + Map contentLauncherlaunchContentRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo contentLauncherlaunchContentautoPlayCommandParameterInfo = + CommandParameterInfo contentLauncherlaunchContentRequestautoPlayCommandParameterInfo = new CommandParameterInfo("autoPlay", boolean.class); - contentLauncherlaunchContentCommandParams.put( - "autoPlay", contentLauncherlaunchContentautoPlayCommandParameterInfo); + contentLauncherlaunchContentRequestCommandParams.put( + "autoPlay", contentLauncherlaunchContentRequestautoPlayCommandParameterInfo); - CommandParameterInfo contentLauncherlaunchContentdataCommandParameterInfo = + CommandParameterInfo contentLauncherlaunchContentRequestdataCommandParameterInfo = new CommandParameterInfo("data", String.class); - contentLauncherlaunchContentCommandParams.put( - "data", contentLauncherlaunchContentdataCommandParameterInfo); - - CommandParameterInfo contentLauncherlaunchContenttypeCommandParameterInfo = - new CommandParameterInfo("type", int.class); - contentLauncherlaunchContentCommandParams.put( - "type", contentLauncherlaunchContenttypeCommandParameterInfo); - - CommandParameterInfo contentLauncherlaunchContentvalueCommandParameterInfo = - new CommandParameterInfo("value", String.class); - contentLauncherlaunchContentCommandParams.put( - "value", contentLauncherlaunchContentvalueCommandParameterInfo); + contentLauncherlaunchContentRequestCommandParams.put( + "data", contentLauncherlaunchContentRequestdataCommandParameterInfo); // Populate commands - InteractionInfo contentLauncherlaunchContentInteractionInfo = + InteractionInfo contentLauncherlaunchContentRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ContentLauncherCluster) cluster) - .launchContent( - (ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback) callback, + .launchContentRequest( + (ChipClusters.ContentLauncherCluster.LaunchResponseCallback) callback, (Boolean) commandArguments.get("autoPlay"), - (String) commandArguments.get("data"), - (Integer) commandArguments.get("type"), - (String) commandArguments.get("value")); + (String) commandArguments.get("data")); }, - () -> new DelegatedLaunchContentResponseCallback(), - contentLauncherlaunchContentCommandParams); + () -> new DelegatedLaunchResponseCallback(), + contentLauncherlaunchContentRequestCommandParams); contentLauncherClusterInteractionInfoMap.put( - "launchContent", contentLauncherlaunchContentInteractionInfo); - Map contentLauncherlaunchURLCommandParams = + "launchContentRequest", contentLauncherlaunchContentRequestInteractionInfo); + Map contentLauncherlaunchURLRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo contentLauncherlaunchURLcontentURLCommandParameterInfo = + CommandParameterInfo contentLauncherlaunchURLRequestcontentURLCommandParameterInfo = new CommandParameterInfo("contentURL", String.class); - contentLauncherlaunchURLCommandParams.put( - "contentURL", contentLauncherlaunchURLcontentURLCommandParameterInfo); + contentLauncherlaunchURLRequestCommandParams.put( + "contentURL", contentLauncherlaunchURLRequestcontentURLCommandParameterInfo); - CommandParameterInfo contentLauncherlaunchURLdisplayStringCommandParameterInfo = + CommandParameterInfo contentLauncherlaunchURLRequestdisplayStringCommandParameterInfo = new CommandParameterInfo("displayString", String.class); - contentLauncherlaunchURLCommandParams.put( - "displayString", contentLauncherlaunchURLdisplayStringCommandParameterInfo); + contentLauncherlaunchURLRequestCommandParams.put( + "displayString", contentLauncherlaunchURLRequestdisplayStringCommandParameterInfo); - CommandParameterInfo contentLauncherlaunchURLproviderNameCommandParameterInfo = + CommandParameterInfo contentLauncherlaunchURLRequestproviderNameCommandParameterInfo = new CommandParameterInfo("providerName", String.class); - contentLauncherlaunchURLCommandParams.put( - "providerName", contentLauncherlaunchURLproviderNameCommandParameterInfo); + contentLauncherlaunchURLRequestCommandParams.put( + "providerName", contentLauncherlaunchURLRequestproviderNameCommandParameterInfo); // Populate commands - InteractionInfo contentLauncherlaunchURLInteractionInfo = + InteractionInfo contentLauncherlaunchURLRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ContentLauncherCluster) cluster) - .launchURL( - (ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback) callback, + .launchURLRequest( + (ChipClusters.ContentLauncherCluster.LaunchResponseCallback) callback, (String) commandArguments.get("contentURL"), (String) commandArguments.get("displayString"), (String) commandArguments.get("providerName")); }, - () -> new DelegatedLaunchURLResponseCallback(), - contentLauncherlaunchURLCommandParams); + () -> new DelegatedLaunchResponseCallback(), + contentLauncherlaunchURLRequestCommandParams); contentLauncherClusterInteractionInfoMap.put( - "launchURL", contentLauncherlaunchURLInteractionInfo); + "launchURLRequest", contentLauncherlaunchURLRequestInteractionInfo); commandMap.put("contentLauncher", contentLauncherClusterInteractionInfoMap); Map descriptorClusterInteractionInfoMap = new LinkedHashMap<>(); commandMap.put("descriptor", descriptorClusterInteractionInfoMap); @@ -7281,24 +6953,26 @@ public Map> getCommandMap() { new LinkedHashMap<>(); commandMap.put("illuminanceMeasurement", illuminanceMeasurementClusterInteractionInfoMap); Map keypadInputClusterInteractionInfoMap = new LinkedHashMap<>(); - Map keypadInputsendKeyCommandParams = + Map keypadInputsendKeyRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo keypadInputsendKeykeyCodeCommandParameterInfo = + CommandParameterInfo keypadInputsendKeyRequestkeyCodeCommandParameterInfo = new CommandParameterInfo("keyCode", int.class); - keypadInputsendKeyCommandParams.put("keyCode", keypadInputsendKeykeyCodeCommandParameterInfo); + keypadInputsendKeyRequestCommandParams.put( + "keyCode", keypadInputsendKeyRequestkeyCodeCommandParameterInfo); // Populate commands - InteractionInfo keypadInputsendKeyInteractionInfo = + InteractionInfo keypadInputsendKeyRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.KeypadInputCluster) cluster) - .sendKey( + .sendKeyRequest( (ChipClusters.KeypadInputCluster.SendKeyResponseCallback) callback, (Integer) commandArguments.get("keyCode")); }, () -> new DelegatedSendKeyResponseCallback(), - keypadInputsendKeyCommandParams); - keypadInputClusterInteractionInfoMap.put("sendKey", keypadInputsendKeyInteractionInfo); + keypadInputsendKeyRequestCommandParams); + keypadInputClusterInteractionInfoMap.put( + "sendKeyRequest", keypadInputsendKeyRequestInteractionInfo); commandMap.put("keypadInput", keypadInputClusterInteractionInfoMap); Map levelControlClusterInteractionInfoMap = new LinkedHashMap<>(); Map levelControlmoveCommandParams = @@ -7549,248 +7223,255 @@ public Map> getCommandMap() { lowPowerClusterInteractionInfoMap.put("sleep", lowPowersleepInteractionInfo); commandMap.put("lowPower", lowPowerClusterInteractionInfoMap); Map mediaInputClusterInteractionInfoMap = new LinkedHashMap<>(); - Map mediaInputhideInputStatusCommandParams = + Map mediaInputhideInputStatusRequestCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo mediaInputhideInputStatusInteractionInfo = + InteractionInfo mediaInputhideInputStatusRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaInputCluster) cluster) - .hideInputStatus((DefaultClusterCallback) callback); + .hideInputStatusRequest((DefaultClusterCallback) callback); }, () -> new DelegatedDefaultClusterCallback(), - mediaInputhideInputStatusCommandParams); + mediaInputhideInputStatusRequestCommandParams); mediaInputClusterInteractionInfoMap.put( - "hideInputStatus", mediaInputhideInputStatusInteractionInfo); - Map mediaInputrenameInputCommandParams = + "hideInputStatusRequest", mediaInputhideInputStatusRequestInteractionInfo); + Map mediaInputrenameInputRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo = + CommandParameterInfo mediaInputrenameInputRequestindexCommandParameterInfo = new CommandParameterInfo("index", int.class); - mediaInputrenameInputCommandParams.put("index", mediaInputrenameInputindexCommandParameterInfo); + mediaInputrenameInputRequestCommandParams.put( + "index", mediaInputrenameInputRequestindexCommandParameterInfo); - CommandParameterInfo mediaInputrenameInputnameCommandParameterInfo = + CommandParameterInfo mediaInputrenameInputRequestnameCommandParameterInfo = new CommandParameterInfo("name", String.class); - mediaInputrenameInputCommandParams.put("name", mediaInputrenameInputnameCommandParameterInfo); + mediaInputrenameInputRequestCommandParams.put( + "name", mediaInputrenameInputRequestnameCommandParameterInfo); // Populate commands - InteractionInfo mediaInputrenameInputInteractionInfo = + InteractionInfo mediaInputrenameInputRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaInputCluster) cluster) - .renameInput( + .renameInputRequest( (DefaultClusterCallback) callback, (Integer) commandArguments.get("index"), (String) commandArguments.get("name")); }, () -> new DelegatedDefaultClusterCallback(), - mediaInputrenameInputCommandParams); - mediaInputClusterInteractionInfoMap.put("renameInput", mediaInputrenameInputInteractionInfo); - Map mediaInputselectInputCommandParams = + mediaInputrenameInputRequestCommandParams); + mediaInputClusterInteractionInfoMap.put( + "renameInputRequest", mediaInputrenameInputRequestInteractionInfo); + Map mediaInputselectInputRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo mediaInputselectInputindexCommandParameterInfo = + CommandParameterInfo mediaInputselectInputRequestindexCommandParameterInfo = new CommandParameterInfo("index", int.class); - mediaInputselectInputCommandParams.put("index", mediaInputselectInputindexCommandParameterInfo); + mediaInputselectInputRequestCommandParams.put( + "index", mediaInputselectInputRequestindexCommandParameterInfo); // Populate commands - InteractionInfo mediaInputselectInputInteractionInfo = + InteractionInfo mediaInputselectInputRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaInputCluster) cluster) - .selectInput( + .selectInputRequest( (DefaultClusterCallback) callback, (Integer) commandArguments.get("index")); }, () -> new DelegatedDefaultClusterCallback(), - mediaInputselectInputCommandParams); - mediaInputClusterInteractionInfoMap.put("selectInput", mediaInputselectInputInteractionInfo); - Map mediaInputshowInputStatusCommandParams = + mediaInputselectInputRequestCommandParams); + mediaInputClusterInteractionInfoMap.put( + "selectInputRequest", mediaInputselectInputRequestInteractionInfo); + Map mediaInputshowInputStatusRequestCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo mediaInputshowInputStatusInteractionInfo = + InteractionInfo mediaInputshowInputStatusRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaInputCluster) cluster) - .showInputStatus((DefaultClusterCallback) callback); + .showInputStatusRequest((DefaultClusterCallback) callback); }, () -> new DelegatedDefaultClusterCallback(), - mediaInputshowInputStatusCommandParams); + mediaInputshowInputStatusRequestCommandParams); mediaInputClusterInteractionInfoMap.put( - "showInputStatus", mediaInputshowInputStatusInteractionInfo); + "showInputStatusRequest", mediaInputshowInputStatusRequestInteractionInfo); commandMap.put("mediaInput", mediaInputClusterInteractionInfoMap); Map mediaPlaybackClusterInteractionInfoMap = new LinkedHashMap<>(); - Map mediaPlaybackmediaFastForwardCommandParams = + Map mediaPlaybackfastForwardRequestCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo mediaPlaybackmediaFastForwardInteractionInfo = + InteractionInfo mediaPlaybackfastForwardRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaPlaybackCluster) cluster) - .mediaFastForward( - (ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback) - callback); + .fastForwardRequest( + (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback); }, - () -> new DelegatedMediaFastForwardResponseCallback(), - mediaPlaybackmediaFastForwardCommandParams); + () -> new DelegatedPlaybackResponseCallback(), + mediaPlaybackfastForwardRequestCommandParams); mediaPlaybackClusterInteractionInfoMap.put( - "mediaFastForward", mediaPlaybackmediaFastForwardInteractionInfo); - Map mediaPlaybackmediaNextCommandParams = + "fastForwardRequest", mediaPlaybackfastForwardRequestInteractionInfo); + Map mediaPlaybacknextRequestCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo mediaPlaybackmediaNextInteractionInfo = + InteractionInfo mediaPlaybacknextRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaPlaybackCluster) cluster) - .mediaNext( - (ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback) callback); + .nextRequest( + (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback); }, - () -> new DelegatedMediaNextResponseCallback(), - mediaPlaybackmediaNextCommandParams); - mediaPlaybackClusterInteractionInfoMap.put("mediaNext", mediaPlaybackmediaNextInteractionInfo); - Map mediaPlaybackmediaPauseCommandParams = + () -> new DelegatedPlaybackResponseCallback(), + mediaPlaybacknextRequestCommandParams); + mediaPlaybackClusterInteractionInfoMap.put( + "nextRequest", mediaPlaybacknextRequestInteractionInfo); + Map mediaPlaybackpauseRequestCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo mediaPlaybackmediaPauseInteractionInfo = + InteractionInfo mediaPlaybackpauseRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaPlaybackCluster) cluster) - .mediaPause( - (ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback) callback); + .pauseRequest( + (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback); }, - () -> new DelegatedMediaPauseResponseCallback(), - mediaPlaybackmediaPauseCommandParams); + () -> new DelegatedPlaybackResponseCallback(), + mediaPlaybackpauseRequestCommandParams); mediaPlaybackClusterInteractionInfoMap.put( - "mediaPause", mediaPlaybackmediaPauseInteractionInfo); - Map mediaPlaybackmediaPlayCommandParams = + "pauseRequest", mediaPlaybackpauseRequestInteractionInfo); + Map mediaPlaybackplayRequestCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo mediaPlaybackmediaPlayInteractionInfo = + InteractionInfo mediaPlaybackplayRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaPlaybackCluster) cluster) - .mediaPlay( - (ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback) callback); + .playRequest( + (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback); }, - () -> new DelegatedMediaPlayResponseCallback(), - mediaPlaybackmediaPlayCommandParams); - mediaPlaybackClusterInteractionInfoMap.put("mediaPlay", mediaPlaybackmediaPlayInteractionInfo); - Map mediaPlaybackmediaPreviousCommandParams = + () -> new DelegatedPlaybackResponseCallback(), + mediaPlaybackplayRequestCommandParams); + mediaPlaybackClusterInteractionInfoMap.put( + "playRequest", mediaPlaybackplayRequestInteractionInfo); + Map mediaPlaybackpreviousRequestCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo mediaPlaybackmediaPreviousInteractionInfo = + InteractionInfo mediaPlaybackpreviousRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaPlaybackCluster) cluster) - .mediaPrevious( - (ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback) callback); + .previousRequest( + (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback); }, - () -> new DelegatedMediaPreviousResponseCallback(), - mediaPlaybackmediaPreviousCommandParams); + () -> new DelegatedPlaybackResponseCallback(), + mediaPlaybackpreviousRequestCommandParams); mediaPlaybackClusterInteractionInfoMap.put( - "mediaPrevious", mediaPlaybackmediaPreviousInteractionInfo); - Map mediaPlaybackmediaRewindCommandParams = + "previousRequest", mediaPlaybackpreviousRequestInteractionInfo); + Map mediaPlaybackrewindRequestCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo mediaPlaybackmediaRewindInteractionInfo = + InteractionInfo mediaPlaybackrewindRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaPlaybackCluster) cluster) - .mediaRewind( - (ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback) callback); + .rewindRequest( + (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback); }, - () -> new DelegatedMediaRewindResponseCallback(), - mediaPlaybackmediaRewindCommandParams); + () -> new DelegatedPlaybackResponseCallback(), + mediaPlaybackrewindRequestCommandParams); mediaPlaybackClusterInteractionInfoMap.put( - "mediaRewind", mediaPlaybackmediaRewindInteractionInfo); - Map mediaPlaybackmediaSeekCommandParams = + "rewindRequest", mediaPlaybackrewindRequestInteractionInfo); + Map mediaPlaybackseekRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo mediaPlaybackmediaSeekpositionCommandParameterInfo = + CommandParameterInfo mediaPlaybackseekRequestpositionCommandParameterInfo = new CommandParameterInfo("position", long.class); - mediaPlaybackmediaSeekCommandParams.put( - "position", mediaPlaybackmediaSeekpositionCommandParameterInfo); + mediaPlaybackseekRequestCommandParams.put( + "position", mediaPlaybackseekRequestpositionCommandParameterInfo); // Populate commands - InteractionInfo mediaPlaybackmediaSeekInteractionInfo = + InteractionInfo mediaPlaybackseekRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaPlaybackCluster) cluster) - .mediaSeek( - (ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback) callback, + .seekRequest( + (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback, (Long) commandArguments.get("position")); }, - () -> new DelegatedMediaSeekResponseCallback(), - mediaPlaybackmediaSeekCommandParams); - mediaPlaybackClusterInteractionInfoMap.put("mediaSeek", mediaPlaybackmediaSeekInteractionInfo); - Map mediaPlaybackmediaSkipBackwardCommandParams = + () -> new DelegatedPlaybackResponseCallback(), + mediaPlaybackseekRequestCommandParams); + mediaPlaybackClusterInteractionInfoMap.put( + "seekRequest", mediaPlaybackseekRequestInteractionInfo); + Map mediaPlaybackskipBackwardRequestCommandParams = new LinkedHashMap(); CommandParameterInfo - mediaPlaybackmediaSkipBackwarddeltaPositionMillisecondsCommandParameterInfo = + mediaPlaybackskipBackwardRequestdeltaPositionMillisecondsCommandParameterInfo = new CommandParameterInfo("deltaPositionMilliseconds", long.class); - mediaPlaybackmediaSkipBackwardCommandParams.put( + mediaPlaybackskipBackwardRequestCommandParams.put( "deltaPositionMilliseconds", - mediaPlaybackmediaSkipBackwarddeltaPositionMillisecondsCommandParameterInfo); + mediaPlaybackskipBackwardRequestdeltaPositionMillisecondsCommandParameterInfo); // Populate commands - InteractionInfo mediaPlaybackmediaSkipBackwardInteractionInfo = + InteractionInfo mediaPlaybackskipBackwardRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaPlaybackCluster) cluster) - .mediaSkipBackward( - (ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback) - callback, + .skipBackwardRequest( + (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback, (Long) commandArguments.get("deltaPositionMilliseconds")); }, - () -> new DelegatedMediaSkipBackwardResponseCallback(), - mediaPlaybackmediaSkipBackwardCommandParams); + () -> new DelegatedPlaybackResponseCallback(), + mediaPlaybackskipBackwardRequestCommandParams); mediaPlaybackClusterInteractionInfoMap.put( - "mediaSkipBackward", mediaPlaybackmediaSkipBackwardInteractionInfo); - Map mediaPlaybackmediaSkipForwardCommandParams = + "skipBackwardRequest", mediaPlaybackskipBackwardRequestInteractionInfo); + Map mediaPlaybackskipForwardRequestCommandParams = new LinkedHashMap(); CommandParameterInfo - mediaPlaybackmediaSkipForwarddeltaPositionMillisecondsCommandParameterInfo = + mediaPlaybackskipForwardRequestdeltaPositionMillisecondsCommandParameterInfo = new CommandParameterInfo("deltaPositionMilliseconds", long.class); - mediaPlaybackmediaSkipForwardCommandParams.put( + mediaPlaybackskipForwardRequestCommandParams.put( "deltaPositionMilliseconds", - mediaPlaybackmediaSkipForwarddeltaPositionMillisecondsCommandParameterInfo); + mediaPlaybackskipForwardRequestdeltaPositionMillisecondsCommandParameterInfo); // Populate commands - InteractionInfo mediaPlaybackmediaSkipForwardInteractionInfo = + InteractionInfo mediaPlaybackskipForwardRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaPlaybackCluster) cluster) - .mediaSkipForward( - (ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback) callback, + .skipForwardRequest( + (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback, (Long) commandArguments.get("deltaPositionMilliseconds")); }, - () -> new DelegatedMediaSkipForwardResponseCallback(), - mediaPlaybackmediaSkipForwardCommandParams); + () -> new DelegatedPlaybackResponseCallback(), + mediaPlaybackskipForwardRequestCommandParams); mediaPlaybackClusterInteractionInfoMap.put( - "mediaSkipForward", mediaPlaybackmediaSkipForwardInteractionInfo); - Map mediaPlaybackmediaStartOverCommandParams = + "skipForwardRequest", mediaPlaybackskipForwardRequestInteractionInfo); + Map mediaPlaybackstartOverRequestCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo mediaPlaybackmediaStartOverInteractionInfo = + InteractionInfo mediaPlaybackstartOverRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaPlaybackCluster) cluster) - .mediaStartOver( - (ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback) callback); + .startOverRequest( + (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback); }, - () -> new DelegatedMediaStartOverResponseCallback(), - mediaPlaybackmediaStartOverCommandParams); + () -> new DelegatedPlaybackResponseCallback(), + mediaPlaybackstartOverRequestCommandParams); mediaPlaybackClusterInteractionInfoMap.put( - "mediaStartOver", mediaPlaybackmediaStartOverInteractionInfo); - Map mediaPlaybackmediaStopCommandParams = + "startOverRequest", mediaPlaybackstartOverRequestInteractionInfo); + Map mediaPlaybackstopRequestCommandParams = new LinkedHashMap(); // Populate commands - InteractionInfo mediaPlaybackmediaStopInteractionInfo = + InteractionInfo mediaPlaybackstopRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.MediaPlaybackCluster) cluster) - .mediaStop( - (ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback) callback); + .stopRequest( + (ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback); }, - () -> new DelegatedMediaStopResponseCallback(), - mediaPlaybackmediaStopCommandParams); - mediaPlaybackClusterInteractionInfoMap.put("mediaStop", mediaPlaybackmediaStopInteractionInfo); + () -> new DelegatedPlaybackResponseCallback(), + mediaPlaybackstopRequestCommandParams); + mediaPlaybackClusterInteractionInfoMap.put( + "stopRequest", mediaPlaybackstopRequestInteractionInfo); commandMap.put("mediaPlayback", mediaPlaybackClusterInteractionInfoMap); Map modeSelectClusterInteractionInfoMap = new LinkedHashMap<>(); Map modeSelectchangeToModeCommandParams = @@ -8730,32 +8411,32 @@ public Map> getCommandMap() { Map switchClusterInteractionInfoMap = new LinkedHashMap<>(); commandMap.put("switch", switchClusterInteractionInfoMap); Map targetNavigatorClusterInteractionInfoMap = new LinkedHashMap<>(); - Map targetNavigatornavigateTargetCommandParams = + Map targetNavigatornavigateTargetRequestCommandParams = new LinkedHashMap(); - CommandParameterInfo targetNavigatornavigateTargettargetCommandParameterInfo = + CommandParameterInfo targetNavigatornavigateTargetRequesttargetCommandParameterInfo = new CommandParameterInfo("target", int.class); - targetNavigatornavigateTargetCommandParams.put( - "target", targetNavigatornavigateTargettargetCommandParameterInfo); + targetNavigatornavigateTargetRequestCommandParams.put( + "target", targetNavigatornavigateTargetRequesttargetCommandParameterInfo); - CommandParameterInfo targetNavigatornavigateTargetdataCommandParameterInfo = + CommandParameterInfo targetNavigatornavigateTargetRequestdataCommandParameterInfo = new CommandParameterInfo("data", String.class); - targetNavigatornavigateTargetCommandParams.put( - "data", targetNavigatornavigateTargetdataCommandParameterInfo); + targetNavigatornavigateTargetRequestCommandParams.put( + "data", targetNavigatornavigateTargetRequestdataCommandParameterInfo); // Populate commands - InteractionInfo targetNavigatornavigateTargetInteractionInfo = + InteractionInfo targetNavigatornavigateTargetRequestInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.TargetNavigatorCluster) cluster) - .navigateTarget( + .navigateTargetRequest( (ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback) callback, (Integer) commandArguments.get("target"), (String) commandArguments.get("data")); }, () -> new DelegatedNavigateTargetResponseCallback(), - targetNavigatornavigateTargetCommandParams); + targetNavigatornavigateTargetRequestCommandParams); targetNavigatorClusterInteractionInfoMap.put( - "navigateTarget", targetNavigatornavigateTargetInteractionInfo); + "navigateTargetRequest", targetNavigatornavigateTargetRequestInteractionInfo); commandMap.put("targetNavigator", targetNavigatorClusterInteractionInfoMap); Map temperatureMeasurementClusterInteractionInfoMap = new LinkedHashMap<>(); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java index 86688c921b7f33..640d5d83065bc3 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java @@ -267,6 +267,23 @@ public Map> getReadAttributeMap() { readApplicationBasicInteractionInfo.put( "readApplicationVersionAttribute", readApplicationBasicApplicationVersionAttributeInteractionInfo); + Map readApplicationBasicAllowedVendorListCommandParams = + new LinkedHashMap(); + InteractionInfo readApplicationBasicAllowedVendorListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.ApplicationBasicCluster) cluster) + .readAllowedVendorListAttribute( + (ChipClusters.ApplicationBasicCluster.AllowedVendorListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedApplicationBasicClusterAllowedVendorListAttributeCallback(), + readApplicationBasicAllowedVendorListCommandParams); + readApplicationBasicInteractionInfo.put( + "readAllowedVendorListAttribute", + readApplicationBasicAllowedVendorListAttributeInteractionInfo); Map readApplicationBasicAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readApplicationBasicAttributeListAttributeInteractionInfo = diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index d7204b128e99d5..9daa930106d2d7 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -67,22 +67,22 @@ class ChipClusters: "commands": { 0x00000000: { "commandId": 0x00000000, - "commandName": "GetSetupPIN", + "commandName": "GetSetupPINRequest", "args": { "tempAccountIdentifier": "str", }, }, - 0x00000001: { - "commandId": 0x00000001, - "commandName": "Login", + 0x00000002: { + "commandId": 0x00000002, + "commandName": "LoginRequest", "args": { "tempAccountIdentifier": "str", "setupPIN": "str", }, }, - 0x00000002: { - "commandId": 0x00000002, - "commandName": "Logout", + 0x00000003: { + "commandId": 0x00000003, + "commandName": "LogoutRequest", "args": { }, }, @@ -164,13 +164,6 @@ class ChipClusters: "clusterName": "ApplicationBasic", "clusterId": 0x0000050D, "commands": { - 0x00000000: { - "commandId": 0x00000000, - "commandName": "ChangeStatus", - "args": { - "status": "int", - }, - }, }, "attributes": { 0x00000000: { @@ -215,6 +208,11 @@ class ChipClusters: "type": "str", "reportable": True, }, + 0x00000007: { + "attributeName": "AllowedVendorList", + "attributeId": 0x00000007, + "type": "int", + }, 0x0000FFFB: { "attributeName": "AttributeList", "attributeId": 0x0000FFFB, @@ -234,7 +232,7 @@ class ChipClusters: "commands": { 0x00000002: { "commandId": 0x00000002, - "commandName": "HideApp", + "commandName": "HideAppRequest", "args": { "catalogVendorId": "int", "applicationId": "str", @@ -242,7 +240,7 @@ class ChipClusters: }, 0x00000000: { "commandId": 0x00000000, - "commandName": "LaunchApp", + "commandName": "LaunchAppRequest", "args": { "data": "str", "catalogVendorId": "int", @@ -251,7 +249,7 @@ class ChipClusters: }, 0x00000001: { "commandId": 0x00000001, - "commandName": "StopApp", + "commandName": "StopAppRequest", "args": { "catalogVendorId": "int", "applicationId": "str", @@ -284,7 +282,7 @@ class ChipClusters: "commands": { 0x00000001: { "commandId": 0x00000001, - "commandName": "RenameOutput", + "commandName": "RenameOutputRequest", "args": { "index": "int", "name": "str", @@ -292,7 +290,7 @@ class ChipClusters: }, 0x00000000: { "commandId": 0x00000000, - "commandName": "SelectOutput", + "commandName": "SelectOutputRequest", "args": { "index": "int", }, @@ -785,24 +783,24 @@ class ChipClusters: "clusterName": "Channel", "clusterId": 0x00000504, "commands": { - 0x00000000: { - "commandId": 0x00000000, - "commandName": "ChangeChannel", + 0x00000002: { + "commandId": 0x00000002, + "commandName": "ChangeChannelByNumberRequest", "args": { - "match": "str", + "majorNumber": "int", + "minorNumber": "int", }, }, - 0x00000001: { - "commandId": 0x00000001, - "commandName": "ChangeChannelByNumber", + 0x00000000: { + "commandId": 0x00000000, + "commandName": "ChangeChannelRequest", "args": { - "majorNumber": "int", - "minorNumber": "int", + "match": "str", }, }, - 0x00000002: { - "commandId": 0x00000002, - "commandName": "SkipChannel", + 0x00000003: { + "commandId": 0x00000003, + "commandName": "SkipChannelRequest", "args": { "count": "int", }, @@ -1383,18 +1381,16 @@ class ChipClusters: "commands": { 0x00000000: { "commandId": 0x00000000, - "commandName": "LaunchContent", + "commandName": "LaunchContentRequest", "args": { "autoPlay": "bool", "data": "str", - "type": "int", - "value": "str", - "externalIDList": "", + "parameterList": "", }, }, 0x00000001: { "commandId": 0x00000001, - "commandName": "LaunchURL", + "commandName": "LaunchURLRequest", "args": { "contentURL": "str", "displayString": "str", @@ -2308,7 +2304,7 @@ class ChipClusters: "commands": { 0x00000000: { "commandId": 0x00000000, - "commandName": "SendKey", + "commandName": "SendKeyRequest", "args": { "keyCode": "int", }, @@ -2539,13 +2535,13 @@ class ChipClusters: "commands": { 0x00000002: { "commandId": 0x00000002, - "commandName": "HideInputStatus", + "commandName": "HideInputStatusRequest", "args": { }, }, 0x00000003: { "commandId": 0x00000003, - "commandName": "RenameInput", + "commandName": "RenameInputRequest", "args": { "index": "int", "name": "str", @@ -2553,14 +2549,14 @@ class ChipClusters: }, 0x00000000: { "commandId": 0x00000000, - "commandName": "SelectInput", + "commandName": "SelectInputRequest", "args": { "index": "int", }, }, 0x00000001: { "commandId": 0x00000001, - "commandName": "ShowInputStatus", + "commandName": "ShowInputStatusRequest", "args": { }, }, @@ -2597,70 +2593,70 @@ class ChipClusters: "commands": { 0x00000007: { "commandId": 0x00000007, - "commandName": "MediaFastForward", + "commandName": "FastForwardRequest", "args": { }, }, 0x00000005: { "commandId": 0x00000005, - "commandName": "MediaNext", + "commandName": "NextRequest", "args": { }, }, 0x00000001: { "commandId": 0x00000001, - "commandName": "MediaPause", + "commandName": "PauseRequest", "args": { }, }, 0x00000000: { "commandId": 0x00000000, - "commandName": "MediaPlay", + "commandName": "PlayRequest", "args": { }, }, 0x00000004: { "commandId": 0x00000004, - "commandName": "MediaPrevious", + "commandName": "PreviousRequest", "args": { }, }, 0x00000006: { "commandId": 0x00000006, - "commandName": "MediaRewind", + "commandName": "RewindRequest", "args": { }, }, - 0x0000000A: { - "commandId": 0x0000000A, - "commandName": "MediaSeek", + 0x0000000B: { + "commandId": 0x0000000B, + "commandName": "SeekRequest", "args": { "position": "int", }, }, 0x00000009: { "commandId": 0x00000009, - "commandName": "MediaSkipBackward", + "commandName": "SkipBackwardRequest", "args": { "deltaPositionMilliseconds": "int", }, }, 0x00000008: { "commandId": 0x00000008, - "commandName": "MediaSkipForward", + "commandName": "SkipForwardRequest", "args": { "deltaPositionMilliseconds": "int", }, }, 0x00000003: { "commandId": 0x00000003, - "commandName": "MediaStartOver", + "commandName": "StartOverRequest", "args": { }, }, 0x00000002: { "commandId": 0x00000002, - "commandName": "MediaStop", + "commandName": "StopRequest", "args": { }, }, @@ -3838,7 +3834,7 @@ class ChipClusters: "commands": { 0x00000000: { "commandId": 0x00000000, - "commandName": "NavigateTarget", + "commandName": "NavigateTargetRequest", "args": { "target": "int", "data": "str", @@ -3856,6 +3852,7 @@ class ChipClusters: "attributeName": "CurrentNavigatorTarget", "attributeId": 0x00000001, "type": "int", + "reportable": True, }, 0x0000FFFB: { "attributeName": "AttributeList", diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 3cd20fe81cb7af..ac7b60c87f2968 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -27353,27 +27353,27 @@ class Channel(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="channelList", Tag=0x00000000, Type=typing.List[Channel.Structs.ChannelInfo]), - ClusterObjectFieldDescriptor(Label="channelLineup", Tag=0x00000001, Type=Channel.Structs.ChannelLineupInfo), - ClusterObjectFieldDescriptor(Label="currentChannel", Tag=0x00000002, Type=Channel.Structs.ChannelInfo), + ClusterObjectFieldDescriptor(Label="channelList", Tag=0x00000000, Type=typing.Optional[typing.List[Channel.Structs.ChannelInfo]]), + ClusterObjectFieldDescriptor(Label="channelLineup", Tag=0x00000001, Type=typing.Optional[Channel.Structs.LineupInfo]), + ClusterObjectFieldDescriptor(Label="currentChannel", Tag=0x00000002, Type=typing.Optional[Channel.Structs.ChannelInfo]), ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - channelList: 'typing.List[Channel.Structs.ChannelInfo]' = None - channelLineup: 'Channel.Structs.ChannelLineupInfo' = None - currentChannel: 'Channel.Structs.ChannelInfo' = None + channelList: 'typing.Optional[typing.List[Channel.Structs.ChannelInfo]]' = None + channelLineup: 'typing.Optional[Channel.Structs.LineupInfo]' = None + currentChannel: 'typing.Optional[Channel.Structs.ChannelInfo]' = None attributeList: 'typing.List[uint]' = None featureMap: 'typing.Optional[uint]' = None clusterRevision: 'uint' = None class Enums: - class ChannelErrorType(IntEnum): + class ErrorTypeEnum(IntEnum): kMultipleMatches = 0x00 kNoMatches = 0x01 - class ChannelLineupInfoType(IntEnum): + class LineupInfoTypeEnum(IntEnum): kMso = 0x00 @@ -27398,7 +27398,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: affiliateCallSign: 'str' = "" @dataclass - class ChannelLineupInfo(ClusterObject): + class LineupInfo(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -27406,19 +27406,19 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="operatorName", Tag=1, Type=str), ClusterObjectFieldDescriptor(Label="lineupName", Tag=2, Type=str), ClusterObjectFieldDescriptor(Label="postalCode", Tag=3, Type=str), - ClusterObjectFieldDescriptor(Label="lineupInfoType", Tag=4, Type=Channel.Enums.ChannelLineupInfoType), + ClusterObjectFieldDescriptor(Label="lineupInfoType", Tag=4, Type=Channel.Enums.LineupInfoTypeEnum), ]) operatorName: 'str' = "" lineupName: 'str' = "" postalCode: 'str' = "" - lineupInfoType: 'Channel.Enums.ChannelLineupInfoType' = 0 + lineupInfoType: 'Channel.Enums.LineupInfoTypeEnum' = 0 class Commands: @dataclass - class ChangeChannel(ClusterCommand): + class ChangeChannelRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0504 command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = True @@ -27435,7 +27435,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass class ChangeChannelResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0504 - command_id: typing.ClassVar[int] = 0x0000 + command_id: typing.ClassVar[int] = 0x0001 is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty @@ -27443,16 +27443,16 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="channelMatch", Tag=0, Type=Channel.Structs.ChannelInfo), - ClusterObjectFieldDescriptor(Label="errorType", Tag=1, Type=Channel.Enums.ChannelErrorType), + ClusterObjectFieldDescriptor(Label="errorType", Tag=1, Type=Channel.Enums.ErrorTypeEnum), ]) channelMatch: 'Channel.Structs.ChannelInfo' = field(default_factory=lambda: Channel.Structs.ChannelInfo()) - errorType: 'Channel.Enums.ChannelErrorType' = 0 + errorType: 'Channel.Enums.ErrorTypeEnum' = 0 @dataclass - class ChangeChannelByNumber(ClusterCommand): + class ChangeChannelByNumberRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0504 - command_id: typing.ClassVar[int] = 0x0001 + command_id: typing.ClassVar[int] = 0x0002 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -27467,9 +27467,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: minorNumber: 'uint' = 0 @dataclass - class SkipChannel(ClusterCommand): + class SkipChannelRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0504 - command_id: typing.ClassVar[int] = 0x0002 + command_id: typing.ClassVar[int] = 0x0003 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -27495,9 +27495,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[Channel.Structs.ChannelInfo]) + return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[Channel.Structs.ChannelInfo]]) - value: 'typing.List[Channel.Structs.ChannelInfo]' = field(default_factory=lambda: []) + value: 'typing.Optional[typing.List[Channel.Structs.ChannelInfo]]' = None @dataclass class ChannelLineup(ClusterAttributeDescriptor): @@ -27511,9 +27511,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=Channel.Structs.ChannelLineupInfo) + return ClusterObjectFieldDescriptor(Type=typing.Optional[Channel.Structs.LineupInfo]) - value: 'Channel.Structs.ChannelLineupInfo' = field(default_factory=lambda: Channel.Structs.ChannelLineupInfo()) + value: 'typing.Optional[Channel.Structs.LineupInfo]' = None @dataclass class CurrentChannel(ClusterAttributeDescriptor): @@ -27527,9 +27527,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=Channel.Structs.ChannelInfo) + return ClusterObjectFieldDescriptor(Type=typing.Optional[Channel.Structs.ChannelInfo]) - value: 'Channel.Structs.ChannelInfo' = field(default_factory=lambda: Channel.Structs.ChannelInfo()) + value: 'typing.Optional[Channel.Structs.ChannelInfo]' = None @dataclass class AttributeList(ClusterAttributeDescriptor): @@ -27589,21 +27589,21 @@ class TargetNavigator(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="targetNavigatorList", Tag=0x00000000, Type=typing.List[TargetNavigator.Structs.NavigateTargetTargetInfo]), + ClusterObjectFieldDescriptor(Label="targetNavigatorList", Tag=0x00000000, Type=typing.List[TargetNavigator.Structs.TargetInfo]), ClusterObjectFieldDescriptor(Label="currentNavigatorTarget", Tag=0x00000001, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - targetNavigatorList: 'typing.List[TargetNavigator.Structs.NavigateTargetTargetInfo]' = None + targetNavigatorList: 'typing.List[TargetNavigator.Structs.TargetInfo]' = None currentNavigatorTarget: 'typing.Optional[uint]' = None attributeList: 'typing.List[uint]' = None featureMap: 'typing.Optional[uint]' = None clusterRevision: 'uint' = None class Enums: - class NavigateTargetStatus(IntEnum): + class StatusEnum(IntEnum): kSuccess = 0x00 kAppNotAvailable = 0x01 kSystemBusy = 0x02 @@ -27611,7 +27611,7 @@ class NavigateTargetStatus(IntEnum): class Structs: @dataclass - class NavigateTargetTargetInfo(ClusterObject): + class TargetInfo(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -27627,7 +27627,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Commands: @dataclass - class NavigateTarget(ClusterCommand): + class NavigateTargetRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0505 command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = True @@ -27646,18 +27646,18 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass class NavigateTargetResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0505 - command_id: typing.ClassVar[int] = 0x0000 + command_id: typing.ClassVar[int] = 0x0001 is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=TargetNavigator.Enums.NavigateTargetStatus), + ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=TargetNavigator.Enums.StatusEnum), ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=str), ]) - status: 'TargetNavigator.Enums.NavigateTargetStatus' = 0 + status: 'TargetNavigator.Enums.StatusEnum' = 0 data: 'str' = "" @@ -27674,9 +27674,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[TargetNavigator.Structs.NavigateTargetTargetInfo]) + return ClusterObjectFieldDescriptor(Type=typing.List[TargetNavigator.Structs.TargetInfo]) - value: 'typing.List[TargetNavigator.Structs.NavigateTargetTargetInfo]' = field(default_factory=lambda: []) + value: 'typing.List[TargetNavigator.Structs.TargetInfo]' = field(default_factory=lambda: []) @dataclass class CurrentNavigatorTarget(ClusterAttributeDescriptor): @@ -27752,10 +27752,10 @@ class MediaPlayback(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="playbackState", Tag=0x00000000, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="playbackState", Tag=0x00000000, Type=typing.Optional[MediaPlayback.Enums.PlaybackStateEnum]), ClusterObjectFieldDescriptor(Label="startTime", Tag=0x00000001, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="duration", Tag=0x00000002, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="position", Tag=0x00000003, Type=MediaPlayback.Structs.MediaPlaybackPosition), + ClusterObjectFieldDescriptor(Label="position", Tag=0x00000003, Type=MediaPlayback.Structs.PlaybackPosition), ClusterObjectFieldDescriptor(Label="playbackSpeed", Tag=0x00000004, Type=typing.Optional[float]), ClusterObjectFieldDescriptor(Label="seekRangeEnd", Tag=0x00000005, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="seekRangeStart", Tag=0x00000006, Type=typing.Optional[uint]), @@ -27764,10 +27764,10 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - playbackState: 'typing.Optional[uint]' = None + playbackState: 'typing.Optional[MediaPlayback.Enums.PlaybackStateEnum]' = None startTime: 'typing.Optional[uint]' = None duration: 'typing.Optional[uint]' = None - position: 'MediaPlayback.Structs.MediaPlaybackPosition' = None + position: 'MediaPlayback.Structs.PlaybackPosition' = None playbackSpeed: 'typing.Optional[float]' = None seekRangeEnd: 'typing.Optional[uint]' = None seekRangeStart: 'typing.Optional[uint]' = None @@ -27776,13 +27776,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class MediaPlaybackState(IntEnum): + class PlaybackStateEnum(IntEnum): kPlaying = 0x00 kPaused = 0x01 kNotPlaying = 0x02 kBuffering = 0x03 - class MediaPlaybackStatus(IntEnum): + class StatusEnum(IntEnum): kSuccess = 0x00 kInvalidStateForCommand = 0x01 kNotAllowed = 0x02 @@ -27793,7 +27793,7 @@ class MediaPlaybackStatus(IntEnum): class Structs: @dataclass - class MediaPlaybackPosition(ClusterObject): + class PlaybackPosition(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -27809,7 +27809,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Commands: @dataclass - class MediaPlay(ClusterCommand): + class PlayRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = True @@ -27822,22 +27822,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass - class MediaPlayResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="mediaPlaybackStatus", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatus), - ]) - - mediaPlaybackStatus: 'MediaPlayback.Enums.MediaPlaybackStatus' = 0 - - @dataclass - class MediaPause(ClusterCommand): + class PauseRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 command_id: typing.ClassVar[int] = 0x0001 is_client: typing.ClassVar[bool] = True @@ -27850,22 +27835,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass - class MediaPauseResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x0001 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="mediaPlaybackStatus", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatus), - ]) - - mediaPlaybackStatus: 'MediaPlayback.Enums.MediaPlaybackStatus' = 0 - - @dataclass - class MediaStop(ClusterCommand): + class StopRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 command_id: typing.ClassVar[int] = 0x0002 is_client: typing.ClassVar[bool] = True @@ -27878,22 +27848,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass - class MediaStopResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x0002 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="mediaPlaybackStatus", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatus), - ]) - - mediaPlaybackStatus: 'MediaPlayback.Enums.MediaPlaybackStatus' = 0 - - @dataclass - class MediaStartOver(ClusterCommand): + class StartOverRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 command_id: typing.ClassVar[int] = 0x0003 is_client: typing.ClassVar[bool] = True @@ -27906,22 +27861,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass - class MediaStartOverResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x0003 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="mediaPlaybackStatus", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatus), - ]) - - mediaPlaybackStatus: 'MediaPlayback.Enums.MediaPlaybackStatus' = 0 - - @dataclass - class MediaPrevious(ClusterCommand): + class PreviousRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 command_id: typing.ClassVar[int] = 0x0004 is_client: typing.ClassVar[bool] = True @@ -27934,22 +27874,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass - class MediaPreviousResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x0004 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="mediaPlaybackStatus", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatus), - ]) - - mediaPlaybackStatus: 'MediaPlayback.Enums.MediaPlaybackStatus' = 0 - - @dataclass - class MediaNext(ClusterCommand): + class NextRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 command_id: typing.ClassVar[int] = 0x0005 is_client: typing.ClassVar[bool] = True @@ -27962,22 +27887,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass - class MediaNextResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x0005 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="mediaPlaybackStatus", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatus), - ]) - - mediaPlaybackStatus: 'MediaPlayback.Enums.MediaPlaybackStatus' = 0 - - @dataclass - class MediaRewind(ClusterCommand): + class RewindRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 command_id: typing.ClassVar[int] = 0x0006 is_client: typing.ClassVar[bool] = True @@ -27990,22 +27900,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass - class MediaRewindResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x0006 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="mediaPlaybackStatus", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatus), - ]) - - mediaPlaybackStatus: 'MediaPlayback.Enums.MediaPlaybackStatus' = 0 - - @dataclass - class MediaFastForward(ClusterCommand): + class FastForwardRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 command_id: typing.ClassVar[int] = 0x0007 is_client: typing.ClassVar[bool] = True @@ -28018,22 +27913,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass - class MediaFastForwardResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x0007 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="mediaPlaybackStatus", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatus), - ]) - - mediaPlaybackStatus: 'MediaPlayback.Enums.MediaPlaybackStatus' = 0 - - @dataclass - class MediaSkipForward(ClusterCommand): + class SkipForwardRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 command_id: typing.ClassVar[int] = 0x0008 is_client: typing.ClassVar[bool] = True @@ -28048,22 +27928,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: deltaPositionMilliseconds: 'uint' = 0 @dataclass - class MediaSkipForwardResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x0008 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="mediaPlaybackStatus", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatus), - ]) - - mediaPlaybackStatus: 'MediaPlayback.Enums.MediaPlaybackStatus' = 0 - - @dataclass - class MediaSkipBackward(ClusterCommand): + class SkipBackwardRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 command_id: typing.ClassVar[int] = 0x0009 is_client: typing.ClassVar[bool] = True @@ -28078,24 +27943,24 @@ def descriptor(cls) -> ClusterObjectDescriptor: deltaPositionMilliseconds: 'uint' = 0 @dataclass - class MediaSkipBackwardResponse(ClusterCommand): + class PlaybackResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x0009 + command_id: typing.ClassVar[int] = 0x000A is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="mediaPlaybackStatus", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatus), + ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=MediaPlayback.Enums.StatusEnum), ]) - mediaPlaybackStatus: 'MediaPlayback.Enums.MediaPlaybackStatus' = 0 + status: 'MediaPlayback.Enums.StatusEnum' = 0 @dataclass - class MediaSeek(ClusterCommand): + class SeekRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x000A + command_id: typing.ClassVar[int] = 0x000B is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -28107,21 +27972,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: position: 'uint' = 0 - @dataclass - class MediaSeekResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0506 - command_id: typing.ClassVar[int] = 0x000B - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="mediaPlaybackStatus", Tag=0, Type=MediaPlayback.Enums.MediaPlaybackStatus), - ]) - - mediaPlaybackStatus: 'MediaPlayback.Enums.MediaPlaybackStatus' = 0 - class Attributes: @dataclass @@ -28136,9 +27986,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + return ClusterObjectFieldDescriptor(Type=typing.Optional[MediaPlayback.Enums.PlaybackStateEnum]) - value: 'typing.Optional[uint]' = None + value: 'typing.Optional[MediaPlayback.Enums.PlaybackStateEnum]' = None @dataclass class StartTime(ClusterAttributeDescriptor): @@ -28184,9 +28034,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=MediaPlayback.Structs.MediaPlaybackPosition) + return ClusterObjectFieldDescriptor(Type=MediaPlayback.Structs.PlaybackPosition) - value: 'MediaPlayback.Structs.MediaPlaybackPosition' = field(default_factory=lambda: MediaPlayback.Structs.MediaPlaybackPosition()) + value: 'MediaPlayback.Structs.PlaybackPosition' = field(default_factory=lambda: MediaPlayback.Structs.PlaybackPosition()) @dataclass class PlaybackSpeed(ClusterAttributeDescriptor): @@ -28294,21 +28144,21 @@ class MediaInput(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="mediaInputList", Tag=0x00000000, Type=typing.List[MediaInput.Structs.MediaInputInfo]), + ClusterObjectFieldDescriptor(Label="mediaInputList", Tag=0x00000000, Type=typing.List[MediaInput.Structs.InputInfo]), ClusterObjectFieldDescriptor(Label="currentMediaInput", Tag=0x00000001, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - mediaInputList: 'typing.List[MediaInput.Structs.MediaInputInfo]' = None + mediaInputList: 'typing.List[MediaInput.Structs.InputInfo]' = None currentMediaInput: 'typing.Optional[uint]' = None attributeList: 'typing.List[uint]' = None featureMap: 'typing.Optional[uint]' = None clusterRevision: 'uint' = None class Enums: - class MediaInputType(IntEnum): + class InputTypeEnum(IntEnum): kInternal = 0x00 kAux = 0x01 kCoax = 0x02 @@ -28325,19 +28175,19 @@ class MediaInputType(IntEnum): class Structs: @dataclass - class MediaInputInfo(ClusterObject): + class InputInfo(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="index", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="inputType", Tag=2, Type=MediaInput.Enums.MediaInputType), + ClusterObjectFieldDescriptor(Label="inputType", Tag=2, Type=MediaInput.Enums.InputTypeEnum), ClusterObjectFieldDescriptor(Label="name", Tag=3, Type=str), ClusterObjectFieldDescriptor(Label="description", Tag=4, Type=str), ]) index: 'uint' = 0 - inputType: 'MediaInput.Enums.MediaInputType' = 0 + inputType: 'MediaInput.Enums.InputTypeEnum' = 0 name: 'str' = "" description: 'str' = "" @@ -28345,7 +28195,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Commands: @dataclass - class SelectInput(ClusterCommand): + class SelectInputRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0507 command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = True @@ -28360,7 +28210,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: index: 'uint' = 0 @dataclass - class ShowInputStatus(ClusterCommand): + class ShowInputStatusRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0507 command_id: typing.ClassVar[int] = 0x0001 is_client: typing.ClassVar[bool] = True @@ -28373,7 +28223,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass - class HideInputStatus(ClusterCommand): + class HideInputStatusRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0507 command_id: typing.ClassVar[int] = 0x0002 is_client: typing.ClassVar[bool] = True @@ -28386,7 +28236,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass - class RenameInput(ClusterCommand): + class RenameInputRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0507 command_id: typing.ClassVar[int] = 0x0003 is_client: typing.ClassVar[bool] = True @@ -28416,9 +28266,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[MediaInput.Structs.MediaInputInfo]) + return ClusterObjectFieldDescriptor(Type=typing.List[MediaInput.Structs.InputInfo]) - value: 'typing.List[MediaInput.Structs.MediaInputInfo]' = field(default_factory=lambda: []) + value: 'typing.List[MediaInput.Structs.InputInfo]' = field(default_factory=lambda: []) @dataclass class CurrentMediaInput(ClusterAttributeDescriptor): @@ -28589,7 +28439,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class KeypadInputCecKeyCode(IntEnum): + class CecKeyCode(IntEnum): kSelect = 0x00 kUp = 0x01 kDown = 0x02 @@ -28677,7 +28527,7 @@ class KeypadInputCecKeyCode(IntEnum): kF5 = 0x75 kData = 0x76 - class KeypadInputStatus(IntEnum): + class StatusEnum(IntEnum): kSuccess = 0x00 kUnsupportedKey = 0x01 kInvalidKeyInCurrentState = 0x02 @@ -28686,7 +28536,7 @@ class KeypadInputStatus(IntEnum): class Commands: @dataclass - class SendKey(ClusterCommand): + class SendKeyRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0509 command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = True @@ -28695,25 +28545,25 @@ class SendKey(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="keyCode", Tag=0, Type=KeypadInput.Enums.KeypadInputCecKeyCode), + ClusterObjectFieldDescriptor(Label="keyCode", Tag=0, Type=KeypadInput.Enums.CecKeyCode), ]) - keyCode: 'KeypadInput.Enums.KeypadInputCecKeyCode' = 0 + keyCode: 'KeypadInput.Enums.CecKeyCode' = 0 @dataclass class SendKeyResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0509 - command_id: typing.ClassVar[int] = 0x0000 + command_id: typing.ClassVar[int] = 0x0001 is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=KeypadInput.Enums.KeypadInputStatus), + ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=KeypadInput.Enums.StatusEnum), ]) - status: 'KeypadInput.Enums.KeypadInputStatus' = 0 + status: 'KeypadInput.Enums.StatusEnum' = 0 class Attributes: @@ -28789,11 +28639,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class ContentLaunchMetricType(IntEnum): + class MetricTypeEnum(IntEnum): kPixels = 0x00 kPercentage = 0x01 - class ContentLaunchParameterEnum(IntEnum): + class ParameterEnum(IntEnum): kActor = 0x00 kChannel = 0x01 kCharacter = 0x02 @@ -28808,7 +28658,7 @@ class ContentLaunchParameterEnum(IntEnum): kSportsTeam = 0x0B kType = 0x0C - class ContentLaunchStatus(IntEnum): + class StatusEnum(IntEnum): kSuccess = 0x00 kUrlNotAvailable = 0x01 kAuthFailed = 0x02 @@ -28816,22 +28666,22 @@ class ContentLaunchStatus(IntEnum): class Structs: @dataclass - class ContentLaunchDimension(ClusterObject): + class Dimension(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="width", Tag=1, Type=float), ClusterObjectFieldDescriptor(Label="height", Tag=2, Type=float), - ClusterObjectFieldDescriptor(Label="metric", Tag=3, Type=ContentLauncher.Enums.ContentLaunchMetricType), + ClusterObjectFieldDescriptor(Label="metric", Tag=3, Type=ContentLauncher.Enums.MetricTypeEnum), ]) width: 'float' = 0.0 height: 'float' = 0.0 - metric: 'ContentLauncher.Enums.ContentLaunchMetricType' = 0 + metric: 'ContentLauncher.Enums.MetricTypeEnum' = 0 @dataclass - class ContentLaunchAdditionalInfo(ClusterObject): + class AdditionalInfo(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -28844,61 +28694,72 @@ def descriptor(cls) -> ClusterObjectDescriptor: value: 'str' = "" @dataclass - class ContentLaunchParamater(ClusterObject): + class Parameter(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="type", Tag=1, Type=ContentLauncher.Enums.ContentLaunchParameterEnum), + ClusterObjectFieldDescriptor(Label="type", Tag=1, Type=ContentLauncher.Enums.ParameterEnum), ClusterObjectFieldDescriptor(Label="value", Tag=2, Type=str), - ClusterObjectFieldDescriptor(Label="externalIDList", Tag=3, Type=typing.List[ContentLauncher.Structs.ContentLaunchAdditionalInfo]), + ClusterObjectFieldDescriptor(Label="externalIDList", Tag=3, Type=typing.List[ContentLauncher.Structs.AdditionalInfo]), ]) - type: 'ContentLauncher.Enums.ContentLaunchParameterEnum' = 0 + type: 'ContentLauncher.Enums.ParameterEnum' = 0 value: 'str' = "" - externalIDList: 'typing.List[ContentLauncher.Structs.ContentLaunchAdditionalInfo]' = field(default_factory=lambda: []) + externalIDList: 'typing.List[ContentLauncher.Structs.AdditionalInfo]' = field(default_factory=lambda: []) + + @dataclass + class ContentSearch(ClusterObject): + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields = [ + ClusterObjectFieldDescriptor(Label="parameterList", Tag=1, Type=typing.List[ContentLauncher.Structs.Parameter]), + ]) + + parameterList: 'typing.List[ContentLauncher.Structs.Parameter]' = field(default_factory=lambda: []) @dataclass - class ContentLaunchStyleInformation(ClusterObject): + class StyleInformation(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="imageUrl", Tag=1, Type=str), ClusterObjectFieldDescriptor(Label="color", Tag=2, Type=str), - ClusterObjectFieldDescriptor(Label="size", Tag=3, Type=ContentLauncher.Structs.ContentLaunchDimension), + ClusterObjectFieldDescriptor(Label="size", Tag=3, Type=ContentLauncher.Structs.Dimension), ]) imageUrl: 'str' = "" color: 'str' = "" - size: 'ContentLauncher.Structs.ContentLaunchDimension' = field(default_factory=lambda: ContentLauncher.Structs.ContentLaunchDimension()) + size: 'ContentLauncher.Structs.Dimension' = field(default_factory=lambda: ContentLauncher.Structs.Dimension()) @dataclass - class ContentLaunchBrandingInformation(ClusterObject): + class BrandingInformation(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="providerName", Tag=1, Type=str), - ClusterObjectFieldDescriptor(Label="background", Tag=2, Type=ContentLauncher.Structs.ContentLaunchStyleInformation), - ClusterObjectFieldDescriptor(Label="logo", Tag=3, Type=ContentLauncher.Structs.ContentLaunchStyleInformation), - ClusterObjectFieldDescriptor(Label="progressBar", Tag=4, Type=ContentLauncher.Structs.ContentLaunchStyleInformation), - ClusterObjectFieldDescriptor(Label="splash", Tag=5, Type=ContentLauncher.Structs.ContentLaunchStyleInformation), - ClusterObjectFieldDescriptor(Label="waterMark", Tag=6, Type=ContentLauncher.Structs.ContentLaunchStyleInformation), + ClusterObjectFieldDescriptor(Label="background", Tag=2, Type=ContentLauncher.Structs.StyleInformation), + ClusterObjectFieldDescriptor(Label="logo", Tag=3, Type=ContentLauncher.Structs.StyleInformation), + ClusterObjectFieldDescriptor(Label="progressBar", Tag=4, Type=ContentLauncher.Structs.StyleInformation), + ClusterObjectFieldDescriptor(Label="splash", Tag=5, Type=ContentLauncher.Structs.StyleInformation), + ClusterObjectFieldDescriptor(Label="waterMark", Tag=6, Type=ContentLauncher.Structs.StyleInformation), ]) providerName: 'str' = "" - background: 'ContentLauncher.Structs.ContentLaunchStyleInformation' = field(default_factory=lambda: ContentLauncher.Structs.ContentLaunchStyleInformation()) - logo: 'ContentLauncher.Structs.ContentLaunchStyleInformation' = field(default_factory=lambda: ContentLauncher.Structs.ContentLaunchStyleInformation()) - progressBar: 'ContentLauncher.Structs.ContentLaunchStyleInformation' = field(default_factory=lambda: ContentLauncher.Structs.ContentLaunchStyleInformation()) - splash: 'ContentLauncher.Structs.ContentLaunchStyleInformation' = field(default_factory=lambda: ContentLauncher.Structs.ContentLaunchStyleInformation()) - waterMark: 'ContentLauncher.Structs.ContentLaunchStyleInformation' = field(default_factory=lambda: ContentLauncher.Structs.ContentLaunchStyleInformation()) + background: 'ContentLauncher.Structs.StyleInformation' = field(default_factory=lambda: ContentLauncher.Structs.StyleInformation()) + logo: 'ContentLauncher.Structs.StyleInformation' = field(default_factory=lambda: ContentLauncher.Structs.StyleInformation()) + progressBar: 'ContentLauncher.Structs.StyleInformation' = field(default_factory=lambda: ContentLauncher.Structs.StyleInformation()) + splash: 'ContentLauncher.Structs.StyleInformation' = field(default_factory=lambda: ContentLauncher.Structs.StyleInformation()) + waterMark: 'ContentLauncher.Structs.StyleInformation' = field(default_factory=lambda: ContentLauncher.Structs.StyleInformation()) class Commands: @dataclass - class LaunchContent(ClusterCommand): + class LaunchContentRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050A command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = True @@ -28909,32 +28770,15 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields = [ ClusterObjectFieldDescriptor(Label="autoPlay", Tag=0, Type=bool), ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=str), - ClusterObjectFieldDescriptor(Label="search", Tag=2, Type=typing.List[ContentLauncher.Structs.ContentLaunchParamater]), + ClusterObjectFieldDescriptor(Label="search", Tag=2, Type=typing.List[ContentLauncher.Structs.ContentSearch]), ]) autoPlay: 'bool' = False data: 'str' = "" - search: 'typing.List[ContentLauncher.Structs.ContentLaunchParamater]' = field(default_factory=lambda: []) - - @dataclass - class LaunchContentResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x050A - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="contentLaunchStatus", Tag=0, Type=ContentLauncher.Enums.ContentLaunchStatus), - ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=str), - ]) - - contentLaunchStatus: 'ContentLauncher.Enums.ContentLaunchStatus' = 0 - data: 'str' = "" + search: 'typing.List[ContentLauncher.Structs.ContentSearch]' = field(default_factory=lambda: []) @dataclass - class LaunchURL(ClusterCommand): + class LaunchURLRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050A command_id: typing.ClassVar[int] = 0x0001 is_client: typing.ClassVar[bool] = True @@ -28945,28 +28789,28 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields = [ ClusterObjectFieldDescriptor(Label="contentURL", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="displayString", Tag=1, Type=str), - ClusterObjectFieldDescriptor(Label="brandingInformation", Tag=2, Type=typing.List[ContentLauncher.Structs.ContentLaunchBrandingInformation]), + ClusterObjectFieldDescriptor(Label="brandingInformation", Tag=2, Type=ContentLauncher.Structs.BrandingInformation), ]) contentURL: 'str' = "" displayString: 'str' = "" - brandingInformation: 'typing.List[ContentLauncher.Structs.ContentLaunchBrandingInformation]' = field(default_factory=lambda: []) + brandingInformation: 'ContentLauncher.Structs.BrandingInformation' = field(default_factory=lambda: ContentLauncher.Structs.BrandingInformation()) @dataclass - class LaunchURLResponse(ClusterCommand): + class LaunchResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050A - command_id: typing.ClassVar[int] = 0x0001 + command_id: typing.ClassVar[int] = 0x0002 is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="contentLaunchStatus", Tag=0, Type=ContentLauncher.Enums.ContentLaunchStatus), + ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ContentLauncher.Enums.StatusEnum), ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=str), ]) - contentLaunchStatus: 'ContentLauncher.Enums.ContentLaunchStatus' = 0 + status: 'ContentLauncher.Enums.StatusEnum' = 0 data: 'str' = "" @@ -29061,21 +28905,21 @@ class AudioOutput(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="audioOutputList", Tag=0x00000000, Type=typing.List[AudioOutput.Structs.AudioOutputInfo]), + ClusterObjectFieldDescriptor(Label="audioOutputList", Tag=0x00000000, Type=typing.List[AudioOutput.Structs.OutputInfo]), ClusterObjectFieldDescriptor(Label="currentAudioOutput", Tag=0x00000001, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - audioOutputList: 'typing.List[AudioOutput.Structs.AudioOutputInfo]' = None + audioOutputList: 'typing.List[AudioOutput.Structs.OutputInfo]' = None currentAudioOutput: 'typing.Optional[uint]' = None attributeList: 'typing.List[uint]' = None featureMap: 'typing.Optional[uint]' = None clusterRevision: 'uint' = None class Enums: - class AudioOutputType(IntEnum): + class OutputTypeEnum(IntEnum): kHdmi = 0x00 kBt = 0x01 kOptical = 0x02 @@ -29086,25 +28930,25 @@ class AudioOutputType(IntEnum): class Structs: @dataclass - class AudioOutputInfo(ClusterObject): + class OutputInfo(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="index", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="outputType", Tag=2, Type=AudioOutput.Enums.AudioOutputType), + ClusterObjectFieldDescriptor(Label="outputType", Tag=2, Type=AudioOutput.Enums.OutputTypeEnum), ClusterObjectFieldDescriptor(Label="name", Tag=3, Type=str), ]) index: 'uint' = 0 - outputType: 'AudioOutput.Enums.AudioOutputType' = 0 + outputType: 'AudioOutput.Enums.OutputTypeEnum' = 0 name: 'str' = "" class Commands: @dataclass - class SelectOutput(ClusterCommand): + class SelectOutputRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050B command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = True @@ -29119,7 +28963,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: index: 'uint' = 0 @dataclass - class RenameOutput(ClusterCommand): + class RenameOutputRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050B command_id: typing.ClassVar[int] = 0x0001 is_client: typing.ClassVar[bool] = True @@ -29149,9 +28993,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[AudioOutput.Structs.AudioOutputInfo]) + return ClusterObjectFieldDescriptor(Type=typing.List[AudioOutput.Structs.OutputInfo]) - value: 'typing.List[AudioOutput.Structs.AudioOutputInfo]' = field(default_factory=lambda: []) + value: 'typing.List[AudioOutput.Structs.OutputInfo]' = field(default_factory=lambda: []) @dataclass class CurrentAudioOutput(ClusterAttributeDescriptor): @@ -29228,20 +29072,20 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="applicationLauncherList", Tag=0x00000000, Type=typing.List[uint]), - ClusterObjectFieldDescriptor(Label="applicationLauncherApp", Tag=0x00000001, Type=ApplicationLauncher.Structs.ApplicationLauncherEndpoint), + ClusterObjectFieldDescriptor(Label="applicationLauncherApp", Tag=0x00000001, Type=ApplicationLauncher.Structs.ApplicationEP), ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) applicationLauncherList: 'typing.List[uint]' = None - applicationLauncherApp: 'ApplicationLauncher.Structs.ApplicationLauncherEndpoint' = None + applicationLauncherApp: 'ApplicationLauncher.Structs.ApplicationEP' = None attributeList: 'typing.List[uint]' = None featureMap: 'typing.Optional[uint]' = None clusterRevision: 'uint' = None class Enums: - class ApplicationLauncherStatus(IntEnum): + class StatusEnum(IntEnum): kSuccess = 0x00 kAppNotAvailable = 0x01 kSystemBusy = 0x02 @@ -29249,7 +29093,7 @@ class ApplicationLauncherStatus(IntEnum): class Structs: @dataclass - class ApplicationLauncherApp(ClusterObject): + class Application(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -29262,23 +29106,23 @@ def descriptor(cls) -> ClusterObjectDescriptor: applicationId: 'str' = "" @dataclass - class ApplicationLauncherEndpoint(ClusterObject): + class ApplicationEP(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="application", Tag=1, Type=ApplicationLauncher.Structs.ApplicationLauncherApp), + ClusterObjectFieldDescriptor(Label="application", Tag=1, Type=ApplicationLauncher.Structs.Application), ClusterObjectFieldDescriptor(Label="endpoint", Tag=2, Type=str), ]) - application: 'ApplicationLauncher.Structs.ApplicationLauncherApp' = field(default_factory=lambda: ApplicationLauncher.Structs.ApplicationLauncherApp()) + application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application()) endpoint: 'str' = "" class Commands: @dataclass - class LaunchApp(ClusterCommand): + class LaunchAppRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050C command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = True @@ -29288,31 +29132,14 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="data", Tag=0, Type=str), - ClusterObjectFieldDescriptor(Label="application", Tag=1, Type=ApplicationLauncher.Structs.ApplicationLauncherApp), - ]) - - data: 'str' = "" - application: 'ApplicationLauncher.Structs.ApplicationLauncherApp' = field(default_factory=lambda: ApplicationLauncher.Structs.ApplicationLauncherApp()) - - @dataclass - class LaunchAppResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x050C - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ApplicationLauncher.Enums.ApplicationLauncherStatus), - ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=str), + ClusterObjectFieldDescriptor(Label="application", Tag=1, Type=ApplicationLauncher.Structs.Application), ]) - status: 'ApplicationLauncher.Enums.ApplicationLauncherStatus' = 0 data: 'str' = "" + application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application()) @dataclass - class StopApp(ClusterCommand): + class StopAppRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050C command_id: typing.ClassVar[int] = 0x0001 is_client: typing.ClassVar[bool] = True @@ -29321,30 +29148,13 @@ class StopApp(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.ApplicationLauncherApp), - ]) - - application: 'ApplicationLauncher.Structs.ApplicationLauncherApp' = field(default_factory=lambda: ApplicationLauncher.Structs.ApplicationLauncherApp()) - - @dataclass - class StopAppResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x050C - command_id: typing.ClassVar[int] = 0x0001 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ApplicationLauncher.Enums.ApplicationLauncherStatus), - ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=str), + ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application), ]) - status: 'ApplicationLauncher.Enums.ApplicationLauncherStatus' = 0 - data: 'str' = "" + application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application()) @dataclass - class HideApp(ClusterCommand): + class HideAppRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050C command_id: typing.ClassVar[int] = 0x0002 is_client: typing.ClassVar[bool] = True @@ -29353,26 +29163,26 @@ class HideApp(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.ApplicationLauncherApp), + ClusterObjectFieldDescriptor(Label="application", Tag=0, Type=ApplicationLauncher.Structs.Application), ]) - application: 'ApplicationLauncher.Structs.ApplicationLauncherApp' = field(default_factory=lambda: ApplicationLauncher.Structs.ApplicationLauncherApp()) + application: 'ApplicationLauncher.Structs.Application' = field(default_factory=lambda: ApplicationLauncher.Structs.Application()) @dataclass - class HideAppResponse(ClusterCommand): + class LauncherResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050C - command_id: typing.ClassVar[int] = 0x0002 + command_id: typing.ClassVar[int] = 0x0003 is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ApplicationLauncher.Enums.ApplicationLauncherStatus), + ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ApplicationLauncher.Enums.StatusEnum), ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=str), ]) - status: 'ApplicationLauncher.Enums.ApplicationLauncherStatus' = 0 + status: 'ApplicationLauncher.Enums.StatusEnum' = 0 data: 'str' = "" @@ -29405,9 +29215,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=ApplicationLauncher.Structs.ApplicationLauncherEndpoint) + return ClusterObjectFieldDescriptor(Type=ApplicationLauncher.Structs.ApplicationEP) - value: 'ApplicationLauncher.Structs.ApplicationLauncherEndpoint' = field(default_factory=lambda: ApplicationLauncher.Structs.ApplicationLauncherEndpoint()) + value: 'ApplicationLauncher.Structs.ApplicationEP' = field(default_factory=lambda: ApplicationLauncher.Structs.ApplicationEP()) @dataclass class AttributeList(ClusterAttributeDescriptor): @@ -29471,9 +29281,10 @@ 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.ApplicationBasicApp), - ClusterObjectFieldDescriptor(Label="applicationStatus", Tag=0x00000005, Type=uint), + ClusterObjectFieldDescriptor(Label="applicationApp", Tag=0x00000004, Type=ApplicationBasic.Structs.Application), + 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]), ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), @@ -29483,15 +29294,16 @@ def descriptor(cls) -> ClusterObjectDescriptor: vendorId: 'uint' = None applicationName: 'str' = None productId: 'uint' = None - applicationApp: 'ApplicationBasic.Structs.ApplicationBasicApp' = None - applicationStatus: 'uint' = None + applicationApp: 'ApplicationBasic.Structs.Application' = None + applicationStatus: 'ApplicationBasic.Enums.ApplicationStatusEnum' = None applicationVersion: 'str' = None + allowedVendorList: 'typing.List[uint]' = None attributeList: 'typing.List[uint]' = None featureMap: 'typing.Optional[uint]' = None clusterRevision: 'uint' = None class Enums: - class ApplicationBasicStatus(IntEnum): + class ApplicationStatusEnum(IntEnum): kStopped = 0x00 kActiveVisibleFocus = 0x01 kActiveHidden = 0x02 @@ -29500,7 +29312,7 @@ class ApplicationBasicStatus(IntEnum): class Structs: @dataclass - class ApplicationBasicApp(ClusterObject): + class Application(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( @@ -29514,22 +29326,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: - class Commands: - @dataclass - class ChangeStatus(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x050D - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=ApplicationBasic.Enums.ApplicationBasicStatus), - ]) - - status: 'ApplicationBasic.Enums.ApplicationBasicStatus' = 0 - class Attributes: @dataclass @@ -29608,9 +29404,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=ApplicationBasic.Structs.ApplicationBasicApp) + return ClusterObjectFieldDescriptor(Type=ApplicationBasic.Structs.Application) - value: 'ApplicationBasic.Structs.ApplicationBasicApp' = field(default_factory=lambda: ApplicationBasic.Structs.ApplicationBasicApp()) + value: 'ApplicationBasic.Structs.Application' = field(default_factory=lambda: ApplicationBasic.Structs.Application()) @dataclass class ApplicationStatus(ClusterAttributeDescriptor): @@ -29624,9 +29420,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) + return ClusterObjectFieldDescriptor(Type=ApplicationBasic.Enums.ApplicationStatusEnum) - value: 'uint' = 0 + value: 'ApplicationBasic.Enums.ApplicationStatusEnum' = 0 @dataclass class ApplicationVersion(ClusterAttributeDescriptor): @@ -29644,6 +29440,22 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'str' = "" + @dataclass + class AllowedVendorList(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x050D + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000007 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[uint]) + + value: 'typing.List[uint]' = field(default_factory=lambda: []) + @dataclass class AttributeList(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -29715,7 +29527,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Commands: @dataclass - class GetSetupPIN(ClusterCommand): + class GetSetupPINRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050E command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = True @@ -29732,7 +29544,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass class GetSetupPINResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050E - command_id: typing.ClassVar[int] = 0x0000 + command_id: typing.ClassVar[int] = 0x0001 is_client: typing.ClassVar[bool] = False @ChipUtility.classproperty @@ -29745,9 +29557,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: setupPIN: 'str' = "" @dataclass - class Login(ClusterCommand): + class LoginRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050E - command_id: typing.ClassVar[int] = 0x0001 + command_id: typing.ClassVar[int] = 0x0002 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty @@ -29762,9 +29574,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: setupPIN: 'str' = "" @dataclass - class Logout(ClusterCommand): + class LogoutRequest(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x050E - command_id: typing.ClassVar[int] = 0x0002 + command_id: typing.ClassVar[int] = 0x0003 is_client: typing.ClassVar[bool] = True @ChipUtility.classproperty diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index 58a8993c30d40c..7407f5c3ec4d82 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -371,9 +371,13 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader if (*aError != CHIP_NO_ERROR) { return nil; } - CHIPApplicationBasicClusterApplicationBasicApp * _Nonnull value; - value = [CHIPApplicationBasicClusterApplicationBasicApp new]; + CHIPApplicationBasicClusterApplication * _Nonnull value; + value = [CHIPApplicationBasicClusterApplication 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]; @@ -387,7 +391,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return nil; } NSNumber * _Nonnull value; - value = [NSNumber numberWithUnsignedChar:cppValue]; + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)]; return value; } case Attributes::ApplicationVersion::Id: { @@ -401,6 +405,32 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding]; return value; } + case Attributes::AllowedVendorList::Id: { + using TypeInfo = Attributes::AllowedVendorList::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSArray * _Nonnull value; + auto * array_0 = [NSMutableArray new]; + auto iter_0 = cppValue.begin(); + while (iter_0.Next()) { + auto & entry_0 = iter_0.GetValue(); + NSNumber * newElement_0; + newElement_0 = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0)]; + [array_0 addObject:newElement_0]; + } + { // Scope for the error so we will know what it's named + CHIP_ERROR err = iter_0.GetStatus(); + if (err != CHIP_NO_ERROR) { + *aError = err; + return nil; + } + } + value = array_0; + return value; + } case Attributes::AttributeList::Id: { using TypeInfo = Attributes::AttributeList::TypeInfo; TypeInfo::DecodableType cppValue; @@ -531,8 +561,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - CHIPAudioOutputClusterAudioOutputInfo * newElement_0; - newElement_0 = [CHIPAudioOutputClusterAudioOutputInfo new]; + CHIPAudioOutputClusterOutputInfo * newElement_0; + newElement_0 = [CHIPAudioOutputClusterOutputInfo new]; newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index]; newElement_0.outputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.outputType)]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() @@ -4031,8 +4061,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - CHIPMediaInputClusterMediaInputInfo * newElement_0; - newElement_0 = [CHIPMediaInputClusterMediaInputInfo new]; + CHIPMediaInputClusterInputInfo * newElement_0; + newElement_0 = [CHIPMediaInputClusterInputInfo new]; newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index]; newElement_0.inputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.inputType)]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() @@ -4118,7 +4148,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return nil; } NSNumber * _Nonnull value; - value = [NSNumber numberWithUnsignedChar:cppValue]; + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)]; return value; } case Attributes::StartTime::Id: { @@ -6103,8 +6133,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - CHIPTargetNavigatorClusterNavigateTargetTargetInfo * newElement_0; - newElement_0 = [CHIPTargetNavigatorClusterNavigateTargetTargetInfo new]; + CHIPTargetNavigatorClusterTargetInfo * newElement_0; + newElement_0 = [CHIPTargetNavigatorClusterTargetInfo new]; newElement_0.identifier = [NSNumber numberWithUnsignedChar:entry_0.identifier]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() length:entry_0.name.size() diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm index 335f3b7cb78b4f..a74b19ad654f15 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -989,6 +989,45 @@ } } +void CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::DecodableList & value) +{ + NSArray * _Nonnull objCValue; + auto * array_0 = [NSMutableArray new]; + auto iter_0 = value.begin(); + while (iter_0.Next()) { + auto & entry_0 = iter_0.GetValue(); + NSNumber * newElement_0; + newElement_0 = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0)]; + [array_0 addObject:newElement_0]; + } + { // Scope for the error so we will know what it's named + CHIP_ERROR err = iter_0.GetStatus(); + if (err != CHIP_NO_ERROR) { + OnFailureFn(context, EMBER_ZCL_STATUS_INVALID_VALUE); + return; + } + } + objCValue = array_0; + DispatchSuccess(context, objCValue); +}; + +void CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +{ + auto * self = static_cast(context); + if (!self->mQueue) { + return; + } + + if (self->mEstablishedHandler != nil) { + dispatch_async(self->mQueue, self->mEstablishedHandler); + // On failure, mEstablishedHandler will be cleaned up by our destructor, + // but we can clean it up earlier on successful subscription + // establishment. + self->mEstablishedHandler = nil; + } +} + void CHIPApplicationBasicAttributeListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { @@ -1108,15 +1147,15 @@ } void CHIPAudioOutputAudioOutputListListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList & value) + const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; auto * array_0 = [NSMutableArray new]; auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - CHIPAudioOutputClusterAudioOutputInfo * newElement_0; - newElement_0 = [CHIPAudioOutputClusterAudioOutputInfo new]; + CHIPAudioOutputClusterOutputInfo * newElement_0; + newElement_0 = [CHIPAudioOutputClusterOutputInfo new]; newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index]; newElement_0.outputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.outputType)]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() @@ -2920,15 +2959,15 @@ } void CHIPMediaInputMediaInputListListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList & value) + const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; auto * array_0 = [NSMutableArray new]; auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - CHIPMediaInputClusterMediaInputInfo * newElement_0; - newElement_0 = [CHIPMediaInputClusterMediaInputInfo new]; + CHIPMediaInputClusterInputInfo * newElement_0; + newElement_0 = [CHIPMediaInputClusterInputInfo new]; newElement_0.index = [NSNumber numberWithUnsignedChar:entry_0.index]; newElement_0.inputType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.inputType)]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() @@ -3973,16 +4012,15 @@ } void CHIPTargetNavigatorTargetNavigatorListListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & value) + const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; auto * array_0 = [NSMutableArray new]; auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - CHIPTargetNavigatorClusterNavigateTargetTargetInfo * newElement_0; - newElement_0 = [CHIPTargetNavigatorClusterNavigateTargetTargetInfo new]; + CHIPTargetNavigatorClusterTargetInfo * newElement_0; + newElement_0 = [CHIPTargetNavigatorClusterTargetInfo new]; newElement_0.identifier = [NSNumber numberWithUnsignedChar:entry_0.identifier]; newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data() length:entry_0.name.size() @@ -5040,36 +5078,10 @@ DispatchSuccess(context, response); }; -void CHIPApplicationLauncherClusterHideAppResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::ApplicationLauncher::Commands::HideAppResponse::DecodableType & data) +void CHIPApplicationLauncherClusterLauncherResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & data) { - auto * response = [CHIPApplicationLauncherClusterHideAppResponseParams new]; - { - response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)]; - } - { - response.data = [[NSString alloc] initWithBytes:data.data.data() length:data.data.size() encoding:NSUTF8StringEncoding]; - } - DispatchSuccess(context, response); -}; - -void CHIPApplicationLauncherClusterLaunchAppResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppResponse::DecodableType & data) -{ - auto * response = [CHIPApplicationLauncherClusterLaunchAppResponseParams new]; - { - response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)]; - } - { - response.data = [[NSString alloc] initWithBytes:data.data.data() length:data.data.size() encoding:NSUTF8StringEncoding]; - } - DispatchSuccess(context, response); -}; - -void CHIPApplicationLauncherClusterStopAppResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::ApplicationLauncher::Commands::StopAppResponse::DecodableType & data) -{ - auto * response = [CHIPApplicationLauncherClusterStopAppResponseParams new]; + auto * response = [CHIPApplicationLauncherClusterLauncherResponseParams new]; { response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)]; } @@ -5103,25 +5115,12 @@ DispatchSuccess(context, response); }; -void CHIPContentLauncherClusterLaunchContentResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchContentResponse::DecodableType & data) +void CHIPContentLauncherClusterLaunchResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data) { - auto * response = [CHIPContentLauncherClusterLaunchContentResponseParams new]; + auto * response = [CHIPContentLauncherClusterLaunchResponseParams new]; { - response.contentLaunchStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.contentLaunchStatus)]; - } - { - response.data = [[NSString alloc] initWithBytes:data.data.data() length:data.data.size() encoding:NSUTF8StringEncoding]; - } - DispatchSuccess(context, response); -}; - -void CHIPContentLauncherClusterLaunchURLResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchURLResponse::DecodableType & data) -{ - auto * response = [CHIPContentLauncherClusterLaunchURLResponseParams new]; - { - response.contentLaunchStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.contentLaunchStatus)]; + response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)]; } { response.data = [[NSString alloc] initWithBytes:data.data.data() length:data.data.size() encoding:NSUTF8StringEncoding]; @@ -5468,112 +5467,12 @@ DispatchSuccess(context, response); }; -void CHIPMediaPlaybackClusterMediaFastForwardResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaFastForwardResponse::DecodableType & data) -{ - auto * response = [CHIPMediaPlaybackClusterMediaFastForwardResponseParams new]; - { - response.mediaPlaybackStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.mediaPlaybackStatus)]; - } - DispatchSuccess(context, response); -}; - -void CHIPMediaPlaybackClusterMediaNextResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaNextResponse::DecodableType & data) -{ - auto * response = [CHIPMediaPlaybackClusterMediaNextResponseParams new]; - { - response.mediaPlaybackStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.mediaPlaybackStatus)]; - } - DispatchSuccess(context, response); -}; - -void CHIPMediaPlaybackClusterMediaPauseResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaPauseResponse::DecodableType & data) -{ - auto * response = [CHIPMediaPlaybackClusterMediaPauseResponseParams new]; - { - response.mediaPlaybackStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.mediaPlaybackStatus)]; - } - DispatchSuccess(context, response); -}; - -void CHIPMediaPlaybackClusterMediaPlayResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaPlayResponse::DecodableType & data) -{ - auto * response = [CHIPMediaPlaybackClusterMediaPlayResponseParams new]; - { - response.mediaPlaybackStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.mediaPlaybackStatus)]; - } - DispatchSuccess(context, response); -}; - -void CHIPMediaPlaybackClusterMediaPreviousResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaPreviousResponse::DecodableType & data) -{ - auto * response = [CHIPMediaPlaybackClusterMediaPreviousResponseParams new]; - { - response.mediaPlaybackStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.mediaPlaybackStatus)]; - } - DispatchSuccess(context, response); -}; - -void CHIPMediaPlaybackClusterMediaRewindResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaRewindResponse::DecodableType & data) -{ - auto * response = [CHIPMediaPlaybackClusterMediaRewindResponseParams new]; - { - response.mediaPlaybackStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.mediaPlaybackStatus)]; - } - DispatchSuccess(context, response); -}; - -void CHIPMediaPlaybackClusterMediaSeekResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaSeekResponse::DecodableType & data) -{ - auto * response = [CHIPMediaPlaybackClusterMediaSeekResponseParams new]; - { - response.mediaPlaybackStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.mediaPlaybackStatus)]; - } - DispatchSuccess(context, response); -}; - -void CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackwardResponse::DecodableType & data) -{ - auto * response = [CHIPMediaPlaybackClusterMediaSkipBackwardResponseParams new]; - { - response.mediaPlaybackStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.mediaPlaybackStatus)]; - } - DispatchSuccess(context, response); -}; - -void CHIPMediaPlaybackClusterMediaSkipForwardResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaSkipForwardResponse::DecodableType & data) -{ - auto * response = [CHIPMediaPlaybackClusterMediaSkipForwardResponseParams new]; - { - response.mediaPlaybackStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.mediaPlaybackStatus)]; - } - DispatchSuccess(context, response); -}; - -void CHIPMediaPlaybackClusterMediaStartOverResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaStartOverResponse::DecodableType & data) +void CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & data) { - auto * response = [CHIPMediaPlaybackClusterMediaStartOverResponseParams new]; + auto * response = [CHIPMediaPlaybackClusterPlaybackResponseParams new]; { - response.mediaPlaybackStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.mediaPlaybackStatus)]; - } - DispatchSuccess(context, response); -}; - -void CHIPMediaPlaybackClusterMediaStopResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaStopResponse::DecodableType & data) -{ - auto * response = [CHIPMediaPlaybackClusterMediaStopResponseParams new]; - { - response.mediaPlaybackStatus = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.mediaPlaybackStatus)]; + response.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(data.status)]; } DispatchSuccess(context, response); }; @@ -10876,17 +10775,17 @@ } } -void CHIPChannelClusterChannelErrorTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::Channel::ChannelErrorType value) +void CHIPChannelClusterErrorTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::Channel::ErrorTypeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPChannelClusterChannelErrorTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPChannelClusterErrorTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -10900,8 +10799,8 @@ } } -void CHIPNullableChannelClusterChannelErrorTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableChannelClusterErrorTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -10912,9 +10811,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableChannelClusterChannelErrorTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPNullableChannelClusterErrorTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -10928,17 +10827,17 @@ } } -void CHIPChannelClusterChannelLineupInfoTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::Channel::ChannelLineupInfoType value) +void CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::Channel::LineupInfoTypeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPChannelClusterChannelLineupInfoTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -10952,8 +10851,8 @@ } } -void CHIPNullableChannelClusterChannelLineupInfoTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -10964,9 +10863,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableChannelClusterChannelLineupInfoTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -10980,17 +10879,17 @@ } } -void CHIPTargetNavigatorClusterNavigateTargetStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::TargetNavigator::NavigateTargetStatus value) +void CHIPTargetNavigatorClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::TargetNavigator::StatusEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPTargetNavigatorClusterNavigateTargetStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPTargetNavigatorClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11004,8 +10903,8 @@ } } -void CHIPNullableTargetNavigatorClusterNavigateTargetStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableTargetNavigatorClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11016,10 +10915,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableTargetNavigatorClusterNavigateTargetStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) +void CHIPNullableTargetNavigatorClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11033,17 +10931,17 @@ } } -void CHIPMediaPlaybackClusterMediaPlaybackStateAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::MediaPlayback::MediaPlaybackState value) +void CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPMediaPlaybackClusterMediaPlaybackStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11057,8 +10955,8 @@ } } -void CHIPNullableMediaPlaybackClusterMediaPlaybackStateAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11069,10 +10967,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableMediaPlaybackClusterMediaPlaybackStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) +void CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11086,17 +10983,17 @@ } } -void CHIPMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::MediaPlayback::MediaPlaybackStatus value) +void CHIPMediaPlaybackClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::MediaPlayback::StatusEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPMediaPlaybackClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11110,8 +11007,8 @@ } } -void CHIPNullableMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableMediaPlaybackClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11122,10 +11019,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) +void CHIPNullableMediaPlaybackClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11139,17 +11035,17 @@ } } -void CHIPMediaInputClusterMediaInputTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::MediaInput::MediaInputType value) +void CHIPMediaInputClusterInputTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::MediaInput::InputTypeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPMediaInputClusterMediaInputTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11163,8 +11059,8 @@ } } -void CHIPNullableMediaInputClusterMediaInputTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11175,9 +11071,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableMediaInputClusterMediaInputTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11191,17 +11087,17 @@ } } -void CHIPKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::KeypadInput::KeypadInputCecKeyCode value) +void CHIPKeypadInputClusterCecKeyCodeAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::KeypadInput::CecKeyCode value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11215,8 +11111,8 @@ } } -void CHIPNullableKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11227,10 +11123,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) +void CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11244,17 +11139,17 @@ } } -void CHIPKeypadInputClusterKeypadInputStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::KeypadInput::KeypadInputStatus value) +void CHIPKeypadInputClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::KeypadInput::StatusEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPKeypadInputClusterKeypadInputStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPKeypadInputClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11268,8 +11163,8 @@ } } -void CHIPNullableKeypadInputClusterKeypadInputStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableKeypadInputClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11280,9 +11175,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableKeypadInputClusterKeypadInputStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPNullableKeypadInputClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11296,17 +11191,17 @@ } } -void CHIPContentLauncherClusterContentLaunchMetricTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::ContentLauncher::ContentLaunchMetricType value) +void CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::ContentLauncher::MetricTypeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPContentLauncherClusterContentLaunchMetricTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11320,8 +11215,8 @@ } } -void CHIPNullableContentLauncherClusterContentLaunchMetricTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11332,11 +11227,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableContentLauncherClusterContentLaunchMetricTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) +void CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self - = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11350,18 +11243,17 @@ } } -void CHIPContentLauncherClusterContentLaunchParameterEnumAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::ContentLauncher::ContentLaunchParameterEnum value) +void CHIPContentLauncherClusterParameterEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::ContentLauncher::ParameterEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPContentLauncherClusterContentLaunchParameterEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) +void CHIPContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11375,8 +11267,8 @@ } } -void CHIPNullableContentLauncherClusterContentLaunchParameterEnumAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11387,11 +11279,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableContentLauncherClusterContentLaunchParameterEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) +void CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self - = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11405,17 +11295,17 @@ } } -void CHIPContentLauncherClusterContentLaunchStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::ContentLauncher::ContentLaunchStatus value) +void CHIPContentLauncherClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::ContentLauncher::StatusEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPContentLauncherClusterContentLaunchStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPContentLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11429,8 +11319,8 @@ } } -void CHIPNullableContentLauncherClusterContentLaunchStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableContentLauncherClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11441,10 +11331,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableContentLauncherClusterContentLaunchStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) +void CHIPNullableContentLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11458,17 +11347,17 @@ } } -void CHIPAudioOutputClusterAudioOutputTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::AudioOutput::AudioOutputType value) +void CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::AudioOutput::OutputTypeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPAudioOutputClusterAudioOutputTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11482,8 +11371,8 @@ } } -void CHIPNullableAudioOutputClusterAudioOutputTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11494,9 +11383,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableAudioOutputClusterAudioOutputTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11510,19 +11399,17 @@ } } -void CHIPApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::ApplicationLauncher::ApplicationLauncherStatus value) +void CHIPApplicationLauncherClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::ApplicationLauncher::StatusEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) +void CHIPApplicationLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self - = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11536,8 +11423,8 @@ } } -void CHIPNullableApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value) +void CHIPNullableApplicationLauncherClusterStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11548,11 +11435,9 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( - void * context) +void CHIPNullableApplicationLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast( - context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11566,17 +11451,17 @@ } } -void CHIPApplicationBasicClusterApplicationBasicStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::ApplicationBasic::ApplicationBasicStatus value) +void CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void CHIPApplicationBasicClusterApplicationBasicStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +void CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) { - auto * self = static_cast(context); + auto * self = static_cast(context); if (!self->mQueue) { return; } @@ -11590,8 +11475,8 @@ } } -void CHIPNullableApplicationBasicClusterApplicationBasicStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void CHIPNullableApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -11602,11 +11487,11 @@ DispatchSuccess(context, objCValue); }; -void CHIPNullableApplicationBasicClusterApplicationBasicStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( +void CHIPNullableApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished( void * context) { auto * self - = static_cast(context); + = static_cast(context); if (!self->mQueue) { return; } diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h index 2e6b6c2402c76c..d604a49dacf75c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h @@ -33,18 +33,12 @@ typedef void (*NullableVendorIdAttributeCallback)(void *, const chip::app::DataM typedef void (*CHIPAccountLoginClusterGetSetupPINResponseCallbackType)( void *, const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType &); -typedef void (*CHIPApplicationLauncherClusterHideAppResponseCallbackType)( - void *, const chip::app::Clusters::ApplicationLauncher::Commands::HideAppResponse::DecodableType &); -typedef void (*CHIPApplicationLauncherClusterLaunchAppResponseCallbackType)( - void *, const chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppResponse::DecodableType &); -typedef void (*CHIPApplicationLauncherClusterStopAppResponseCallbackType)( - void *, const chip::app::Clusters::ApplicationLauncher::Commands::StopAppResponse::DecodableType &); +typedef void (*CHIPApplicationLauncherClusterLauncherResponseCallbackType)( + void *, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType &); typedef void (*CHIPChannelClusterChangeChannelResponseCallbackType)( void *, const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType &); -typedef void (*CHIPContentLauncherClusterLaunchContentResponseCallbackType)( - void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchContentResponse::DecodableType &); -typedef void (*CHIPContentLauncherClusterLaunchURLResponseCallbackType)( - void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchURLResponse::DecodableType &); +typedef void (*CHIPContentLauncherClusterLaunchResponseCallbackType)( + void *, const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType &); typedef void (*CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackType)( void *, const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType &); typedef void (*CHIPDoorLockClusterGetCredentialStatusResponseCallbackType)( @@ -75,28 +69,8 @@ typedef void (*CHIPIdentifyClusterIdentifyQueryResponseCallbackType)( void *, const chip::app::Clusters::Identify::Commands::IdentifyQueryResponse::DecodableType &); typedef void (*CHIPKeypadInputClusterSendKeyResponseCallbackType)( void *, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaFastForwardResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaFastForwardResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaNextResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaNextResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaPauseResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaPauseResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaPlayResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaPlayResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaPreviousResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaPreviousResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaRewindResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaRewindResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaSeekResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaSeekResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackwardResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaSkipForwardResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaSkipForwardResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaStartOverResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaStartOverResponse::DecodableType &); -typedef void (*CHIPMediaPlaybackClusterMediaStopResponseCallbackType)( - void *, const chip::app::Clusters::MediaPlayback::Commands::MediaStopResponse::DecodableType &); +typedef void (*CHIPMediaPlaybackClusterPlaybackResponseCallbackType)( + void *, const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType &); typedef void (*CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType)( void *, const chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::DecodableType &); typedef void (*CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType)( @@ -458,57 +432,50 @@ typedef void (*NullableIasAceClusterIasAcePanelStatusAttributeCallback)( typedef void (*IasAceClusterIasZoneTypeAttributeCallback)(void *, chip::app::Clusters::IasAce::IasZoneType); typedef void (*NullableIasAceClusterIasZoneTypeAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*ChannelClusterChannelErrorTypeAttributeCallback)(void *, chip::app::Clusters::Channel::ChannelErrorType); -typedef void (*NullableChannelClusterChannelErrorTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*ChannelClusterChannelLineupInfoTypeAttributeCallback)(void *, chip::app::Clusters::Channel::ChannelLineupInfoType); -typedef void (*NullableChannelClusterChannelLineupInfoTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*TargetNavigatorClusterNavigateTargetStatusAttributeCallback)( - void *, chip::app::Clusters::TargetNavigator::NavigateTargetStatus); -typedef void (*NullableTargetNavigatorClusterNavigateTargetStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*MediaPlaybackClusterMediaPlaybackStateAttributeCallback)(void *, - chip::app::Clusters::MediaPlayback::MediaPlaybackState); -typedef void (*NullableMediaPlaybackClusterMediaPlaybackStateAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*MediaPlaybackClusterMediaPlaybackStatusAttributeCallback)(void *, - chip::app::Clusters::MediaPlayback::MediaPlaybackStatus); -typedef void (*NullableMediaPlaybackClusterMediaPlaybackStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*MediaInputClusterMediaInputTypeAttributeCallback)(void *, chip::app::Clusters::MediaInput::MediaInputType); -typedef void (*NullableMediaInputClusterMediaInputTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*KeypadInputClusterKeypadInputCecKeyCodeAttributeCallback)(void *, - chip::app::Clusters::KeypadInput::KeypadInputCecKeyCode); -typedef void (*NullableKeypadInputClusterKeypadInputCecKeyCodeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*KeypadInputClusterKeypadInputStatusAttributeCallback)(void *, chip::app::Clusters::KeypadInput::KeypadInputStatus); -typedef void (*NullableKeypadInputClusterKeypadInputStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*ContentLauncherClusterContentLaunchMetricTypeAttributeCallback)( - void *, chip::app::Clusters::ContentLauncher::ContentLaunchMetricType); -typedef void (*NullableContentLauncherClusterContentLaunchMetricTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*ContentLauncherClusterContentLaunchParameterEnumAttributeCallback)( - void *, chip::app::Clusters::ContentLauncher::ContentLaunchParameterEnum); -typedef void (*NullableContentLauncherClusterContentLaunchParameterEnumAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*ContentLauncherClusterContentLaunchStatusAttributeCallback)( - void *, chip::app::Clusters::ContentLauncher::ContentLaunchStatus); -typedef void (*NullableContentLauncherClusterContentLaunchStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*AudioOutputClusterAudioOutputTypeAttributeCallback)(void *, chip::app::Clusters::AudioOutput::AudioOutputType); -typedef void (*NullableAudioOutputClusterAudioOutputTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*ApplicationLauncherClusterApplicationLauncherStatusAttributeCallback)( - void *, chip::app::Clusters::ApplicationLauncher::ApplicationLauncherStatus); -typedef void (*NullableApplicationLauncherClusterApplicationLauncherStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*ApplicationBasicClusterApplicationBasicStatusAttributeCallback)( - void *, chip::app::Clusters::ApplicationBasic::ApplicationBasicStatus); -typedef void (*NullableApplicationBasicClusterApplicationBasicStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*ChannelClusterErrorTypeEnumAttributeCallback)(void *, chip::app::Clusters::Channel::ErrorTypeEnum); +typedef void (*NullableChannelClusterErrorTypeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*ChannelClusterLineupInfoTypeEnumAttributeCallback)(void *, chip::app::Clusters::Channel::LineupInfoTypeEnum); +typedef void (*NullableChannelClusterLineupInfoTypeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*TargetNavigatorClusterStatusEnumAttributeCallback)(void *, chip::app::Clusters::TargetNavigator::StatusEnum); +typedef void (*NullableTargetNavigatorClusterStatusEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*MediaPlaybackClusterPlaybackStateEnumAttributeCallback)(void *, + chip::app::Clusters::MediaPlayback::PlaybackStateEnum); +typedef void (*NullableMediaPlaybackClusterPlaybackStateEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*MediaPlaybackClusterStatusEnumAttributeCallback)(void *, chip::app::Clusters::MediaPlayback::StatusEnum); +typedef void (*NullableMediaPlaybackClusterStatusEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*MediaInputClusterInputTypeEnumAttributeCallback)(void *, chip::app::Clusters::MediaInput::InputTypeEnum); +typedef void (*NullableMediaInputClusterInputTypeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*KeypadInputClusterCecKeyCodeAttributeCallback)(void *, chip::app::Clusters::KeypadInput::CecKeyCode); +typedef void (*NullableKeypadInputClusterCecKeyCodeAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*KeypadInputClusterStatusEnumAttributeCallback)(void *, chip::app::Clusters::KeypadInput::StatusEnum); +typedef void (*NullableKeypadInputClusterStatusEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*ContentLauncherClusterMetricTypeEnumAttributeCallback)(void *, chip::app::Clusters::ContentLauncher::MetricTypeEnum); +typedef void (*NullableContentLauncherClusterMetricTypeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*ContentLauncherClusterParameterEnumAttributeCallback)(void *, chip::app::Clusters::ContentLauncher::ParameterEnum); +typedef void (*NullableContentLauncherClusterParameterEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*ContentLauncherClusterStatusEnumAttributeCallback)(void *, chip::app::Clusters::ContentLauncher::StatusEnum); +typedef void (*NullableContentLauncherClusterStatusEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*AudioOutputClusterOutputTypeEnumAttributeCallback)(void *, chip::app::Clusters::AudioOutput::OutputTypeEnum); +typedef void (*NullableAudioOutputClusterOutputTypeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*ApplicationLauncherClusterStatusEnumAttributeCallback)(void *, chip::app::Clusters::ApplicationLauncher::StatusEnum); +typedef void (*NullableApplicationLauncherClusterStatusEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*ApplicationBasicClusterApplicationStatusEnumAttributeCallback)( + void *, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum); +typedef void (*NullableApplicationBasicClusterApplicationStatusEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*TestClusterClusterSimpleEnumAttributeCallback)(void *, chip::app::Clusters::TestCluster::SimpleEnum); typedef void (*NullableTestClusterClusterSimpleEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); @@ -1402,6 +1369,35 @@ class CHIPAdministratorCommissioningAttributeListListAttributeCallbackSubscripti SubscriptionEstablishedHandler mEstablishedHandler; }; +class CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge + : public CHIPCallbackBridge +{ +public: + CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; + + static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); +}; + +class CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge + : public CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge +{ +public: + CHIPApplicationBasicAllowedVendorListListAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge(queue, handler, action, true), + mEstablishedHandler(establishedHandler) + {} + + static void OnSubscriptionEstablished(void * context); + +private: + SubscriptionEstablishedHandler mEstablishedHandler; +}; + class CHIPApplicationBasicAttributeListListAttributeCallbackBridge : public CHIPCallbackBridge { @@ -1497,8 +1493,7 @@ class CHIPAudioOutputAudioOutputListListAttributeCallbackBridge static void OnSuccessFn( void * context, - const chip::app::DataModel::DecodableList & - value); + const chip::app::DataModel::DecodableList & value); }; class CHIPAudioOutputAudioOutputListListAttributeCallbackSubscriptionBridge @@ -2738,7 +2733,7 @@ class CHIPMediaInputMediaInputListListAttributeCallbackBridge static void OnSuccessFn( void * context, - const chip::app::DataModel::DecodableList & value); + const chip::app::DataModel::DecodableList & value); }; class CHIPMediaInputMediaInputListListAttributeCallbackSubscriptionBridge @@ -3484,9 +3479,10 @@ class CHIPTargetNavigatorTargetNavigatorListListAttributeCallbackBridge CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & value); + static void OnSuccessFn( + void * context, + const chip::app::DataModel::DecodableList & + value); }; class CHIPTargetNavigatorTargetNavigatorListListAttributeCallbackSubscriptionBridge @@ -4106,43 +4102,17 @@ class CHIPAccountLoginClusterGetSetupPINResponseCallbackBridge const chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & data); }; -class CHIPApplicationLauncherClusterHideAppResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPApplicationLauncherClusterHideAppResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::ApplicationLauncher::Commands::HideAppResponse::DecodableType & data); -}; - -class CHIPApplicationLauncherClusterLaunchAppResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPApplicationLauncherClusterLaunchAppResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppResponse::DecodableType & data); -}; - -class CHIPApplicationLauncherClusterStopAppResponseCallbackBridge - : public CHIPCallbackBridge +class CHIPApplicationLauncherClusterLauncherResponseCallbackBridge + : public CHIPCallbackBridge { public: - CHIPApplicationLauncherClusterStopAppResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPApplicationLauncherClusterLauncherResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::Clusters::ApplicationLauncher::Commands::StopAppResponse::DecodableType & data); + const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & data); }; class CHIPChannelClusterChangeChannelResponseCallbackBridge @@ -4157,30 +4127,16 @@ class CHIPChannelClusterChangeChannelResponseCallbackBridge const chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType & data); }; -class CHIPContentLauncherClusterLaunchContentResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPContentLauncherClusterLaunchContentResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::ContentLauncher::Commands::LaunchContentResponse::DecodableType & data); -}; - -class CHIPContentLauncherClusterLaunchURLResponseCallbackBridge - : public CHIPCallbackBridge +class CHIPContentLauncherClusterLaunchResponseCallbackBridge + : public CHIPCallbackBridge { public: - CHIPContentLauncherClusterLaunchURLResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPContentLauncherClusterLaunchResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, + bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::Clusters::ContentLauncher::Commands::LaunchURLResponse::DecodableType & data); + const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data); }; class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge @@ -4367,143 +4323,16 @@ class CHIPKeypadInputClusterSendKeyResponseCallbackBridge const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & data); }; -class CHIPMediaPlaybackClusterMediaFastForwardResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPMediaPlaybackClusterMediaFastForwardResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaFastForwardResponse::DecodableType & data); -}; - -class CHIPMediaPlaybackClusterMediaNextResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPMediaPlaybackClusterMediaNextResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaNextResponse::DecodableType & data); -}; - -class CHIPMediaPlaybackClusterMediaPauseResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPMediaPlaybackClusterMediaPauseResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaPauseResponse::DecodableType & data); -}; - -class CHIPMediaPlaybackClusterMediaPlayResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPMediaPlaybackClusterMediaPlayResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaPlayResponse::DecodableType & data); -}; - -class CHIPMediaPlaybackClusterMediaPreviousResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPMediaPlaybackClusterMediaPreviousResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaPreviousResponse::DecodableType & data); -}; - -class CHIPMediaPlaybackClusterMediaRewindResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPMediaPlaybackClusterMediaRewindResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaRewindResponse::DecodableType & data); -}; - -class CHIPMediaPlaybackClusterMediaSeekResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPMediaPlaybackClusterMediaSeekResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaSeekResponse::DecodableType & data); -}; - -class CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackwardResponse::DecodableType & data); -}; - -class CHIPMediaPlaybackClusterMediaSkipForwardResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPMediaPlaybackClusterMediaSkipForwardResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaSkipForwardResponse::DecodableType & data); -}; - -class CHIPMediaPlaybackClusterMediaStartOverResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPMediaPlaybackClusterMediaStartOverResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaStartOverResponse::DecodableType & data); -}; - -class CHIPMediaPlaybackClusterMediaStopResponseCallbackBridge - : public CHIPCallbackBridge +class CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge + : public CHIPCallbackBridge { public: - CHIPMediaPlaybackClusterMediaStopResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; + CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, + bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaStopResponse::DecodableType & data); + const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & data); }; class CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackBridge @@ -10079,25 +9908,25 @@ class CHIPNullableIasAceClusterIasZoneTypeAttributeCallbackSubscriptionBridge SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPChannelClusterChannelErrorTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPChannelClusterErrorTypeEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPChannelClusterChannelErrorTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; + CHIPChannelClusterErrorTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, + bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::Channel::ChannelErrorType value); + static void OnSuccessFn(void * context, chip::app::Clusters::Channel::ErrorTypeEnum value); }; -class CHIPChannelClusterChannelErrorTypeAttributeCallbackSubscriptionBridge - : public CHIPChannelClusterChannelErrorTypeAttributeCallbackBridge +class CHIPChannelClusterErrorTypeEnumAttributeCallbackSubscriptionBridge + : public CHIPChannelClusterErrorTypeEnumAttributeCallbackBridge { public: - CHIPChannelClusterChannelErrorTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPChannelClusterChannelErrorTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPChannelClusterErrorTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPChannelClusterErrorTypeEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10107,27 +9936,26 @@ class CHIPChannelClusterChannelErrorTypeAttributeCallbackSubscriptionBridge SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableChannelClusterChannelErrorTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableChannelClusterErrorTypeEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableChannelClusterChannelErrorTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPNullableChannelClusterErrorTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableChannelClusterChannelErrorTypeAttributeCallbackSubscriptionBridge - : public CHIPNullableChannelClusterChannelErrorTypeAttributeCallbackBridge +class CHIPNullableChannelClusterErrorTypeEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableChannelClusterErrorTypeEnumAttributeCallbackBridge { public: - CHIPNullableChannelClusterChannelErrorTypeAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableChannelClusterChannelErrorTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableChannelClusterErrorTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPNullableChannelClusterErrorTypeEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10137,25 +9965,25 @@ class CHIPNullableChannelClusterChannelErrorTypeAttributeCallbackSubscriptionBri SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPChannelClusterChannelLineupInfoTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPChannelClusterChannelLineupInfoTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; + CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::Channel::ChannelLineupInfoType value); + static void OnSuccessFn(void * context, chip::app::Clusters::Channel::LineupInfoTypeEnum value); }; -class CHIPChannelClusterChannelLineupInfoTypeAttributeCallbackSubscriptionBridge - : public CHIPChannelClusterChannelLineupInfoTypeAttributeCallbackBridge +class CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge + : public CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge { public: - CHIPChannelClusterChannelLineupInfoTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPChannelClusterChannelLineupInfoTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPChannelClusterLineupInfoTypeEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10165,27 +9993,27 @@ class CHIPChannelClusterChannelLineupInfoTypeAttributeCallbackSubscriptionBridge SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableChannelClusterChannelLineupInfoTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableChannelClusterChannelLineupInfoTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableChannelClusterChannelLineupInfoTypeAttributeCallbackSubscriptionBridge - : public CHIPNullableChannelClusterChannelLineupInfoTypeAttributeCallbackBridge +class CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackBridge { public: - CHIPNullableChannelClusterChannelLineupInfoTypeAttributeCallbackSubscriptionBridge( + CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableChannelClusterChannelLineupInfoTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableChannelClusterLineupInfoTypeEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10195,26 +10023,25 @@ class CHIPNullableChannelClusterChannelLineupInfoTypeAttributeCallbackSubscripti SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPTargetNavigatorClusterNavigateTargetStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPTargetNavigatorClusterStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPTargetNavigatorClusterNavigateTargetStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPTargetNavigatorClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::TargetNavigator::NavigateTargetStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::TargetNavigator::StatusEnum value); }; -class CHIPTargetNavigatorClusterNavigateTargetStatusAttributeCallbackSubscriptionBridge - : public CHIPTargetNavigatorClusterNavigateTargetStatusAttributeCallbackBridge +class CHIPTargetNavigatorClusterStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPTargetNavigatorClusterStatusEnumAttributeCallbackBridge { public: - CHIPTargetNavigatorClusterNavigateTargetStatusAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPTargetNavigatorClusterNavigateTargetStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPTargetNavigatorClusterStatusEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPTargetNavigatorClusterStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10224,28 +10051,27 @@ class CHIPTargetNavigatorClusterNavigateTargetStatusAttributeCallbackSubscriptio SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableTargetNavigatorClusterNavigateTargetStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableTargetNavigatorClusterStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableTargetNavigatorClusterNavigateTargetStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPNullableTargetNavigatorClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableTargetNavigatorClusterNavigateTargetStatusAttributeCallbackSubscriptionBridge - : public CHIPNullableTargetNavigatorClusterNavigateTargetStatusAttributeCallbackBridge +class CHIPNullableTargetNavigatorClusterStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableTargetNavigatorClusterStatusEnumAttributeCallbackBridge { public: - CHIPNullableTargetNavigatorClusterNavigateTargetStatusAttributeCallbackSubscriptionBridge( + CHIPNullableTargetNavigatorClusterStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableTargetNavigatorClusterNavigateTargetStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableTargetNavigatorClusterStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10255,26 +10081,26 @@ class CHIPNullableTargetNavigatorClusterNavigateTargetStatusAttributeCallbackSub SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPMediaPlaybackClusterMediaPlaybackStateAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPMediaPlaybackClusterMediaPlaybackStateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::MediaPlayback::MediaPlaybackState value); + static void OnSuccessFn(void * context, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value); }; -class CHIPMediaPlaybackClusterMediaPlaybackStateAttributeCallbackSubscriptionBridge - : public CHIPMediaPlaybackClusterMediaPlaybackStateAttributeCallbackBridge +class CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge + : public CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge { public: - CHIPMediaPlaybackClusterMediaPlaybackStateAttributeCallbackSubscriptionBridge( + CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPMediaPlaybackClusterMediaPlaybackStateAttributeCallbackBridge(queue, handler, action, true), + CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10284,27 +10110,27 @@ class CHIPMediaPlaybackClusterMediaPlaybackStateAttributeCallbackSubscriptionBri SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableMediaPlaybackClusterMediaPlaybackStateAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableMediaPlaybackClusterMediaPlaybackStateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableMediaPlaybackClusterMediaPlaybackStateAttributeCallbackSubscriptionBridge - : public CHIPNullableMediaPlaybackClusterMediaPlaybackStateAttributeCallbackBridge +class CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge { public: - CHIPNullableMediaPlaybackClusterMediaPlaybackStateAttributeCallbackSubscriptionBridge( + CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableMediaPlaybackClusterMediaPlaybackStateAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10314,26 +10140,25 @@ class CHIPNullableMediaPlaybackClusterMediaPlaybackStateAttributeCallbackSubscri SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPMediaPlaybackClusterStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPMediaPlaybackClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::MediaPlayback::MediaPlaybackStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::MediaPlayback::StatusEnum value); }; -class CHIPMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackSubscriptionBridge - : public CHIPMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackBridge +class CHIPMediaPlaybackClusterStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPMediaPlaybackClusterStatusEnumAttributeCallbackBridge { public: - CHIPMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPMediaPlaybackClusterStatusEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPMediaPlaybackClusterStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10343,27 +10168,27 @@ class CHIPMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackSubscriptionBr SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableMediaPlaybackClusterStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPNullableMediaPlaybackClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackSubscriptionBridge - : public CHIPNullableMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackBridge +class CHIPNullableMediaPlaybackClusterStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableMediaPlaybackClusterStatusEnumAttributeCallbackBridge { public: - CHIPNullableMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackSubscriptionBridge( + CHIPNullableMediaPlaybackClusterStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableMediaPlaybackClusterStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10373,25 +10198,25 @@ class CHIPNullableMediaPlaybackClusterMediaPlaybackStatusAttributeCallbackSubscr SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPMediaInputClusterMediaInputTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPMediaInputClusterInputTypeEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPMediaInputClusterMediaInputTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; + CHIPMediaInputClusterInputTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::MediaInput::MediaInputType value); + static void OnSuccessFn(void * context, chip::app::Clusters::MediaInput::InputTypeEnum value); }; -class CHIPMediaInputClusterMediaInputTypeAttributeCallbackSubscriptionBridge - : public CHIPMediaInputClusterMediaInputTypeAttributeCallbackBridge +class CHIPMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge + : public CHIPMediaInputClusterInputTypeEnumAttributeCallbackBridge { public: - CHIPMediaInputClusterMediaInputTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPMediaInputClusterMediaInputTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPMediaInputClusterInputTypeEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10401,27 +10226,27 @@ class CHIPMediaInputClusterMediaInputTypeAttributeCallbackSubscriptionBridge SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableMediaInputClusterMediaInputTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableMediaInputClusterMediaInputTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableMediaInputClusterMediaInputTypeAttributeCallbackSubscriptionBridge - : public CHIPNullableMediaInputClusterMediaInputTypeAttributeCallbackBridge +class CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackBridge { public: - CHIPNullableMediaInputClusterMediaInputTypeAttributeCallbackSubscriptionBridge( + CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableMediaInputClusterMediaInputTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableMediaInputClusterInputTypeEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10431,26 +10256,25 @@ class CHIPNullableMediaInputClusterMediaInputTypeAttributeCallbackSubscriptionBr SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPKeypadInputClusterCecKeyCodeAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPKeypadInputClusterCecKeyCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, + bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::KeypadInput::KeypadInputCecKeyCode value); + static void OnSuccessFn(void * context, chip::app::Clusters::KeypadInput::CecKeyCode value); }; -class CHIPKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackSubscriptionBridge - : public CHIPKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackBridge +class CHIPKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge + : public CHIPKeypadInputClusterCecKeyCodeAttributeCallbackBridge { public: - CHIPKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackBridge(queue, handler, action, true), + CHIPKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPKeypadInputClusterCecKeyCodeAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10460,27 +10284,26 @@ class CHIPKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackSubscriptionBr SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackSubscriptionBridge - : public CHIPNullableKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackBridge +class CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge + : public CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackBridge { public: - CHIPNullableKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPNullableKeypadInputClusterCecKeyCodeAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10490,25 +10313,25 @@ class CHIPNullableKeypadInputClusterKeypadInputCecKeyCodeAttributeCallbackSubscr SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPKeypadInputClusterKeypadInputStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPKeypadInputClusterStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPKeypadInputClusterKeypadInputStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; + CHIPKeypadInputClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, + bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::KeypadInput::KeypadInputStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::KeypadInput::StatusEnum value); }; -class CHIPKeypadInputClusterKeypadInputStatusAttributeCallbackSubscriptionBridge - : public CHIPKeypadInputClusterKeypadInputStatusAttributeCallbackBridge +class CHIPKeypadInputClusterStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPKeypadInputClusterStatusEnumAttributeCallbackBridge { public: - CHIPKeypadInputClusterKeypadInputStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPKeypadInputClusterKeypadInputStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPKeypadInputClusterStatusEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPKeypadInputClusterStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10518,27 +10341,26 @@ class CHIPKeypadInputClusterKeypadInputStatusAttributeCallbackSubscriptionBridge SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableKeypadInputClusterKeypadInputStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableKeypadInputClusterStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableKeypadInputClusterKeypadInputStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPNullableKeypadInputClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableKeypadInputClusterKeypadInputStatusAttributeCallbackSubscriptionBridge - : public CHIPNullableKeypadInputClusterKeypadInputStatusAttributeCallbackBridge +class CHIPNullableKeypadInputClusterStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableKeypadInputClusterStatusEnumAttributeCallbackBridge { public: - CHIPNullableKeypadInputClusterKeypadInputStatusAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableKeypadInputClusterKeypadInputStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableKeypadInputClusterStatusEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPNullableKeypadInputClusterStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10548,26 +10370,25 @@ class CHIPNullableKeypadInputClusterKeypadInputStatusAttributeCallbackSubscripti SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPContentLauncherClusterContentLaunchMetricTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPContentLauncherClusterContentLaunchMetricTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::ContentLauncher::ContentLaunchMetricType value); + static void OnSuccessFn(void * context, chip::app::Clusters::ContentLauncher::MetricTypeEnum value); }; -class CHIPContentLauncherClusterContentLaunchMetricTypeAttributeCallbackSubscriptionBridge - : public CHIPContentLauncherClusterContentLaunchMetricTypeAttributeCallbackBridge +class CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge + : public CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackBridge { public: - CHIPContentLauncherClusterContentLaunchMetricTypeAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPContentLauncherClusterContentLaunchMetricTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPContentLauncherClusterMetricTypeEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10577,30 +10398,27 @@ class CHIPContentLauncherClusterContentLaunchMetricTypeAttributeCallbackSubscrip SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableContentLauncherClusterContentLaunchMetricTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableContentLauncherClusterContentLaunchMetricTypeAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, - OnSuccessFn, keepAlive){}; + CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableContentLauncherClusterContentLaunchMetricTypeAttributeCallbackSubscriptionBridge - : public CHIPNullableContentLauncherClusterContentLaunchMetricTypeAttributeCallbackBridge +class CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackBridge { public: - CHIPNullableContentLauncherClusterContentLaunchMetricTypeAttributeCallbackSubscriptionBridge( + CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableContentLauncherClusterContentLaunchMetricTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableContentLauncherClusterMetricTypeEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10610,26 +10428,25 @@ class CHIPNullableContentLauncherClusterContentLaunchMetricTypeAttributeCallback SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPContentLauncherClusterContentLaunchParameterEnumAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPContentLauncherClusterParameterEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPContentLauncherClusterContentLaunchParameterEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPContentLauncherClusterParameterEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::ContentLauncher::ContentLaunchParameterEnum value); + static void OnSuccessFn(void * context, chip::app::Clusters::ContentLauncher::ParameterEnum value); }; -class CHIPContentLauncherClusterContentLaunchParameterEnumAttributeCallbackSubscriptionBridge - : public CHIPContentLauncherClusterContentLaunchParameterEnumAttributeCallbackBridge +class CHIPContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge + : public CHIPContentLauncherClusterParameterEnumAttributeCallbackBridge { public: - CHIPContentLauncherClusterContentLaunchParameterEnumAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPContentLauncherClusterContentLaunchParameterEnumAttributeCallbackBridge(queue, handler, action, true), + CHIPContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPContentLauncherClusterParameterEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10639,30 +10456,27 @@ class CHIPContentLauncherClusterContentLaunchParameterEnumAttributeCallbackSubsc SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableContentLauncherClusterContentLaunchParameterEnumAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableContentLauncherClusterContentLaunchParameterEnumAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, - OnSuccessFn, keepAlive){}; + CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableContentLauncherClusterContentLaunchParameterEnumAttributeCallbackSubscriptionBridge - : public CHIPNullableContentLauncherClusterContentLaunchParameterEnumAttributeCallbackBridge +class CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackBridge { public: - CHIPNullableContentLauncherClusterContentLaunchParameterEnumAttributeCallbackSubscriptionBridge( + CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableContentLauncherClusterContentLaunchParameterEnumAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableContentLauncherClusterParameterEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10672,26 +10486,25 @@ class CHIPNullableContentLauncherClusterContentLaunchParameterEnumAttributeCallb SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPContentLauncherClusterContentLaunchStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPContentLauncherClusterStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPContentLauncherClusterContentLaunchStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPContentLauncherClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::ContentLauncher::ContentLaunchStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::ContentLauncher::StatusEnum value); }; -class CHIPContentLauncherClusterContentLaunchStatusAttributeCallbackSubscriptionBridge - : public CHIPContentLauncherClusterContentLaunchStatusAttributeCallbackBridge +class CHIPContentLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPContentLauncherClusterStatusEnumAttributeCallbackBridge { public: - CHIPContentLauncherClusterContentLaunchStatusAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPContentLauncherClusterContentLaunchStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPContentLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPContentLauncherClusterStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10701,28 +10514,27 @@ class CHIPContentLauncherClusterContentLaunchStatusAttributeCallbackSubscription SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableContentLauncherClusterContentLaunchStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableContentLauncherClusterStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableContentLauncherClusterContentLaunchStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPNullableContentLauncherClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableContentLauncherClusterContentLaunchStatusAttributeCallbackSubscriptionBridge - : public CHIPNullableContentLauncherClusterContentLaunchStatusAttributeCallbackBridge +class CHIPNullableContentLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableContentLauncherClusterStatusEnumAttributeCallbackBridge { public: - CHIPNullableContentLauncherClusterContentLaunchStatusAttributeCallbackSubscriptionBridge( + CHIPNullableContentLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableContentLauncherClusterContentLaunchStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableContentLauncherClusterStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10732,25 +10544,25 @@ class CHIPNullableContentLauncherClusterContentLaunchStatusAttributeCallbackSubs SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPAudioOutputClusterAudioOutputTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPAudioOutputClusterAudioOutputTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; + CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::AudioOutput::AudioOutputType value); + static void OnSuccessFn(void * context, chip::app::Clusters::AudioOutput::OutputTypeEnum value); }; -class CHIPAudioOutputClusterAudioOutputTypeAttributeCallbackSubscriptionBridge - : public CHIPAudioOutputClusterAudioOutputTypeAttributeCallbackBridge +class CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge + : public CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackBridge { public: - CHIPAudioOutputClusterAudioOutputTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPAudioOutputClusterAudioOutputTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPAudioOutputClusterOutputTypeEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10760,27 +10572,27 @@ class CHIPAudioOutputClusterAudioOutputTypeAttributeCallbackSubscriptionBridge SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableAudioOutputClusterAudioOutputTypeAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableAudioOutputClusterAudioOutputTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableAudioOutputClusterAudioOutputTypeAttributeCallbackSubscriptionBridge - : public CHIPNullableAudioOutputClusterAudioOutputTypeAttributeCallbackBridge +class CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackBridge { public: - CHIPNullableAudioOutputClusterAudioOutputTypeAttributeCallbackSubscriptionBridge( + CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableAudioOutputClusterAudioOutputTypeAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableAudioOutputClusterOutputTypeEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10790,26 +10602,25 @@ class CHIPNullableAudioOutputClusterAudioOutputTypeAttributeCallbackSubscription SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPApplicationLauncherClusterStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, - OnSuccessFn, keepAlive){}; + CHIPApplicationLauncherClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::ApplicationLauncher::ApplicationLauncherStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::ApplicationLauncher::StatusEnum value); }; -class CHIPApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackSubscriptionBridge - : public CHIPApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackBridge +class CHIPApplicationLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPApplicationLauncherClusterStatusEnumAttributeCallbackBridge { public: - CHIPApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - SubscriptionEstablishedHandler establishedHandler) : - CHIPApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPApplicationLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPApplicationLauncherClusterStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10819,30 +10630,27 @@ class CHIPApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackSu SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableApplicationLauncherClusterStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, - OnSuccessFn, keepAlive){}; + CHIPNullableApplicationLauncherClusterStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackSubscriptionBridge - : public CHIPNullableApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackBridge +class CHIPNullableApplicationLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableApplicationLauncherClusterStatusEnumAttributeCallbackBridge { public: - CHIPNullableApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackSubscriptionBridge( + CHIPNullableApplicationLauncherClusterStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableApplicationLauncherClusterApplicationLauncherStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableApplicationLauncherClusterStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10852,26 +10660,26 @@ class CHIPNullableApplicationLauncherClusterApplicationLauncherStatusAttributeCa SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPApplicationBasicClusterApplicationBasicStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPApplicationBasicClusterApplicationBasicStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - CHIPActionBlock action, bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, - keepAlive){}; + CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; - static void OnSuccessFn(void * context, chip::app::Clusters::ApplicationBasic::ApplicationBasicStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value); }; -class CHIPApplicationBasicClusterApplicationBasicStatusAttributeCallbackSubscriptionBridge - : public CHIPApplicationBasicClusterApplicationBasicStatusAttributeCallbackBridge +class CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge { public: - CHIPApplicationBasicClusterApplicationBasicStatusAttributeCallbackSubscriptionBridge( + CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPApplicationBasicClusterApplicationBasicStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} @@ -10881,30 +10689,29 @@ class CHIPApplicationBasicClusterApplicationBasicStatusAttributeCallbackSubscrip SubscriptionEstablishedHandler mEstablishedHandler; }; -class CHIPNullableApplicationBasicClusterApplicationBasicStatusAttributeCallbackBridge - : public CHIPCallbackBridge +class CHIPNullableApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge + : public CHIPCallbackBridge { public: - CHIPNullableApplicationBasicClusterApplicationBasicStatusAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, - OnSuccessFn, keepAlive){}; + CHIPNullableApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, + OnSuccessFn, keepAlive){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class CHIPNullableApplicationBasicClusterApplicationBasicStatusAttributeCallbackSubscriptionBridge - : public CHIPNullableApplicationBasicClusterApplicationBasicStatusAttributeCallbackBridge +class CHIPNullableApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge + : public CHIPNullableApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge { public: - CHIPNullableApplicationBasicClusterApplicationBasicStatusAttributeCallbackSubscriptionBridge( + CHIPNullableApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, SubscriptionEstablishedHandler establishedHandler) : - CHIPNullableApplicationBasicClusterApplicationBasicStatusAttributeCallbackBridge(queue, handler, action, true), + CHIPNullableApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge(queue, handler, action, true), mEstablishedHandler(establishedHandler) {} diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h index 43be5d68df46d9..be721e0dc860cd 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h @@ -66,11 +66,12 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPAccountLogin : CHIPCluster -- (void)getSetupPINWithParams:(CHIPAccountLoginClusterGetSetupPINParams *)params - completionHandler:(void (^)(CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)loginWithParams:(CHIPAccountLoginClusterLoginParams *)params completionHandler:(StatusCompletion)completionHandler; -- (void)logoutWithCompletionHandler:(StatusCompletion)completionHandler; +- (void)getSetupPINRequestWithParams:(CHIPAccountLoginClusterGetSetupPINRequestParams *)params + completionHandler:(void (^)(CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)loginRequestWithParams:(CHIPAccountLoginClusterLoginRequestParams *)params + completionHandler:(StatusCompletion)completionHandler; +- (void)logoutRequestWithCompletionHandler:(StatusCompletion)completionHandler; - (void)readAttributeAttributeListWithCompletionHandler:(void (^)( NSArray * _Nullable value, NSError * _Nullable error))completionHandler; @@ -125,9 +126,6 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPApplicationBasic : CHIPCluster -- (void)changeStatusWithParams:(CHIPApplicationBasicClusterChangeStatusParams *)params - completionHandler:(StatusCompletion)completionHandler; - - (void)readAttributeVendorNameWithCompletionHandler:(void (^)( NSString * _Nullable value, NSError * _Nullable error))completionHandler; - (void)subscribeAttributeVendorNameWithMinInterval:(uint16_t)minInterval @@ -173,6 +171,9 @@ NS_ASSUME_NONNULL_BEGIN reportHandler: (void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler; +- (void)readAttributeAllowedVendorListWithCompletionHandler:(void (^)(NSArray * _Nullable value, + NSError * _Nullable error))completionHandler; + - (void)readAttributeAttributeListWithCompletionHandler:(void (^)( NSArray * _Nullable value, NSError * _Nullable error))completionHandler; @@ -192,15 +193,15 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPApplicationLauncher : CHIPCluster -- (void)hideAppWithParams:(CHIPApplicationLauncherClusterHideAppParams *)params - completionHandler:(void (^)(CHIPApplicationLauncherClusterHideAppResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)launchAppWithParams:(CHIPApplicationLauncherClusterLaunchAppParams *)params - completionHandler:(void (^)(CHIPApplicationLauncherClusterLaunchAppResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)stopAppWithParams:(CHIPApplicationLauncherClusterStopAppParams *)params - completionHandler:(void (^)(CHIPApplicationLauncherClusterStopAppResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; +- (void)hideAppRequestWithParams:(CHIPApplicationLauncherClusterHideAppRequestParams *)params + completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)launchAppRequestWithParams:(CHIPApplicationLauncherClusterLaunchAppRequestParams *)params + completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)stopAppRequestWithParams:(CHIPApplicationLauncherClusterStopAppRequestParams *)params + completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; - (void)readAttributeApplicationLauncherListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler; @@ -230,10 +231,10 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPAudioOutput : CHIPCluster -- (void)renameOutputWithParams:(CHIPAudioOutputClusterRenameOutputParams *)params - completionHandler:(StatusCompletion)completionHandler; -- (void)selectOutputWithParams:(CHIPAudioOutputClusterSelectOutputParams *)params - completionHandler:(StatusCompletion)completionHandler; +- (void)renameOutputRequestWithParams:(CHIPAudioOutputClusterRenameOutputRequestParams *)params + completionHandler:(StatusCompletion)completionHandler; +- (void)selectOutputRequestWithParams:(CHIPAudioOutputClusterSelectOutputRequestParams *)params + completionHandler:(StatusCompletion)completionHandler; - (void)readAttributeAudioOutputListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler; @@ -669,12 +670,13 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPChannel : CHIPCluster -- (void)changeChannelWithParams:(CHIPChannelClusterChangeChannelParams *)params - completionHandler:(void (^)(CHIPChannelClusterChangeChannelResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)changeChannelByNumberWithParams:(CHIPChannelClusterChangeChannelByNumberParams *)params - completionHandler:(StatusCompletion)completionHandler; -- (void)skipChannelWithParams:(CHIPChannelClusterSkipChannelParams *)params completionHandler:(StatusCompletion)completionHandler; +- (void)changeChannelByNumberRequestWithParams:(CHIPChannelClusterChangeChannelByNumberRequestParams *)params + completionHandler:(StatusCompletion)completionHandler; +- (void)changeChannelRequestWithParams:(CHIPChannelClusterChangeChannelRequestParams *)params + completionHandler:(void (^)(CHIPChannelClusterChangeChannelResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)skipChannelRequestWithParams:(CHIPChannelClusterSkipChannelRequestParams *)params + completionHandler:(StatusCompletion)completionHandler; - (void)readAttributeChannelListWithCompletionHandler:(void (^)( NSArray * _Nullable value, NSError * _Nullable error))completionHandler; @@ -1180,12 +1182,12 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPContentLauncher : CHIPCluster -- (void)launchContentWithParams:(CHIPContentLauncherClusterLaunchContentParams *)params - completionHandler:(void (^)(CHIPContentLauncherClusterLaunchContentResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)launchURLWithParams:(CHIPContentLauncherClusterLaunchURLParams *)params - completionHandler:(void (^)(CHIPContentLauncherClusterLaunchURLResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; +- (void)launchContentRequestWithParams:(CHIPContentLauncherClusterLaunchContentRequestParams *)params + completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)launchURLRequestWithParams:(CHIPContentLauncherClusterLaunchURLRequestParams *)params + completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; - (void)readAttributeAcceptHeaderListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler; @@ -2033,9 +2035,9 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPKeypadInput : CHIPCluster -- (void)sendKeyWithParams:(CHIPKeypadInputClusterSendKeyParams *)params - completionHandler: - (void (^)(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; +- (void)sendKeyRequestWithParams:(CHIPKeypadInputClusterSendKeyRequestParams *)params + completionHandler:(void (^)(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; - (void)readAttributeAttributeListWithCompletionHandler:(void (^)( NSArray * _Nullable value, NSError * _Nullable error))completionHandler; @@ -2226,12 +2228,12 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPMediaInput : CHIPCluster -- (void)hideInputStatusWithCompletionHandler:(StatusCompletion)completionHandler; -- (void)renameInputWithParams:(CHIPMediaInputClusterRenameInputParams *)params - completionHandler:(StatusCompletion)completionHandler; -- (void)selectInputWithParams:(CHIPMediaInputClusterSelectInputParams *)params - completionHandler:(StatusCompletion)completionHandler; -- (void)showInputStatusWithCompletionHandler:(StatusCompletion)completionHandler; +- (void)hideInputStatusRequestWithCompletionHandler:(StatusCompletion)completionHandler; +- (void)renameInputRequestWithParams:(CHIPMediaInputClusterRenameInputRequestParams *)params + completionHandler:(StatusCompletion)completionHandler; +- (void)selectInputRequestWithParams:(CHIPMediaInputClusterSelectInputRequestParams *)params + completionHandler:(StatusCompletion)completionHandler; +- (void)showInputStatusRequestWithCompletionHandler:(StatusCompletion)completionHandler; - (void)readAttributeMediaInputListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler; @@ -2268,31 +2270,31 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPMediaPlayback : CHIPCluster -- (void)mediaFastForwardWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaFastForwardResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)mediaNextWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaNextResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)mediaPauseWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaPauseResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)mediaPlayWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaPlayResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)mediaPreviousWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaPreviousResponseParams * _Nullable data, +- (void)fastForwardRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)nextRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)pauseRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)playRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)previousRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)rewindRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; -- (void)mediaRewindWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaRewindResponseParams * _Nullable data, +- (void)seekRequestWithParams:(CHIPMediaPlaybackClusterSeekRequestParams *)params + completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)skipBackwardRequestWithParams:(CHIPMediaPlaybackClusterSkipBackwardRequestParams *)params + completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)skipForwardRequestWithParams:(CHIPMediaPlaybackClusterSkipForwardRequestParams *)params + completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)startOverRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; +- (void)stopRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler; -- (void)mediaSeekWithParams:(CHIPMediaPlaybackClusterMediaSeekParams *)params - completionHandler:(void (^)(CHIPMediaPlaybackClusterMediaSeekResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)mediaSkipBackwardWithParams:(CHIPMediaPlaybackClusterMediaSkipBackwardParams *)params - completionHandler:(void (^)(CHIPMediaPlaybackClusterMediaSkipBackwardResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)mediaSkipForwardWithParams:(CHIPMediaPlaybackClusterMediaSkipForwardParams *)params - completionHandler:(void (^)(CHIPMediaPlaybackClusterMediaSkipForwardResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)mediaStartOverWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaStartOverResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)mediaStopWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaStopResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; - (void)readAttributePlaybackStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; @@ -3406,9 +3408,9 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPTargetNavigator : CHIPCluster -- (void)navigateTargetWithParams:(CHIPTargetNavigatorClusterNavigateTargetParams *)params - completionHandler:(void (^)(CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; +- (void)navigateTargetRequestWithParams:(CHIPTargetNavigatorClusterNavigateTargetRequestParams *)params + completionHandler:(void (^)(CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; - (void)readAttributeTargetNavigatorListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler; @@ -3421,6 +3423,12 @@ NS_ASSUME_NONNULL_BEGIN - (void)readAttributeCurrentNavigatorTargetWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; +- (void)subscribeAttributeCurrentNavigatorTargetWithMinInterval:(uint16_t)minInterval + maxInterval:(uint16_t)maxInterval + subscriptionEstablished: + (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))reportHandler; - (void)readAttributeAttributeListWithCompletionHandler:(void (^)( NSArray * _Nullable value, NSError * _Nullable error))completionHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index 5fc509541bccb3..1dabf9f13951c6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -287,26 +287,27 @@ @implementation CHIPAccountLogin return &_cppCluster; } -- (void)getSetupPINWithParams:(CHIPAccountLoginClusterGetSetupPINParams *)params - completionHandler:(void (^)(CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)getSetupPINRequestWithParams:(CHIPAccountLoginClusterGetSetupPINRequestParams *)params + completionHandler:(void (^)(CHIPAccountLoginClusterGetSetupPINResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - AccountLogin::Commands::GetSetupPIN::Type request; + AccountLogin::Commands::GetSetupPINRequest::Type request; request.tempAccountIdentifier = [self asCharSpan:params.tempAccountIdentifier]; new CHIPAccountLoginClusterGetSetupPINResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); + return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, 10000); }); } -- (void)loginWithParams:(CHIPAccountLoginClusterLoginParams *)params completionHandler:(StatusCompletion)completionHandler +- (void)loginRequestWithParams:(CHIPAccountLoginClusterLoginRequestParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - AccountLogin::Commands::Login::Type request; + AccountLogin::Commands::LoginRequest::Type request; request.tempAccountIdentifier = [self asCharSpan:params.tempAccountIdentifier]; request.setupPIN = [self asCharSpan:params.setupPIN]; @@ -322,10 +323,10 @@ new CHIPCommandSuccessCallbackBridge( }); } -- (void)logoutWithCompletionHandler:(StatusCompletion)completionHandler +- (void)logoutRequestWithCompletionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - AccountLogin::Commands::Logout::Type request; + AccountLogin::Commands::LogoutRequest::Type request; new CHIPCommandSuccessCallbackBridge( self.callbackQueue, @@ -335,7 +336,7 @@ new CHIPCommandSuccessCallbackBridge( ^(Cancelable * success, Cancelable * failure) { auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); + return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, 10000); }); } @@ -532,25 +533,6 @@ @implementation CHIPApplicationBasic return &_cppCluster; } -- (void)changeStatusWithParams:(CHIPApplicationBasicClusterChangeStatusParams *)params - completionHandler:(StatusCompletion)completionHandler -{ - ListFreer listFreer; - ApplicationBasic::Commands::ChangeStatus::Type request; - request.status = static_cast>(params.status.unsignedCharValue); - - new CHIPCommandSuccessCallbackBridge( - self.callbackQueue, - ^(id _Nullable value, NSError * _Nullable error) { - completionHandler(error); - }, - ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); - }); -} - - (void)readAttributeVendorNameWithCompletionHandler:(void (^)( NSString * _Nullable value, NSError * _Nullable error))completionHandler { @@ -667,12 +649,13 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge( - (void)readAttributeApplicationStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = ApplicationBasic::Attributes::ApplicationStatus::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); + new CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = ApplicationBasic::Attributes::ApplicationStatus::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); } - (void)subscribeAttributeApplicationStatusWithMinInterval:(uint16_t)minInterval @@ -681,14 +664,15 @@ - (void)subscribeAttributeApplicationStatusWithMinInterval:(uint16_t)minInterval reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPInt8uAttributeCallbackSubscriptionBridge( + new CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { using TypeInfo = ApplicationBasic::Attributes::ApplicationStatus::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, - minInterval, maxInterval, CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished); + minInterval, maxInterval, + CHIPApplicationBasicClusterApplicationStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished); }, subscriptionEstablishedHandler); } @@ -722,6 +706,18 @@ new CHIPCharStringAttributeCallbackSubscriptionBridge( subscriptionEstablishedHandler); } +- (void)readAttributeAllowedVendorListWithCompletionHandler:(void (^)(NSArray * _Nullable value, + NSError * _Nullable error))completionHandler +{ + new CHIPApplicationBasicAllowedVendorListListAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = ApplicationBasic::Attributes::AllowedVendorList::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + - (void)readAttributeAttributeListWithCompletionHandler:(void (^)( NSArray * _Nullable value, NSError * _Nullable error))completionHandler { @@ -772,53 +768,59 @@ @implementation CHIPApplicationLauncher return &_cppCluster; } -- (void)hideAppWithParams:(CHIPApplicationLauncherClusterHideAppParams *)params - completionHandler:(void (^)(CHIPApplicationLauncherClusterHideAppResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)hideAppRequestWithParams:(CHIPApplicationLauncherClusterHideAppRequestParams *)params + completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - ApplicationLauncher::Commands::HideApp::Type request; + 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 CHIPApplicationLauncherClusterHideAppResponseCallbackBridge( + new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)launchAppWithParams:(CHIPApplicationLauncherClusterLaunchAppParams *)params - completionHandler:(void (^)(CHIPApplicationLauncherClusterLaunchAppResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)launchAppRequestWithParams:(CHIPApplicationLauncherClusterLaunchAppRequestParams *)params + completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - ApplicationLauncher::Commands::LaunchApp::Type request; + 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 CHIPApplicationLauncherClusterLaunchAppResponseCallbackBridge( + new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)stopAppWithParams:(CHIPApplicationLauncherClusterStopAppParams *)params - completionHandler:(void (^)(CHIPApplicationLauncherClusterStopAppResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)stopAppRequestWithParams:(CHIPApplicationLauncherClusterStopAppRequestParams *)params + completionHandler:(void (^)(CHIPApplicationLauncherClusterLauncherResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - ApplicationLauncher::Commands::StopApp::Type request; + 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 CHIPApplicationLauncherClusterStopAppResponseCallbackBridge( + new CHIPApplicationLauncherClusterLauncherResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); @@ -906,11 +908,11 @@ @implementation CHIPAudioOutput return &_cppCluster; } -- (void)renameOutputWithParams:(CHIPAudioOutputClusterRenameOutputParams *)params - completionHandler:(StatusCompletion)completionHandler +- (void)renameOutputRequestWithParams:(CHIPAudioOutputClusterRenameOutputRequestParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - AudioOutput::Commands::RenameOutput::Type request; + AudioOutput::Commands::RenameOutputRequest::Type request; request.index = params.index.unsignedCharValue; request.name = [self asCharSpan:params.name]; @@ -926,11 +928,11 @@ new CHIPCommandSuccessCallbackBridge( }); } -- (void)selectOutputWithParams:(CHIPAudioOutputClusterSelectOutputParams *)params - completionHandler:(StatusCompletion)completionHandler +- (void)selectOutputRequestWithParams:(CHIPAudioOutputClusterSelectOutputRequestParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - AudioOutput::Commands::SelectOutput::Type request; + AudioOutput::Commands::SelectOutputRequest::Type request; request.index = params.index.unsignedCharValue; new CHIPCommandSuccessCallbackBridge( @@ -2715,27 +2717,11 @@ @implementation CHIPChannel return &_cppCluster; } -- (void)changeChannelWithParams:(CHIPChannelClusterChangeChannelParams *)params - completionHandler:(void (^)(CHIPChannelClusterChangeChannelResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler -{ - ListFreer listFreer; - Channel::Commands::ChangeChannel::Type request; - request.match = [self asCharSpan:params.match]; - - new CHIPChannelClusterChangeChannelResponseCallbackBridge( - self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); - }); -} - -- (void)changeChannelByNumberWithParams:(CHIPChannelClusterChangeChannelByNumberParams *)params - completionHandler:(StatusCompletion)completionHandler +- (void)changeChannelByNumberRequestWithParams:(CHIPChannelClusterChangeChannelByNumberRequestParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - Channel::Commands::ChangeChannelByNumber::Type request; + Channel::Commands::ChangeChannelByNumberRequest::Type request; request.majorNumber = params.majorNumber.unsignedShortValue; request.minorNumber = params.minorNumber.unsignedShortValue; @@ -2751,10 +2737,27 @@ new CHIPCommandSuccessCallbackBridge( }); } -- (void)skipChannelWithParams:(CHIPChannelClusterSkipChannelParams *)params completionHandler:(StatusCompletion)completionHandler +- (void)changeChannelRequestWithParams:(CHIPChannelClusterChangeChannelRequestParams *)params + completionHandler:(void (^)(CHIPChannelClusterChangeChannelResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler +{ + ListFreer listFreer; + Channel::Commands::ChangeChannelRequest::Type request; + request.match = [self asCharSpan:params.match]; + + new CHIPChannelClusterChangeChannelResponseCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + +- (void)skipChannelRequestWithParams:(CHIPChannelClusterSkipChannelRequestParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - Channel::Commands::SkipChannel::Type request; + Channel::Commands::SkipChannelRequest::Type request; request.count = params.count.unsignedShortValue; new CHIPCommandSuccessCallbackBridge( @@ -5055,12 +5058,12 @@ @implementation CHIPContentLauncher return &_cppCluster; } -- (void)launchContentWithParams:(CHIPContentLauncherClusterLaunchContentParams *)params - completionHandler:(void (^)(CHIPContentLauncherClusterLaunchContentResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)launchContentRequestWithParams:(CHIPContentLauncherClusterLaunchContentRequestParams *)params + completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - ContentLauncher::Commands::LaunchContent::Type request; + ContentLauncher::Commands::LaunchContentRequest::Type request; request.autoPlay = params.autoPlay.boolValue; request.data = [self asCharSpan:params.data]; { @@ -5073,37 +5076,59 @@ - (void)launchContentWithParams:(CHIPContentLauncherClusterLaunchContentParams * } listFreer.add(listHolder_0); for (size_t i_0 = 0; i_0 < params.search.count; ++i_0) { - if (![params.search[i_0] isKindOfClass:[CHIPContentLauncherClusterContentLaunchParamater class]]) { + if (![params.search[i_0] isKindOfClass:[CHIPContentLauncherClusterContentSearch class]]) { // Wrong kind of value. return; } - auto element_0 = (CHIPContentLauncherClusterContentLaunchParamater *) params.search[i_0]; - listHolder_0->mList[i_0].type = static_castmList[i_0].type)>>( - element_0.type.unsignedCharValue); - listHolder_0->mList[i_0].value = [self asCharSpan:element_0.value]; + auto element_0 = (CHIPContentLauncherClusterContentSearch *) params.search[i_0]; { - using ListType_2 = std::remove_reference_tmList[i_0].externalIDList)>; + using ListType_2 = std::remove_reference_tmList[i_0].parameterList)>; using ListMemberType_2 = ListMemberTypeGetter::Type; - if (element_0.externalIDList.count != 0) { - auto * listHolder_2 = new ListHolder(element_0.externalIDList.count); + if (element_0.parameterList.count != 0) { + auto * listHolder_2 = new ListHolder(element_0.parameterList.count); if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) { return; } listFreer.add(listHolder_2); - for (size_t i_2 = 0; i_2 < element_0.externalIDList.count; ++i_2) { - if (![element_0.externalIDList[i_2] - isKindOfClass:[CHIPContentLauncherClusterContentLaunchAdditionalInfo class]]) { + for (size_t i_2 = 0; i_2 < element_0.parameterList.count; ++i_2) { + if (![element_0.parameterList[i_2] isKindOfClass:[CHIPContentLauncherClusterParameter class]]) { // Wrong kind of value. return; } - auto element_2 - = (CHIPContentLauncherClusterContentLaunchAdditionalInfo *) element_0.externalIDList[i_2]; - listHolder_2->mList[i_2].name = [self asCharSpan:element_2.name]; + auto element_2 = (CHIPContentLauncherClusterParameter *) element_0.parameterList[i_2]; + listHolder_2->mList[i_2].type + = static_castmList[i_2].type)>>( + element_2.type.unsignedCharValue); listHolder_2->mList[i_2].value = [self asCharSpan:element_2.value]; + { + using ListType_4 = std::remove_reference_tmList[i_2].externalIDList)>; + using ListMemberType_4 = ListMemberTypeGetter::Type; + if (element_2.externalIDList.count != 0) { + auto * listHolder_4 = new ListHolder(element_2.externalIDList.count); + if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) { + return; + } + listFreer.add(listHolder_4); + for (size_t i_4 = 0; i_4 < element_2.externalIDList.count; ++i_4) { + if (![element_2.externalIDList[i_4] + isKindOfClass:[CHIPContentLauncherClusterAdditionalInfo class]]) { + // Wrong kind of value. + return; + } + auto element_4 = (CHIPContentLauncherClusterAdditionalInfo *) element_2.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]; + } + listHolder_2->mList[i_2].externalIDList + = ListType_4(listHolder_4->mList, element_2.externalIDList.count); + } else { + listHolder_2->mList[i_2].externalIDList = ListType_4(); + } + } } - listHolder_0->mList[i_0].externalIDList = ListType_2(listHolder_2->mList, element_0.externalIDList.count); + listHolder_0->mList[i_0].parameterList = ListType_2(listHolder_2->mList, element_0.parameterList.count); } else { - listHolder_0->mList[i_0].externalIDList = ListType_2(); + listHolder_0->mList[i_0].parameterList = ListType_2(); } } } @@ -5113,84 +5138,62 @@ - (void)launchContentWithParams:(CHIPContentLauncherClusterLaunchContentParams * } } - new CHIPContentLauncherClusterLaunchContentResponseCallbackBridge( + new CHIPContentLauncherClusterLaunchResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)launchURLWithParams:(CHIPContentLauncherClusterLaunchURLParams *)params - completionHandler:(void (^)(CHIPContentLauncherClusterLaunchURLResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)launchURLRequestWithParams:(CHIPContentLauncherClusterLaunchURLRequestParams *)params + completionHandler:(void (^)(CHIPContentLauncherClusterLaunchResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - ContentLauncher::Commands::LaunchURL::Type request; + ContentLauncher::Commands::LaunchURLRequest::Type request; request.contentURL = [self asCharSpan:params.contentURL]; request.displayString = [self asCharSpan:params.displayString]; - { - using ListType_0 = std::remove_reference_t; - using ListMemberType_0 = ListMemberTypeGetter::Type; - if (params.brandingInformation.count != 0) { - auto * listHolder_0 = new ListHolder(params.brandingInformation.count); - if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) { - return; - } - listFreer.add(listHolder_0); - for (size_t i_0 = 0; i_0 < params.brandingInformation.count; ++i_0) { - if (![params.brandingInformation[i_0] - isKindOfClass:[CHIPContentLauncherClusterContentLaunchBrandingInformation class]]) { - // Wrong kind of value. - return; - } - auto element_0 = (CHIPContentLauncherClusterContentLaunchBrandingInformation *) params.brandingInformation[i_0]; - listHolder_0->mList[i_0].providerName = [self asCharSpan:element_0.providerName]; - listHolder_0->mList[i_0].background.imageUrl = [self asCharSpan:element_0.background.imageUrl]; - listHolder_0->mList[i_0].background.color = [self asCharSpan:element_0.background.color]; - listHolder_0->mList[i_0].background.size.width = element_0.background.size.width.doubleValue; - listHolder_0->mList[i_0].background.size.height = element_0.background.size.height.doubleValue; - listHolder_0->mList[i_0].background.size.metric - = static_castmList[i_0].background.size.metric)>>( - element_0.background.size.metric.unsignedCharValue); - listHolder_0->mList[i_0].logo.imageUrl = [self asCharSpan:element_0.logo.imageUrl]; - listHolder_0->mList[i_0].logo.color = [self asCharSpan:element_0.logo.color]; - listHolder_0->mList[i_0].logo.size.width = element_0.logo.size.width.doubleValue; - listHolder_0->mList[i_0].logo.size.height = element_0.logo.size.height.doubleValue; - listHolder_0->mList[i_0].logo.size.metric - = static_castmList[i_0].logo.size.metric)>>( - element_0.logo.size.metric.unsignedCharValue); - listHolder_0->mList[i_0].progressBar.imageUrl = [self asCharSpan:element_0.progressBar.imageUrl]; - listHolder_0->mList[i_0].progressBar.color = [self asCharSpan:element_0.progressBar.color]; - listHolder_0->mList[i_0].progressBar.size.width = element_0.progressBar.size.width.doubleValue; - listHolder_0->mList[i_0].progressBar.size.height = element_0.progressBar.size.height.doubleValue; - listHolder_0->mList[i_0].progressBar.size.metric - = static_castmList[i_0].progressBar.size.metric)>>( - element_0.progressBar.size.metric.unsignedCharValue); - listHolder_0->mList[i_0].splash.imageUrl = [self asCharSpan:element_0.splash.imageUrl]; - listHolder_0->mList[i_0].splash.color = [self asCharSpan:element_0.splash.color]; - listHolder_0->mList[i_0].splash.size.width = element_0.splash.size.width.doubleValue; - listHolder_0->mList[i_0].splash.size.height = element_0.splash.size.height.doubleValue; - listHolder_0->mList[i_0].splash.size.metric - = static_castmList[i_0].splash.size.metric)>>( - element_0.splash.size.metric.unsignedCharValue); - listHolder_0->mList[i_0].waterMark.imageUrl = [self asCharSpan:element_0.waterMark.imageUrl]; - listHolder_0->mList[i_0].waterMark.color = [self asCharSpan:element_0.waterMark.color]; - listHolder_0->mList[i_0].waterMark.size.width = element_0.waterMark.size.width.doubleValue; - listHolder_0->mList[i_0].waterMark.size.height = element_0.waterMark.size.height.doubleValue; - listHolder_0->mList[i_0].waterMark.size.metric - = static_castmList[i_0].waterMark.size.metric)>>( - element_0.waterMark.size.metric.unsignedCharValue); - } - request.brandingInformation = ListType_0(listHolder_0->mList, params.brandingInformation.count); - } else { - request.brandingInformation = ListType_0(); - } - } - - new CHIPContentLauncherClusterLaunchURLResponseCallbackBridge( + request.brandingInformation.providerName = [self asCharSpan:params.brandingInformation.providerName]; + request.brandingInformation.background.imageUrl = [self asCharSpan:params.brandingInformation.background.imageUrl]; + request.brandingInformation.background.color = [self asCharSpan:params.brandingInformation.background.color]; + request.brandingInformation.background.size.width = params.brandingInformation.background.size.width.doubleValue; + request.brandingInformation.background.size.height = params.brandingInformation.background.size.height.doubleValue; + request.brandingInformation.background.size.metric + = static_cast>( + params.brandingInformation.background.size.metric.unsignedCharValue); + request.brandingInformation.logo.imageUrl = [self asCharSpan:params.brandingInformation.logo.imageUrl]; + request.brandingInformation.logo.color = [self asCharSpan:params.brandingInformation.logo.color]; + request.brandingInformation.logo.size.width = params.brandingInformation.logo.size.width.doubleValue; + request.brandingInformation.logo.size.height = params.brandingInformation.logo.size.height.doubleValue; + request.brandingInformation.logo.size.metric + = static_cast>( + params.brandingInformation.logo.size.metric.unsignedCharValue); + request.brandingInformation.progressBar.imageUrl = [self asCharSpan:params.brandingInformation.progressBar.imageUrl]; + request.brandingInformation.progressBar.color = [self asCharSpan:params.brandingInformation.progressBar.color]; + request.brandingInformation.progressBar.size.width = params.brandingInformation.progressBar.size.width.doubleValue; + request.brandingInformation.progressBar.size.height = params.brandingInformation.progressBar.size.height.doubleValue; + request.brandingInformation.progressBar.size.metric + = static_cast>( + params.brandingInformation.progressBar.size.metric.unsignedCharValue); + request.brandingInformation.splash.imageUrl = [self asCharSpan:params.brandingInformation.splash.imageUrl]; + request.brandingInformation.splash.color = [self asCharSpan:params.brandingInformation.splash.color]; + request.brandingInformation.splash.size.width = params.brandingInformation.splash.size.width.doubleValue; + request.brandingInformation.splash.size.height = params.brandingInformation.splash.size.height.doubleValue; + request.brandingInformation.splash.size.metric + = static_cast>( + params.brandingInformation.splash.size.metric.unsignedCharValue); + request.brandingInformation.waterMark.imageUrl = [self asCharSpan:params.brandingInformation.waterMark.imageUrl]; + request.brandingInformation.waterMark.color = [self asCharSpan:params.brandingInformation.waterMark.color]; + request.brandingInformation.waterMark.size.width = params.brandingInformation.waterMark.size.width.doubleValue; + request.brandingInformation.waterMark.size.height = params.brandingInformation.waterMark.size.height.doubleValue; + request.brandingInformation.waterMark.size.metric + = static_cast>( + params.brandingInformation.waterMark.size.metric.unsignedCharValue); + + new CHIPContentLauncherClusterLaunchResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); @@ -8522,12 +8525,12 @@ @implementation CHIPKeypadInput return &_cppCluster; } -- (void)sendKeyWithParams:(CHIPKeypadInputClusterSendKeyParams *)params - completionHandler: - (void (^)(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completionHandler +- (void)sendKeyRequestWithParams:(CHIPKeypadInputClusterSendKeyRequestParams *)params + completionHandler:(void (^)(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - KeypadInput::Commands::SendKey::Type request; + KeypadInput::Commands::SendKeyRequest::Type request; request.keyCode = static_cast>(params.keyCode.unsignedCharValue); new CHIPKeypadInputClusterSendKeyResponseCallbackBridge( @@ -9416,10 +9419,10 @@ @implementation CHIPMediaInput return &_cppCluster; } -- (void)hideInputStatusWithCompletionHandler:(StatusCompletion)completionHandler +- (void)hideInputStatusRequestWithCompletionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - MediaInput::Commands::HideInputStatus::Type request; + MediaInput::Commands::HideInputStatusRequest::Type request; new CHIPCommandSuccessCallbackBridge( self.callbackQueue, @@ -9433,10 +9436,11 @@ new CHIPCommandSuccessCallbackBridge( }); } -- (void)renameInputWithParams:(CHIPMediaInputClusterRenameInputParams *)params completionHandler:(StatusCompletion)completionHandler +- (void)renameInputRequestWithParams:(CHIPMediaInputClusterRenameInputRequestParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - MediaInput::Commands::RenameInput::Type request; + MediaInput::Commands::RenameInputRequest::Type request; request.index = params.index.unsignedCharValue; request.name = [self asCharSpan:params.name]; @@ -9452,10 +9456,11 @@ new CHIPCommandSuccessCallbackBridge( }); } -- (void)selectInputWithParams:(CHIPMediaInputClusterSelectInputParams *)params completionHandler:(StatusCompletion)completionHandler +- (void)selectInputRequestWithParams:(CHIPMediaInputClusterSelectInputRequestParams *)params + completionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - MediaInput::Commands::SelectInput::Type request; + MediaInput::Commands::SelectInputRequest::Type request; request.index = params.index.unsignedCharValue; new CHIPCommandSuccessCallbackBridge( @@ -9470,10 +9475,10 @@ new CHIPCommandSuccessCallbackBridge( }); } -- (void)showInputStatusWithCompletionHandler:(StatusCompletion)completionHandler +- (void)showInputStatusRequestWithCompletionHandler:(StatusCompletion)completionHandler { ListFreer listFreer; - MediaInput::Commands::ShowInputStatus::Type request; + MediaInput::Commands::ShowInputStatusRequest::Type request; new CHIPCommandSuccessCallbackBridge( self.callbackQueue, @@ -9597,161 +9602,161 @@ @implementation CHIPMediaPlayback return &_cppCluster; } -- (void)mediaFastForwardWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaFastForwardResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)fastForwardRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - MediaPlayback::Commands::MediaFastForward::Type request; + MediaPlayback::Commands::FastForwardRequest::Type request; - new CHIPMediaPlaybackClusterMediaFastForwardResponseCallbackBridge( + new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)mediaNextWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaNextResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)nextRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - MediaPlayback::Commands::MediaNext::Type request; + MediaPlayback::Commands::NextRequest::Type request; - new CHIPMediaPlaybackClusterMediaNextResponseCallbackBridge( + new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)mediaPauseWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaPauseResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)pauseRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - MediaPlayback::Commands::MediaPause::Type request; + MediaPlayback::Commands::PauseRequest::Type request; - new CHIPMediaPlaybackClusterMediaPauseResponseCallbackBridge( + new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)mediaPlayWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaPlayResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)playRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - MediaPlayback::Commands::MediaPlay::Type request; + MediaPlayback::Commands::PlayRequest::Type request; - new CHIPMediaPlaybackClusterMediaPlayResponseCallbackBridge( + new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)mediaPreviousWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaPreviousResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)previousRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - MediaPlayback::Commands::MediaPrevious::Type request; + MediaPlayback::Commands::PreviousRequest::Type request; - new CHIPMediaPlaybackClusterMediaPreviousResponseCallbackBridge( + new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)mediaRewindWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaRewindResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)rewindRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - MediaPlayback::Commands::MediaRewind::Type request; + MediaPlayback::Commands::RewindRequest::Type request; - new CHIPMediaPlaybackClusterMediaRewindResponseCallbackBridge( + new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)mediaSeekWithParams:(CHIPMediaPlaybackClusterMediaSeekParams *)params - completionHandler:(void (^)(CHIPMediaPlaybackClusterMediaSeekResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)seekRequestWithParams:(CHIPMediaPlaybackClusterSeekRequestParams *)params + completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - MediaPlayback::Commands::MediaSeek::Type request; + MediaPlayback::Commands::SeekRequest::Type request; request.position = params.position.unsignedLongLongValue; - new CHIPMediaPlaybackClusterMediaSeekResponseCallbackBridge( + new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)mediaSkipBackwardWithParams:(CHIPMediaPlaybackClusterMediaSkipBackwardParams *)params - completionHandler:(void (^)(CHIPMediaPlaybackClusterMediaSkipBackwardResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)skipBackwardRequestWithParams:(CHIPMediaPlaybackClusterSkipBackwardRequestParams *)params + completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - MediaPlayback::Commands::MediaSkipBackward::Type request; + MediaPlayback::Commands::SkipBackwardRequest::Type request; request.deltaPositionMilliseconds = params.deltaPositionMilliseconds.unsignedLongLongValue; - new CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallbackBridge( + new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)mediaSkipForwardWithParams:(CHIPMediaPlaybackClusterMediaSkipForwardParams *)params - completionHandler:(void (^)(CHIPMediaPlaybackClusterMediaSkipForwardResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)skipForwardRequestWithParams:(CHIPMediaPlaybackClusterSkipForwardRequestParams *)params + completionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - MediaPlayback::Commands::MediaSkipForward::Type request; + MediaPlayback::Commands::SkipForwardRequest::Type request; request.deltaPositionMilliseconds = params.deltaPositionMilliseconds.unsignedLongLongValue; - new CHIPMediaPlaybackClusterMediaSkipForwardResponseCallbackBridge( + new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)mediaStartOverWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaStartOverResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)startOverRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - MediaPlayback::Commands::MediaStartOver::Type request; + MediaPlayback::Commands::StartOverRequest::Type request; - new CHIPMediaPlaybackClusterMediaStartOverResponseCallbackBridge( + new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)mediaStopWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterMediaStopResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)stopRequestWithCompletionHandler:(void (^)(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - MediaPlayback::Commands::MediaStop::Type request; + MediaPlayback::Commands::StopRequest::Type request; - new CHIPMediaPlaybackClusterMediaStopResponseCallbackBridge( + new CHIPMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); @@ -9760,12 +9765,13 @@ new CHIPMediaPlaybackClusterMediaStopResponseCallbackBridge( - (void)readAttributePlaybackStateWithCompletionHandler:(void (^)( NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = MediaPlayback::Attributes::PlaybackState::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); + new CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = MediaPlayback::Attributes::PlaybackState::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); } - (void)subscribeAttributePlaybackStateWithMinInterval:(uint16_t)minInterval @@ -9774,14 +9780,15 @@ - (void)subscribeAttributePlaybackStateWithMinInterval:(uint16_t)minInterval reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPInt8uAttributeCallbackSubscriptionBridge( + new CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { using TypeInfo = MediaPlayback::Attributes::PlaybackState::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, - minInterval, maxInterval, CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished); + minInterval, maxInterval, + CHIPMediaPlaybackClusterPlaybackStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished); }, subscriptionEstablishedHandler); } @@ -14090,12 +14097,12 @@ @implementation CHIPTargetNavigator return &_cppCluster; } -- (void)navigateTargetWithParams:(CHIPTargetNavigatorClusterNavigateTargetParams *)params - completionHandler:(void (^)(CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler +- (void)navigateTargetRequestWithParams:(CHIPTargetNavigatorClusterNavigateTargetRequestParams *)params + completionHandler:(void (^)(CHIPTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; - TargetNavigator::Commands::NavigateTarget::Type request; + TargetNavigator::Commands::NavigateTargetRequest::Type request; request.target = params.target.unsignedCharValue; request.data = [self asCharSpan:params.data]; @@ -14150,6 +14157,25 @@ new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Ca }); } +- (void)subscribeAttributeCurrentNavigatorTargetWithMinInterval:(uint16_t)minInterval + maxInterval:(uint16_t)maxInterval + subscriptionEstablished: + (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + new CHIPInt8uAttributeCallbackSubscriptionBridge( + self.callbackQueue, reportHandler, + ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = TargetNavigator::Attributes::CurrentNavigatorTarget::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, + minInterval, maxInterval, CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished); + }, + subscriptionEstablishedHandler); +} + - (void)readAttributeAttributeListWithCompletionHandler:(void (^)( NSArray * _Nullable value, NSError * _Nullable error))completionHandler { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h index e2e124dc0f31a5..3bb2801450420f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h @@ -1534,7 +1534,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPChannelClusterChangeChannelParams : NSObject +@interface CHIPChannelClusterChangeChannelRequestParams : NSObject @property (strong, nonatomic) NSString * _Nonnull match; - (instancetype)init; @end @@ -1545,18 +1545,18 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPChannelClusterChangeChannelByNumberParams : NSObject +@interface CHIPChannelClusterChangeChannelByNumberRequestParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull majorNumber; @property (strong, nonatomic) NSNumber * _Nonnull minorNumber; - (instancetype)init; @end -@interface CHIPChannelClusterSkipChannelParams : NSObject +@interface CHIPChannelClusterSkipChannelRequestParams : NSObject @property (strong, nonatomic, getter=getCount) NSNumber * _Nonnull count; - (instancetype)init; @end -@interface CHIPTargetNavigatorClusterNavigateTargetParams : NSObject +@interface CHIPTargetNavigatorClusterNavigateTargetRequestParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull target; @property (strong, nonatomic) NSString * _Nonnull data; - (instancetype)init; @@ -1568,88 +1568,38 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPMediaPlaybackClusterMediaPlayResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull mediaPlaybackStatus; -- (instancetype)init; -@end - -@interface CHIPMediaPlaybackClusterMediaPauseResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull mediaPlaybackStatus; -- (instancetype)init; -@end - -@interface CHIPMediaPlaybackClusterMediaStopResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull mediaPlaybackStatus; -- (instancetype)init; -@end - -@interface CHIPMediaPlaybackClusterMediaStartOverResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull mediaPlaybackStatus; -- (instancetype)init; -@end - -@interface CHIPMediaPlaybackClusterMediaPreviousResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull mediaPlaybackStatus; -- (instancetype)init; -@end - -@interface CHIPMediaPlaybackClusterMediaNextResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull mediaPlaybackStatus; -- (instancetype)init; -@end - -@interface CHIPMediaPlaybackClusterMediaRewindResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull mediaPlaybackStatus; -- (instancetype)init; -@end - -@interface CHIPMediaPlaybackClusterMediaFastForwardResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull mediaPlaybackStatus; -- (instancetype)init; -@end - -@interface CHIPMediaPlaybackClusterMediaSkipForwardParams : NSObject +@interface CHIPMediaPlaybackClusterSkipForwardRequestParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull deltaPositionMilliseconds; - (instancetype)init; @end -@interface CHIPMediaPlaybackClusterMediaSkipForwardResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull mediaPlaybackStatus; -- (instancetype)init; -@end - -@interface CHIPMediaPlaybackClusterMediaSkipBackwardParams : NSObject +@interface CHIPMediaPlaybackClusterSkipBackwardRequestParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull deltaPositionMilliseconds; - (instancetype)init; @end -@interface CHIPMediaPlaybackClusterMediaSkipBackwardResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull mediaPlaybackStatus; +@interface CHIPMediaPlaybackClusterPlaybackResponseParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull status; - (instancetype)init; @end -@interface CHIPMediaPlaybackClusterMediaSeekParams : NSObject +@interface CHIPMediaPlaybackClusterSeekRequestParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull position; - (instancetype)init; @end -@interface CHIPMediaPlaybackClusterMediaSeekResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull mediaPlaybackStatus; -- (instancetype)init; -@end - -@interface CHIPMediaInputClusterSelectInputParams : NSObject +@interface CHIPMediaInputClusterSelectInputRequestParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull index; - (instancetype)init; @end -@interface CHIPMediaInputClusterRenameInputParams : NSObject +@interface CHIPMediaInputClusterRenameInputRequestParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull index; @property (strong, nonatomic) NSString * _Nonnull name; - (instancetype)init; @end -@interface CHIPKeypadInputClusterSendKeyParams : NSObject +@interface CHIPKeypadInputClusterSendKeyRequestParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull keyCode; - (instancetype)init; @end @@ -1659,83 +1609,60 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPContentLauncherClusterLaunchContentParams : NSObject +@interface CHIPContentLauncherClusterLaunchContentRequestParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull autoPlay; @property (strong, nonatomic) NSString * _Nonnull data; @property (strong, nonatomic) NSArray * _Nonnull search; - (instancetype)init; @end -@interface CHIPContentLauncherClusterLaunchContentResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull contentLaunchStatus; -@property (strong, nonatomic) NSString * _Nonnull data; -- (instancetype)init; -@end - -@interface CHIPContentLauncherClusterLaunchURLParams : NSObject +@interface CHIPContentLauncherClusterLaunchURLRequestParams : NSObject @property (strong, nonatomic) NSString * _Nonnull contentURL; @property (strong, nonatomic) NSString * _Nonnull displayString; -@property (strong, nonatomic) NSArray * _Nonnull brandingInformation; +@property (strong, nonatomic) CHIPContentLauncherClusterBrandingInformation * _Nonnull brandingInformation; - (instancetype)init; @end -@interface CHIPContentLauncherClusterLaunchURLResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull contentLaunchStatus; +@interface CHIPContentLauncherClusterLaunchResponseParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull status; @property (strong, nonatomic) NSString * _Nonnull data; - (instancetype)init; @end -@interface CHIPAudioOutputClusterSelectOutputParams : NSObject +@interface CHIPAudioOutputClusterSelectOutputRequestParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull index; - (instancetype)init; @end -@interface CHIPAudioOutputClusterRenameOutputParams : NSObject +@interface CHIPAudioOutputClusterRenameOutputRequestParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull index; @property (strong, nonatomic) NSString * _Nonnull name; - (instancetype)init; @end -@interface CHIPApplicationLauncherClusterLaunchAppParams : NSObject +@interface CHIPApplicationLauncherClusterLaunchAppRequestParams : NSObject @property (strong, nonatomic) NSString * _Nonnull data; -@property (strong, nonatomic) CHIPApplicationLauncherClusterApplicationLauncherApp * _Nonnull application; +@property (strong, nonatomic) CHIPApplicationLauncherClusterApplication * _Nonnull application; - (instancetype)init; @end -@interface CHIPApplicationLauncherClusterLaunchAppResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; -@property (strong, nonatomic) NSString * _Nonnull data; +@interface CHIPApplicationLauncherClusterStopAppRequestParams : NSObject +@property (strong, nonatomic) CHIPApplicationLauncherClusterApplication * _Nonnull application; - (instancetype)init; @end -@interface CHIPApplicationLauncherClusterStopAppParams : NSObject -@property (strong, nonatomic) CHIPApplicationLauncherClusterApplicationLauncherApp * _Nonnull application; +@interface CHIPApplicationLauncherClusterHideAppRequestParams : NSObject +@property (strong, nonatomic) CHIPApplicationLauncherClusterApplication * _Nonnull application; - (instancetype)init; @end -@interface CHIPApplicationLauncherClusterStopAppResponseParams : NSObject +@interface CHIPApplicationLauncherClusterLauncherResponseParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull status; @property (strong, nonatomic) NSString * _Nonnull data; - (instancetype)init; @end -@interface CHIPApplicationLauncherClusterHideAppParams : NSObject -@property (strong, nonatomic) CHIPApplicationLauncherClusterApplicationLauncherApp * _Nonnull application; -- (instancetype)init; -@end - -@interface CHIPApplicationLauncherClusterHideAppResponseParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; -@property (strong, nonatomic) NSString * _Nonnull data; -- (instancetype)init; -@end - -@interface CHIPApplicationBasicClusterChangeStatusParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull status; -- (instancetype)init; -@end - -@interface CHIPAccountLoginClusterGetSetupPINParams : NSObject +@interface CHIPAccountLoginClusterGetSetupPINRequestParams : NSObject @property (strong, nonatomic) NSString * _Nonnull tempAccountIdentifier; - (instancetype)init; @end @@ -1745,7 +1672,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPAccountLoginClusterLoginParams : NSObject +@interface CHIPAccountLoginClusterLoginRequestParams : NSObject @property (strong, nonatomic) NSString * _Nonnull tempAccountIdentifier; @property (strong, nonatomic) NSString * _Nonnull setupPIN; - (instancetype)init; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm index a9ee42f97c13a8..09635ee5631183 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm @@ -3257,7 +3257,7 @@ - (instancetype)init } @end -@implementation CHIPChannelClusterChangeChannelParams +@implementation CHIPChannelClusterChangeChannelRequestParams - (instancetype)init { if (self = [super init]) { @@ -3281,7 +3281,7 @@ - (instancetype)init } @end -@implementation CHIPChannelClusterChangeChannelByNumberParams +@implementation CHIPChannelClusterChangeChannelByNumberRequestParams - (instancetype)init { if (self = [super init]) { @@ -3294,7 +3294,7 @@ - (instancetype)init } @end -@implementation CHIPChannelClusterSkipChannelParams +@implementation CHIPChannelClusterSkipChannelRequestParams - (instancetype)init { if (self = [super init]) { @@ -3305,7 +3305,7 @@ - (instancetype)init } @end -@implementation CHIPTargetNavigatorClusterNavigateTargetParams +@implementation CHIPTargetNavigatorClusterNavigateTargetRequestParams - (instancetype)init { if (self = [super init]) { @@ -3331,95 +3331,7 @@ - (instancetype)init } @end -@implementation CHIPMediaPlaybackClusterMediaPlayResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _mediaPlaybackStatus = @(0); - } - return self; -} -@end - -@implementation CHIPMediaPlaybackClusterMediaPauseResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _mediaPlaybackStatus = @(0); - } - return self; -} -@end - -@implementation CHIPMediaPlaybackClusterMediaStopResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _mediaPlaybackStatus = @(0); - } - return self; -} -@end - -@implementation CHIPMediaPlaybackClusterMediaStartOverResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _mediaPlaybackStatus = @(0); - } - return self; -} -@end - -@implementation CHIPMediaPlaybackClusterMediaPreviousResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _mediaPlaybackStatus = @(0); - } - return self; -} -@end - -@implementation CHIPMediaPlaybackClusterMediaNextResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _mediaPlaybackStatus = @(0); - } - return self; -} -@end - -@implementation CHIPMediaPlaybackClusterMediaRewindResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _mediaPlaybackStatus = @(0); - } - return self; -} -@end - -@implementation CHIPMediaPlaybackClusterMediaFastForwardResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _mediaPlaybackStatus = @(0); - } - return self; -} -@end - -@implementation CHIPMediaPlaybackClusterMediaSkipForwardParams +@implementation CHIPMediaPlaybackClusterSkipForwardRequestParams - (instancetype)init { if (self = [super init]) { @@ -3430,18 +3342,7 @@ - (instancetype)init } @end -@implementation CHIPMediaPlaybackClusterMediaSkipForwardResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _mediaPlaybackStatus = @(0); - } - return self; -} -@end - -@implementation CHIPMediaPlaybackClusterMediaSkipBackwardParams +@implementation CHIPMediaPlaybackClusterSkipBackwardRequestParams - (instancetype)init { if (self = [super init]) { @@ -3452,18 +3353,18 @@ - (instancetype)init } @end -@implementation CHIPMediaPlaybackClusterMediaSkipBackwardResponseParams +@implementation CHIPMediaPlaybackClusterPlaybackResponseParams - (instancetype)init { if (self = [super init]) { - _mediaPlaybackStatus = @(0); + _status = @(0); } return self; } @end -@implementation CHIPMediaPlaybackClusterMediaSeekParams +@implementation CHIPMediaPlaybackClusterSeekRequestParams - (instancetype)init { if (self = [super init]) { @@ -3474,18 +3375,7 @@ - (instancetype)init } @end -@implementation CHIPMediaPlaybackClusterMediaSeekResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _mediaPlaybackStatus = @(0); - } - return self; -} -@end - -@implementation CHIPMediaInputClusterSelectInputParams +@implementation CHIPMediaInputClusterSelectInputRequestParams - (instancetype)init { if (self = [super init]) { @@ -3496,7 +3386,7 @@ - (instancetype)init } @end -@implementation CHIPMediaInputClusterRenameInputParams +@implementation CHIPMediaInputClusterRenameInputRequestParams - (instancetype)init { if (self = [super init]) { @@ -3509,7 +3399,7 @@ - (instancetype)init } @end -@implementation CHIPKeypadInputClusterSendKeyParams +@implementation CHIPKeypadInputClusterSendKeyRequestParams - (instancetype)init { if (self = [super init]) { @@ -3531,7 +3421,7 @@ - (instancetype)init } @end -@implementation CHIPContentLauncherClusterLaunchContentParams +@implementation CHIPContentLauncherClusterLaunchContentRequestParams - (instancetype)init { if (self = [super init]) { @@ -3546,20 +3436,7 @@ - (instancetype)init } @end -@implementation CHIPContentLauncherClusterLaunchContentResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _contentLaunchStatus = @(0); - - _data = @""; - } - return self; -} -@end - -@implementation CHIPContentLauncherClusterLaunchURLParams +@implementation CHIPContentLauncherClusterLaunchURLRequestParams - (instancetype)init { if (self = [super init]) { @@ -3568,18 +3445,18 @@ - (instancetype)init _displayString = @""; - _brandingInformation = [NSArray array]; + _brandingInformation = [CHIPContentLauncherClusterBrandingInformation new]; } return self; } @end -@implementation CHIPContentLauncherClusterLaunchURLResponseParams +@implementation CHIPContentLauncherClusterLaunchResponseParams - (instancetype)init { if (self = [super init]) { - _contentLaunchStatus = @(0); + _status = @(0); _data = @""; } @@ -3587,7 +3464,7 @@ - (instancetype)init } @end -@implementation CHIPAudioOutputClusterSelectOutputParams +@implementation CHIPAudioOutputClusterSelectOutputRequestParams - (instancetype)init { if (self = [super init]) { @@ -3598,7 +3475,7 @@ - (instancetype)init } @end -@implementation CHIPAudioOutputClusterRenameOutputParams +@implementation CHIPAudioOutputClusterRenameOutputRequestParams - (instancetype)init { if (self = [super init]) { @@ -3611,68 +3488,42 @@ - (instancetype)init } @end -@implementation CHIPApplicationLauncherClusterLaunchAppParams +@implementation CHIPApplicationLauncherClusterLaunchAppRequestParams - (instancetype)init { if (self = [super init]) { _data = @""; - _application = [CHIPApplicationLauncherClusterApplicationLauncherApp new]; + _application = [CHIPApplicationLauncherClusterApplication new]; } return self; } @end -@implementation CHIPApplicationLauncherClusterLaunchAppResponseParams +@implementation CHIPApplicationLauncherClusterStopAppRequestParams - (instancetype)init { if (self = [super init]) { - _status = @(0); - - _data = @""; - } - return self; -} -@end - -@implementation CHIPApplicationLauncherClusterStopAppParams -- (instancetype)init -{ - if (self = [super init]) { - - _application = [CHIPApplicationLauncherClusterApplicationLauncherApp new]; - } - return self; -} -@end - -@implementation CHIPApplicationLauncherClusterStopAppResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _status = @(0); - - _data = @""; + _application = [CHIPApplicationLauncherClusterApplication new]; } return self; } @end -@implementation CHIPApplicationLauncherClusterHideAppParams +@implementation CHIPApplicationLauncherClusterHideAppRequestParams - (instancetype)init { if (self = [super init]) { - _application = [CHIPApplicationLauncherClusterApplicationLauncherApp new]; + _application = [CHIPApplicationLauncherClusterApplication new]; } return self; } @end -@implementation CHIPApplicationLauncherClusterHideAppResponseParams +@implementation CHIPApplicationLauncherClusterLauncherResponseParams - (instancetype)init { if (self = [super init]) { @@ -3685,18 +3536,7 @@ - (instancetype)init } @end -@implementation CHIPApplicationBasicClusterChangeStatusParams -- (instancetype)init -{ - if (self = [super init]) { - - _status = @(0); - } - return self; -} -@end - -@implementation CHIPAccountLoginClusterGetSetupPINParams +@implementation CHIPAccountLoginClusterGetSetupPINRequestParams - (instancetype)init { if (self = [super init]) { @@ -3718,7 +3558,7 @@ - (instancetype)init } @end -@implementation CHIPAccountLoginClusterLoginParams +@implementation CHIPAccountLoginClusterLoginRequestParams - (instancetype)init { if (self = [super init]) { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h index fb8d83823269f2..a0e2fa8d42d9fa 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h @@ -310,7 +310,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPChannelClusterChannelLineupInfo : NSObject +@interface CHIPChannelClusterLineupInfo : NSObject @property (strong, nonatomic) NSString * _Nonnull operatorName; @property (strong, nonatomic) NSString * _Nonnull lineupName; @property (strong, nonatomic) NSString * _Nonnull postalCode; @@ -318,19 +318,19 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPTargetNavigatorClusterNavigateTargetTargetInfo : NSObject +@interface CHIPTargetNavigatorClusterTargetInfo : NSObject @property (strong, nonatomic) NSNumber * _Nonnull identifier; @property (strong, nonatomic) NSString * _Nonnull name; - (instancetype)init; @end -@interface CHIPMediaPlaybackClusterMediaPlaybackPosition : NSObject +@interface CHIPMediaPlaybackClusterPlaybackPosition : NSObject @property (strong, nonatomic) NSNumber * _Nonnull updatedAt; @property (strong, nonatomic) NSNumber * _Nonnull position; - (instancetype)init; @end -@interface CHIPMediaInputClusterMediaInputInfo : NSObject +@interface CHIPMediaInputClusterInputInfo : NSObject @property (strong, nonatomic) NSNumber * _Nonnull index; @property (strong, nonatomic) NSNumber * _Nonnull inputType; @property (strong, nonatomic) NSString * _Nonnull name; @@ -338,63 +338,68 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPContentLauncherClusterContentLaunchDimension : NSObject +@interface CHIPContentLauncherClusterDimension : NSObject @property (strong, nonatomic) NSNumber * _Nonnull width; @property (strong, nonatomic) NSNumber * _Nonnull height; @property (strong, nonatomic) NSNumber * _Nonnull metric; - (instancetype)init; @end -@interface CHIPContentLauncherClusterContentLaunchAdditionalInfo : NSObject +@interface CHIPContentLauncherClusterAdditionalInfo : NSObject @property (strong, nonatomic) NSString * _Nonnull name; @property (strong, nonatomic) NSString * _Nonnull value; - (instancetype)init; @end -@interface CHIPContentLauncherClusterContentLaunchParamater : NSObject +@interface CHIPContentLauncherClusterParameter : NSObject @property (strong, nonatomic) NSNumber * _Nonnull type; @property (strong, nonatomic) NSString * _Nonnull value; @property (strong, nonatomic) NSArray * _Nonnull externalIDList; - (instancetype)init; @end -@interface CHIPContentLauncherClusterContentLaunchStyleInformation : NSObject +@interface CHIPContentLauncherClusterContentSearch : NSObject +@property (strong, nonatomic) NSArray * _Nonnull parameterList; +- (instancetype)init; +@end + +@interface CHIPContentLauncherClusterStyleInformation : NSObject @property (strong, nonatomic) NSString * _Nonnull imageUrl; @property (strong, nonatomic) NSString * _Nonnull color; -@property (strong, nonatomic) CHIPContentLauncherClusterContentLaunchDimension * _Nonnull size; +@property (strong, nonatomic) CHIPContentLauncherClusterDimension * _Nonnull size; - (instancetype)init; @end -@interface CHIPContentLauncherClusterContentLaunchBrandingInformation : NSObject +@interface CHIPContentLauncherClusterBrandingInformation : NSObject @property (strong, nonatomic) NSString * _Nonnull providerName; -@property (strong, nonatomic) CHIPContentLauncherClusterContentLaunchStyleInformation * _Nonnull background; -@property (strong, nonatomic) CHIPContentLauncherClusterContentLaunchStyleInformation * _Nonnull logo; -@property (strong, nonatomic) CHIPContentLauncherClusterContentLaunchStyleInformation * _Nonnull progressBar; -@property (strong, nonatomic) CHIPContentLauncherClusterContentLaunchStyleInformation * _Nonnull splash; -@property (strong, nonatomic) CHIPContentLauncherClusterContentLaunchStyleInformation * _Nonnull waterMark; +@property (strong, nonatomic) CHIPContentLauncherClusterStyleInformation * _Nonnull background; +@property (strong, nonatomic) CHIPContentLauncherClusterStyleInformation * _Nonnull logo; +@property (strong, nonatomic) CHIPContentLauncherClusterStyleInformation * _Nonnull progressBar; +@property (strong, nonatomic) CHIPContentLauncherClusterStyleInformation * _Nonnull splash; +@property (strong, nonatomic) CHIPContentLauncherClusterStyleInformation * _Nonnull waterMark; - (instancetype)init; @end -@interface CHIPAudioOutputClusterAudioOutputInfo : NSObject +@interface CHIPAudioOutputClusterOutputInfo : NSObject @property (strong, nonatomic) NSNumber * _Nonnull index; @property (strong, nonatomic) NSNumber * _Nonnull outputType; @property (strong, nonatomic) NSString * _Nonnull name; - (instancetype)init; @end -@interface CHIPApplicationLauncherClusterApplicationLauncherApp : NSObject +@interface CHIPApplicationLauncherClusterApplication : NSObject @property (strong, nonatomic) NSNumber * _Nonnull catalogVendorId; @property (strong, nonatomic) NSString * _Nonnull applicationId; - (instancetype)init; @end -@interface CHIPApplicationLauncherClusterApplicationLauncherEndpoint : NSObject -@property (strong, nonatomic) CHIPApplicationLauncherClusterApplicationLauncherApp * _Nonnull application; +@interface CHIPApplicationLauncherClusterApplicationEP : NSObject +@property (strong, nonatomic) CHIPApplicationLauncherClusterApplication * _Nonnull application; @property (strong, nonatomic) NSString * _Nonnull endpoint; - (instancetype)init; @end -@interface CHIPApplicationBasicClusterApplicationBasicApp : NSObject +@interface CHIPApplicationBasicClusterApplication : 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 16b408f0328dd4..ceed1a9f390e45 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm @@ -627,7 +627,7 @@ - (instancetype)init } @end -@implementation CHIPChannelClusterChannelLineupInfo +@implementation CHIPChannelClusterLineupInfo - (instancetype)init { if (self = [super init]) { @@ -644,7 +644,7 @@ - (instancetype)init } @end -@implementation CHIPTargetNavigatorClusterNavigateTargetTargetInfo +@implementation CHIPTargetNavigatorClusterTargetInfo - (instancetype)init { if (self = [super init]) { @@ -657,7 +657,7 @@ - (instancetype)init } @end -@implementation CHIPMediaPlaybackClusterMediaPlaybackPosition +@implementation CHIPMediaPlaybackClusterPlaybackPosition - (instancetype)init { if (self = [super init]) { @@ -670,7 +670,7 @@ - (instancetype)init } @end -@implementation CHIPMediaInputClusterMediaInputInfo +@implementation CHIPMediaInputClusterInputInfo - (instancetype)init { if (self = [super init]) { @@ -687,7 +687,7 @@ - (instancetype)init } @end -@implementation CHIPContentLauncherClusterContentLaunchDimension +@implementation CHIPContentLauncherClusterDimension - (instancetype)init { if (self = [super init]) { @@ -702,7 +702,7 @@ - (instancetype)init } @end -@implementation CHIPContentLauncherClusterContentLaunchAdditionalInfo +@implementation CHIPContentLauncherClusterAdditionalInfo - (instancetype)init { if (self = [super init]) { @@ -715,7 +715,7 @@ - (instancetype)init } @end -@implementation CHIPContentLauncherClusterContentLaunchParamater +@implementation CHIPContentLauncherClusterParameter - (instancetype)init { if (self = [super init]) { @@ -730,7 +730,18 @@ - (instancetype)init } @end -@implementation CHIPContentLauncherClusterContentLaunchStyleInformation +@implementation CHIPContentLauncherClusterContentSearch +- (instancetype)init +{ + if (self = [super init]) { + + _parameterList = [NSArray array]; + } + return self; +} +@end + +@implementation CHIPContentLauncherClusterStyleInformation - (instancetype)init { if (self = [super init]) { @@ -739,34 +750,34 @@ - (instancetype)init _color = @""; - _size = [CHIPContentLauncherClusterContentLaunchDimension new]; + _size = [CHIPContentLauncherClusterDimension new]; } return self; } @end -@implementation CHIPContentLauncherClusterContentLaunchBrandingInformation +@implementation CHIPContentLauncherClusterBrandingInformation - (instancetype)init { if (self = [super init]) { _providerName = @""; - _background = [CHIPContentLauncherClusterContentLaunchStyleInformation new]; + _background = [CHIPContentLauncherClusterStyleInformation new]; - _logo = [CHIPContentLauncherClusterContentLaunchStyleInformation new]; + _logo = [CHIPContentLauncherClusterStyleInformation new]; - _progressBar = [CHIPContentLauncherClusterContentLaunchStyleInformation new]; + _progressBar = [CHIPContentLauncherClusterStyleInformation new]; - _splash = [CHIPContentLauncherClusterContentLaunchStyleInformation new]; + _splash = [CHIPContentLauncherClusterStyleInformation new]; - _waterMark = [CHIPContentLauncherClusterContentLaunchStyleInformation new]; + _waterMark = [CHIPContentLauncherClusterStyleInformation new]; } return self; } @end -@implementation CHIPAudioOutputClusterAudioOutputInfo +@implementation CHIPAudioOutputClusterOutputInfo - (instancetype)init { if (self = [super init]) { @@ -781,7 +792,7 @@ - (instancetype)init } @end -@implementation CHIPApplicationLauncherClusterApplicationLauncherApp +@implementation CHIPApplicationLauncherClusterApplication - (instancetype)init { if (self = [super init]) { @@ -794,12 +805,12 @@ - (instancetype)init } @end -@implementation CHIPApplicationLauncherClusterApplicationLauncherEndpoint +@implementation CHIPApplicationLauncherClusterApplicationEP - (instancetype)init { if (self = [super init]) { - _application = [CHIPApplicationLauncherClusterApplicationLauncherApp new]; + _application = [CHIPApplicationLauncherClusterApplication new]; _endpoint = @""; } @@ -807,7 +818,7 @@ - (instancetype)init } @end -@implementation CHIPApplicationBasicClusterApplicationBasicApp +@implementation CHIPApplicationBasicClusterApplication - (instancetype)init { if (self = [super init]) { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h index 2a0013a804303d..e883fcb8d4b30e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h @@ -71,6 +71,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)writeAttributeProductIdWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeApplicationStatusWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeApplicationVersionWithValue:(NSString * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeAllowedVendorListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeClusterRevisionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm index 27e60116c1a84b..b516ec76659c6d 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm @@ -391,7 +391,7 @@ new CHIPDefaultSuccessCallbackBridge( ListFreer listFreer; using TypeInfo = ApplicationBasic::Attributes::ApplicationStatus::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.unsignedCharValue; + cppValue = static_cast>(value.unsignedCharValue); auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); @@ -416,6 +416,46 @@ new CHIPDefaultSuccessCallbackBridge( }); } +- (void)writeAttributeAllowedVendorListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +{ + new CHIPDefaultSuccessCallbackBridge( + self.callbackQueue, + ^(id _Nullable ignored, NSError * _Nullable error) { + completionHandler(error); + }, + ^(Cancelable * success, Cancelable * failure) { + ListFreer listFreer; + using TypeInfo = ApplicationBasic::Attributes::AllowedVendorList::TypeInfo; + TypeInfo::Type cppValue; + { + using ListType_0 = std::remove_reference_t; + using ListMemberType_0 = ListMemberTypeGetter::Type; + if (value.count != 0) { + auto * listHolder_0 = new ListHolder(value.count); + if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) { + return CHIP_ERROR_INVALID_ARGUMENT; + } + listFreer.add(listHolder_0); + for (size_t i_0 = 0; i_0 < value.count; ++i_0) { + if (![value[i_0] isKindOfClass:[NSNumber class]]) { + // Wrong kind of value. + return CHIP_ERROR_INVALID_ARGUMENT; + } + auto element_0 = (NSNumber *) value[i_0]; + listHolder_0->mList[i_0] = static_castmList[i_0])>>( + element_0.unsignedShortValue); + } + cppValue = ListType_0(listHolder_0->mList, value.count); + } else { + cppValue = ListType_0(); + } + } + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler { new CHIPDefaultSuccessCallbackBridge( @@ -617,11 +657,11 @@ new CHIPDefaultSuccessCallbackBridge( } listFreer.add(listHolder_0); for (size_t i_0 = 0; i_0 < value.count; ++i_0) { - if (![value[i_0] isKindOfClass:[CHIPAudioOutputClusterAudioOutputInfo class]]) { + if (![value[i_0] isKindOfClass:[CHIPAudioOutputClusterOutputInfo class]]) { // Wrong kind of value. return CHIP_ERROR_INVALID_ARGUMENT; } - auto element_0 = (CHIPAudioOutputClusterAudioOutputInfo *) value[i_0]; + auto element_0 = (CHIPAudioOutputClusterOutputInfo *) value[i_0]; listHolder_0->mList[i_0].index = element_0.index.unsignedCharValue; listHolder_0->mList[i_0].outputType = static_castmList[i_0].outputType)>>( @@ -5418,11 +5458,11 @@ new CHIPDefaultSuccessCallbackBridge( } listFreer.add(listHolder_0); for (size_t i_0 = 0; i_0 < value.count; ++i_0) { - if (![value[i_0] isKindOfClass:[CHIPMediaInputClusterMediaInputInfo class]]) { + if (![value[i_0] isKindOfClass:[CHIPMediaInputClusterInputInfo class]]) { // Wrong kind of value. return CHIP_ERROR_INVALID_ARGUMENT; } - auto element_0 = (CHIPMediaInputClusterMediaInputInfo *) value[i_0]; + auto element_0 = (CHIPMediaInputClusterInputInfo *) value[i_0]; listHolder_0->mList[i_0].index = element_0.index.unsignedCharValue; listHolder_0->mList[i_0].inputType = static_castmList[i_0].inputType)>>( @@ -5540,7 +5580,7 @@ new CHIPDefaultSuccessCallbackBridge( ListFreer listFreer; using TypeInfo = MediaPlayback::Attributes::PlaybackState::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.unsignedCharValue; + cppValue = static_cast>(value.unsignedCharValue); auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); @@ -8420,11 +8460,11 @@ new CHIPDefaultSuccessCallbackBridge( } listFreer.add(listHolder_0); for (size_t i_0 = 0; i_0 < value.count; ++i_0) { - if (![value[i_0] isKindOfClass:[CHIPTargetNavigatorClusterNavigateTargetTargetInfo class]]) { + if (![value[i_0] isKindOfClass:[CHIPTargetNavigatorClusterTargetInfo class]]) { // Wrong kind of value. return CHIP_ERROR_INVALID_ARGUMENT; } - auto element_0 = (CHIPTargetNavigatorClusterNavigateTargetTargetInfo *) value[i_0]; + auto element_0 = (CHIPTargetNavigatorClusterTargetInfo *) value[i_0]; listHolder_0->mList[i_0].identifier = element_0.identifier.unsignedCharValue; listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name]; } diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m index cd8d5c1fc4d139..732e13b1787cb0 100644 --- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m +++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m @@ -36301,6 +36301,31 @@ - (void)testSendClusterApplicationBasicReadAttributeApplicationVersionWithComple [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } +- (void)testSendClusterApplicationBasicReadAttributeAllowedVendorListWithCompletionHandler +{ + dispatch_queue_t queue = dispatch_get_main_queue(); + + XCTestExpectation * connectedExpectation = + [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; + WaitForCommissionee(connectedExpectation, queue); + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; + + CHIPDevice * device = GetConnectedDevice(); + CHIPApplicationBasic * cluster = [[CHIPApplicationBasic alloc] initWithDevice:device endpoint:1 queue:queue]; + XCTAssertNotNil(cluster); + + XCTestExpectation * expectation = + [self expectationWithDescription:@"ApplicationBasicReadAttributeAllowedVendorListWithCompletionHandler"]; + + [cluster readAttributeAllowedVendorListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) { + NSLog(@"ApplicationBasic AllowedVendorList Error: %@", err); + XCTAssertEqual(err.code, 0); + [expectation fulfill]; + }]; + + [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; +} + - (void)testSendClusterApplicationBasicReadAttributeAttributeListWithCompletionHandler { dispatch_queue_t queue = dispatch_get_main_queue(); diff --git a/zzz_generated/README.md b/zzz_generated/README.md deleted file mode 100644 index 5c4e3c3779e678..00000000000000 --- a/zzz_generated/README.md +++ /dev/null @@ -1,5 +0,0 @@ -### Generated files - -This folder contains generated zap source files. The unusual name (starting with -zzz) is to make alphabetical sorting show generated files at the end of file -diffs to make code review easier. diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index d849fd40d7c92c..564db359b1f371 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -498,63 +498,69 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ + /* Endpoint: 1, Cluster: Application Basic (server), big-endian */ \ + \ + /* 2542 - allowed vendor list, */ \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + \ /* Endpoint: 1, Cluster: Test Cluster (server), big-endian */ \ \ - /* 2542 - bitmap32, */ \ + /* 2574 - bitmap32, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 2546 - bitmap64, */ \ + /* 2578 - bitmap64, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2554 - int24u, */ \ + /* 2586 - int24u, */ \ 0x00, 0x00, 0x00, \ \ - /* 2557 - int32u, */ \ + /* 2589 - int32u, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 2561 - int40u, */ \ + /* 2593 - int40u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2566 - int48u, */ \ + /* 2598 - int48u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2572 - int56u, */ \ + /* 2604 - int56u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2579 - int64u, */ \ + /* 2611 - int64u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2587 - int24s, */ \ + /* 2619 - int24s, */ \ 0x00, 0x00, 0x00, \ \ - /* 2590 - int32s, */ \ + /* 2622 - int32s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 2594 - int40s, */ \ + /* 2626 - int40s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2599 - int48s, */ \ + /* 2631 - int48s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2605 - int56s, */ \ + /* 2637 - int56s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2612 - int64s, */ \ + /* 2644 - int64s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2620 - float_single, */ \ + /* 2652 - float_single, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 2624 - float_double, */ \ + /* 2656 - float_double, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2632 - epoch_us, */ \ + /* 2664 - epoch_us, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2640 - epoch_s, */ \ + /* 2672 - epoch_s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 2644 - list_long_octet_string, */ \ + /* 2676 - list_long_octet_string, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -609,65 +615,65 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3644 - nullable_bitmap32, */ \ + /* 3676 - nullable_bitmap32, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3648 - nullable_bitmap64, */ \ + /* 3680 - nullable_bitmap64, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3656 - nullable_int24u, */ \ + /* 3688 - nullable_int24u, */ \ 0x00, 0x00, 0x00, \ \ - /* 3659 - nullable_int32u, */ \ + /* 3691 - nullable_int32u, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3663 - nullable_int40u, */ \ + /* 3695 - nullable_int40u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3668 - nullable_int48u, */ \ + /* 3700 - nullable_int48u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3674 - nullable_int56u, */ \ + /* 3706 - nullable_int56u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3681 - nullable_int64u, */ \ + /* 3713 - nullable_int64u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3689 - nullable_int24s, */ \ + /* 3721 - nullable_int24s, */ \ 0x00, 0x00, 0x00, \ \ - /* 3692 - nullable_int32s, */ \ + /* 3724 - nullable_int32s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3696 - nullable_int40s, */ \ + /* 3728 - nullable_int40s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3701 - nullable_int48s, */ \ + /* 3733 - nullable_int48s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3707 - nullable_int56s, */ \ + /* 3739 - nullable_int56s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3714 - nullable_int64s, */ \ + /* 3746 - nullable_int64s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3722 - nullable_float_single, */ \ + /* 3754 - nullable_float_single, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3726 - nullable_float_double, */ \ + /* 3758 - nullable_float_double, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Electrical Measurement (server), big-endian */ \ \ - /* 3734 - measurement type, */ \ + /* 3766 - measurement type, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3738 - total active power, */ \ + /* 3770 - total active power, */ \ 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 2, Cluster: On/Off (server), big-endian */ \ \ - /* 3742 - FeatureMap, */ \ + /* 3774 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x00, \ } @@ -1146,63 +1152,69 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ + /* Endpoint: 1, Cluster: Application Basic (server), little-endian */ \ + \ + /* 2542 - allowed vendor list, */ \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + \ /* Endpoint: 1, Cluster: Test Cluster (server), little-endian */ \ \ - /* 2542 - bitmap32, */ \ + /* 2574 - bitmap32, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 2546 - bitmap64, */ \ + /* 2578 - bitmap64, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2554 - int24u, */ \ + /* 2586 - int24u, */ \ 0x00, 0x00, 0x00, \ \ - /* 2557 - int32u, */ \ + /* 2589 - int32u, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 2561 - int40u, */ \ + /* 2593 - int40u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2566 - int48u, */ \ + /* 2598 - int48u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2572 - int56u, */ \ + /* 2604 - int56u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2579 - int64u, */ \ + /* 2611 - int64u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2587 - int24s, */ \ + /* 2619 - int24s, */ \ 0x00, 0x00, 0x00, \ \ - /* 2590 - int32s, */ \ + /* 2622 - int32s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 2594 - int40s, */ \ + /* 2626 - int40s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2599 - int48s, */ \ + /* 2631 - int48s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2605 - int56s, */ \ + /* 2637 - int56s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2612 - int64s, */ \ + /* 2644 - int64s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2620 - float_single, */ \ + /* 2652 - float_single, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 2624 - float_double, */ \ + /* 2656 - float_double, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2632 - epoch_us, */ \ + /* 2664 - epoch_us, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 2640 - epoch_s, */ \ + /* 2672 - epoch_s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 2644 - list_long_octet_string, */ \ + /* 2676 - list_long_octet_string, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -1257,71 +1269,71 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3644 - nullable_bitmap32, */ \ + /* 3676 - nullable_bitmap32, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3648 - nullable_bitmap64, */ \ + /* 3680 - nullable_bitmap64, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3656 - nullable_int24u, */ \ + /* 3688 - nullable_int24u, */ \ 0x00, 0x00, 0x00, \ \ - /* 3659 - nullable_int32u, */ \ + /* 3691 - nullable_int32u, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3663 - nullable_int40u, */ \ + /* 3695 - nullable_int40u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3668 - nullable_int48u, */ \ + /* 3700 - nullable_int48u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3674 - nullable_int56u, */ \ + /* 3706 - nullable_int56u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3681 - nullable_int64u, */ \ + /* 3713 - nullable_int64u, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3689 - nullable_int24s, */ \ + /* 3721 - nullable_int24s, */ \ 0x00, 0x00, 0x00, \ \ - /* 3692 - nullable_int32s, */ \ + /* 3724 - nullable_int32s, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3696 - nullable_int40s, */ \ + /* 3728 - nullable_int40s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3701 - nullable_int48s, */ \ + /* 3733 - nullable_int48s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3707 - nullable_int56s, */ \ + /* 3739 - nullable_int56s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3714 - nullable_int64s, */ \ + /* 3746 - nullable_int64s, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3722 - nullable_float_single, */ \ + /* 3754 - nullable_float_single, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3726 - nullable_float_double, */ \ + /* 3758 - nullable_float_double, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 1, Cluster: Electrical Measurement (server), little-endian */ \ \ - /* 3734 - measurement type, */ \ + /* 3766 - measurement type, */ \ 0x00, 0x00, 0x00, 0x00, \ \ - /* 3738 - total active power, */ \ + /* 3770 - total active power, */ \ 0x00, 0x00, 0x00, 0x00, \ \ /* Endpoint: 2, Cluster: On/Off (server), little-endian */ \ \ - /* 3742 - FeatureMap, */ \ + /* 3774 - FeatureMap, */ \ 0x00, 0x00, 0x00, 0x00, \ } #endif // BIGENDIAN_CPU -#define GENERATED_DEFAULTS_COUNT (143) +#define GENERATED_DEFAULTS_COUNT (144) #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE #define ZAP_LONG_DEFAULTS_INDEX(index) \ @@ -1414,7 +1426,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 600 +#define GENERATED_ATTRIBUTE_COUNT 601 #define GENERATED_ATTRIBUTES \ { \ \ @@ -2096,13 +2108,14 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Application Basic (server) */ \ - { 0x0000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* vendor name */ \ - { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* vendor id */ \ - { 0x0002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application name */ \ - { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* product id */ \ - { 0x0005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* application status */ \ - { 0x0006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application version */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + { 0x0000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* vendor name */ \ + { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* vendor id */ \ + { 0x0002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application name */ \ + { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* product id */ \ + { 0x0005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* application status */ \ + { 0x0006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application version */ \ + { 0x0007, ZAP_TYPE(ARRAY), 32, 0, ZAP_LONG_DEFAULTS_INDEX(2542) }, /* allowed vendor list */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Account Login (server) */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ @@ -2111,28 +2124,28 @@ { 0x0000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(false) }, /* boolean */ \ { 0x0001, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* bitmap8 */ \ { 0x0002, ZAP_TYPE(BITMAP16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* bitmap16 */ \ - { 0x0003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2542) }, /* bitmap32 */ \ - { 0x0004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2546) }, /* bitmap64 */ \ + { 0x0003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2574) }, /* bitmap32 */ \ + { 0x0004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2578) }, /* bitmap64 */ \ { 0x0005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* int8u */ \ { 0x0006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* int16u */ \ - { 0x0007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2554) }, /* int24u */ \ - { 0x0008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2557) }, /* int32u */ \ - { 0x0009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2561) }, /* int40u */ \ - { 0x000A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2566) }, /* int48u */ \ - { 0x000B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2572) }, /* int56u */ \ - { 0x000C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2579) }, /* int64u */ \ + { 0x0007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2586) }, /* int24u */ \ + { 0x0008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2589) }, /* int32u */ \ + { 0x0009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2593) }, /* int40u */ \ + { 0x000A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2598) }, /* int48u */ \ + { 0x000B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2604) }, /* int56u */ \ + { 0x000C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2611) }, /* int64u */ \ { 0x000D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* int8s */ \ { 0x000E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* int16s */ \ - { 0x000F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2587) }, /* int24s */ \ - { 0x0010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2590) }, /* int32s */ \ - { 0x0011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2594) }, /* int40s */ \ - { 0x0012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2599) }, /* int48s */ \ - { 0x0013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2605) }, /* int56s */ \ - { 0x0014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2612) }, /* int64s */ \ + { 0x000F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2619) }, /* int24s */ \ + { 0x0010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2622) }, /* int32s */ \ + { 0x0011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2626) }, /* int40s */ \ + { 0x0012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2631) }, /* int48s */ \ + { 0x0013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2637) }, /* int56s */ \ + { 0x0014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2644) }, /* int64s */ \ { 0x0015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* enum8 */ \ { 0x0016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* enum16 */ \ - { 0x0017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2620) }, /* float_single */ \ - { 0x0018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2624) }, /* float_double */ \ + { 0x0017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2652) }, /* float_single */ \ + { 0x0018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2656) }, /* float_double */ \ { 0x0019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* octet_string */ \ { 0x001A, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* list_int8u */ \ @@ -2145,8 +2158,8 @@ { 0x001E, ZAP_TYPE(CHAR_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* char_string */ \ { 0x001F, ZAP_TYPE(LONG_CHAR_STRING), 1002, ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* long_char_string */ \ - { 0x0020, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2632) }, /* epoch_us */ \ - { 0x0021, ZAP_TYPE(EPOCH_S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2640) }, /* epoch_s */ \ + { 0x0020, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2664) }, /* epoch_us */ \ + { 0x0021, ZAP_TYPE(EPOCH_S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(2672) }, /* epoch_s */ \ { 0x0022, ZAP_TYPE(VENDOR_ID), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* vendor_id */ \ { 0x0023, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* list_nullables_and_optionals_struct */ \ @@ -2161,7 +2174,7 @@ ZAP_MIN_MAX_DEFAULTS_INDEX(33) }, /* range_restricted_int16u */ \ { 0x0029, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_MIN_MAX_DEFAULTS_INDEX(34) }, /* range_restricted_int16s */ \ - { 0x002A, ZAP_TYPE(ARRAY), 1000, 0, ZAP_LONG_DEFAULTS_INDEX(2644) }, /* list_long_octet_string */ \ + { 0x002A, ZAP_TYPE(ARRAY), 1000, 0, ZAP_LONG_DEFAULTS_INDEX(2676) }, /* list_long_octet_string */ \ { 0x0030, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(MUST_USE_TIMED_WRITE), \ ZAP_EMPTY_DEFAULT() }, /* timed_write_boolean */ \ { 0x8000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ @@ -2171,49 +2184,49 @@ { 0x8002, ZAP_TYPE(BITMAP16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_bitmap16 */ \ { 0x8003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3644) }, /* nullable_bitmap32 */ \ + ZAP_LONG_DEFAULTS_INDEX(3676) }, /* nullable_bitmap32 */ \ { 0x8004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3648) }, /* nullable_bitmap64 */ \ + ZAP_LONG_DEFAULTS_INDEX(3680) }, /* nullable_bitmap64 */ \ { 0x8005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int8u */ \ { 0x8006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int16u */ \ { 0x8007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3656) }, /* nullable_int24u */ \ + ZAP_LONG_DEFAULTS_INDEX(3688) }, /* nullable_int24u */ \ { 0x8008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3659) }, /* nullable_int32u */ \ + ZAP_LONG_DEFAULTS_INDEX(3691) }, /* nullable_int32u */ \ { 0x8009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3663) }, /* nullable_int40u */ \ + ZAP_LONG_DEFAULTS_INDEX(3695) }, /* nullable_int40u */ \ { 0x800A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3668) }, /* nullable_int48u */ \ + ZAP_LONG_DEFAULTS_INDEX(3700) }, /* nullable_int48u */ \ { 0x800B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3674) }, /* nullable_int56u */ \ + ZAP_LONG_DEFAULTS_INDEX(3706) }, /* nullable_int56u */ \ { 0x800C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3681) }, /* nullable_int64u */ \ + ZAP_LONG_DEFAULTS_INDEX(3713) }, /* nullable_int64u */ \ { 0x800D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int8s */ \ { 0x800E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int16s */ \ { 0x800F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3689) }, /* nullable_int24s */ \ + ZAP_LONG_DEFAULTS_INDEX(3721) }, /* nullable_int24s */ \ { 0x8010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3692) }, /* nullable_int32s */ \ + ZAP_LONG_DEFAULTS_INDEX(3724) }, /* nullable_int32s */ \ { 0x8011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3696) }, /* nullable_int40s */ \ + ZAP_LONG_DEFAULTS_INDEX(3728) }, /* nullable_int40s */ \ { 0x8012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3701) }, /* nullable_int48s */ \ + ZAP_LONG_DEFAULTS_INDEX(3733) }, /* nullable_int48s */ \ { 0x8013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3707) }, /* nullable_int56s */ \ + ZAP_LONG_DEFAULTS_INDEX(3739) }, /* nullable_int56s */ \ { 0x8014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3714) }, /* nullable_int64s */ \ + ZAP_LONG_DEFAULTS_INDEX(3746) }, /* nullable_int64s */ \ { 0x8015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_enum8 */ \ { 0x8016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_enum16 */ \ { 0x8017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3722) }, /* nullable_float_single */ \ + ZAP_LONG_DEFAULTS_INDEX(3754) }, /* nullable_float_single */ \ { 0x8018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3726) }, /* nullable_float_double */ \ + ZAP_LONG_DEFAULTS_INDEX(3758) }, /* nullable_float_double */ \ { 0x8019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* nullable_octet_string */ \ { 0x801E, ZAP_TYPE(CHAR_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ @@ -2238,8 +2251,8 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ - { 0x0000, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3734) }, /* measurement type */ \ - { 0x0304, ZAP_TYPE(INT32S), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3738) }, /* total active power */ \ + { 0x0000, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3766) }, /* measurement type */ \ + { 0x0304, ZAP_TYPE(INT32S), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3770) }, /* total active power */ \ { 0x0505, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) }, /* rms voltage */ \ { 0x0506, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* rms voltage min */ \ { 0x0507, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* rms voltage max */ \ @@ -2261,7 +2274,7 @@ { 0x4001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* OnTime */ \ { 0x4002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* OffWaitTime */ \ { 0x4003, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* StartUpOnOff */ \ - { 0xFFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3742) }, /* FeatureMap */ \ + { 0xFFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(3774) }, /* FeatureMap */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ @@ -2577,34 +2590,34 @@ 0x050C, ZAP_ATTRIBUTE_INDEX(482), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Application Launcher (server) */ \ { \ - 0x050D, ZAP_ATTRIBUTE_INDEX(484), 7, 106, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050D, ZAP_ATTRIBUTE_INDEX(484), 8, 138, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Application Basic (server) */ \ { \ - 0x050E, ZAP_ATTRIBUTE_INDEX(491), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050E, ZAP_ATTRIBUTE_INDEX(492), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Account Login (server) */ \ { \ - 0x050F, ZAP_ATTRIBUTE_INDEX(492), 78, 3285, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050F, ZAP_ATTRIBUTE_INDEX(493), 78, 3285, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Test Cluster (server) */ \ { \ - 0x0B04, ZAP_ATTRIBUTE_INDEX(570), 12, 28, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0B04, ZAP_ATTRIBUTE_INDEX(571), 12, 28, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ { 0x0004, \ - ZAP_ATTRIBUTE_INDEX(582), \ + ZAP_ATTRIBUTE_INDEX(583), \ 2, \ 3, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayGroupsServer }, /* Endpoint: 2, Cluster: Groups (server) */ \ { 0x0006, \ - ZAP_ATTRIBUTE_INDEX(584), \ + ZAP_ATTRIBUTE_INDEX(585), \ 7, \ 13, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/Off (server) */ \ { \ - 0x001D, ZAP_ATTRIBUTE_INDEX(591), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x001D, ZAP_ATTRIBUTE_INDEX(592), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 2, Cluster: Descriptor (server) */ \ { 0x0406, \ - ZAP_ATTRIBUTE_INDEX(596), \ + ZAP_ATTRIBUTE_INDEX(597), \ 4, \ 5, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -2616,7 +2629,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 23, 1465 }, { ZAP_CLUSTER_INDEX(23), 46, 6138 }, { ZAP_CLUSTER_INDEX(69), 4, 21 }, \ + { ZAP_CLUSTER_INDEX(0), 23, 1465 }, { ZAP_CLUSTER_INDEX(23), 46, 6170 }, { ZAP_CLUSTER_INDEX(69), 4, 21 }, \ } // Largest attribute size is needed for various buffers @@ -2626,7 +2639,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (689) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (7624) +#define ATTRIBUTE_MAX_SIZE (7656) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (3) 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 f8b76f34721cba..20c6b0cc467237 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 @@ -28,6 +28,21 @@ #include "enums.h" +// Struct for Dimension +typedef struct _Dimension +{ + double width; + double height; + uint8_t metric; +} Dimension; + +// Struct for AdditionalInfo +typedef struct _AdditionalInfo +{ + chip::CharSpan name; + chip::CharSpan value; +} AdditionalInfo; + // Struct for SimpleStruct typedef struct _SimpleStruct { @@ -84,61 +99,52 @@ typedef struct _DoubleNestedStructList /* TYPE WARNING: array array defaults to */ uint8_t * a; } DoubleNestedStructList; -// Struct for ContentLaunchDimension -typedef struct _ContentLaunchDimension -{ - double width; - double height; - uint8_t metric; -} ContentLaunchDimension; - -// Struct for ContentLaunchAdditionalInfo -typedef struct _ContentLaunchAdditionalInfo -{ - chip::CharSpan name; - chip::CharSpan value; -} ContentLaunchAdditionalInfo; - -// Struct for ContentLaunchParamater -typedef struct _ContentLaunchParamater +// Struct for Parameter +typedef struct _Parameter { uint8_t type; chip::CharSpan value; /* TYPE WARNING: array array defaults to */ uint8_t * externalIDList; -} ContentLaunchParamater; +} Parameter; -// Struct for ContentLaunchStyleInformation -typedef struct _ContentLaunchStyleInformation +// Struct for ContentSearch +typedef struct _ContentSearch +{ + /* TYPE WARNING: array array defaults to */ uint8_t * parameterList; +} ContentSearch; + +// Struct for StyleInformation +typedef struct _StyleInformation { chip::CharSpan imageUrl; chip::CharSpan color; - ContentLaunchDimension size; -} ContentLaunchStyleInformation; + Dimension size; +} StyleInformation; -// Struct for ContentLaunchBrandingInformation -typedef struct _ContentLaunchBrandingInformation +// Struct for BrandingInformation +typedef struct _BrandingInformation { chip::CharSpan providerName; - ContentLaunchStyleInformation background; - ContentLaunchStyleInformation logo; - ContentLaunchStyleInformation progressBar; - ContentLaunchStyleInformation splash; - ContentLaunchStyleInformation waterMark; -} ContentLaunchBrandingInformation; + StyleInformation background; + StyleInformation logo; + StyleInformation progressBar; + StyleInformation splash; + StyleInformation waterMark; +} BrandingInformation; -// Struct for ApplicationLauncherApp -typedef struct _ApplicationLauncherApp +// Struct for Application +typedef struct _Application { uint16_t catalogVendorId; chip::CharSpan applicationId; -} ApplicationLauncherApp; +} Application; -// Struct for ApplicationLauncherEndpoint -typedef struct _ApplicationLauncherEndpoint +// Struct for ApplicationEP +typedef struct _ApplicationEP { - ApplicationLauncherApp application; + Application application; chip::CharSpan endpoint; -} ApplicationLauncherEndpoint; +} ApplicationEP; // Struct for Target typedef struct _Target @@ -169,21 +175,6 @@ typedef struct _ActionStruct uint8_t Status; } ActionStruct; -// Struct for ApplicationBasicApp -typedef struct _ApplicationBasicApp -{ - uint16_t catalogVendorId; - chip::CharSpan applicationId; -} ApplicationBasicApp; - -// Struct for AudioOutputInfo -typedef struct _AudioOutputInfo -{ - uint8_t index; - uint8_t outputType; - chip::CharSpan name; -} AudioOutputInfo; - // Struct for BasicCommissioningInfoType typedef struct _BasicCommissioningInfoType { @@ -214,15 +205,6 @@ typedef struct _ChannelInfo chip::CharSpan affiliateCallSign; } ChannelInfo; -// Struct for ChannelLineupInfo -typedef struct _ChannelLineupInfo -{ - chip::CharSpan operatorName; - chip::CharSpan lineupName; - chip::CharSpan postalCode; - uint8_t lineupInfoType; -} ChannelLineupInfo; - // Struct for DeviceType typedef struct _DeviceType { @@ -301,6 +283,15 @@ typedef struct _IasAceZoneStatusResult uint16_t zoneStatus; } IasAceZoneStatusResult; +// Struct for InputInfo +typedef struct _InputInfo +{ + uint8_t index; + uint8_t inputType; + chip::CharSpan name; + chip::CharSpan description; +} InputInfo; + // Struct for LabelStruct typedef struct _LabelStruct { @@ -308,21 +299,14 @@ typedef struct _LabelStruct chip::CharSpan value; } LabelStruct; -// Struct for MediaInputInfo -typedef struct _MediaInputInfo -{ - uint8_t index; - uint8_t inputType; - chip::CharSpan name; - chip::CharSpan description; -} MediaInputInfo; - -// Struct for MediaPlaybackPosition -typedef struct _MediaPlaybackPosition +// Struct for LineupInfo +typedef struct _LineupInfo { - uint64_t updatedAt; - uint64_t position; -} MediaPlaybackPosition; + chip::CharSpan operatorName; + chip::CharSpan lineupName; + chip::CharSpan postalCode; + uint8_t lineupInfoType; +} LineupInfo; // Struct for ModeOptionStruct typedef struct _ModeOptionStruct @@ -339,13 +323,6 @@ typedef struct _NOCStruct chip::ByteSpan NOC; } NOCStruct; -// Struct for NavigateTargetTargetInfo -typedef struct _NavigateTargetTargetInfo -{ - uint8_t identifier; - chip::CharSpan name; -} NavigateTargetTargetInfo; - // Struct for NeighborTable typedef struct _NeighborTable { @@ -407,6 +384,21 @@ typedef struct _OperationalDatasetComponents bool ChannelMaskPresent; } OperationalDatasetComponents; +// Struct for OutputInfo +typedef struct _OutputInfo +{ + uint8_t index; + uint8_t outputType; + chip::CharSpan name; +} OutputInfo; + +// Struct for PlaybackPosition +typedef struct _PlaybackPosition +{ + uint64_t updatedAt; + uint64_t position; +} PlaybackPosition; + // Struct for PowerProfileRecord typedef struct _PowerProfileRecord { @@ -500,6 +492,13 @@ typedef struct _SoftwareFault chip::ByteSpan FaultRecording; } SoftwareFault; +// Struct for TargetInfo +typedef struct _TargetInfo +{ + uint8_t identifier; + chip::CharSpan name; +} TargetInfo; + // Struct for TestListStructOctet typedef struct _TestListStructOctet { diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h index dbfe2d788be81b..23c0e496087fca 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h @@ -1446,6 +1446,7 @@ #define ZCL_APPLICATION_APP_ATTRIBUTE_ID (0x0004) #define ZCL_APPLICATION_STATUS_ATTRIBUTE_ID (0x0005) #define ZCL_APPLICATION_VERSION_ATTRIBUTE_ID (0x0006) +#define ZCL_APPLICATION_ALLOWED_VENDOR_LIST_ATTRIBUTE_ID (0x0007) // Attribute ids for cluster: Account Login diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index f950a76e4853b5..60bca6f419a4d9 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -29776,9 +29776,9 @@ namespace Attributes { namespace PlaybackState { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::MediaPlayback::Id, Id, readable, sizeof(temp)); @@ -29790,9 +29790,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -30653,9 +30653,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) namespace ApplicationStatus { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp)); @@ -30667,9 +30667,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index b7963ab6f92b7c..cb858dc836fec7 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -5241,8 +5241,8 @@ namespace MediaPlayback { namespace Attributes { namespace PlaybackState { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum * value); // PlaybackStateEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value); } // namespace PlaybackState namespace StartTime { @@ -5418,8 +5418,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ProductId namespace ApplicationStatus { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus Get(chip::EndpointId endpoint, + chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum * value); // ApplicationStatusEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value); } // namespace ApplicationStatus namespace ApplicationVersion { 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 5f3edc834bb15f..040d705f7ad673 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -14805,11 +14805,11 @@ bool emberAfIasWdClusterStartWarningCallback(chip::app::CommandHandler * command bool emberAfIasWdClusterSquawkCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::IasWd::Commands::Squawk::DecodableType & commandData); /** - * @brief Channel Cluster ChangeChannel Command callback (from client) + * @brief Channel Cluster ChangeChannelRequest Command callback (from client) */ -bool emberAfChannelClusterChangeChannelCallback( +bool emberAfChannelClusterChangeChannelRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::Channel::Commands::ChangeChannel::DecodableType & commandData); + const chip::app::Clusters::Channel::Commands::ChangeChannelRequest::DecodableType & commandData); /** * @brief Channel Cluster ChangeChannelResponse Command callback (from server) */ @@ -14817,285 +14817,214 @@ bool emberAfChannelClusterChangeChannelResponseCallback( chip::EndpointId endpoint, chip::app::CommandSender * commandObj, chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType channelMatch, uint8_t errorType); /** - * @brief Channel Cluster ChangeChannelByNumber Command callback (from client) + * @brief Channel Cluster ChangeChannelByNumberRequest Command callback (from client) */ -bool emberAfChannelClusterChangeChannelByNumberCallback( +bool emberAfChannelClusterChangeChannelByNumberRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::DecodableType & commandData); + const chip::app::Clusters::Channel::Commands::ChangeChannelByNumberRequest::DecodableType & commandData); /** - * @brief Channel Cluster SkipChannel Command callback (from client) + * @brief Channel Cluster SkipChannelRequest Command callback (from client) */ -bool emberAfChannelClusterSkipChannelCallback( +bool emberAfChannelClusterSkipChannelRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::Channel::Commands::SkipChannel::DecodableType & commandData); + const chip::app::Clusters::Channel::Commands::SkipChannelRequest::DecodableType & commandData); /** - * @brief Target Navigator Cluster NavigateTarget Command callback (from client) + * @brief Target Navigator Cluster NavigateTargetRequest Command callback (from client) */ -bool emberAfTargetNavigatorClusterNavigateTargetCallback( +bool emberAfTargetNavigatorClusterNavigateTargetRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::DecodableType & commandData); + const chip::app::Clusters::TargetNavigator::Commands::NavigateTargetRequest::DecodableType & commandData); /** * @brief Target Navigator Cluster NavigateTargetResponse Command callback (from server) */ bool emberAfTargetNavigatorClusterNavigateTargetResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status, chip::CharSpan data); /** - * @brief Media Playback Cluster MediaPlay Command callback (from client) + * @brief Media Playback Cluster PlayRequest Command callback (from client) */ -bool emberAfMediaPlaybackClusterMediaPlayCallback( +bool emberAfMediaPlaybackClusterPlayRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaPlayback::Commands::MediaPlay::DecodableType & commandData); + const chip::app::Clusters::MediaPlayback::Commands::PlayRequest::DecodableType & commandData); /** - * @brief Media Playback Cluster MediaPlayResponse Command callback (from server) + * @brief Media Playback Cluster PauseRequest Command callback (from client) */ -bool emberAfMediaPlaybackClusterMediaPlayResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus); -/** - * @brief Media Playback Cluster MediaPause Command callback (from client) - */ -bool emberAfMediaPlaybackClusterMediaPauseCallback( +bool emberAfMediaPlaybackClusterPauseRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaPlayback::Commands::MediaPause::DecodableType & commandData); -/** - * @brief Media Playback Cluster MediaPauseResponse Command callback (from server) - */ -bool emberAfMediaPlaybackClusterMediaPauseResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus); + const chip::app::Clusters::MediaPlayback::Commands::PauseRequest::DecodableType & commandData); /** - * @brief Media Playback Cluster MediaStop Command callback (from client) + * @brief Media Playback Cluster StopRequest Command callback (from client) */ -bool emberAfMediaPlaybackClusterMediaStopCallback( +bool emberAfMediaPlaybackClusterStopRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaPlayback::Commands::MediaStop::DecodableType & commandData); + const chip::app::Clusters::MediaPlayback::Commands::StopRequest::DecodableType & commandData); /** - * @brief Media Playback Cluster MediaStopResponse Command callback (from server) + * @brief Media Playback Cluster StartOverRequest Command callback (from client) */ -bool emberAfMediaPlaybackClusterMediaStopResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus); -/** - * @brief Media Playback Cluster MediaStartOver Command callback (from client) - */ -bool emberAfMediaPlaybackClusterMediaStartOverCallback( +bool emberAfMediaPlaybackClusterStartOverRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaPlayback::Commands::MediaStartOver::DecodableType & commandData); -/** - * @brief Media Playback Cluster MediaStartOverResponse Command callback (from server) - */ -bool emberAfMediaPlaybackClusterMediaStartOverResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus); + const chip::app::Clusters::MediaPlayback::Commands::StartOverRequest::DecodableType & commandData); /** - * @brief Media Playback Cluster MediaPrevious Command callback (from client) + * @brief Media Playback Cluster PreviousRequest Command callback (from client) */ -bool emberAfMediaPlaybackClusterMediaPreviousCallback( +bool emberAfMediaPlaybackClusterPreviousRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaPlayback::Commands::MediaPrevious::DecodableType & commandData); + const chip::app::Clusters::MediaPlayback::Commands::PreviousRequest::DecodableType & commandData); /** - * @brief Media Playback Cluster MediaPreviousResponse Command callback (from server) + * @brief Media Playback Cluster NextRequest Command callback (from client) */ -bool emberAfMediaPlaybackClusterMediaPreviousResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus); -/** - * @brief Media Playback Cluster MediaNext Command callback (from client) - */ -bool emberAfMediaPlaybackClusterMediaNextCallback( +bool emberAfMediaPlaybackClusterNextRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaPlayback::Commands::MediaNext::DecodableType & commandData); -/** - * @brief Media Playback Cluster MediaNextResponse Command callback (from server) - */ -bool emberAfMediaPlaybackClusterMediaNextResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus); + const chip::app::Clusters::MediaPlayback::Commands::NextRequest::DecodableType & commandData); /** - * @brief Media Playback Cluster MediaRewind Command callback (from client) + * @brief Media Playback Cluster RewindRequest Command callback (from client) */ -bool emberAfMediaPlaybackClusterMediaRewindCallback( +bool emberAfMediaPlaybackClusterRewindRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaPlayback::Commands::MediaRewind::DecodableType & commandData); + const chip::app::Clusters::MediaPlayback::Commands::RewindRequest::DecodableType & commandData); /** - * @brief Media Playback Cluster MediaRewindResponse Command callback (from server) + * @brief Media Playback Cluster FastForwardRequest Command callback (from client) */ -bool emberAfMediaPlaybackClusterMediaRewindResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus); -/** - * @brief Media Playback Cluster MediaFastForward Command callback (from client) - */ -bool emberAfMediaPlaybackClusterMediaFastForwardCallback( +bool emberAfMediaPlaybackClusterFastForwardRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaPlayback::Commands::MediaFastForward::DecodableType & commandData); -/** - * @brief Media Playback Cluster MediaFastForwardResponse Command callback (from server) - */ -bool emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus); + const chip::app::Clusters::MediaPlayback::Commands::FastForwardRequest::DecodableType & commandData); /** - * @brief Media Playback Cluster MediaSkipForward Command callback (from client) + * @brief Media Playback Cluster SkipForwardRequest Command callback (from client) */ -bool emberAfMediaPlaybackClusterMediaSkipForwardCallback( +bool emberAfMediaPlaybackClusterSkipForwardRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaPlayback::Commands::MediaSkipForward::DecodableType & commandData); + const chip::app::Clusters::MediaPlayback::Commands::SkipForwardRequest::DecodableType & commandData); /** - * @brief Media Playback Cluster MediaSkipForwardResponse Command callback (from server) + * @brief Media Playback Cluster SkipBackwardRequest Command callback (from client) */ -bool emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus); -/** - * @brief Media Playback Cluster MediaSkipBackward Command callback (from client) - */ -bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback( +bool emberAfMediaPlaybackClusterSkipBackwardRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackward::DecodableType & commandData); + const chip::app::Clusters::MediaPlayback::Commands::SkipBackwardRequest::DecodableType & commandData); /** - * @brief Media Playback Cluster MediaSkipBackwardResponse Command callback (from server) + * @brief Media Playback Cluster PlaybackResponse Command callback (from server) */ -bool emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus); +bool emberAfMediaPlaybackClusterPlaybackResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + uint8_t status); /** - * @brief Media Playback Cluster MediaSeek Command callback (from client) + * @brief Media Playback Cluster SeekRequest Command callback (from client) */ -bool emberAfMediaPlaybackClusterMediaSeekCallback( +bool emberAfMediaPlaybackClusterSeekRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaPlayback::Commands::MediaSeek::DecodableType & commandData); -/** - * @brief Media Playback Cluster MediaSeekResponse Command callback (from server) - */ -bool emberAfMediaPlaybackClusterMediaSeekResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus); + const chip::app::Clusters::MediaPlayback::Commands::SeekRequest::DecodableType & commandData); /** - * @brief Media Input Cluster SelectInput Command callback (from client) + * @brief Media Input Cluster SelectInputRequest Command callback (from client) */ -bool emberAfMediaInputClusterSelectInputCallback( +bool emberAfMediaInputClusterSelectInputRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaInput::Commands::SelectInput::DecodableType & commandData); + const chip::app::Clusters::MediaInput::Commands::SelectInputRequest::DecodableType & commandData); /** - * @brief Media Input Cluster ShowInputStatus Command callback (from client) + * @brief Media Input Cluster ShowInputStatusRequest Command callback (from client) */ -bool emberAfMediaInputClusterShowInputStatusCallback( +bool emberAfMediaInputClusterShowInputStatusRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaInput::Commands::ShowInputStatus::DecodableType & commandData); + const chip::app::Clusters::MediaInput::Commands::ShowInputStatusRequest::DecodableType & commandData); /** - * @brief Media Input Cluster HideInputStatus Command callback (from client) + * @brief Media Input Cluster HideInputStatusRequest Command callback (from client) */ -bool emberAfMediaInputClusterHideInputStatusCallback( +bool emberAfMediaInputClusterHideInputStatusRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaInput::Commands::HideInputStatus::DecodableType & commandData); + const chip::app::Clusters::MediaInput::Commands::HideInputStatusRequest::DecodableType & commandData); /** - * @brief Media Input Cluster RenameInput Command callback (from client) + * @brief Media Input Cluster RenameInputRequest Command callback (from client) */ -bool emberAfMediaInputClusterRenameInputCallback( +bool emberAfMediaInputClusterRenameInputRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::MediaInput::Commands::RenameInput::DecodableType & commandData); + const chip::app::Clusters::MediaInput::Commands::RenameInputRequest::DecodableType & commandData); /** * @brief Low Power Cluster Sleep Command callback (from client) */ bool emberAfLowPowerClusterSleepCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::LowPower::Commands::Sleep::DecodableType & commandData); /** - * @brief Keypad Input Cluster SendKey Command callback (from client) + * @brief Keypad Input Cluster SendKeyRequest Command callback (from client) */ -bool emberAfKeypadInputClusterSendKeyCallback( +bool emberAfKeypadInputClusterSendKeyRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::KeypadInput::Commands::SendKey::DecodableType & commandData); + const chip::app::Clusters::KeypadInput::Commands::SendKeyRequest::DecodableType & commandData); /** * @brief Keypad Input Cluster SendKeyResponse Command callback (from server) */ bool emberAfKeypadInputClusterSendKeyResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status); /** - * @brief Content Launcher Cluster LaunchContent Command callback (from client) + * @brief Content Launcher Cluster LaunchContentRequest Command callback (from client) */ -bool emberAfContentLauncherClusterLaunchContentCallback( +bool emberAfContentLauncherClusterLaunchContentRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::ContentLauncher::Commands::LaunchContent::DecodableType & commandData); + const chip::app::Clusters::ContentLauncher::Commands::LaunchContentRequest::DecodableType & commandData); /** - * @brief Content Launcher Cluster LaunchContentResponse Command callback (from server) + * @brief Content Launcher Cluster LaunchURLRequest Command callback (from client) */ -bool emberAfContentLauncherClusterLaunchContentResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t contentLaunchStatus, chip::CharSpan data); -/** - * @brief Content Launcher Cluster LaunchURL Command callback (from client) - */ -bool emberAfContentLauncherClusterLaunchURLCallback( +bool emberAfContentLauncherClusterLaunchURLRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::ContentLauncher::Commands::LaunchURL::DecodableType & commandData); + const chip::app::Clusters::ContentLauncher::Commands::LaunchURLRequest::DecodableType & commandData); /** - * @brief Content Launcher Cluster LaunchURLResponse Command callback (from server) + * @brief Content Launcher Cluster LaunchResponse Command callback (from server) */ -bool emberAfContentLauncherClusterLaunchURLResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t contentLaunchStatus, chip::CharSpan data); +bool emberAfContentLauncherClusterLaunchResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + uint8_t status, chip::CharSpan data); /** - * @brief Audio Output Cluster SelectOutput Command callback (from client) + * @brief Audio Output Cluster SelectOutputRequest Command callback (from client) */ -bool emberAfAudioOutputClusterSelectOutputCallback( +bool emberAfAudioOutputClusterSelectOutputRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::AudioOutput::Commands::SelectOutput::DecodableType & commandData); + const chip::app::Clusters::AudioOutput::Commands::SelectOutputRequest::DecodableType & commandData); /** - * @brief Audio Output Cluster RenameOutput Command callback (from client) + * @brief Audio Output Cluster RenameOutputRequest Command callback (from client) */ -bool emberAfAudioOutputClusterRenameOutputCallback( +bool emberAfAudioOutputClusterRenameOutputRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::AudioOutput::Commands::RenameOutput::DecodableType & commandData); + const chip::app::Clusters::AudioOutput::Commands::RenameOutputRequest::DecodableType & commandData); /** - * @brief Application Launcher Cluster LaunchApp Command callback (from client) + * @brief Application Launcher Cluster LaunchAppRequest Command callback (from client) */ -bool emberAfApplicationLauncherClusterLaunchAppCallback( +bool emberAfApplicationLauncherClusterLaunchAppRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::DecodableType & commandData); -/** - * @brief Application Launcher Cluster LaunchAppResponse Command callback (from server) - */ -bool emberAfApplicationLauncherClusterLaunchAppResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status, chip::CharSpan data); + const chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppRequest::DecodableType & commandData); /** - * @brief Application Launcher Cluster StopApp Command callback (from client) + * @brief Application Launcher Cluster StopAppRequest Command callback (from client) */ -bool emberAfApplicationLauncherClusterStopAppCallback( +bool emberAfApplicationLauncherClusterStopAppRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::ApplicationLauncher::Commands::StopApp::DecodableType & commandData); + const chip::app::Clusters::ApplicationLauncher::Commands::StopAppRequest::DecodableType & commandData); /** - * @brief Application Launcher Cluster StopAppResponse Command callback (from server) + * @brief Application Launcher Cluster HideAppRequest Command callback (from client) */ -bool emberAfApplicationLauncherClusterStopAppResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status, chip::CharSpan data); -/** - * @brief Application Launcher Cluster HideApp Command callback (from client) - */ -bool emberAfApplicationLauncherClusterHideAppCallback( +bool emberAfApplicationLauncherClusterHideAppRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::ApplicationLauncher::Commands::HideApp::DecodableType & commandData); + const chip::app::Clusters::ApplicationLauncher::Commands::HideAppRequest::DecodableType & commandData); /** - * @brief Application Launcher Cluster HideAppResponse Command callback (from server) + * @brief Application Launcher Cluster LauncherResponse Command callback (from server) */ -bool emberAfApplicationLauncherClusterHideAppResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t status, chip::CharSpan data); +bool emberAfApplicationLauncherClusterLauncherResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + uint8_t status, chip::CharSpan data); /** - * @brief Application Basic Cluster ChangeStatus Command callback (from client) + * @brief Account Login Cluster GetSetupPINRequest Command callback (from client) */ -bool emberAfApplicationBasicClusterChangeStatusCallback( +bool emberAfAccountLoginClusterGetSetupPINRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::ApplicationBasic::Commands::ChangeStatus::DecodableType & commandData); -/** - * @brief Account Login Cluster GetSetupPIN Command callback (from client) - */ -bool emberAfAccountLoginClusterGetSetupPINCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::DecodableType & commandData); + const chip::app::Clusters::AccountLogin::Commands::GetSetupPINRequest::DecodableType & commandData); /** * @brief Account Login Cluster GetSetupPINResponse Command callback (from server) */ bool emberAfAccountLoginClusterGetSetupPINResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, chip::CharSpan setupPIN); /** - * @brief Account Login Cluster Login Command callback (from client) + * @brief Account Login Cluster LoginRequest Command callback (from client) */ -bool emberAfAccountLoginClusterLoginCallback(chip::app::CommandHandler * commandObj, - const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::AccountLogin::Commands::Login::DecodableType & commandData); +bool emberAfAccountLoginClusterLoginRequestCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::AccountLogin::Commands::LoginRequest::DecodableType & commandData); /** - * @brief Account Login Cluster Logout Command callback (from client) + * @brief Account Login Cluster LogoutRequest Command callback (from client) */ -bool emberAfAccountLoginClusterLogoutCallback( +bool emberAfAccountLoginClusterLogoutRequestCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::AccountLogin::Commands::Logout::DecodableType & commandData); + const chip::app::Clusters::AccountLogin::Commands::LogoutRequest::DecodableType & commandData); /** * @brief Test Cluster Cluster Test Command callback (from client) */ 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 af86e8da235004..be254177301560 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 @@ -19247,7 +19247,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } // namespace ChannelInfo -namespace ChannelLineupInfo { +namespace LineupInfo { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19294,11 +19294,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ChannelLineupInfo +} // namespace LineupInfo } // namespace Structs namespace Commands { -namespace ChangeChannel { +namespace ChangeChannelRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19331,7 +19331,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ChangeChannel. +} // namespace ChangeChannelRequest. namespace ChangeChannelResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -19370,7 +19370,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace ChangeChannelResponse. -namespace ChangeChannelByNumber { +namespace ChangeChannelByNumberRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19407,8 +19407,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ChangeChannelByNumber. -namespace SkipChannel { +} // namespace ChangeChannelByNumberRequest. +namespace SkipChannelRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19441,7 +19441,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SkipChannel. +} // namespace SkipChannelRequest. } // namespace Commands namespace Attributes { @@ -19481,7 +19481,7 @@ namespace Events { } // namespace Channel namespace TargetNavigator { namespace Structs { -namespace NavigateTargetTargetInfo { +namespace TargetInfo { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19520,11 +19520,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace NavigateTargetTargetInfo +} // namespace TargetInfo } // namespace Structs namespace Commands { -namespace NavigateTarget { +namespace NavigateTargetRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19561,7 +19561,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace NavigateTarget. +} // namespace NavigateTargetRequest. namespace NavigateTargetResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -19636,7 +19636,7 @@ namespace Events { } // namespace TargetNavigator namespace MediaPlayback { namespace Structs { -namespace MediaPlaybackPosition { +namespace PlaybackPosition { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19675,11 +19675,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace MediaPlaybackPosition +} // namespace PlaybackPosition } // namespace Structs namespace Commands { -namespace MediaPlay { +namespace PlayRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19708,108 +19708,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaPlay. -namespace MediaPlayResponse { -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::kMediaPlaybackStatus)), mediaPlaybackStatus)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kMediaPlaybackStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, mediaPlaybackStatus)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace MediaPlayResponse. -namespace MediaPause { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace MediaPause. -namespace MediaPauseResponse { -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::kMediaPlaybackStatus)), mediaPlaybackStatus)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kMediaPlaybackStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, mediaPlaybackStatus)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace MediaPauseResponse. -namespace MediaStop { +} // namespace PlayRequest. +namespace PauseRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19838,14 +19738,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaStop. -namespace MediaStopResponse { +} // namespace PauseRequest. +namespace StopRequest { 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::kMediaPlaybackStatus)), mediaPlaybackStatus)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -19861,9 +19759,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kMediaPlaybackStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, mediaPlaybackStatus)); - break; default: break; } @@ -19873,8 +19768,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaStopResponse. -namespace MediaStartOver { +} // namespace StopRequest. +namespace StartOverRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19903,14 +19798,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaStartOver. -namespace MediaStartOverResponse { +} // namespace StartOverRequest. +namespace PreviousRequest { 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::kMediaPlaybackStatus)), mediaPlaybackStatus)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -19926,9 +19819,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kMediaPlaybackStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, mediaPlaybackStatus)); - break; default: break; } @@ -19938,8 +19828,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaStartOverResponse. -namespace MediaPrevious { +} // namespace PreviousRequest. +namespace NextRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -19968,14 +19858,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaPrevious. -namespace MediaPreviousResponse { +} // namespace NextRequest. +namespace RewindRequest { 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::kMediaPlaybackStatus)), mediaPlaybackStatus)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -19991,9 +19879,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kMediaPlaybackStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, mediaPlaybackStatus)); - break; default: break; } @@ -20003,8 +19888,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaPreviousResponse. -namespace MediaNext { +} // namespace RewindRequest. +namespace FastForwardRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20033,173 +19918,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaNext. -namespace MediaNextResponse { -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::kMediaPlaybackStatus)), mediaPlaybackStatus)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kMediaPlaybackStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, mediaPlaybackStatus)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace MediaNextResponse. -namespace MediaRewind { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace MediaRewind. -namespace MediaRewindResponse { -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::kMediaPlaybackStatus)), mediaPlaybackStatus)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kMediaPlaybackStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, mediaPlaybackStatus)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace MediaRewindResponse. -namespace MediaFastForward { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace MediaFastForward. -namespace MediaFastForwardResponse { -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::kMediaPlaybackStatus)), mediaPlaybackStatus)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kMediaPlaybackStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, mediaPlaybackStatus)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace MediaFastForwardResponse. -namespace MediaSkipForward { +} // namespace FastForwardRequest. +namespace SkipForwardRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20233,43 +19953,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaSkipForward. -namespace MediaSkipForwardResponse { -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::kMediaPlaybackStatus)), mediaPlaybackStatus)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kMediaPlaybackStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, mediaPlaybackStatus)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace MediaSkipForwardResponse. -namespace MediaSkipBackward { +} // namespace SkipForwardRequest. +namespace SkipBackwardRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20303,14 +19988,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaSkipBackward. -namespace MediaSkipBackwardResponse { +} // namespace SkipBackwardRequest. +namespace PlaybackResponse { 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::kMediaPlaybackStatus)), mediaPlaybackStatus)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -20326,8 +20010,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kMediaPlaybackStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, mediaPlaybackStatus)); + case to_underlying(Fields::kStatus): + ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; default: break; @@ -20338,8 +20022,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaSkipBackwardResponse. -namespace MediaSeek { +} // namespace PlaybackResponse. +namespace SeekRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20372,42 +20056,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace MediaSeek. -namespace MediaSeekResponse { -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::kMediaPlaybackStatus)), mediaPlaybackStatus)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kMediaPlaybackStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, mediaPlaybackStatus)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace MediaSeekResponse. +} // namespace SeekRequest. } // namespace Commands namespace Attributes { @@ -20459,7 +20108,7 @@ namespace Events { } // namespace MediaPlayback namespace MediaInput { namespace Structs { -namespace MediaInputInfo { +namespace InputInfo { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20506,11 +20155,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace MediaInputInfo +} // namespace InputInfo } // namespace Structs namespace Commands { -namespace SelectInput { +namespace SelectInputRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20543,8 +20192,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SelectInput. -namespace ShowInputStatus { +} // namespace SelectInputRequest. +namespace ShowInputStatusRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20573,8 +20222,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ShowInputStatus. -namespace HideInputStatus { +} // namespace ShowInputStatusRequest. +namespace HideInputStatusRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20603,8 +20252,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace HideInputStatus. -namespace RenameInput { +} // namespace HideInputStatusRequest. +namespace RenameInputRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20641,7 +20290,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace RenameInput. +} // namespace RenameInputRequest. } // namespace Commands namespace Attributes { @@ -20740,7 +20389,7 @@ namespace Events { namespace KeypadInput { namespace Commands { -namespace SendKey { +namespace SendKeyRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20773,7 +20422,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SendKey. +} // namespace SendKeyRequest. namespace SendKeyResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -20838,7 +20487,7 @@ namespace Events { } // namespace KeypadInput namespace ContentLauncher { namespace Structs { -namespace ContentLaunchDimension { +namespace Dimension { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20881,8 +20530,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ContentLaunchDimension -namespace ContentLaunchAdditionalInfo { +} // namespace Dimension +namespace AdditionalInfo { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20921,8 +20570,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ContentLaunchAdditionalInfo -namespace ContentLaunchParamater { +} // namespace AdditionalInfo +namespace Parameter { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -20965,8 +20614,44 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ContentLaunchParamater -namespace ContentLaunchStyleInformation { +} // namespace Parameter +namespace ContentSearch { +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::kParameterList)), parameterList)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + err = reader.EnterContainer(outer); + ReturnErrorOnFailure(err); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + switch (TLV::TagNumFromTag(reader.GetTag())) + { + case to_underlying(Fields::kParameterList): + ReturnErrorOnFailure(DataModel::Decode(reader, parameterList)); + break; + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; +} + +} // namespace ContentSearch +namespace StyleInformation { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21009,8 +20694,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ContentLaunchStyleInformation -namespace ContentLaunchBrandingInformation { +} // namespace StyleInformation +namespace BrandingInformation { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21065,11 +20750,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ContentLaunchBrandingInformation +} // namespace BrandingInformation } // namespace Structs namespace Commands { -namespace LaunchContent { +namespace LaunchContentRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21110,47 +20795,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace LaunchContent. -namespace LaunchContentResponse { -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::kContentLaunchStatus)), contentLaunchStatus)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kContentLaunchStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, contentLaunchStatus)); - break; - case to_underlying(Fields::kData): - ReturnErrorOnFailure(DataModel::Decode(reader, data)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace LaunchContentResponse. -namespace LaunchURL { +} // namespace LaunchContentRequest. +namespace LaunchURLRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21192,14 +20838,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace LaunchURL. -namespace LaunchURLResponse { +} // namespace LaunchURLRequest. +namespace LaunchResponse { 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::kContentLaunchStatus)), contentLaunchStatus)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; @@ -21216,8 +20861,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kContentLaunchStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, contentLaunchStatus)); + case to_underlying(Fields::kStatus): + ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; case to_underlying(Fields::kData): ReturnErrorOnFailure(DataModel::Decode(reader, data)); @@ -21231,7 +20876,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace LaunchURLResponse. +} // namespace LaunchResponse. } // namespace Commands namespace Attributes { @@ -21268,7 +20913,7 @@ namespace Events { } // namespace ContentLauncher namespace AudioOutput { namespace Structs { -namespace AudioOutputInfo { +namespace OutputInfo { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21311,11 +20956,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace AudioOutputInfo +} // namespace OutputInfo } // namespace Structs namespace Commands { -namespace SelectOutput { +namespace SelectOutputRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21348,8 +20993,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace SelectOutput. -namespace RenameOutput { +} // namespace SelectOutputRequest. +namespace RenameOutputRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21386,7 +21031,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace RenameOutput. +} // namespace RenameOutputRequest. } // namespace Commands namespace Attributes { @@ -21423,7 +21068,7 @@ namespace Events { } // namespace AudioOutput namespace ApplicationLauncher { namespace Structs { -namespace ApplicationLauncherApp { +namespace Application { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21462,8 +21107,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ApplicationLauncherApp -namespace ApplicationLauncherEndpoint { +} // namespace Application +namespace ApplicationEP { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21502,11 +21147,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ApplicationLauncherEndpoint +} // namespace ApplicationEP } // namespace Structs namespace Commands { -namespace LaunchApp { +namespace LaunchAppRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21543,46 +21188,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace LaunchApp. -namespace LaunchAppResponse { -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::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); - break; - case to_underlying(Fields::kData): - ReturnErrorOnFailure(DataModel::Decode(reader, data)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace LaunchAppResponse. -namespace StopApp { +} // namespace LaunchAppRequest. +namespace StopAppRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21615,46 +21222,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace StopApp. -namespace StopAppResponse { -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::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); - break; - case to_underlying(Fields::kData): - ReturnErrorOnFailure(DataModel::Decode(reader, data)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace StopAppResponse. -namespace HideApp { +} // namespace StopAppRequest. +namespace HideAppRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21687,8 +21256,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace HideApp. -namespace HideAppResponse { +} // namespace HideAppRequest. +namespace LauncherResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21725,7 +21294,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace HideAppResponse. +} // namespace LauncherResponse. } // namespace Commands namespace Attributes { @@ -21762,7 +21331,7 @@ namespace Events { } // namespace ApplicationLauncher namespace ApplicationBasic { namespace Structs { -namespace ApplicationBasicApp { +namespace Application { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21801,44 +21370,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } -} // namespace ApplicationBasicApp +} // namespace Application } // namespace Structs namespace Commands { -namespace ChangeStatus { -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::kStatus)), status)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace ChangeStatus. } // namespace Commands namespace Attributes { @@ -21867,6 +21402,9 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::ApplicationVersion::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, applicationVersion)); break; + case Attributes::AllowedVendorList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, allowedVendorList)); + break; case Attributes::AttributeList::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); break; @@ -21891,7 +21429,7 @@ namespace Events { namespace AccountLogin { namespace Commands { -namespace GetSetupPIN { +namespace GetSetupPINRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21925,7 +21463,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace GetSetupPIN. +} // namespace GetSetupPINRequest. namespace GetSetupPINResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -21960,7 +21498,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace GetSetupPINResponse. -namespace Login { +namespace LoginRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -21998,8 +21536,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace Login. -namespace Logout { +} // namespace LoginRequest. +namespace LogoutRequest { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -22028,7 +21566,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace Logout. +} // namespace LogoutRequest. } // 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 ad8fc491517c30..fa448dc9587174 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 @@ -30267,14 +30267,14 @@ struct TypeInfo } // namespace Attributes } // namespace WakeOnLan namespace Channel { -// Enum for ChannelErrorType -enum class ChannelErrorType : uint8_t +// Enum for ErrorTypeEnum +enum class ErrorTypeEnum : uint8_t { kMultipleMatches = 0x00, kNoMatches = 0x01, }; -// Enum for ChannelLineupInfoType -enum class ChannelLineupInfoType : uint8_t +// Enum for LineupInfoTypeEnum +enum class LineupInfoTypeEnum : uint8_t { kMso = 0x00, }; @@ -30306,7 +30306,7 @@ struct Type using DecodableType = Type; } // namespace ChannelInfo -namespace ChannelLineupInfo { +namespace LineupInfo { enum class Fields { kOperatorName = 1, @@ -30321,7 +30321,7 @@ struct Type chip::CharSpan operatorName; chip::CharSpan lineupName; chip::CharSpan postalCode; - ChannelLineupInfoType lineupInfoType; + LineupInfoTypeEnum lineupInfoType; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -30329,36 +30329,36 @@ struct Type using DecodableType = Type; -} // namespace ChannelLineupInfo +} // namespace LineupInfo } // namespace Structs namespace Commands { // Forward-declarations so we can reference these later. -namespace ChangeChannel { +namespace ChangeChannelRequest { struct Type; struct DecodableType; -} // namespace ChangeChannel +} // namespace ChangeChannelRequest namespace ChangeChannelResponse { struct Type; struct DecodableType; } // namespace ChangeChannelResponse -namespace ChangeChannelByNumber { +namespace ChangeChannelByNumberRequest { struct Type; struct DecodableType; -} // namespace ChangeChannelByNumber +} // namespace ChangeChannelByNumberRequest -namespace SkipChannel { +namespace SkipChannelRequest { struct Type; struct DecodableType; -} // namespace SkipChannel +} // namespace SkipChannelRequest } // namespace Commands namespace Commands { -namespace ChangeChannel { +namespace ChangeChannelRequest { enum class Fields { kMatch = 0, @@ -30368,7 +30368,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ChangeChannel::Id; } + static constexpr CommandId GetCommandId() { return Commands::ChangeChannelRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } chip::CharSpan match; @@ -30383,13 +30383,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ChangeChannel::Id; } + static constexpr CommandId GetCommandId() { return Commands::ChangeChannelRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } chip::CharSpan match; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ChangeChannel +}; // namespace ChangeChannelRequest namespace ChangeChannelResponse { enum class Fields { @@ -30405,7 +30405,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } Structs::ChannelInfo::Type channelMatch; - ChannelErrorType errorType; + ErrorTypeEnum errorType; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -30421,11 +30421,11 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } Structs::ChannelInfo::DecodableType channelMatch; - ChannelErrorType errorType; + ErrorTypeEnum errorType; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ChangeChannelResponse -namespace ChangeChannelByNumber { +namespace ChangeChannelByNumberRequest { enum class Fields { kMajorNumber = 0, @@ -30436,7 +30436,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ChangeChannelByNumber::Id; } + static constexpr CommandId GetCommandId() { return Commands::ChangeChannelByNumberRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } uint16_t majorNumber; @@ -30452,15 +30452,15 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ChangeChannelByNumber::Id; } + static constexpr CommandId GetCommandId() { return Commands::ChangeChannelByNumberRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } uint16_t majorNumber; uint16_t minorNumber; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ChangeChannelByNumber -namespace SkipChannel { +}; // namespace ChangeChannelByNumberRequest +namespace SkipChannelRequest { enum class Fields { kCount = 0, @@ -30470,7 +30470,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SkipChannel::Id; } + static constexpr CommandId GetCommandId() { return Commands::SkipChannelRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } uint16_t count; @@ -30485,13 +30485,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SkipChannel::Id; } + static constexpr CommandId GetCommandId() { return Commands::SkipChannelRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } uint16_t count; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SkipChannel +}; // namespace SkipChannelRequest } // namespace Commands namespace Attributes { @@ -30512,9 +30512,9 @@ struct TypeInfo namespace ChannelLineup { struct TypeInfo { - using Type = chip::app::Clusters::Channel::Structs::ChannelLineupInfo::Type; - using DecodableType = chip::app::Clusters::Channel::Structs::ChannelLineupInfo::DecodableType; - using DecodableArgType = const chip::app::Clusters::Channel::Structs::ChannelLineupInfo::DecodableType &; + using Type = chip::app::Clusters::Channel::Structs::LineupInfo::Type; + using DecodableType = chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType; + using DecodableArgType = const chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType &; static constexpr ClusterId GetClusterId() { return Clusters::Channel::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ChannelLineup::Id; } @@ -30589,8 +30589,8 @@ struct TypeInfo } // namespace Attributes } // namespace Channel namespace TargetNavigator { -// Enum for NavigateTargetStatus -enum class NavigateTargetStatus : uint8_t +// Enum for StatusEnum +enum class StatusEnum : uint8_t { kSuccess = 0x00, kAppNotAvailable = 0x01, @@ -30598,7 +30598,7 @@ enum class NavigateTargetStatus : uint8_t }; namespace Structs { -namespace NavigateTargetTargetInfo { +namespace TargetInfo { enum class Fields { kIdentifier = 1, @@ -30617,16 +30617,16 @@ struct Type using DecodableType = Type; -} // namespace NavigateTargetTargetInfo +} // namespace TargetInfo } // namespace Structs namespace Commands { // Forward-declarations so we can reference these later. -namespace NavigateTarget { +namespace NavigateTargetRequest { struct Type; struct DecodableType; -} // namespace NavigateTarget +} // namespace NavigateTargetRequest namespace NavigateTargetResponse { struct Type; @@ -30636,7 +30636,7 @@ struct DecodableType; } // namespace Commands namespace Commands { -namespace NavigateTarget { +namespace NavigateTargetRequest { enum class Fields { kTarget = 0, @@ -30647,7 +30647,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::NavigateTarget::Id; } + static constexpr CommandId GetCommandId() { return Commands::NavigateTargetRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; } uint8_t target; @@ -30663,14 +30663,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::NavigateTarget::Id; } + static constexpr CommandId GetCommandId() { return Commands::NavigateTargetRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; } uint8_t target; chip::CharSpan data; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace NavigateTarget +}; // namespace NavigateTargetRequest namespace NavigateTargetResponse { enum class Fields { @@ -30685,7 +30685,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::NavigateTargetResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; } - NavigateTargetStatus status; + StatusEnum status; chip::CharSpan data; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -30701,7 +30701,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::NavigateTargetResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; } - NavigateTargetStatus status; + StatusEnum status; chip::CharSpan data; CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -30713,11 +30713,11 @@ namespace Attributes { namespace TargetNavigatorList { struct TypeInfo { - using Type = chip::app::DataModel::List; + using Type = chip::app::DataModel::List; using DecodableType = - chip::app::DataModel::DecodableList; - using DecodableArgType = const chip::app::DataModel::DecodableList< - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> &; + chip::app::DataModel::DecodableList; + using DecodableArgType = + const chip::app::DataModel::DecodableList &; static constexpr ClusterId GetClusterId() { return Clusters::TargetNavigator::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::TargetNavigatorList::Id; } @@ -30791,25 +30791,16 @@ struct TypeInfo } // namespace Attributes } // namespace TargetNavigator namespace MediaPlayback { -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Enum for MediaPlaybackState -enum class MediaPlaybackState : uint8_t +// Enum for PlaybackStateEnum +enum class PlaybackStateEnum : uint8_t { kPlaying = 0x00, kPaused = 0x01, kNotPlaying = 0x02, kBuffering = 0x03, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using MediaPlaybackState = EmberAfMediaPlaybackState; -#endif -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Enum for MediaPlaybackStatus -enum class MediaPlaybackStatus : uint8_t +// Enum for StatusEnum +enum class StatusEnum : uint8_t { kSuccess = 0x00, kInvalidStateForCommand = 0x01, @@ -30818,12 +30809,9 @@ enum class MediaPlaybackStatus : uint8_t kSpeedOutOfRange = 0x04, kSeekOutOfRange = 0x05, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using MediaPlaybackStatus = EmberAfMediaPlaybackStatus; -#endif namespace Structs { -namespace MediaPlaybackPosition { +namespace PlaybackPosition { enum class Fields { kUpdatedAt = 1, @@ -30842,306 +30830,76 @@ struct Type using DecodableType = Type; -} // namespace MediaPlaybackPosition +} // namespace PlaybackPosition } // namespace Structs namespace Commands { // Forward-declarations so we can reference these later. -namespace MediaPlay { -struct Type; -struct DecodableType; -} // namespace MediaPlay - -namespace MediaPlayResponse { -struct Type; -struct DecodableType; -} // namespace MediaPlayResponse - -namespace MediaPause { -struct Type; -struct DecodableType; -} // namespace MediaPause - -namespace MediaPauseResponse { -struct Type; -struct DecodableType; -} // namespace MediaPauseResponse - -namespace MediaStop { -struct Type; -struct DecodableType; -} // namespace MediaStop - -namespace MediaStopResponse { -struct Type; -struct DecodableType; -} // namespace MediaStopResponse - -namespace MediaStartOver { -struct Type; -struct DecodableType; -} // namespace MediaStartOver - -namespace MediaStartOverResponse { -struct Type; -struct DecodableType; -} // namespace MediaStartOverResponse - -namespace MediaPrevious { -struct Type; -struct DecodableType; -} // namespace MediaPrevious - -namespace MediaPreviousResponse { +namespace PlayRequest { struct Type; struct DecodableType; -} // namespace MediaPreviousResponse +} // namespace PlayRequest -namespace MediaNext { +namespace PauseRequest { struct Type; struct DecodableType; -} // namespace MediaNext +} // namespace PauseRequest -namespace MediaNextResponse { +namespace StopRequest { struct Type; struct DecodableType; -} // namespace MediaNextResponse +} // namespace StopRequest -namespace MediaRewind { +namespace StartOverRequest { struct Type; struct DecodableType; -} // namespace MediaRewind +} // namespace StartOverRequest -namespace MediaRewindResponse { +namespace PreviousRequest { struct Type; struct DecodableType; -} // namespace MediaRewindResponse +} // namespace PreviousRequest -namespace MediaFastForward { +namespace NextRequest { struct Type; struct DecodableType; -} // namespace MediaFastForward +} // namespace NextRequest -namespace MediaFastForwardResponse { +namespace RewindRequest { struct Type; struct DecodableType; -} // namespace MediaFastForwardResponse +} // namespace RewindRequest -namespace MediaSkipForward { +namespace FastForwardRequest { struct Type; struct DecodableType; -} // namespace MediaSkipForward +} // namespace FastForwardRequest -namespace MediaSkipForwardResponse { +namespace SkipForwardRequest { struct Type; struct DecodableType; -} // namespace MediaSkipForwardResponse +} // namespace SkipForwardRequest -namespace MediaSkipBackward { +namespace SkipBackwardRequest { struct Type; struct DecodableType; -} // namespace MediaSkipBackward +} // namespace SkipBackwardRequest -namespace MediaSkipBackwardResponse { +namespace PlaybackResponse { struct Type; struct DecodableType; -} // namespace MediaSkipBackwardResponse +} // namespace PlaybackResponse -namespace MediaSeek { +namespace SeekRequest { struct Type; struct DecodableType; -} // namespace MediaSeek - -namespace MediaSeekResponse { -struct Type; -struct DecodableType; -} // namespace MediaSeekResponse +} // namespace SeekRequest } // namespace Commands namespace Commands { -namespace MediaPlay { -enum class Fields -{ -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaPlay::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::MediaPlayback::Commands::MediaPlayResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::MediaPlay::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace MediaPlay -namespace MediaPlayResponse { -enum class Fields -{ - kMediaPlaybackStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaPlayResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::MediaPlayResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace MediaPlayResponse -namespace MediaPause { -enum class Fields -{ -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaPause::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::MediaPlayback::Commands::MediaPauseResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::MediaPause::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace MediaPause -namespace MediaPauseResponse { -enum class Fields -{ - kMediaPlaybackStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaPauseResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::MediaPauseResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace MediaPauseResponse -namespace MediaStop { -enum class Fields -{ -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaStop::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::MediaPlayback::Commands::MediaStopResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::MediaStop::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace MediaStop -namespace MediaStopResponse { -enum class Fields -{ - kMediaPlaybackStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaStopResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::MediaStopResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace MediaStopResponse -namespace MediaStartOver { +namespace PlayRequest { enum class Fields { }; @@ -31150,12 +30908,12 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaStartOver::Id; } + static constexpr CommandId GetCommandId() { return Commands::PlayRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::MediaPlayback::Commands::MediaStartOverResponse::DecodableType; + using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -31163,90 +30921,27 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaStartOver::Id; } + static constexpr CommandId GetCommandId() { return Commands::PlayRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaStartOver -namespace MediaStartOverResponse { +}; // namespace PlayRequest +namespace PauseRequest { enum class Fields { - kMediaPlaybackStatus = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaStartOverResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::PauseRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - MediaPlaybackStatus mediaPlaybackStatus; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::MediaStartOverResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace MediaStartOverResponse -namespace MediaPrevious { -enum class Fields -{ -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaPrevious::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::MediaPlayback::Commands::MediaPreviousResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::MediaPrevious::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace MediaPrevious -namespace MediaPreviousResponse { -enum class Fields -{ - kMediaPlaybackStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaPreviousResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -31254,14 +30949,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaPreviousResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::PauseRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - MediaPlaybackStatus mediaPlaybackStatus; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaPreviousResponse -namespace MediaNext { +}; // namespace PauseRequest +namespace StopRequest { enum class Fields { }; @@ -31270,12 +30964,12 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaNext::Id; } + static constexpr CommandId GetCommandId() { return Commands::StopRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::MediaPlayback::Commands::MediaNextResponse::DecodableType; + using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -31283,30 +30977,27 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaNext::Id; } + static constexpr CommandId GetCommandId() { return Commands::StopRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaNext -namespace MediaNextResponse { +}; // namespace StopRequest +namespace StartOverRequest { enum class Fields { - kMediaPlaybackStatus = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaNextResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::StartOverRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - MediaPlaybackStatus mediaPlaybackStatus; - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -31314,14 +31005,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaNextResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::StartOverRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - MediaPlaybackStatus mediaPlaybackStatus; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaNextResponse -namespace MediaRewind { +}; // namespace StartOverRequest +namespace PreviousRequest { enum class Fields { }; @@ -31330,12 +31020,12 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaRewind::Id; } + static constexpr CommandId GetCommandId() { return Commands::PreviousRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::MediaPlayback::Commands::MediaRewindResponse::DecodableType; + using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -31343,30 +31033,27 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaRewind::Id; } + static constexpr CommandId GetCommandId() { return Commands::PreviousRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaRewind -namespace MediaRewindResponse { +}; // namespace PreviousRequest +namespace NextRequest { enum class Fields { - kMediaPlaybackStatus = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaRewindResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::NextRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - MediaPlaybackStatus mediaPlaybackStatus; - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -31374,14 +31061,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaRewindResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::NextRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - MediaPlaybackStatus mediaPlaybackStatus; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaRewindResponse -namespace MediaFastForward { +}; // namespace NextRequest +namespace RewindRequest { enum class Fields { }; @@ -31390,12 +31076,12 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaFastForward::Id; } + static constexpr CommandId GetCommandId() { return Commands::RewindRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::MediaPlayback::Commands::MediaFastForwardResponse::DecodableType; + using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -31403,30 +31089,27 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaFastForward::Id; } + static constexpr CommandId GetCommandId() { return Commands::RewindRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaFastForward -namespace MediaFastForwardResponse { +}; // namespace RewindRequest +namespace FastForwardRequest { enum class Fields { - kMediaPlaybackStatus = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaFastForwardResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::FastForwardRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - MediaPlaybackStatus mediaPlaybackStatus; - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -31434,14 +31117,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaFastForwardResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::FastForwardRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - MediaPlaybackStatus mediaPlaybackStatus; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaFastForwardResponse -namespace MediaSkipForward { +}; // namespace FastForwardRequest +namespace SkipForwardRequest { enum class Fields { kDeltaPositionMilliseconds = 0, @@ -31451,14 +31133,14 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaSkipForward::Id; } + static constexpr CommandId GetCommandId() { return Commands::SkipForwardRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } uint64_t deltaPositionMilliseconds; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::MediaPlayback::Commands::MediaSkipForwardResponse::DecodableType; + using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -31466,46 +31148,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaSkipForward::Id; } + static constexpr CommandId GetCommandId() { return Commands::SkipForwardRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } uint64_t deltaPositionMilliseconds; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaSkipForward -namespace MediaSkipForwardResponse { -enum class Fields -{ - kMediaPlaybackStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaSkipForwardResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::MediaSkipForwardResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace MediaSkipForwardResponse -namespace MediaSkipBackward { +}; // namespace SkipForwardRequest +namespace SkipBackwardRequest { enum class Fields { kDeltaPositionMilliseconds = 0, @@ -31515,14 +31165,14 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaSkipBackward::Id; } + static constexpr CommandId GetCommandId() { return Commands::SkipBackwardRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } uint64_t deltaPositionMilliseconds; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::MediaPlayback::Commands::MediaSkipBackwardResponse::DecodableType; + using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -31530,27 +31180,27 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaSkipBackward::Id; } + static constexpr CommandId GetCommandId() { return Commands::SkipBackwardRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } uint64_t deltaPositionMilliseconds; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaSkipBackward -namespace MediaSkipBackwardResponse { +}; // namespace SkipBackwardRequest +namespace PlaybackResponse { enum class Fields { - kMediaPlaybackStatus = 0, + kStatus = 0, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaSkipBackwardResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::PlaybackResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - MediaPlaybackStatus mediaPlaybackStatus; + StatusEnum status; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -31562,14 +31212,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaSkipBackwardResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::PlaybackResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - MediaPlaybackStatus mediaPlaybackStatus; + StatusEnum status; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaSkipBackwardResponse -namespace MediaSeek { +}; // namespace PlaybackResponse +namespace SeekRequest { enum class Fields { kPosition = 0, @@ -31579,14 +31229,14 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaSeek::Id; } + static constexpr CommandId GetCommandId() { return Commands::SeekRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } uint64_t position; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::MediaPlayback::Commands::MediaSeekResponse::DecodableType; + using ResponseType = Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -31594,45 +31244,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MediaSeek::Id; } + static constexpr CommandId GetCommandId() { return Commands::SeekRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } uint64_t position; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MediaSeek -namespace MediaSeekResponse { -enum class Fields -{ - kMediaPlaybackStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MediaSeekResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::MediaSeekResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } - - MediaPlaybackStatus mediaPlaybackStatus; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace MediaSeekResponse +}; // namespace SeekRequest } // namespace Commands namespace Attributes { @@ -31640,9 +31258,9 @@ namespace Attributes { namespace PlaybackState { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = chip::app::Clusters::MediaPlayback::PlaybackStateEnum; + using DecodableType = chip::app::Clusters::MediaPlayback::PlaybackStateEnum; + using DecodableArgType = chip::app::Clusters::MediaPlayback::PlaybackStateEnum; static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::PlaybackState::Id; } @@ -31676,9 +31294,9 @@ struct TypeInfo namespace Position { struct TypeInfo { - using Type = chip::app::Clusters::MediaPlayback::Structs::MediaPlaybackPosition::Type; - using DecodableType = chip::app::Clusters::MediaPlayback::Structs::MediaPlaybackPosition::DecodableType; - using DecodableArgType = const chip::app::Clusters::MediaPlayback::Structs::MediaPlaybackPosition::DecodableType &; + using Type = chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::Type; + using DecodableType = chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType; + using DecodableArgType = const chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType &; static constexpr ClusterId GetClusterId() { return Clusters::MediaPlayback::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::Position::Id; } @@ -31781,11 +31399,8 @@ struct TypeInfo } // namespace Attributes } // namespace MediaPlayback namespace MediaInput { -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Enum for MediaInputType -enum class MediaInputType : uint8_t +// Enum for InputTypeEnum +enum class InputTypeEnum : uint8_t { kInternal = 0x00, kAux = 0x01, @@ -31800,12 +31415,9 @@ enum class MediaInputType : uint8_t kUsb = 0x0A, kOther = 0x0B, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using MediaInputType = EmberAfMediaInputType; -#endif namespace Structs { -namespace MediaInputInfo { +namespace InputInfo { enum class Fields { kIndex = 1, @@ -31818,7 +31430,7 @@ struct Type { public: uint8_t index; - MediaInputType inputType; + InputTypeEnum inputType; chip::CharSpan name; chip::CharSpan description; @@ -31828,36 +31440,36 @@ struct Type using DecodableType = Type; -} // namespace MediaInputInfo +} // namespace InputInfo } // namespace Structs namespace Commands { // Forward-declarations so we can reference these later. -namespace SelectInput { +namespace SelectInputRequest { struct Type; struct DecodableType; -} // namespace SelectInput +} // namespace SelectInputRequest -namespace ShowInputStatus { +namespace ShowInputStatusRequest { struct Type; struct DecodableType; -} // namespace ShowInputStatus +} // namespace ShowInputStatusRequest -namespace HideInputStatus { +namespace HideInputStatusRequest { struct Type; struct DecodableType; -} // namespace HideInputStatus +} // namespace HideInputStatusRequest -namespace RenameInput { +namespace RenameInputRequest { struct Type; struct DecodableType; -} // namespace RenameInput +} // namespace RenameInputRequest } // namespace Commands namespace Commands { -namespace SelectInput { +namespace SelectInputRequest { enum class Fields { kIndex = 0, @@ -31867,7 +31479,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SelectInput::Id; } + static constexpr CommandId GetCommandId() { return Commands::SelectInputRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; } uint8_t index; @@ -31882,14 +31494,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SelectInput::Id; } + static constexpr CommandId GetCommandId() { return Commands::SelectInputRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; } uint8_t index; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SelectInput -namespace ShowInputStatus { +}; // namespace SelectInputRequest +namespace ShowInputStatusRequest { enum class Fields { }; @@ -31898,7 +31510,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ShowInputStatus::Id; } + static constexpr CommandId GetCommandId() { return Commands::ShowInputStatusRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; } CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -31911,13 +31523,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ShowInputStatus::Id; } + static constexpr CommandId GetCommandId() { return Commands::ShowInputStatusRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ShowInputStatus -namespace HideInputStatus { +}; // namespace ShowInputStatusRequest +namespace HideInputStatusRequest { enum class Fields { }; @@ -31926,7 +31538,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::HideInputStatus::Id; } + static constexpr CommandId GetCommandId() { return Commands::HideInputStatusRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; } CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -31939,13 +31551,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::HideInputStatus::Id; } + static constexpr CommandId GetCommandId() { return Commands::HideInputStatusRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace HideInputStatus -namespace RenameInput { +}; // namespace HideInputStatusRequest +namespace RenameInputRequest { enum class Fields { kIndex = 0, @@ -31956,7 +31568,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::RenameInput::Id; } + static constexpr CommandId GetCommandId() { return Commands::RenameInputRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; } uint8_t index; @@ -31972,14 +31584,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::RenameInput::Id; } + static constexpr CommandId GetCommandId() { return Commands::RenameInputRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; } uint8_t index; chip::CharSpan name; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace RenameInput +}; // namespace RenameInputRequest } // namespace Commands namespace Attributes { @@ -31987,11 +31599,10 @@ namespace Attributes { namespace MediaInputList { struct TypeInfo { - using Type = chip::app::DataModel::List; - using DecodableType = - chip::app::DataModel::DecodableList; + using Type = chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList; using DecodableArgType = - const chip::app::DataModel::DecodableList &; + const chip::app::DataModel::DecodableList &; static constexpr ClusterId GetClusterId() { return Clusters::MediaInput::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::MediaInputList::Id; } @@ -32162,11 +31773,8 @@ struct TypeInfo } // namespace Attributes } // namespace LowPower namespace KeypadInput { -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Enum for KeypadInputCecKeyCode -enum class KeypadInputCecKeyCode : uint8_t +// Enum for CecKeyCode +enum class CecKeyCode : uint8_t { kSelect = 0x00, kUp = 0x01, @@ -32255,30 +31863,21 @@ enum class KeypadInputCecKeyCode : uint8_t kF5 = 0x75, kData = 0x76, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using KeypadInputCecKeyCode = EmberAfKeypadInputCecKeyCode; -#endif -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Enum for KeypadInputStatus -enum class KeypadInputStatus : uint8_t +// Enum for StatusEnum +enum class StatusEnum : uint8_t { kSuccess = 0x00, kUnsupportedKey = 0x01, kInvalidKeyInCurrentState = 0x02, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using KeypadInputStatus = EmberAfKeypadInputStatus; -#endif namespace Commands { // Forward-declarations so we can reference these later. -namespace SendKey { +namespace SendKeyRequest { struct Type; struct DecodableType; -} // namespace SendKey +} // namespace SendKeyRequest namespace SendKeyResponse { struct Type; @@ -32288,7 +31887,7 @@ struct DecodableType; } // namespace Commands namespace Commands { -namespace SendKey { +namespace SendKeyRequest { enum class Fields { kKeyCode = 0, @@ -32298,10 +31897,10 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SendKey::Id; } + static constexpr CommandId GetCommandId() { return Commands::SendKeyRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; } - KeypadInputCecKeyCode keyCode; + CecKeyCode keyCode; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -32313,13 +31912,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SendKey::Id; } + static constexpr CommandId GetCommandId() { return Commands::SendKeyRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; } - KeypadInputCecKeyCode keyCode; + CecKeyCode keyCode; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SendKey +}; // namespace SendKeyRequest namespace SendKeyResponse { enum class Fields { @@ -32333,7 +31932,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::SendKeyResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; } - KeypadInputStatus status; + StatusEnum status; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -32348,7 +31947,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::SendKeyResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::KeypadInput::Id; } - KeypadInputStatus status; + StatusEnum status; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace SendKeyResponse @@ -32409,14 +32008,14 @@ struct TypeInfo } // namespace Attributes } // namespace KeypadInput namespace ContentLauncher { -// Enum for ContentLaunchMetricType -enum class ContentLaunchMetricType : uint8_t +// Enum for MetricTypeEnum +enum class MetricTypeEnum : uint8_t { kPixels = 0x00, kPercentage = 0x01, }; -// Enum for ContentLaunchParameterEnum -enum class ContentLaunchParameterEnum : uint8_t +// Enum for ParameterEnum +enum class ParameterEnum : uint8_t { kActor = 0x00, kChannel = 0x01, @@ -32432,19 +32031,13 @@ enum class ContentLaunchParameterEnum : uint8_t kSportsTeam = 0x0B, kType = 0x0C, }; -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Enum for ContentLaunchStatus -enum class ContentLaunchStatus : uint8_t +// Enum for StatusEnum +enum class StatusEnum : uint8_t { kSuccess = 0x00, kUrlNotAvailable = 0x01, kAuthFailed = 0x02, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using ContentLaunchStatus = EmberAfContentLaunchStatus; -#endif // Bitmap for SupportedStreamingProtocol enum class SupportedStreamingProtocol : uint32_t @@ -32454,7 +32047,7 @@ enum class SupportedStreamingProtocol : uint32_t }; namespace Structs { -namespace ContentLaunchDimension { +namespace Dimension { enum class Fields { kWidth = 1, @@ -32467,7 +32060,7 @@ struct Type public: double width; double height; - ContentLaunchMetricType metric; + MetricTypeEnum metric; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -32475,8 +32068,8 @@ struct Type using DecodableType = Type; -} // namespace ContentLaunchDimension -namespace ContentLaunchAdditionalInfo { +} // namespace Dimension +namespace AdditionalInfo { enum class Fields { kName = 1, @@ -32495,8 +32088,8 @@ struct Type using DecodableType = Type; -} // namespace ContentLaunchAdditionalInfo -namespace ContentLaunchParamater { +} // namespace AdditionalInfo +namespace Parameter { enum class Fields { kType = 1, @@ -32507,9 +32100,9 @@ enum class Fields struct Type { public: - ContentLaunchParameterEnum type; + ParameterEnum type; chip::CharSpan value; - DataModel::List externalIDList; + DataModel::List externalIDList; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -32517,14 +32110,36 @@ struct Type struct DecodableType { public: - ContentLaunchParameterEnum type; + ParameterEnum type; chip::CharSpan value; - DataModel::DecodableList externalIDList; + DataModel::DecodableList externalIDList; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -} // namespace ContentLaunchParamater -namespace ContentLaunchStyleInformation { +} // namespace Parameter +namespace ContentSearch { +enum class Fields +{ + kParameterList = 1, +}; + +struct Type +{ +public: + DataModel::List parameterList; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; +}; + +struct DecodableType +{ +public: + DataModel::DecodableList parameterList; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; + +} // namespace ContentSearch +namespace StyleInformation { enum class Fields { kImageUrl = 1, @@ -32537,7 +32152,7 @@ struct Type public: chip::CharSpan imageUrl; chip::CharSpan color; - Structs::ContentLaunchDimension::Type size; + Structs::Dimension::Type size; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -32545,8 +32160,8 @@ struct Type using DecodableType = Type; -} // namespace ContentLaunchStyleInformation -namespace ContentLaunchBrandingInformation { +} // namespace StyleInformation +namespace BrandingInformation { enum class Fields { kProviderName = 1, @@ -32561,11 +32176,11 @@ struct Type { public: chip::CharSpan providerName; - Structs::ContentLaunchStyleInformation::Type background; - Structs::ContentLaunchStyleInformation::Type logo; - Structs::ContentLaunchStyleInformation::Type progressBar; - Structs::ContentLaunchStyleInformation::Type splash; - Structs::ContentLaunchStyleInformation::Type waterMark; + Structs::StyleInformation::Type background; + Structs::StyleInformation::Type logo; + Structs::StyleInformation::Type progressBar; + Structs::StyleInformation::Type splash; + Structs::StyleInformation::Type waterMark; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -32573,36 +32188,31 @@ struct Type using DecodableType = Type; -} // namespace ContentLaunchBrandingInformation +} // namespace BrandingInformation } // namespace Structs namespace Commands { // Forward-declarations so we can reference these later. -namespace LaunchContent { +namespace LaunchContentRequest { struct Type; struct DecodableType; -} // namespace LaunchContent +} // namespace LaunchContentRequest -namespace LaunchContentResponse { +namespace LaunchURLRequest { struct Type; struct DecodableType; -} // namespace LaunchContentResponse +} // namespace LaunchURLRequest -namespace LaunchURL { +namespace LaunchResponse { struct Type; struct DecodableType; -} // namespace LaunchURL - -namespace LaunchURLResponse { -struct Type; -struct DecodableType; -} // namespace LaunchURLResponse +} // namespace LaunchResponse } // namespace Commands namespace Commands { -namespace LaunchContent { +namespace LaunchContentRequest { enum class Fields { kAutoPlay = 0, @@ -32614,16 +32224,16 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::LaunchContent::Id; } + static constexpr CommandId GetCommandId() { return Commands::LaunchContentRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } bool autoPlay; chip::CharSpan data; - DataModel::List search; + DataModel::List search; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::ContentLauncher::Commands::LaunchContentResponse::DecodableType; + using ResponseType = Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -32631,51 +32241,16 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::LaunchContent::Id; } + static constexpr CommandId GetCommandId() { return Commands::LaunchContentRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } bool autoPlay; chip::CharSpan data; - DataModel::DecodableList search; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace LaunchContent -namespace LaunchContentResponse { -enum class Fields -{ - kContentLaunchStatus = 0, - kData = 1, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::LaunchContentResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } - - ContentLaunchStatus contentLaunchStatus; - chip::CharSpan data; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::LaunchContentResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } - - ContentLaunchStatus contentLaunchStatus; - chip::CharSpan data; + DataModel::DecodableList search; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace LaunchContentResponse -namespace LaunchURL { +}; // namespace LaunchContentRequest +namespace LaunchURLRequest { enum class Fields { kContentURL = 0, @@ -32687,16 +32262,16 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::LaunchURL::Id; } + static constexpr CommandId GetCommandId() { return Commands::LaunchURLRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } chip::CharSpan contentURL; chip::CharSpan displayString; - DataModel::List brandingInformation; + Structs::BrandingInformation::Type brandingInformation; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::ContentLauncher::Commands::LaunchURLResponse::DecodableType; + using ResponseType = Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -32704,30 +32279,30 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::LaunchURL::Id; } + static constexpr CommandId GetCommandId() { return Commands::LaunchURLRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } chip::CharSpan contentURL; chip::CharSpan displayString; - DataModel::DecodableList brandingInformation; + Structs::BrandingInformation::DecodableType brandingInformation; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace LaunchURL -namespace LaunchURLResponse { +}; // namespace LaunchURLRequest +namespace LaunchResponse { enum class Fields { - kContentLaunchStatus = 0, - kData = 1, + kStatus = 0, + kData = 1, }; struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::LaunchURLResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::LaunchResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } - ContentLaunchStatus contentLaunchStatus; + StatusEnum status; chip::CharSpan data; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -32740,14 +32315,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::LaunchURLResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::LaunchResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ContentLauncher::Id; } - ContentLaunchStatus contentLaunchStatus; + StatusEnum status; chip::CharSpan data; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace LaunchURLResponse +}; // namespace LaunchResponse } // namespace Commands namespace Attributes { @@ -32831,11 +32406,8 @@ struct TypeInfo } // namespace Attributes } // namespace ContentLauncher namespace AudioOutput { -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Enum for AudioOutputType -enum class AudioOutputType : uint8_t +// Enum for OutputTypeEnum +enum class OutputTypeEnum : uint8_t { kHdmi = 0x00, kBt = 0x01, @@ -32844,12 +32416,9 @@ enum class AudioOutputType : uint8_t kInternal = 0x04, kOther = 0x05, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using AudioOutputType = EmberAfAudioOutputType; -#endif namespace Structs { -namespace AudioOutputInfo { +namespace OutputInfo { enum class Fields { kIndex = 1, @@ -32861,7 +32430,7 @@ struct Type { public: uint8_t index; - AudioOutputType outputType; + OutputTypeEnum outputType; chip::CharSpan name; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -32870,26 +32439,26 @@ struct Type using DecodableType = Type; -} // namespace AudioOutputInfo +} // namespace OutputInfo } // namespace Structs namespace Commands { // Forward-declarations so we can reference these later. -namespace SelectOutput { +namespace SelectOutputRequest { struct Type; struct DecodableType; -} // namespace SelectOutput +} // namespace SelectOutputRequest -namespace RenameOutput { +namespace RenameOutputRequest { struct Type; struct DecodableType; -} // namespace RenameOutput +} // namespace RenameOutputRequest } // namespace Commands namespace Commands { -namespace SelectOutput { +namespace SelectOutputRequest { enum class Fields { kIndex = 0, @@ -32899,7 +32468,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::SelectOutput::Id; } + static constexpr CommandId GetCommandId() { return Commands::SelectOutputRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; } uint8_t index; @@ -32914,14 +32483,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::SelectOutput::Id; } + static constexpr CommandId GetCommandId() { return Commands::SelectOutputRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; } uint8_t index; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace SelectOutput -namespace RenameOutput { +}; // namespace SelectOutputRequest +namespace RenameOutputRequest { enum class Fields { kIndex = 0, @@ -32932,7 +32501,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::RenameOutput::Id; } + static constexpr CommandId GetCommandId() { return Commands::RenameOutputRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; } uint8_t index; @@ -32948,14 +32517,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::RenameOutput::Id; } + static constexpr CommandId GetCommandId() { return Commands::RenameOutputRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; } uint8_t index; chip::CharSpan name; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace RenameOutput +}; // namespace RenameOutputRequest } // namespace Commands namespace Attributes { @@ -32963,11 +32532,10 @@ namespace Attributes { namespace AudioOutputList { struct TypeInfo { - using Type = chip::app::DataModel::List; - using DecodableType = - chip::app::DataModel::DecodableList; + using Type = chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList; using DecodableArgType = - const chip::app::DataModel::DecodableList &; + const chip::app::DataModel::DecodableList &; static constexpr ClusterId GetClusterId() { return Clusters::AudioOutput::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::AudioOutputList::Id; } @@ -33041,22 +32609,16 @@ struct TypeInfo } // namespace Attributes } // namespace AudioOutput namespace ApplicationLauncher { -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Enum for ApplicationLauncherStatus -enum class ApplicationLauncherStatus : uint8_t +// Enum for StatusEnum +enum class StatusEnum : uint8_t { kSuccess = 0x00, kAppNotAvailable = 0x01, kSystemBusy = 0x02, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using ApplicationLauncherStatus = EmberAfApplicationLauncherStatus; -#endif namespace Structs { -namespace ApplicationLauncherApp { +namespace Application { enum class Fields { kCatalogVendorId = 1, @@ -33075,8 +32637,8 @@ struct Type using DecodableType = Type; -} // namespace ApplicationLauncherApp -namespace ApplicationLauncherEndpoint { +} // namespace Application +namespace ApplicationEP { enum class Fields { kApplication = 1, @@ -33086,7 +32648,7 @@ enum class Fields struct Type { public: - Structs::ApplicationLauncherApp::Type application; + Structs::Application::Type application; chip::CharSpan endpoint; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -33095,46 +32657,36 @@ struct Type using DecodableType = Type; -} // namespace ApplicationLauncherEndpoint +} // namespace ApplicationEP } // namespace Structs namespace Commands { // Forward-declarations so we can reference these later. -namespace LaunchApp { -struct Type; -struct DecodableType; -} // namespace LaunchApp - -namespace LaunchAppResponse { -struct Type; -struct DecodableType; -} // namespace LaunchAppResponse - -namespace StopApp { +namespace LaunchAppRequest { struct Type; struct DecodableType; -} // namespace StopApp +} // namespace LaunchAppRequest -namespace StopAppResponse { +namespace StopAppRequest { struct Type; struct DecodableType; -} // namespace StopAppResponse +} // namespace StopAppRequest -namespace HideApp { +namespace HideAppRequest { struct Type; struct DecodableType; -} // namespace HideApp +} // namespace HideAppRequest -namespace HideAppResponse { +namespace LauncherResponse { struct Type; struct DecodableType; -} // namespace HideAppResponse +} // namespace LauncherResponse } // namespace Commands namespace Commands { -namespace LaunchApp { +namespace LaunchAppRequest { enum class Fields { kData = 0, @@ -33145,50 +32697,15 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::LaunchApp::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - - chip::CharSpan data; - Structs::ApplicationLauncherApp::Type application; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::ApplicationLauncher::Commands::LaunchAppResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::LaunchApp::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - - chip::CharSpan data; - Structs::ApplicationLauncherApp::DecodableType application; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace LaunchApp -namespace LaunchAppResponse { -enum class Fields -{ - kStatus = 0, - kData = 1, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::LaunchAppResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::LaunchAppRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - ApplicationLauncherStatus status; chip::CharSpan data; + Structs::Application::Type application; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -33196,15 +32713,15 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::LaunchAppResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::LaunchAppRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - ApplicationLauncherStatus status; chip::CharSpan data; + Structs::Application::DecodableType application; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace LaunchAppResponse -namespace StopApp { +}; // namespace LaunchAppRequest +namespace StopAppRequest { enum class Fields { kApplication = 0, @@ -33214,14 +32731,14 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::StopApp::Id; } + static constexpr CommandId GetCommandId() { return Commands::StopAppRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - Structs::ApplicationLauncherApp::Type application; + Structs::Application::Type application; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::ApplicationLauncher::Commands::StopAppResponse::DecodableType; + using ResponseType = Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -33229,49 +32746,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::StopApp::Id; } + static constexpr CommandId GetCommandId() { return Commands::StopAppRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - Structs::ApplicationLauncherApp::DecodableType application; + Structs::Application::DecodableType application; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace StopApp -namespace StopAppResponse { -enum class Fields -{ - kStatus = 0, - kData = 1, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::StopAppResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - - ApplicationLauncherStatus status; - chip::CharSpan data; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::StopAppResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - - ApplicationLauncherStatus status; - chip::CharSpan data; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace StopAppResponse -namespace HideApp { +}; // namespace StopAppRequest +namespace HideAppRequest { enum class Fields { kApplication = 0, @@ -33281,14 +32763,14 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::HideApp::Id; } + static constexpr CommandId GetCommandId() { return Commands::HideAppRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - Structs::ApplicationLauncherApp::Type application; + Structs::Application::Type application; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::ApplicationLauncher::Commands::HideAppResponse::DecodableType; + using ResponseType = Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -33296,14 +32778,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::HideApp::Id; } + static constexpr CommandId GetCommandId() { return Commands::HideAppRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - Structs::ApplicationLauncherApp::DecodableType application; + Structs::Application::DecodableType application; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace HideApp -namespace HideAppResponse { +}; // namespace HideAppRequest +namespace LauncherResponse { enum class Fields { kStatus = 0, @@ -33314,10 +32796,10 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::HideAppResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - ApplicationLauncherStatus status; + StatusEnum status; chip::CharSpan data; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -33330,14 +32812,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::HideAppResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::LauncherResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } - ApplicationLauncherStatus status; + StatusEnum status; chip::CharSpan data; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace HideAppResponse +}; // namespace LauncherResponse } // namespace Commands namespace Attributes { @@ -33357,9 +32839,9 @@ struct TypeInfo namespace ApplicationLauncherApp { struct TypeInfo { - using Type = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherEndpoint::Type; - using DecodableType = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherEndpoint::DecodableType; - using DecodableArgType = const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherEndpoint::DecodableType &; + using Type = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::Type; + using DecodableType = chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType; + using DecodableArgType = const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType &; static constexpr ClusterId GetClusterId() { return Clusters::ApplicationLauncher::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ApplicationLauncherApp::Id; } @@ -33421,8 +32903,8 @@ struct TypeInfo } // namespace Attributes } // namespace ApplicationLauncher namespace ApplicationBasic { -// Enum for ApplicationBasicStatus -enum class ApplicationBasicStatus : uint8_t +// Enum for ApplicationStatusEnum +enum class ApplicationStatusEnum : uint8_t { kStopped = 0x00, kActiveVisibleFocus = 0x01, @@ -33431,7 +32913,7 @@ enum class ApplicationBasicStatus : uint8_t }; namespace Structs { -namespace ApplicationBasicApp { +namespace Application { enum class Fields { kCatalogVendorId = 1, @@ -33450,54 +32932,9 @@ struct Type using DecodableType = Type; -} // namespace ApplicationBasicApp +} // namespace Application } // namespace Structs -namespace Commands { -// Forward-declarations so we can reference these later. - -namespace ChangeStatus { -struct Type; -struct DecodableType; -} // namespace ChangeStatus - -} // namespace Commands - -namespace Commands { -namespace ChangeStatus { -enum class Fields -{ - kStatus = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::ChangeStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; } - - ApplicationBasicStatus status; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::ChangeStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; } - - ApplicationBasicStatus status; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace ChangeStatus -} // namespace Commands - namespace Attributes { namespace VendorName { @@ -33551,9 +32988,9 @@ struct TypeInfo namespace ApplicationApp { struct TypeInfo { - using Type = chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApp::Type; - using DecodableType = chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApp::DecodableType; - using DecodableArgType = const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApp::DecodableType &; + 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 &; static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ApplicationApp::Id; } @@ -33563,9 +33000,9 @@ struct TypeInfo namespace ApplicationStatus { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum; + using DecodableType = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum; + using DecodableArgType = chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum; static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ApplicationStatus::Id; } @@ -33584,6 +33021,18 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace ApplicationVersion +namespace AllowedVendorList { +struct TypeInfo +{ + using Type = chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList; + using DecodableArgType = const chip::app::DataModel::DecodableList &; + + static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::AllowedVendorList::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace AllowedVendorList namespace AttributeList { struct TypeInfo { @@ -33636,6 +33085,7 @@ struct TypeInfo Attributes::ApplicationApp::TypeInfo::DecodableType applicationApp; Attributes::ApplicationStatus::TypeInfo::DecodableType applicationStatus; Attributes::ApplicationVersion::TypeInfo::DecodableType applicationVersion; + Attributes::AllowedVendorList::TypeInfo::DecodableType allowedVendorList; Attributes::AttributeList::TypeInfo::DecodableType attributeList; Attributes::FeatureMap::TypeInfo::DecodableType featureMap; Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision; @@ -33648,30 +33098,30 @@ namespace AccountLogin { namespace Commands { // Forward-declarations so we can reference these later. -namespace GetSetupPIN { +namespace GetSetupPINRequest { struct Type; struct DecodableType; -} // namespace GetSetupPIN +} // namespace GetSetupPINRequest namespace GetSetupPINResponse { struct Type; struct DecodableType; } // namespace GetSetupPINResponse -namespace Login { +namespace LoginRequest { struct Type; struct DecodableType; -} // namespace Login +} // namespace LoginRequest -namespace Logout { +namespace LogoutRequest { struct Type; struct DecodableType; -} // namespace Logout +} // namespace LogoutRequest } // namespace Commands namespace Commands { -namespace GetSetupPIN { +namespace GetSetupPINRequest { enum class Fields { kTempAccountIdentifier = 0, @@ -33681,7 +33131,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::GetSetupPIN::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetSetupPINRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; } chip::CharSpan tempAccountIdentifier; @@ -33690,19 +33140,19 @@ struct Type using ResponseType = Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType; - static constexpr bool MustUseTimedInvoke() { return false; } + static constexpr bool MustUseTimedInvoke() { return true; } }; struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::GetSetupPIN::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetSetupPINRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; } chip::CharSpan tempAccountIdentifier; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace GetSetupPIN +}; // namespace GetSetupPINRequest namespace GetSetupPINResponse { enum class Fields { @@ -33722,7 +33172,7 @@ struct Type using ResponseType = DataModel::NullObjectType; - static constexpr bool MustUseTimedInvoke() { return false; } + static constexpr bool MustUseTimedInvoke() { return true; } }; struct DecodableType @@ -33735,7 +33185,7 @@ struct DecodableType CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace GetSetupPINResponse -namespace Login { +namespace LoginRequest { enum class Fields { kTempAccountIdentifier = 0, @@ -33746,7 +33196,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::Login::Id; } + static constexpr CommandId GetCommandId() { return Commands::LoginRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; } chip::CharSpan tempAccountIdentifier; @@ -33762,15 +33212,15 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::Login::Id; } + static constexpr CommandId GetCommandId() { return Commands::LoginRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; } chip::CharSpan tempAccountIdentifier; chip::CharSpan setupPIN; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace Login -namespace Logout { +}; // namespace LoginRequest +namespace LogoutRequest { enum class Fields { }; @@ -33779,25 +33229,25 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::Logout::Id; } + static constexpr CommandId GetCommandId() { return Commands::LogoutRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; } CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; using ResponseType = DataModel::NullObjectType; - static constexpr bool MustUseTimedInvoke() { return false; } + static constexpr bool MustUseTimedInvoke() { return true; } }; struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::Logout::Id; } + static constexpr CommandId GetCommandId() { return Commands::LogoutRequest::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AccountLogin::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace Logout +}; // namespace LogoutRequest } // namespace Commands namespace Attributes { diff --git a/zzz_generated/app-common/app-common/zap-generated/command-id.h b/zzz_generated/app-common/app-common/zap-generated/command-id.h index 5d7519e1d2e79c..26bfa4e6f87ffd 100644 --- a/zzz_generated/app-common/app-common/zap-generated/command-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/command-id.h @@ -364,78 +364,62 @@ #define ZCL_SQUAWK_COMMAND_ID (0x01) // Commands for cluster: Channel -#define ZCL_CHANGE_CHANNEL_COMMAND_ID (0x00) -#define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x00) -#define ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID (0x01) -#define ZCL_SKIP_CHANNEL_COMMAND_ID (0x02) +#define ZCL_CHANGE_CHANNEL_REQUEST_COMMAND_ID (0x00) +#define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x01) +#define ZCL_CHANGE_CHANNEL_BY_NUMBER_REQUEST_COMMAND_ID (0x02) +#define ZCL_SKIP_CHANNEL_REQUEST_COMMAND_ID (0x03) // Commands for cluster: Target Navigator -#define ZCL_NAVIGATE_TARGET_COMMAND_ID (0x00) -#define ZCL_NAVIGATE_TARGET_RESPONSE_COMMAND_ID (0x00) +#define ZCL_NAVIGATE_TARGET_REQUEST_COMMAND_ID (0x00) +#define ZCL_NAVIGATE_TARGET_RESPONSE_COMMAND_ID (0x01) // Commands for cluster: Media Playback -#define ZCL_MEDIA_PLAY_COMMAND_ID (0x00) -#define ZCL_MEDIA_PLAY_RESPONSE_COMMAND_ID (0x00) -#define ZCL_MEDIA_PAUSE_COMMAND_ID (0x01) -#define ZCL_MEDIA_PAUSE_RESPONSE_COMMAND_ID (0x01) -#define ZCL_MEDIA_STOP_COMMAND_ID (0x02) -#define ZCL_MEDIA_STOP_RESPONSE_COMMAND_ID (0x02) -#define ZCL_MEDIA_START_OVER_COMMAND_ID (0x03) -#define ZCL_MEDIA_START_OVER_RESPONSE_COMMAND_ID (0x03) -#define ZCL_MEDIA_PREVIOUS_COMMAND_ID (0x04) -#define ZCL_MEDIA_PREVIOUS_RESPONSE_COMMAND_ID (0x04) -#define ZCL_MEDIA_NEXT_COMMAND_ID (0x05) -#define ZCL_MEDIA_NEXT_RESPONSE_COMMAND_ID (0x05) -#define ZCL_MEDIA_REWIND_COMMAND_ID (0x06) -#define ZCL_MEDIA_REWIND_RESPONSE_COMMAND_ID (0x06) -#define ZCL_MEDIA_FAST_FORWARD_COMMAND_ID (0x07) -#define ZCL_MEDIA_FAST_FORWARD_RESPONSE_COMMAND_ID (0x07) -#define ZCL_MEDIA_SKIP_FORWARD_COMMAND_ID (0x08) -#define ZCL_MEDIA_SKIP_FORWARD_RESPONSE_COMMAND_ID (0x08) -#define ZCL_MEDIA_SKIP_BACKWARD_COMMAND_ID (0x09) -#define ZCL_MEDIA_SKIP_BACKWARD_RESPONSE_COMMAND_ID (0x09) -#define ZCL_MEDIA_SEEK_COMMAND_ID (0x0A) -#define ZCL_MEDIA_SEEK_RESPONSE_COMMAND_ID (0x0B) +#define ZCL_PLAY_REQUEST_COMMAND_ID (0x00) +#define ZCL_PAUSE_REQUEST_COMMAND_ID (0x01) +#define ZCL_STOP_REQUEST_COMMAND_ID (0x02) +#define ZCL_START_OVER_REQUEST_COMMAND_ID (0x03) +#define ZCL_PREVIOUS_REQUEST_COMMAND_ID (0x04) +#define ZCL_NEXT_REQUEST_COMMAND_ID (0x05) +#define ZCL_REWIND_REQUEST_COMMAND_ID (0x06) +#define ZCL_FAST_FORWARD_REQUEST_COMMAND_ID (0x07) +#define ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID (0x08) +#define ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID (0x09) +#define ZCL_PLAYBACK_RESPONSE_COMMAND_ID (0x0A) +#define ZCL_SEEK_REQUEST_COMMAND_ID (0x0B) // Commands for cluster: Media Input -#define ZCL_SELECT_INPUT_COMMAND_ID (0x00) -#define ZCL_SHOW_INPUT_STATUS_COMMAND_ID (0x01) -#define ZCL_HIDE_INPUT_STATUS_COMMAND_ID (0x02) -#define ZCL_RENAME_INPUT_COMMAND_ID (0x03) +#define ZCL_SELECT_INPUT_REQUEST_COMMAND_ID (0x00) +#define ZCL_SHOW_INPUT_STATUS_REQUEST_COMMAND_ID (0x01) +#define ZCL_HIDE_INPUT_STATUS_REQUEST_COMMAND_ID (0x02) +#define ZCL_RENAME_INPUT_REQUEST_COMMAND_ID (0x03) // Commands for cluster: Low Power #define ZCL_SLEEP_COMMAND_ID (0x00) // Commands for cluster: Keypad Input -#define ZCL_SEND_KEY_COMMAND_ID (0x00) -#define ZCL_SEND_KEY_RESPONSE_COMMAND_ID (0x00) +#define ZCL_SEND_KEY_REQUEST_COMMAND_ID (0x00) +#define ZCL_SEND_KEY_RESPONSE_COMMAND_ID (0x01) // Commands for cluster: Content Launcher -#define ZCL_LAUNCH_CONTENT_COMMAND_ID (0x00) -#define ZCL_LAUNCH_CONTENT_RESPONSE_COMMAND_ID (0x00) -#define ZCL_LAUNCH_URL_COMMAND_ID (0x01) -#define ZCL_LAUNCH_URL_RESPONSE_COMMAND_ID (0x01) +#define ZCL_LAUNCH_CONTENT_REQUEST_COMMAND_ID (0x00) +#define ZCL_LAUNCH_URL_REQUEST_COMMAND_ID (0x01) +#define ZCL_LAUNCH_RESPONSE_COMMAND_ID (0x02) // Commands for cluster: Audio Output -#define ZCL_SELECT_OUTPUT_COMMAND_ID (0x00) -#define ZCL_RENAME_OUTPUT_COMMAND_ID (0x01) +#define ZCL_SELECT_OUTPUT_REQUEST_COMMAND_ID (0x00) +#define ZCL_RENAME_OUTPUT_REQUEST_COMMAND_ID (0x01) // Commands for cluster: Application Launcher -#define ZCL_LAUNCH_APP_COMMAND_ID (0x00) -#define ZCL_LAUNCH_APP_RESPONSE_COMMAND_ID (0x00) -#define ZCL_STOP_APP_COMMAND_ID (0x01) -#define ZCL_STOP_APP_RESPONSE_COMMAND_ID (0x01) -#define ZCL_HIDE_APP_COMMAND_ID (0x02) -#define ZCL_HIDE_APP_RESPONSE_COMMAND_ID (0x02) - -// Commands for cluster: Application Basic -#define ZCL_CHANGE_STATUS_COMMAND_ID (0x00) +#define ZCL_LAUNCH_APP_REQUEST_COMMAND_ID (0x00) +#define ZCL_STOP_APP_REQUEST_COMMAND_ID (0x01) +#define ZCL_HIDE_APP_REQUEST_COMMAND_ID (0x02) +#define ZCL_LAUNCHER_RESPONSE_COMMAND_ID (0x03) // Commands for cluster: Account Login -#define ZCL_GET_SETUP_PIN_COMMAND_ID (0x00) -#define ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID (0x00) -#define ZCL_LOGIN_COMMAND_ID (0x01) -#define ZCL_LOGOUT_COMMAND_ID (0x02) +#define ZCL_GET_SETUP_PIN_REQUEST_COMMAND_ID (0x00) +#define ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID (0x01) +#define ZCL_LOGIN_REQUEST_COMMAND_ID (0x02) +#define ZCL_LOGOUT_REQUEST_COMMAND_ID (0x03) // Commands for cluster: Test Cluster #define ZCL_TEST_COMMAND_ID (0x00) diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h index 96bd03e8da7fd9..16cbcd723fbf29 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -24,14 +24,6 @@ // ZCL enums -// Enum for ApplicationLauncherStatus -enum EmberAfApplicationLauncherStatus : uint8_t -{ - EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS = 0, - EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1, - EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY = 2, -}; - // Enum for AttributeWritePermission enum EmberAfAttributeWritePermission : uint8_t { @@ -44,17 +36,6 @@ enum EmberAfAttributeWritePermission : uint8_t EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE = 141, }; -// Enum for AudioOutputType -enum EmberAfAudioOutputType : uint8_t -{ - EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI = 0, - EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT = 1, - EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL = 2, - EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3, - EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL = 4, - EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER = 5, -}; - // Enum for BarrierControlBarrierPosition enum EmberAfBarrierControlBarrierPosition : uint8_t { @@ -122,14 +103,6 @@ enum EmberAfColorMode : uint8_t EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE = 2, }; -// Enum for ContentLaunchStatus -enum EmberAfContentLaunchStatus : uint8_t -{ - EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS = 0, - EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1, - EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED = 2, -}; - // Enum for DoorLockEventSource enum EmberAfDoorLockEventSource : uint8_t { @@ -353,105 +326,6 @@ enum EmberAfInterfaceType : uint8_t EMBER_ZCL_INTERFACE_TYPE_THREAD = 4, }; -// Enum for KeypadInputCecKeyCode -enum EmberAfKeypadInputCecKeyCode : uint8_t -{ - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_SELECT = 0, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_UP = 1, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_DOWN = 2, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_LEFT = 3, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_RIGHT = 4, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_RIGHT_UP = 5, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_RIGHT_DOWN = 6, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_LEFT_UP = 7, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_LEFT_DOWN = 8, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_ROOT_MENU = 9, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_SETUP_MENU = 10, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_CONTENTS_MENU = 11, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_FAVORITE_MENU = 12, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_EXIT = 13, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_MEDIA_TOP_MENU = 16, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_MEDIA_CONTEXT_SENSITIVE_MENU = 17, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBER_ENTRY_MODE = 29, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBER11 = 30, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBER12 = 31, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBER0_OR_NUMBER10 = 32, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBERS1 = 33, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBERS2 = 34, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBERS3 = 35, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBERS4 = 36, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBERS5 = 37, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBERS6 = 38, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBERS7 = 39, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBERS8 = 40, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NUMBERS9 = 41, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_DOT = 42, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_ENTER = 43, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_CLEAR = 44, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_NEXT_FAVORITE = 47, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_CHANNEL_UP = 48, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_CHANNEL_DOWN = 49, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_PREVIOUS_CHANNEL = 50, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_SOUND_SELECT = 51, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_INPUT_SELECT = 52, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_DISPLAY_INFORMATION = 53, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_HELP = 54, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_PAGE_UP = 55, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_PAGE_DOWN = 56, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_POWER = 64, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_VOLUME_UP = 65, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_VOLUME_DOWN = 66, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_MUTE = 67, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_PLAY = 68, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_STOP = 69, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_PAUSE = 70, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_RECORD = 71, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_REWIND = 72, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_FAST_FORWARD = 73, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_EJECT = 74, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_FORWARD = 75, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_BACKWARD = 76, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_STOP_RECORD = 77, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_PAUSE_RECORD = 78, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_RESERVED = 79, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_ANGLE = 80, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_SUB_PICTURE = 81, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_VIDEO_ON_DEMAND = 82, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_ELECTRONIC_PROGRAM_GUIDE = 83, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_TIMER_PROGRAMMING = 84, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_INITIAL_CONFIGURATION = 85, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_SELECT_BROADCAST_TYPE = 86, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_SELECT_SOUND_PRESENTATION = 87, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_PLAY_FUNCTION = 96, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_PAUSE_PLAY_FUNCTION = 97, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_RECORD_FUNCTION = 98, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_PAUSE_RECORD_FUNCTION = 99, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_STOP_FUNCTION = 100, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_MUTE_FUNCTION = 101, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_RESTORE_VOLUME_FUNCTION = 102, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_TUNE_FUNCTION = 103, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_SELECT_MEDIA_FUNCTION = 104, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_SELECT_AV_INPUT_FUNCTION = 105, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_SELECT_AUDIO_INPUT_FUNCTION = 106, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_POWER_TOGGLE_FUNCTION = 107, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_POWER_OFF_FUNCTION = 108, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_POWER_ON_FUNCTION = 109, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_F1_BLUE = 113, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_F2_RED = 114, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_F3_GREEN = 115, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_F4_YELLOW = 116, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_F5 = 117, - EMBER_ZCL_KEYPAD_INPUT_CEC_KEY_CODE_DATA = 118, -}; - -// Enum for KeypadInputStatus -enum EmberAfKeypadInputStatus : uint8_t -{ - EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS = 0, - EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY = 1, - EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2, -}; - // Enum for KeypadLockout enum EmberAfKeypadLockout : uint8_t { @@ -470,43 +344,6 @@ enum EmberAfLevelControlOptions : uint8_t EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2, }; -// Enum for MediaInputType -enum EmberAfMediaInputType : uint8_t -{ - EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL = 0, - EMBER_ZCL_MEDIA_INPUT_TYPE_AUX = 1, - EMBER_ZCL_MEDIA_INPUT_TYPE_COAX = 2, - EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3, - EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI = 4, - EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT = 5, - EMBER_ZCL_MEDIA_INPUT_TYPE_LINE = 6, - EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL = 7, - EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO = 8, - EMBER_ZCL_MEDIA_INPUT_TYPE_SCART = 9, - EMBER_ZCL_MEDIA_INPUT_TYPE_USB = 10, - EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER = 11, -}; - -// Enum for MediaPlaybackState -enum EmberAfMediaPlaybackState : uint8_t -{ - EMBER_ZCL_MEDIA_PLAYBACK_STATE_PLAYING = 0, - EMBER_ZCL_MEDIA_PLAYBACK_STATE_PAUSED = 1, - EMBER_ZCL_MEDIA_PLAYBACK_STATE_NOT_PLAYING = 2, - EMBER_ZCL_MEDIA_PLAYBACK_STATE_BUFFERING = 3, -}; - -// Enum for MediaPlaybackStatus -enum EmberAfMediaPlaybackStatus : uint8_t -{ - EMBER_ZCL_MEDIA_PLAYBACK_STATUS_SUCCESS = 0, - EMBER_ZCL_MEDIA_PLAYBACK_STATUS_INVALID_STATE_FOR_COMMAND = 1, - EMBER_ZCL_MEDIA_PLAYBACK_STATUS_NOT_ALLOWED = 2, - EMBER_ZCL_MEDIA_PLAYBACK_STATUS_NOT_ACTIVE = 3, - EMBER_ZCL_MEDIA_PLAYBACK_STATUS_SPEED_OUT_OF_RANGE = 4, - EMBER_ZCL_MEDIA_PLAYBACK_STATUS_SEEK_OUT_OF_RANGE = 5, -}; - // Enum for MoveMode enum EmberAfMoveMode : uint8_t { diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index e3095e38277663..3bc731181f2d4d 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -5054,6 +5054,10 @@ namespace ApplicationVersion { static constexpr AttributeId Id = 0x00000006; } // namespace ApplicationVersion +namespace AllowedVendorList { +static constexpr AttributeId Id = 0x00000007; +} // namespace AllowedVendorList + namespace AttributeList { static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id; } // namespace AttributeList 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 14e1f0956cdb20..8d0ba7f394e092 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 @@ -1286,21 +1286,21 @@ static constexpr CommandId Id = 0x00000001; namespace Channel { namespace Commands { -namespace ChangeChannel { +namespace ChangeChannelRequest { static constexpr CommandId Id = 0x00000000; -} // namespace ChangeChannel +} // namespace ChangeChannelRequest namespace ChangeChannelResponse { -static constexpr CommandId Id = 0x00000000; -} // namespace ChangeChannelResponse - -namespace ChangeChannelByNumber { static constexpr CommandId Id = 0x00000001; -} // namespace ChangeChannelByNumber +} // namespace ChangeChannelResponse -namespace SkipChannel { +namespace ChangeChannelByNumberRequest { static constexpr CommandId Id = 0x00000002; -} // namespace SkipChannel +} // namespace ChangeChannelByNumberRequest + +namespace SkipChannelRequest { +static constexpr CommandId Id = 0x00000003; +} // namespace SkipChannelRequest } // namespace Commands } // namespace Channel @@ -1308,12 +1308,12 @@ static constexpr CommandId Id = 0x00000002; namespace TargetNavigator { namespace Commands { -namespace NavigateTarget { +namespace NavigateTargetRequest { static constexpr CommandId Id = 0x00000000; -} // namespace NavigateTarget +} // namespace NavigateTargetRequest namespace NavigateTargetResponse { -static constexpr CommandId Id = 0x00000000; +static constexpr CommandId Id = 0x00000001; } // namespace NavigateTargetResponse } // namespace Commands @@ -1322,93 +1322,53 @@ static constexpr CommandId Id = 0x00000000; namespace MediaPlayback { namespace Commands { -namespace MediaPlay { -static constexpr CommandId Id = 0x00000000; -} // namespace MediaPlay - -namespace MediaPlayResponse { +namespace PlayRequest { static constexpr CommandId Id = 0x00000000; -} // namespace MediaPlayResponse +} // namespace PlayRequest -namespace MediaPause { +namespace PauseRequest { static constexpr CommandId Id = 0x00000001; -} // namespace MediaPause - -namespace MediaPauseResponse { -static constexpr CommandId Id = 0x00000001; -} // namespace MediaPauseResponse - -namespace MediaStop { -static constexpr CommandId Id = 0x00000002; -} // namespace MediaStop +} // namespace PauseRequest -namespace MediaStopResponse { +namespace StopRequest { static constexpr CommandId Id = 0x00000002; -} // namespace MediaStopResponse - -namespace MediaStartOver { -static constexpr CommandId Id = 0x00000003; -} // namespace MediaStartOver +} // namespace StopRequest -namespace MediaStartOverResponse { +namespace StartOverRequest { static constexpr CommandId Id = 0x00000003; -} // namespace MediaStartOverResponse +} // namespace StartOverRequest -namespace MediaPrevious { +namespace PreviousRequest { static constexpr CommandId Id = 0x00000004; -} // namespace MediaPrevious - -namespace MediaPreviousResponse { -static constexpr CommandId Id = 0x00000004; -} // namespace MediaPreviousResponse - -namespace MediaNext { -static constexpr CommandId Id = 0x00000005; -} // namespace MediaNext +} // namespace PreviousRequest -namespace MediaNextResponse { +namespace NextRequest { static constexpr CommandId Id = 0x00000005; -} // namespace MediaNextResponse +} // namespace NextRequest -namespace MediaRewind { +namespace RewindRequest { static constexpr CommandId Id = 0x00000006; -} // namespace MediaRewind +} // namespace RewindRequest -namespace MediaRewindResponse { -static constexpr CommandId Id = 0x00000006; -} // namespace MediaRewindResponse - -namespace MediaFastForward { -static constexpr CommandId Id = 0x00000007; -} // namespace MediaFastForward - -namespace MediaFastForwardResponse { +namespace FastForwardRequest { static constexpr CommandId Id = 0x00000007; -} // namespace MediaFastForwardResponse - -namespace MediaSkipForward { -static constexpr CommandId Id = 0x00000008; -} // namespace MediaSkipForward +} // namespace FastForwardRequest -namespace MediaSkipForwardResponse { +namespace SkipForwardRequest { static constexpr CommandId Id = 0x00000008; -} // namespace MediaSkipForwardResponse +} // namespace SkipForwardRequest -namespace MediaSkipBackward { +namespace SkipBackwardRequest { static constexpr CommandId Id = 0x00000009; -} // namespace MediaSkipBackward +} // namespace SkipBackwardRequest -namespace MediaSkipBackwardResponse { -static constexpr CommandId Id = 0x00000009; -} // namespace MediaSkipBackwardResponse - -namespace MediaSeek { +namespace PlaybackResponse { static constexpr CommandId Id = 0x0000000A; -} // namespace MediaSeek +} // namespace PlaybackResponse -namespace MediaSeekResponse { +namespace SeekRequest { static constexpr CommandId Id = 0x0000000B; -} // namespace MediaSeekResponse +} // namespace SeekRequest } // namespace Commands } // namespace MediaPlayback @@ -1416,21 +1376,21 @@ static constexpr CommandId Id = 0x0000000B; namespace MediaInput { namespace Commands { -namespace SelectInput { +namespace SelectInputRequest { static constexpr CommandId Id = 0x00000000; -} // namespace SelectInput +} // namespace SelectInputRequest -namespace ShowInputStatus { +namespace ShowInputStatusRequest { static constexpr CommandId Id = 0x00000001; -} // namespace ShowInputStatus +} // namespace ShowInputStatusRequest -namespace HideInputStatus { +namespace HideInputStatusRequest { static constexpr CommandId Id = 0x00000002; -} // namespace HideInputStatus +} // namespace HideInputStatusRequest -namespace RenameInput { +namespace RenameInputRequest { static constexpr CommandId Id = 0x00000003; -} // namespace RenameInput +} // namespace RenameInputRequest } // namespace Commands } // namespace MediaInput @@ -1448,12 +1408,12 @@ static constexpr CommandId Id = 0x00000000; namespace KeypadInput { namespace Commands { -namespace SendKey { +namespace SendKeyRequest { static constexpr CommandId Id = 0x00000000; -} // namespace SendKey +} // namespace SendKeyRequest namespace SendKeyResponse { -static constexpr CommandId Id = 0x00000000; +static constexpr CommandId Id = 0x00000001; } // namespace SendKeyResponse } // namespace Commands @@ -1462,21 +1422,17 @@ static constexpr CommandId Id = 0x00000000; namespace ContentLauncher { namespace Commands { -namespace LaunchContent { +namespace LaunchContentRequest { static constexpr CommandId Id = 0x00000000; -} // namespace LaunchContent +} // namespace LaunchContentRequest -namespace LaunchContentResponse { -static constexpr CommandId Id = 0x00000000; -} // namespace LaunchContentResponse - -namespace LaunchURL { +namespace LaunchURLRequest { static constexpr CommandId Id = 0x00000001; -} // namespace LaunchURL +} // namespace LaunchURLRequest -namespace LaunchURLResponse { -static constexpr CommandId Id = 0x00000001; -} // namespace LaunchURLResponse +namespace LaunchResponse { +static constexpr CommandId Id = 0x00000002; +} // namespace LaunchResponse } // namespace Commands } // namespace ContentLauncher @@ -1484,13 +1440,13 @@ static constexpr CommandId Id = 0x00000001; namespace AudioOutput { namespace Commands { -namespace SelectOutput { +namespace SelectOutputRequest { static constexpr CommandId Id = 0x00000000; -} // namespace SelectOutput +} // namespace SelectOutputRequest -namespace RenameOutput { +namespace RenameOutputRequest { static constexpr CommandId Id = 0x00000001; -} // namespace RenameOutput +} // namespace RenameOutputRequest } // namespace Commands } // namespace AudioOutput @@ -1498,61 +1454,43 @@ static constexpr CommandId Id = 0x00000001; namespace ApplicationLauncher { namespace Commands { -namespace LaunchApp { -static constexpr CommandId Id = 0x00000000; -} // namespace LaunchApp - -namespace LaunchAppResponse { +namespace LaunchAppRequest { static constexpr CommandId Id = 0x00000000; -} // namespace LaunchAppResponse +} // namespace LaunchAppRequest -namespace StopApp { +namespace StopAppRequest { static constexpr CommandId Id = 0x00000001; -} // namespace StopApp +} // namespace StopAppRequest -namespace StopAppResponse { -static constexpr CommandId Id = 0x00000001; -} // namespace StopAppResponse - -namespace HideApp { +namespace HideAppRequest { static constexpr CommandId Id = 0x00000002; -} // namespace HideApp +} // namespace HideAppRequest -namespace HideAppResponse { -static constexpr CommandId Id = 0x00000002; -} // namespace HideAppResponse +namespace LauncherResponse { +static constexpr CommandId Id = 0x00000003; +} // namespace LauncherResponse } // namespace Commands } // namespace ApplicationLauncher -namespace ApplicationBasic { -namespace Commands { - -namespace ChangeStatus { -static constexpr CommandId Id = 0x00000000; -} // namespace ChangeStatus - -} // namespace Commands -} // namespace ApplicationBasic - namespace AccountLogin { namespace Commands { -namespace GetSetupPIN { +namespace GetSetupPINRequest { static constexpr CommandId Id = 0x00000000; -} // namespace GetSetupPIN +} // namespace GetSetupPINRequest namespace GetSetupPINResponse { -static constexpr CommandId Id = 0x00000000; -} // namespace GetSetupPINResponse - -namespace Login { static constexpr CommandId Id = 0x00000001; -} // namespace Login +} // namespace GetSetupPINResponse -namespace Logout { +namespace LoginRequest { static constexpr CommandId Id = 0x00000002; -} // namespace Logout +} // namespace LoginRequest + +namespace LogoutRequest { +static constexpr CommandId Id = 0x00000003; +} // namespace LogoutRequest } // namespace Commands } // namespace AccountLogin diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index bb230623dc26d2..b78a88b3a85fa3 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -109,31 +109,33 @@ CHIP_ERROR LogValue(const char * label, size_t indent, CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::Channel::Structs::ChannelLineupInfo::DecodableType & value); + const chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType & value); + const chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::MediaPlayback::Structs::MediaPlaybackPosition::DecodableType & value); + const chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::MediaInput::Structs::MediaInputInfo::DecodableType & value); + const chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::ContentLaunchDimension::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::ContentLaunchAdditionalInfo::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::ContentLaunchParamater::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::Parameter::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::ContentLaunchStyleInformation::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::ContentSearch::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ContentLauncher::Structs::ContentLaunchBrandingInformation::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::StyleInformation::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::AudioOutput::Structs::AudioOutputInfo::DecodableType & value); + const chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherApp::DecodableType & value); + const chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationLauncherEndpoint::DecodableType & value); + const chip::app::Clusters::ApplicationLauncher::Structs::Application::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApp::DecodableType & value); + 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); 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, @@ -1747,7 +1749,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::Channel::Structs::ChannelLineupInfo::DecodableType & value) + const chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -1787,7 +1789,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::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType & value) + const chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -1810,7 +1812,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::MediaPlayback::Structs::MediaPlaybackPosition::DecodableType & value) + const chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -1833,7 +1835,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::MediaInput::Structs::MediaInputInfo::DecodableType & value) + const chip::app::Clusters::MediaInput::Structs::InputInfo::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -1872,7 +1874,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::ContentLauncher::Structs::ContentLaunchDimension::DecodableType & value) + const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -1903,7 +1905,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::ContentLauncher::Structs::ContentLaunchAdditionalInfo::DecodableType & value) + const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -1926,7 +1928,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::ContentLauncher::Structs::ContentLaunchParamater::DecodableType & value) + const chip::app::Clusters::ContentLauncher::Structs::Parameter::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -1958,7 +1960,22 @@ 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::ContentLauncher::Structs::ContentLaunchStyleInformation::DecodableType & value) + const chip::app::Clusters::ContentLauncher::Structs::ContentSearch::DecodableType & value) +{ + ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); + { + CHIP_ERROR err = LogValue("ParameterList", indent + 1, value.parameterList); + if (err != CHIP_NO_ERROR) + { + ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'ParameterList'", IndentStr(indent + 1).c_str()); + return err; + } + } + ChipLogProgress(chipTool, "%s}", IndentStr(indent).c_str()); + return CHIP_NO_ERROR; +} +CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::ContentLauncher::Structs::StyleInformation::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -1989,7 +2006,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::ContentLauncher::Structs::ContentLaunchBrandingInformation::DecodableType & value) + const chip::app::Clusters::ContentLauncher::Structs::BrandingInformation::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -2044,7 +2061,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::AudioOutput::Structs::AudioOutputInfo::DecodableType & value) + const chip::app::Clusters::AudioOutput::Structs::OutputInfo::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -2075,7 +2092,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::ApplicationLauncherApp::DecodableType & value) + const chip::app::Clusters::ApplicationLauncher::Structs::Application::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -2099,7 +2116,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::ApplicationLauncherEndpoint::DecodableType & value) + const chip::app::Clusters::ApplicationLauncher::Structs::ApplicationEP::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -2122,7 +2139,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::ApplicationBasicApp::DecodableType & value) + const chip::app::Clusters::ApplicationBasic::Structs::Application::DecodableType & value) { ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); { @@ -2513,46 +2530,10 @@ static void OnAccountLoginGetSetupPINResponseSuccess( command->SetCommandExitStatus(err); }; -static void OnApplicationLauncherHideAppResponseSuccess( - void * context, const chip::app::Clusters::ApplicationLauncher::Commands::HideAppResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received HideAppResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - if (err == CHIP_NO_ERROR) - { - err = LogValue("data", 1, data.data); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnApplicationLauncherLaunchAppResponseSuccess( - void * context, const chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received LaunchAppResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("status", 1, data.status); - } - if (err == CHIP_NO_ERROR) - { - err = LogValue("data", 1, data.data); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnApplicationLauncherStopAppResponseSuccess( - void * context, const chip::app::Clusters::ApplicationLauncher::Commands::StopAppResponse::DecodableType & data) +static void OnApplicationLauncherLauncherResponseSuccess( + void * context, const chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType & data) { - ChipLogProgress(Zcl, "Received StopAppResponse:"); + ChipLogProgress(Zcl, "Received LauncherResponse:"); CHIP_ERROR err = CHIP_NO_ERROR; if (err == CHIP_NO_ERROR) { @@ -2586,32 +2567,15 @@ OnChannelChangeChannelResponseSuccess(void * context, command->SetCommandExitStatus(err); }; -static void OnContentLauncherLaunchContentResponseSuccess( - void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchContentResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received LaunchContentResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("contentLaunchStatus", 1, data.contentLaunchStatus); - } - if (err == CHIP_NO_ERROR) - { - err = LogValue("data", 1, data.data); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnContentLauncherLaunchURLResponseSuccess( - void * context, const chip::app::Clusters::ContentLauncher::Commands::LaunchURLResponse::DecodableType & data) +static void +OnContentLauncherLaunchResponseSuccess(void * context, + const chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType & data) { - ChipLogProgress(Zcl, "Received LaunchURLResponse:"); + ChipLogProgress(Zcl, "Received LaunchResponse:"); CHIP_ERROR err = CHIP_NO_ERROR; if (err == CHIP_NO_ERROR) { - err = LogValue("contentLaunchStatus", 1, data.contentLaunchStatus); + err = LogValue("status", 1, data.status); } if (err == CHIP_NO_ERROR) { @@ -2932,158 +2896,15 @@ OnKeypadInputSendKeyResponseSuccess(void * context, command->SetCommandExitStatus(err); }; -static void OnMediaPlaybackMediaFastForwardResponseSuccess( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaFastForwardResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received MediaFastForwardResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("mediaPlaybackStatus", 1, data.mediaPlaybackStatus); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - static void -OnMediaPlaybackMediaNextResponseSuccess(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaNextResponse::DecodableType & data) +OnMediaPlaybackPlaybackResponseSuccess(void * context, + const chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType & data) { - ChipLogProgress(Zcl, "Received MediaNextResponse:"); + ChipLogProgress(Zcl, "Received PlaybackResponse:"); CHIP_ERROR err = CHIP_NO_ERROR; if (err == CHIP_NO_ERROR) { - err = LogValue("mediaPlaybackStatus", 1, data.mediaPlaybackStatus); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnMediaPlaybackMediaPauseResponseSuccess( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaPauseResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received MediaPauseResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("mediaPlaybackStatus", 1, data.mediaPlaybackStatus); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void -OnMediaPlaybackMediaPlayResponseSuccess(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaPlayResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received MediaPlayResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("mediaPlaybackStatus", 1, data.mediaPlaybackStatus); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnMediaPlaybackMediaPreviousResponseSuccess( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaPreviousResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received MediaPreviousResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("mediaPlaybackStatus", 1, data.mediaPlaybackStatus); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnMediaPlaybackMediaRewindResponseSuccess( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaRewindResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received MediaRewindResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("mediaPlaybackStatus", 1, data.mediaPlaybackStatus); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void -OnMediaPlaybackMediaSeekResponseSuccess(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaSeekResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received MediaSeekResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("mediaPlaybackStatus", 1, data.mediaPlaybackStatus); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnMediaPlaybackMediaSkipBackwardResponseSuccess( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackwardResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received MediaSkipBackwardResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("mediaPlaybackStatus", 1, data.mediaPlaybackStatus); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnMediaPlaybackMediaSkipForwardResponseSuccess( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaSkipForwardResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received MediaSkipForwardResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("mediaPlaybackStatus", 1, data.mediaPlaybackStatus); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void OnMediaPlaybackMediaStartOverResponseSuccess( - void * context, const chip::app::Clusters::MediaPlayback::Commands::MediaStartOverResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received MediaStartOverResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("mediaPlaybackStatus", 1, data.mediaPlaybackStatus); - } - - ModelCommand * command = static_cast(context); - command->SetCommandExitStatus(err); -}; - -static void -OnMediaPlaybackMediaStopResponseSuccess(void * context, - const chip::app::Clusters::MediaPlayback::Commands::MediaStopResponse::DecodableType & data) -{ - ChipLogProgress(Zcl, "Received MediaStopResponse:"); - CHIP_ERROR err = CHIP_NO_ERROR; - if (err == CHIP_NO_ERROR) - { - err = LogValue("mediaPlaybackStatus", 1, data.mediaPlaybackStatus); + err = LogValue("status", 1, data.status); } ModelCommand * command = static_cast(context); @@ -3929,9 +3750,9 @@ class ReadAccessControlClusterRevision : public ModelCommand | Cluster AccountLogin | 0x050E | |------------------------------------------------------------------------------| | Commands: | | -| * GetSetupPIN | 0x00 | -| * Login | 0x01 | -| * Logout | 0x02 | +| * GetSetupPINRequest | 0x00 | +| * LoginRequest | 0x02 | +| * LogoutRequest | 0x03 | |------------------------------------------------------------------------------| | Attributes: | | | * AttributeList | 0xFFFB | @@ -3939,12 +3760,12 @@ class ReadAccessControlClusterRevision : public ModelCommand \*----------------------------------------------------------------------------*/ /* - * Command GetSetupPIN + * Command GetSetupPINRequest */ -class AccountLoginGetSetupPIN : public ModelCommand +class AccountLoginGetSetupPINRequest : public ModelCommand { public: - AccountLoginGetSetupPIN() : ModelCommand("get-setup-pin") + AccountLoginGetSetupPINRequest() : ModelCommand("get-setup-pinrequest") { AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier); ModelCommand::AddArguments(); @@ -3959,16 +3780,16 @@ class AccountLoginGetSetupPIN : public ModelCommand } private: - chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Type mRequest; + chip::app::Clusters::AccountLogin::Commands::GetSetupPINRequest::Type mRequest; }; /* - * Command Login + * Command LoginRequest */ -class AccountLoginLogin : public ModelCommand +class AccountLoginLoginRequest : public ModelCommand { public: - AccountLoginLogin() : ModelCommand("login") + AccountLoginLoginRequest() : ModelCommand("login-request") { AddArgument("TempAccountIdentifier", &mRequest.tempAccountIdentifier); AddArgument("SetupPIN", &mRequest.setupPIN); @@ -3977,34 +3798,34 @@ class AccountLoginLogin : public ModelCommand CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000001) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000002) on endpoint %" PRIu8, endpointId); return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::AccountLogin::Commands::Login::Type mRequest; + chip::app::Clusters::AccountLogin::Commands::LoginRequest::Type mRequest; }; /* - * Command Logout + * Command LogoutRequest */ -class AccountLoginLogout : public ModelCommand +class AccountLoginLogoutRequest : public ModelCommand { public: - AccountLoginLogout() : ModelCommand("logout") { ModelCommand::AddArguments(); } + AccountLoginLogoutRequest() : ModelCommand("logout-request") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000002) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050E) command (0x00000003) on endpoint %" PRIu8, endpointId); return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::AccountLogin::Commands::Logout::Type mRequest; + chip::app::Clusters::AccountLogin::Commands::LogoutRequest::Type mRequest; }; /* @@ -4391,7 +4212,6 @@ class ReportAdministratorCommissioningClusterRevision : public ModelCommand | Cluster ApplicationBasic | 0x050D | |------------------------------------------------------------------------------| | Commands: | | -| * ChangeStatus | 0x00 | |------------------------------------------------------------------------------| | Attributes: | | | * VendorName | 0x0000 | @@ -4401,35 +4221,11 @@ class ReportAdministratorCommissioningClusterRevision : public ModelCommand | * ApplicationApp | 0x0004 | | * ApplicationStatus | 0x0005 | | * ApplicationVersion | 0x0006 | +| * AllowedVendorList | 0x0007 | | * AttributeList | 0xFFFB | | * ClusterRevision | 0xFFFD | \*----------------------------------------------------------------------------*/ -/* - * Command ChangeStatus - */ -class ApplicationBasicChangeStatus : public ModelCommand -{ -public: - ApplicationBasicChangeStatus() : ModelCommand("change-status") - { - AddArgument("Status", 0, UINT8_MAX, - reinterpret_cast *>(&mRequest.status)); - ModelCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override - { - ChipLogProgress(chipTool, "Sending cluster (0x0000050D) command (0x00000000) on endpoint %" PRIu8, endpointId); - - return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, - mTimedInteractionTimeoutMs); - } - -private: - chip::app::Clusters::ApplicationBasic::Commands::ChangeStatus::Type mRequest; -}; - /* * Attribute VendorName */ @@ -4733,7 +4529,7 @@ class ReadApplicationBasicApplicationStatus : public ModelCommand this, OnAttributeResponse, OnDefaultFailure); } - static void OnAttributeResponse(void * context, uint8_t value) + static void OnAttributeResponse(void * context, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value) { OnGeneralAttributeResponse(context, "ApplicationBasic.ApplicationStatus response", value); } @@ -4770,7 +4566,10 @@ class ReportApplicationBasicApplicationStatus : public ModelCommand return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); } - static void OnValueReport(void * context, uint8_t value) { LogValue("ApplicationBasic.ApplicationStatus report", 0, value); } + static void OnValueReport(void * context, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum value) + { + LogValue("ApplicationBasic.ApplicationStatus report", 0, value); + } private: uint16_t mMinInterval; @@ -4850,6 +4649,36 @@ class ReportApplicationBasicApplicationVersion : public ModelCommand bool mWait; }; +/* + * Attribute AllowedVendorList + */ +class ReadApplicationBasicAllowedVendorList : public ModelCommand +{ +public: + ReadApplicationBasicAllowedVendorList() : ModelCommand("read") + { + AddArgument("attr-name", "allowed-vendor-list"); + ModelCommand::AddArguments(); + } + + ~ReadApplicationBasicAllowedVendorList() {} + + CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x050D) command (0x00) on endpoint %" PRIu8, endpointId); + + chip::Controller::ApplicationBasicCluster cluster; + cluster.Associate(device, endpointId); + return cluster.ReadAttribute( + this, OnAttributeResponse, OnDefaultFailure); + } + + static void OnAttributeResponse(void * context, const chip::app::DataModel::DecodableList & value) + { + OnGeneralAttributeResponse(context, "ApplicationBasic.AllowedVendorList response", value); + } +}; + /* * Attribute AttributeList */ @@ -4953,9 +4782,9 @@ class ReportApplicationBasicClusterRevision : public ModelCommand | Cluster ApplicationLauncher | 0x050C | |------------------------------------------------------------------------------| | Commands: | | -| * HideApp | 0x02 | -| * LaunchApp | 0x00 | -| * StopApp | 0x01 | +| * HideAppRequest | 0x02 | +| * LaunchAppRequest | 0x00 | +| * StopAppRequest | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | | * ApplicationLauncherList | 0x0000 | @@ -4964,12 +4793,12 @@ class ReportApplicationBasicClusterRevision : public ModelCommand \*----------------------------------------------------------------------------*/ /* - * Command HideApp + * Command HideAppRequest */ -class ApplicationLauncherHideApp : public ModelCommand +class ApplicationLauncherHideAppRequest : public ModelCommand { public: - ApplicationLauncherHideApp() : ModelCommand("hide-app") + ApplicationLauncherHideAppRequest() : ModelCommand("hide-app-request") { // application Struct parsing is not supported yet ModelCommand::AddArguments(); @@ -4979,21 +4808,21 @@ class ApplicationLauncherHideApp : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000002) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnApplicationLauncherHideAppResponseSuccess, OnDefaultFailure, + return chip::Controller::InvokeCommand(device, this, OnApplicationLauncherLauncherResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Type mRequest; + chip::app::Clusters::ApplicationLauncher::Commands::HideAppRequest::Type mRequest; }; /* - * Command LaunchApp + * Command LaunchAppRequest */ -class ApplicationLauncherLaunchApp : public ModelCommand +class ApplicationLauncherLaunchAppRequest : public ModelCommand { public: - ApplicationLauncherLaunchApp() : ModelCommand("launch-app") + ApplicationLauncherLaunchAppRequest() : ModelCommand("launch-app-request") { AddArgument("Data", &mRequest.data); // application Struct parsing is not supported yet @@ -5004,21 +4833,21 @@ class ApplicationLauncherLaunchApp : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000000) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnApplicationLauncherLaunchAppResponseSuccess, OnDefaultFailure, + return chip::Controller::InvokeCommand(device, this, OnApplicationLauncherLauncherResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Type mRequest; + chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppRequest::Type mRequest; }; /* - * Command StopApp + * Command StopAppRequest */ -class ApplicationLauncherStopApp : public ModelCommand +class ApplicationLauncherStopAppRequest : public ModelCommand { public: - ApplicationLauncherStopApp() : ModelCommand("stop-app") + ApplicationLauncherStopAppRequest() : ModelCommand("stop-app-request") { // application Struct parsing is not supported yet ModelCommand::AddArguments(); @@ -5028,12 +4857,12 @@ class ApplicationLauncherStopApp : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x0000050C) command (0x00000001) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnApplicationLauncherStopAppResponseSuccess, OnDefaultFailure, + return chip::Controller::InvokeCommand(device, this, OnApplicationLauncherLauncherResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Type mRequest; + chip::app::Clusters::ApplicationLauncher::Commands::StopAppRequest::Type mRequest; }; /* @@ -5211,8 +5040,8 @@ class ReportApplicationLauncherClusterRevision : public ModelCommand | Cluster AudioOutput | 0x050B | |------------------------------------------------------------------------------| | Commands: | | -| * RenameOutput | 0x01 | -| * SelectOutput | 0x00 | +| * RenameOutputRequest | 0x01 | +| * SelectOutputRequest | 0x00 | |------------------------------------------------------------------------------| | Attributes: | | | * AudioOutputList | 0x0000 | @@ -5222,12 +5051,12 @@ class ReportApplicationLauncherClusterRevision : public ModelCommand \*----------------------------------------------------------------------------*/ /* - * Command RenameOutput + * Command RenameOutputRequest */ -class AudioOutputRenameOutput : public ModelCommand +class AudioOutputRenameOutputRequest : public ModelCommand { public: - AudioOutputRenameOutput() : ModelCommand("rename-output") + AudioOutputRenameOutputRequest() : ModelCommand("rename-output-request") { AddArgument("Index", 0, UINT8_MAX, &mRequest.index); AddArgument("Name", &mRequest.name); @@ -5243,16 +5072,16 @@ class AudioOutputRenameOutput : public ModelCommand } private: - chip::app::Clusters::AudioOutput::Commands::RenameOutput::Type mRequest; + chip::app::Clusters::AudioOutput::Commands::RenameOutputRequest::Type mRequest; }; /* - * Command SelectOutput + * Command SelectOutputRequest */ -class AudioOutputSelectOutput : public ModelCommand +class AudioOutputSelectOutputRequest : public ModelCommand { public: - AudioOutputSelectOutput() : ModelCommand("select-output") + AudioOutputSelectOutputRequest() : ModelCommand("select-output-request") { AddArgument("Index", 0, UINT8_MAX, &mRequest.index); ModelCommand::AddArguments(); @@ -5267,7 +5096,7 @@ class AudioOutputSelectOutput : public ModelCommand } private: - chip::app::Clusters::AudioOutput::Commands::SelectOutput::Type mRequest; + chip::app::Clusters::AudioOutput::Commands::SelectOutputRequest::Type mRequest; }; /* @@ -5296,8 +5125,7 @@ class ReadAudioOutputAudioOutputList : public ModelCommand static void OnAttributeResponse( void * context, - const chip::app::DataModel::DecodableList & - value) + const chip::app::DataModel::DecodableList & value) { OnGeneralAttributeResponse(context, "AudioOutput.AudioOutputList response", value); } @@ -5336,8 +5164,7 @@ class ReportAudioOutputAudioOutputList : public ModelCommand static void OnValueReport( void * context, - const chip::app::DataModel::DecodableList & - value) + const chip::app::DataModel::DecodableList & value) { LogValue("AudioOutput.AudioOutputList report", 0, value); } @@ -8932,9 +8759,9 @@ class ReportBridgedDeviceBasicClusterRevision : public ModelCommand | Cluster Channel | 0x0504 | |------------------------------------------------------------------------------| | Commands: | | -| * ChangeChannel | 0x00 | -| * ChangeChannelByNumber | 0x01 | -| * SkipChannel | 0x02 | +| * ChangeChannelByNumberRequest | 0x02 | +| * ChangeChannelRequest | 0x00 | +| * SkipChannelRequest | 0x03 | |------------------------------------------------------------------------------| | Attributes: | | | * ChannelList | 0x0000 | @@ -8943,61 +8770,61 @@ class ReportBridgedDeviceBasicClusterRevision : public ModelCommand \*----------------------------------------------------------------------------*/ /* - * Command ChangeChannel + * Command ChangeChannelByNumberRequest */ -class ChannelChangeChannel : public ModelCommand +class ChannelChangeChannelByNumberRequest : public ModelCommand { public: - ChannelChangeChannel() : ModelCommand("change-channel") + ChannelChangeChannelByNumberRequest() : ModelCommand("change-channel-by-number-request") { - AddArgument("Match", &mRequest.match); + AddArgument("MajorNumber", 0, UINT16_MAX, &mRequest.majorNumber); + AddArgument("MinorNumber", 0, UINT16_MAX, &mRequest.minorNumber); ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000000) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000002) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnChannelChangeChannelResponseSuccess, OnDefaultFailure, endpointId, - mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, + mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::Channel::Commands::ChangeChannel::Type mRequest; + chip::app::Clusters::Channel::Commands::ChangeChannelByNumberRequest::Type mRequest; }; /* - * Command ChangeChannelByNumber + * Command ChangeChannelRequest */ -class ChannelChangeChannelByNumber : public ModelCommand +class ChannelChangeChannelRequest : public ModelCommand { public: - ChannelChangeChannelByNumber() : ModelCommand("change-channel-by-number") + ChannelChangeChannelRequest() : ModelCommand("change-channel-request") { - AddArgument("MajorNumber", 0, UINT16_MAX, &mRequest.majorNumber); - AddArgument("MinorNumber", 0, UINT16_MAX, &mRequest.minorNumber); + AddArgument("Match", &mRequest.match); ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000001) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000000) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, - mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnChannelChangeChannelResponseSuccess, OnDefaultFailure, endpointId, + mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type mRequest; + chip::app::Clusters::Channel::Commands::ChangeChannelRequest::Type mRequest; }; /* - * Command SkipChannel + * Command SkipChannelRequest */ -class ChannelSkipChannel : public ModelCommand +class ChannelSkipChannelRequest : public ModelCommand { public: - ChannelSkipChannel() : ModelCommand("skip-channel") + ChannelSkipChannelRequest() : ModelCommand("skip-channel-request") { AddArgument("Count", 0, UINT16_MAX, &mRequest.count); ModelCommand::AddArguments(); @@ -9005,14 +8832,14 @@ class ChannelSkipChannel : public ModelCommand CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000002) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x00000504) command (0x00000003) on endpoint %" PRIu8, endpointId); return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::Channel::Commands::SkipChannel::Type mRequest; + chip::app::Clusters::Channel::Commands::SkipChannelRequest::Type mRequest; }; /* @@ -13854,8 +13681,8 @@ class ReportColorControlClusterRevision : public ModelCommand | Cluster ContentLauncher | 0x050A | |------------------------------------------------------------------------------| | Commands: | | -| * LaunchContent | 0x00 | -| * LaunchURL | 0x01 | +| * LaunchContentRequest | 0x00 | +| * LaunchURLRequest | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | | * AcceptHeaderList | 0x0000 | @@ -13865,12 +13692,12 @@ class ReportColorControlClusterRevision : public ModelCommand \*----------------------------------------------------------------------------*/ /* - * Command LaunchContent + * Command LaunchContentRequest */ -class ContentLauncherLaunchContent : public ModelCommand +class ContentLauncherLaunchContentRequest : public ModelCommand { public: - ContentLauncherLaunchContent() : ModelCommand("launch-content") + ContentLauncherLaunchContentRequest() : ModelCommand("launch-content-request") { AddArgument("AutoPlay", 0, 1, &mRequest.autoPlay); AddArgument("Data", &mRequest.data); @@ -13882,25 +13709,25 @@ class ContentLauncherLaunchContent : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000000) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnContentLauncherLaunchContentResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnContentLauncherLaunchResponseSuccess, OnDefaultFailure, endpointId, + mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest; + chip::app::Clusters::ContentLauncher::Commands::LaunchContentRequest::Type mRequest; }; /* - * Command LaunchURL + * Command LaunchURLRequest */ -class ContentLauncherLaunchURL : public ModelCommand +class ContentLauncherLaunchURLRequest : public ModelCommand { public: - ContentLauncherLaunchURL() : ModelCommand("launch-url") + ContentLauncherLaunchURLRequest() : ModelCommand("launch-urlrequest") { AddArgument("ContentURL", &mRequest.contentURL); AddArgument("DisplayString", &mRequest.displayString); - // brandingInformation Array parsing is not supported yet + // brandingInformation Struct parsing is not supported yet ModelCommand::AddArguments(); } @@ -13908,12 +13735,12 @@ class ContentLauncherLaunchURL : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x0000050A) command (0x00000001) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnContentLauncherLaunchURLResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnContentLauncherLaunchResponseSuccess, OnDefaultFailure, endpointId, + mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest; + chip::app::Clusters::ContentLauncher::Commands::LaunchURLRequest::Type mRequest; }; /* @@ -21077,7 +20904,7 @@ class ReportIlluminanceMeasurementClusterRevision : public ModelCommand | Cluster KeypadInput | 0x0509 | |------------------------------------------------------------------------------| | Commands: | | -| * SendKey | 0x00 | +| * SendKeyRequest | 0x00 | |------------------------------------------------------------------------------| | Attributes: | | | * AttributeList | 0xFFFB | @@ -21085,12 +20912,12 @@ class ReportIlluminanceMeasurementClusterRevision : public ModelCommand \*----------------------------------------------------------------------------*/ /* - * Command SendKey + * Command SendKeyRequest */ -class KeypadInputSendKey : public ModelCommand +class KeypadInputSendKeyRequest : public ModelCommand { public: - KeypadInputSendKey() : ModelCommand("send-key") + KeypadInputSendKeyRequest() : ModelCommand("send-key-request") { AddArgument("KeyCode", 0, UINT8_MAX, reinterpret_cast *>(&mRequest.keyCode)); @@ -21106,7 +20933,7 @@ class KeypadInputSendKey : public ModelCommand } private: - chip::app::Clusters::KeypadInput::Commands::SendKey::Type mRequest; + chip::app::Clusters::KeypadInput::Commands::SendKeyRequest::Type mRequest; }; /* @@ -22840,10 +22667,10 @@ class ReportLowPowerClusterRevision : public ModelCommand | Cluster MediaInput | 0x0507 | |------------------------------------------------------------------------------| | Commands: | | -| * HideInputStatus | 0x02 | -| * RenameInput | 0x03 | -| * SelectInput | 0x00 | -| * ShowInputStatus | 0x01 | +| * HideInputStatusRequest | 0x02 | +| * RenameInputRequest | 0x03 | +| * SelectInputRequest | 0x00 | +| * ShowInputStatusRequest | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | | * MediaInputList | 0x0000 | @@ -22853,12 +22680,12 @@ class ReportLowPowerClusterRevision : public ModelCommand \*----------------------------------------------------------------------------*/ /* - * Command HideInputStatus + * Command HideInputStatusRequest */ -class MediaInputHideInputStatus : public ModelCommand +class MediaInputHideInputStatusRequest : public ModelCommand { public: - MediaInputHideInputStatus() : ModelCommand("hide-input-status") { ModelCommand::AddArguments(); } + MediaInputHideInputStatusRequest() : ModelCommand("hide-input-status-request") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { @@ -22869,16 +22696,16 @@ class MediaInputHideInputStatus : public ModelCommand } private: - chip::app::Clusters::MediaInput::Commands::HideInputStatus::Type mRequest; + chip::app::Clusters::MediaInput::Commands::HideInputStatusRequest::Type mRequest; }; /* - * Command RenameInput + * Command RenameInputRequest */ -class MediaInputRenameInput : public ModelCommand +class MediaInputRenameInputRequest : public ModelCommand { public: - MediaInputRenameInput() : ModelCommand("rename-input") + MediaInputRenameInputRequest() : ModelCommand("rename-input-request") { AddArgument("Index", 0, UINT8_MAX, &mRequest.index); AddArgument("Name", &mRequest.name); @@ -22894,16 +22721,16 @@ class MediaInputRenameInput : public ModelCommand } private: - chip::app::Clusters::MediaInput::Commands::RenameInput::Type mRequest; + chip::app::Clusters::MediaInput::Commands::RenameInputRequest::Type mRequest; }; /* - * Command SelectInput + * Command SelectInputRequest */ -class MediaInputSelectInput : public ModelCommand +class MediaInputSelectInputRequest : public ModelCommand { public: - MediaInputSelectInput() : ModelCommand("select-input") + MediaInputSelectInputRequest() : ModelCommand("select-input-request") { AddArgument("Index", 0, UINT8_MAX, &mRequest.index); ModelCommand::AddArguments(); @@ -22918,16 +22745,16 @@ class MediaInputSelectInput : public ModelCommand } private: - chip::app::Clusters::MediaInput::Commands::SelectInput::Type mRequest; + chip::app::Clusters::MediaInput::Commands::SelectInputRequest::Type mRequest; }; /* - * Command ShowInputStatus + * Command ShowInputStatusRequest */ -class MediaInputShowInputStatus : public ModelCommand +class MediaInputShowInputStatusRequest : public ModelCommand { public: - MediaInputShowInputStatus() : ModelCommand("show-input-status") { ModelCommand::AddArguments(); } + MediaInputShowInputStatusRequest() : ModelCommand("show-input-status-request") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { @@ -22938,7 +22765,7 @@ class MediaInputShowInputStatus : public ModelCommand } private: - chip::app::Clusters::MediaInput::Commands::ShowInputStatus::Type mRequest; + chip::app::Clusters::MediaInput::Commands::ShowInputStatusRequest::Type mRequest; }; /* @@ -22967,7 +22794,7 @@ class ReadMediaInputMediaInputList : public ModelCommand static void OnAttributeResponse( void * context, - const chip::app::DataModel::DecodableList & value) + const chip::app::DataModel::DecodableList & value) { OnGeneralAttributeResponse(context, "MediaInput.MediaInputList response", value); } @@ -23006,7 +22833,7 @@ class ReportMediaInputMediaInputList : public ModelCommand static void OnValueReport( void * context, - const chip::app::DataModel::DecodableList & value) + const chip::app::DataModel::DecodableList & value) { LogValue("MediaInput.MediaInputList report", 0, value); } @@ -23189,17 +23016,17 @@ class ReportMediaInputClusterRevision : public ModelCommand | Cluster MediaPlayback | 0x0506 | |------------------------------------------------------------------------------| | Commands: | | -| * MediaFastForward | 0x07 | -| * MediaNext | 0x05 | -| * MediaPause | 0x01 | -| * MediaPlay | 0x00 | -| * MediaPrevious | 0x04 | -| * MediaRewind | 0x06 | -| * MediaSeek | 0x0A | -| * MediaSkipBackward | 0x09 | -| * MediaSkipForward | 0x08 | -| * MediaStartOver | 0x03 | -| * MediaStop | 0x02 | +| * FastForwardRequest | 0x07 | +| * NextRequest | 0x05 | +| * PauseRequest | 0x01 | +| * PlayRequest | 0x00 | +| * PreviousRequest | 0x04 | +| * RewindRequest | 0x06 | +| * SeekRequest | 0x0B | +| * SkipBackwardRequest | 0x09 | +| * SkipForwardRequest | 0x08 | +| * StartOverRequest | 0x03 | +| * StopRequest | 0x02 | |------------------------------------------------------------------------------| | Attributes: | | | * PlaybackState | 0x0000 | @@ -23213,132 +23040,132 @@ class ReportMediaInputClusterRevision : public ModelCommand \*----------------------------------------------------------------------------*/ /* - * Command MediaFastForward + * Command FastForwardRequest */ -class MediaPlaybackMediaFastForward : public ModelCommand +class MediaPlaybackFastForwardRequest : public ModelCommand { public: - MediaPlaybackMediaFastForward() : ModelCommand("media-fast-forward") { ModelCommand::AddArguments(); } + MediaPlaybackFastForwardRequest() : ModelCommand("fast-forward-request") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000007) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackMediaFastForwardResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackPlaybackResponseSuccess, OnDefaultFailure, endpointId, + mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::MediaPlayback::Commands::MediaFastForward::Type mRequest; + chip::app::Clusters::MediaPlayback::Commands::FastForwardRequest::Type mRequest; }; /* - * Command MediaNext + * Command NextRequest */ -class MediaPlaybackMediaNext : public ModelCommand +class MediaPlaybackNextRequest : public ModelCommand { public: - MediaPlaybackMediaNext() : ModelCommand("media-next") { ModelCommand::AddArguments(); } + MediaPlaybackNextRequest() : ModelCommand("next-request") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000005) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackMediaNextResponseSuccess, OnDefaultFailure, endpointId, + return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackPlaybackResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::MediaPlayback::Commands::MediaNext::Type mRequest; + chip::app::Clusters::MediaPlayback::Commands::NextRequest::Type mRequest; }; /* - * Command MediaPause + * Command PauseRequest */ -class MediaPlaybackMediaPause : public ModelCommand +class MediaPlaybackPauseRequest : public ModelCommand { public: - MediaPlaybackMediaPause() : ModelCommand("media-pause") { ModelCommand::AddArguments(); } + MediaPlaybackPauseRequest() : ModelCommand("pause-request") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000001) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackMediaPauseResponseSuccess, OnDefaultFailure, endpointId, + return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackPlaybackResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::MediaPlayback::Commands::MediaPause::Type mRequest; + chip::app::Clusters::MediaPlayback::Commands::PauseRequest::Type mRequest; }; /* - * Command MediaPlay + * Command PlayRequest */ -class MediaPlaybackMediaPlay : public ModelCommand +class MediaPlaybackPlayRequest : public ModelCommand { public: - MediaPlaybackMediaPlay() : ModelCommand("media-play") { ModelCommand::AddArguments(); } + MediaPlaybackPlayRequest() : ModelCommand("play-request") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000000) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackMediaPlayResponseSuccess, OnDefaultFailure, endpointId, + return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackPlaybackResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::MediaPlayback::Commands::MediaPlay::Type mRequest; + chip::app::Clusters::MediaPlayback::Commands::PlayRequest::Type mRequest; }; /* - * Command MediaPrevious + * Command PreviousRequest */ -class MediaPlaybackMediaPrevious : public ModelCommand +class MediaPlaybackPreviousRequest : public ModelCommand { public: - MediaPlaybackMediaPrevious() : ModelCommand("media-previous") { ModelCommand::AddArguments(); } + MediaPlaybackPreviousRequest() : ModelCommand("previous-request") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000004) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackMediaPreviousResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackPlaybackResponseSuccess, OnDefaultFailure, endpointId, + mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::MediaPlayback::Commands::MediaPrevious::Type mRequest; + chip::app::Clusters::MediaPlayback::Commands::PreviousRequest::Type mRequest; }; /* - * Command MediaRewind + * Command RewindRequest */ -class MediaPlaybackMediaRewind : public ModelCommand +class MediaPlaybackRewindRequest : public ModelCommand { public: - MediaPlaybackMediaRewind() : ModelCommand("media-rewind") { ModelCommand::AddArguments(); } + MediaPlaybackRewindRequest() : ModelCommand("rewind-request") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000006) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackMediaRewindResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackPlaybackResponseSuccess, OnDefaultFailure, endpointId, + mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::MediaPlayback::Commands::MediaRewind::Type mRequest; + chip::app::Clusters::MediaPlayback::Commands::RewindRequest::Type mRequest; }; /* - * Command MediaSeek + * Command SeekRequest */ -class MediaPlaybackMediaSeek : public ModelCommand +class MediaPlaybackSeekRequest : public ModelCommand { public: - MediaPlaybackMediaSeek() : ModelCommand("media-seek") + MediaPlaybackSeekRequest() : ModelCommand("seek-request") { AddArgument("Position", 0, UINT64_MAX, &mRequest.position); ModelCommand::AddArguments(); @@ -23346,23 +23173,23 @@ class MediaPlaybackMediaSeek : public ModelCommand CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x0000000A) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x0000000B) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackMediaSeekResponseSuccess, OnDefaultFailure, endpointId, + return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackPlaybackResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::MediaPlayback::Commands::MediaSeek::Type mRequest; + chip::app::Clusters::MediaPlayback::Commands::SeekRequest::Type mRequest; }; /* - * Command MediaSkipBackward + * Command SkipBackwardRequest */ -class MediaPlaybackMediaSkipBackward : public ModelCommand +class MediaPlaybackSkipBackwardRequest : public ModelCommand { public: - MediaPlaybackMediaSkipBackward() : ModelCommand("media-skip-backward") + MediaPlaybackSkipBackwardRequest() : ModelCommand("skip-backward-request") { AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds); ModelCommand::AddArguments(); @@ -23372,21 +23199,21 @@ class MediaPlaybackMediaSkipBackward : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000009) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackMediaSkipBackwardResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackPlaybackResponseSuccess, OnDefaultFailure, endpointId, + mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackward::Type mRequest; + chip::app::Clusters::MediaPlayback::Commands::SkipBackwardRequest::Type mRequest; }; /* - * Command MediaSkipForward + * Command SkipForwardRequest */ -class MediaPlaybackMediaSkipForward : public ModelCommand +class MediaPlaybackSkipForwardRequest : public ModelCommand { public: - MediaPlaybackMediaSkipForward() : ModelCommand("media-skip-forward") + MediaPlaybackSkipForwardRequest() : ModelCommand("skip-forward-request") { AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mRequest.deltaPositionMilliseconds); ModelCommand::AddArguments(); @@ -23396,52 +23223,52 @@ class MediaPlaybackMediaSkipForward : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000008) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackMediaSkipForwardResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackPlaybackResponseSuccess, OnDefaultFailure, endpointId, + mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::MediaPlayback::Commands::MediaSkipForward::Type mRequest; + chip::app::Clusters::MediaPlayback::Commands::SkipForwardRequest::Type mRequest; }; /* - * Command MediaStartOver + * Command StartOverRequest */ -class MediaPlaybackMediaStartOver : public ModelCommand +class MediaPlaybackStartOverRequest : public ModelCommand { public: - MediaPlaybackMediaStartOver() : ModelCommand("media-start-over") { ModelCommand::AddArguments(); } + MediaPlaybackStartOverRequest() : ModelCommand("start-over-request") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000003) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackMediaStartOverResponseSuccess, OnDefaultFailure, - endpointId, mRequest, mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackPlaybackResponseSuccess, OnDefaultFailure, endpointId, + mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::MediaPlayback::Commands::MediaStartOver::Type mRequest; + chip::app::Clusters::MediaPlayback::Commands::StartOverRequest::Type mRequest; }; /* - * Command MediaStop + * Command StopRequest */ -class MediaPlaybackMediaStop : public ModelCommand +class MediaPlaybackStopRequest : public ModelCommand { public: - MediaPlaybackMediaStop() : ModelCommand("media-stop") { ModelCommand::AddArguments(); } + MediaPlaybackStopRequest() : ModelCommand("stop-request") { ModelCommand::AddArguments(); } CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000506) command (0x00000002) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackMediaStopResponseSuccess, OnDefaultFailure, endpointId, + return chip::Controller::InvokeCommand(device, this, OnMediaPlaybackPlaybackResponseSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); } private: - chip::app::Clusters::MediaPlayback::Commands::MediaStop::Type mRequest; + chip::app::Clusters::MediaPlayback::Commands::StopRequest::Type mRequest; }; /* @@ -23468,7 +23295,7 @@ class ReadMediaPlaybackPlaybackState : public ModelCommand this, OnAttributeResponse, OnDefaultFailure); } - static void OnAttributeResponse(void * context, uint8_t value) + static void OnAttributeResponse(void * context, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value) { OnGeneralAttributeResponse(context, "MediaPlayback.PlaybackState response", value); } @@ -23505,7 +23332,10 @@ class ReportMediaPlaybackPlaybackState : public ModelCommand return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); } - static void OnValueReport(void * context, uint8_t value) { LogValue("MediaPlayback.PlaybackState report", 0, value); } + static void OnValueReport(void * context, chip::app::Clusters::MediaPlayback::PlaybackStateEnum value) + { + LogValue("MediaPlayback.PlaybackState report", 0, value); + } private: uint16_t mMinInterval; @@ -32880,7 +32710,7 @@ class ReportSwitchClusterRevision : public ModelCommand | Cluster TargetNavigator | 0x0505 | |------------------------------------------------------------------------------| | Commands: | | -| * NavigateTarget | 0x00 | +| * NavigateTargetRequest | 0x00 | |------------------------------------------------------------------------------| | Attributes: | | | * TargetNavigatorList | 0x0000 | @@ -32890,12 +32720,12 @@ class ReportSwitchClusterRevision : public ModelCommand \*----------------------------------------------------------------------------*/ /* - * Command NavigateTarget + * Command NavigateTargetRequest */ -class TargetNavigatorNavigateTarget : public ModelCommand +class TargetNavigatorNavigateTargetRequest : public ModelCommand { public: - TargetNavigatorNavigateTarget() : ModelCommand("navigate-target") + TargetNavigatorNavigateTargetRequest() : ModelCommand("navigate-target-request") { AddArgument("Target", 0, UINT8_MAX, &mRequest.target); AddArgument("Data", &mRequest.data); @@ -32911,7 +32741,7 @@ class TargetNavigatorNavigateTarget : public ModelCommand } private: - chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Type mRequest; + chip::app::Clusters::TargetNavigator::Commands::NavigateTargetRequest::Type mRequest; }; /* @@ -32938,10 +32768,9 @@ class ReadTargetNavigatorTargetNavigatorList : public ModelCommand this, OnAttributeResponse, OnDefaultFailure); } - static void - OnAttributeResponse(void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & value) + static void OnAttributeResponse( + void * context, + const chip::app::DataModel::DecodableList & value) { OnGeneralAttributeResponse(context, "TargetNavigator.TargetNavigatorList response", value); } @@ -32978,9 +32807,9 @@ class ReportTargetNavigatorTargetNavigatorList : public ModelCommand return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); } - static void OnValueReport(void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & value) + static void OnValueReport( + void * context, + const chip::app::DataModel::DecodableList & value) { LogValue("TargetNavigator.TargetNavigatorList report", 0, value); } @@ -33021,6 +32850,48 @@ class ReadTargetNavigatorCurrentNavigatorTarget : public ModelCommand } }; +class ReportTargetNavigatorCurrentNavigatorTarget : public ModelCommand +{ +public: + ReportTargetNavigatorCurrentNavigatorTarget() : ModelCommand("report") + { + AddArgument("attr-name", "current-navigator-target"); + AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); + AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("wait", 0, 1, &mWait); + ModelCommand::AddArguments(); + } + + ~ReportTargetNavigatorCurrentNavigatorTarget() {} + + CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x0505) command (0x06) on endpoint %" PRIu8, endpointId); + + chip::Controller::TargetNavigatorCluster cluster; + cluster.Associate(device, endpointId); + + auto subscriptionEstablishedCallback = mWait ? OnDefaultSuccessResponseWithoutExit : OnDefaultSuccessResponse; + return cluster.SubscribeAttribute( + this, OnValueReport, OnDefaultFailure, mMinInterval, mMaxInterval, subscriptionEstablishedCallback); + } + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); + } + + static void OnValueReport(void * context, uint8_t value) + { + LogValue("TargetNavigator.CurrentNavigatorTarget report", 0, value); + } + +private: + uint16_t mMinInterval; + uint16_t mMaxInterval; + bool mWait; +}; + /* * Attribute AttributeList */ @@ -51216,9 +51087,9 @@ void registerClusterAccountLogin(Commands & commands) const char * clusterName = "AccountLogin"; commands_list clusterCommands = { - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // @@ -51249,7 +51120,6 @@ void registerClusterApplicationBasic(Commands & commands) const char * clusterName = "ApplicationBasic"; commands_list clusterCommands = { - make_unique(), // make_unique(), // make_unique(), // make_unique(), // @@ -51262,6 +51132,7 @@ void registerClusterApplicationBasic(Commands & commands) make_unique(), // make_unique(), // make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // @@ -51274,9 +51145,9 @@ void registerClusterApplicationLauncher(Commands & commands) const char * clusterName = "ApplicationLauncher"; commands_list clusterCommands = { - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // @@ -51290,8 +51161,8 @@ void registerClusterAudioOutput(Commands & commands) const char * clusterName = "AudioOutput"; commands_list clusterCommands = { - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // @@ -51470,13 +51341,13 @@ void registerClusterChannel(Commands & commands) const char * clusterName = "Channel"; commands_list clusterCommands = { - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // }; commands.Register(clusterName, clusterCommands); @@ -51634,8 +51505,8 @@ void registerClusterContentLauncher(Commands & commands) const char * clusterName = "ContentLauncher"; commands_list clusterCommands = { - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // @@ -51959,7 +51830,7 @@ void registerClusterKeypadInput(Commands & commands) const char * clusterName = "KeypadInput"; commands_list clusterCommands = { - make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // @@ -52040,10 +51911,10 @@ void registerClusterMediaInput(Commands & commands) const char * clusterName = "MediaInput"; commands_list clusterCommands = { - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // @@ -52059,17 +51930,17 @@ void registerClusterMediaPlayback(Commands & commands) const char * clusterName = "MediaPlayback"; commands_list clusterCommands = { - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // @@ -52493,12 +52364,13 @@ void registerClusterTargetNavigator(Commands & commands) const char * clusterName = "TargetNavigator"; commands_list clusterCommands = { - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // }; commands.Register(clusterName, clusterCommands); diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index cb22ab2cd080a4..92839e75bea53f 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -32093,8 +32093,8 @@ class TV_TargetNavigatorCluster : public TestCommand err = TestReadAttributeCurrentNavigatorTarget_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : Navigate Target Command\n"); - err = TestNavigateTargetCommand_3(); + ChipLogProgress(chipTool, " ***** Test Step 3 : Navigate Target Request Command\n"); + err = TestNavigateTargetRequestCommand_3(); break; } @@ -32116,8 +32116,8 @@ class TV_TargetNavigatorCluster : public TestCommand static void OnSuccessCallback_1( void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & targetNavigatorList) + const chip::app::DataModel::DecodableList & + targetNavigatorList) { (static_cast(context))->OnSuccessResponse_1(targetNavigatorList); } @@ -32156,8 +32156,8 @@ class TV_TargetNavigatorCluster : public TestCommand void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1( - const chip::app::DataModel::DecodableList< - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & targetNavigatorList) + const chip::app::DataModel::DecodableList & + targetNavigatorList) { auto iter = targetNavigatorList.begin(); VerifyOrReturn(CheckNextListItemDecodes("targetNavigatorList", iter, 0)); @@ -32192,10 +32192,10 @@ class TV_TargetNavigatorCluster : public TestCommand NextTest(); } - CHIP_ERROR TestNavigateTargetCommand_3() + CHIP_ERROR TestNavigateTargetRequestCommand_3() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::TargetNavigator::Commands::NavigateTarget::Type; + using RequestType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetRequest::Type; RequestType request; request.target = 1; @@ -32215,7 +32215,7 @@ class TV_TargetNavigatorCluster : public TestCommand void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_3(chip::app::Clusters::TargetNavigator::NavigateTargetStatus status, chip::CharSpan data) + void OnSuccessResponse_3(chip::app::Clusters::TargetNavigator::StatusEnum status, chip::CharSpan data) { VerifyOrReturn(CheckValue("status", status, 0)); @@ -32295,7 +32295,7 @@ class TV_AudioOutputCluster : public TestCommand static void OnSuccessCallback_1( void * context, - const chip::app::DataModel::DecodableList & + const chip::app::DataModel::DecodableList & audioOutputList) { (static_cast(context))->OnSuccessResponse_1(audioOutputList); @@ -32335,7 +32335,7 @@ class TV_AudioOutputCluster : public TestCommand void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1( - const chip::app::DataModel::DecodableList & + const chip::app::DataModel::DecodableList & audioOutputList) { auto iter = audioOutputList.begin(); @@ -32379,7 +32379,7 @@ class TV_AudioOutputCluster : public TestCommand CHIP_ERROR TestSelectOutputCommand_3() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 2; - using RequestType = chip::app::Clusters::AudioOutput::Commands::SelectOutput::Type; + using RequestType = chip::app::Clusters::AudioOutput::Commands::SelectOutputRequest::Type; RequestType request; request.index = 1; @@ -32403,7 +32403,7 @@ class TV_AudioOutputCluster : public TestCommand CHIP_ERROR TestRenameOutputCommand_4() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 2; - using RequestType = chip::app::Clusters::AudioOutput::Commands::RenameOutput::Type; + using RequestType = chip::app::Clusters::AudioOutput::Commands::RenameOutputRequest::Type; RequestType request; request.index = 1; @@ -32538,12 +32538,14 @@ class TV_ApplicationLauncherCluster : public TestCommand CHIP_ERROR TestLaunchAppCommand_2() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Type; + using RequestType = chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppRequest::Type; RequestType request; 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) { @@ -32560,7 +32562,7 @@ class TV_ApplicationLauncherCluster : public TestCommand void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_2(chip::app::Clusters::ApplicationLauncher::ApplicationLauncherStatus status, chip::CharSpan data) + void OnSuccessResponse_2(chip::app::Clusters::ApplicationLauncher::StatusEnum status, chip::CharSpan data) { VerifyOrReturn(CheckValue("status", status, 0)); @@ -32572,11 +32574,13 @@ class TV_ApplicationLauncherCluster : public TestCommand CHIP_ERROR TestStopAppCommand_3() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Type; + using RequestType = chip::app::Clusters::ApplicationLauncher::Commands::StopAppRequest::Type; 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) { @@ -32593,7 +32597,7 @@ class TV_ApplicationLauncherCluster : public TestCommand void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_3(chip::app::Clusters::ApplicationLauncher::ApplicationLauncherStatus status, chip::CharSpan data) + void OnSuccessResponse_3(chip::app::Clusters::ApplicationLauncher::StatusEnum status, chip::CharSpan data) { VerifyOrReturn(CheckValue("status", status, 0)); @@ -32605,11 +32609,13 @@ class TV_ApplicationLauncherCluster : public TestCommand CHIP_ERROR TestHideAppCommand_4() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Type; + using RequestType = chip::app::Clusters::ApplicationLauncher::Commands::HideAppRequest::Type; 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) { @@ -32626,7 +32632,7 @@ class TV_ApplicationLauncherCluster : public TestCommand void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_4(chip::app::Clusters::ApplicationLauncher::ApplicationLauncherStatus status, chip::CharSpan data) + void OnSuccessResponse_4(chip::app::Clusters::ApplicationLauncher::StatusEnum status, chip::CharSpan data) { VerifyOrReturn(CheckValue("status", status, 0)); @@ -32700,10 +32706,10 @@ class TV_KeypadInputCluster : public TestCommand CHIP_ERROR TestSendKeyCommand_1() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::KeypadInput::Commands::SendKey::Type; + using RequestType = chip::app::Clusters::KeypadInput::Commands::SendKeyRequest::Type; RequestType request; - request.keyCode = static_cast(3); + request.keyCode = static_cast(3); auto success = [](void * context, const typename RequestType::ResponseType & data) { (static_cast(context))->OnSuccessResponse_1(data.status); @@ -32719,7 +32725,7 @@ class TV_KeypadInputCluster : public TestCommand void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_1(chip::app::Clusters::KeypadInput::KeypadInputStatus status) + void OnSuccessResponse_1(chip::app::Clusters::KeypadInput::StatusEnum status) { VerifyOrReturn(CheckValue("status", status, 0)); @@ -32799,7 +32805,7 @@ class TV_AccountLoginCluster : public TestCommand CHIP_ERROR TestGetSetupPinCommand_1() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Type; + using RequestType = chip::app::Clusters::AccountLogin::Commands::GetSetupPINRequest::Type; RequestType request; request.tempAccountIdentifier = chip::Span("asdfgarbage: not in length on purpose", 4); @@ -32812,7 +32818,8 @@ class TV_AccountLoginCluster : public TestCommand (static_cast(context))->OnFailureResponse_1(status); }; - ReturnErrorOnFailure(chip::Controller::InvokeCommand(mDevices[kIdentityAlpha], this, success, failure, endpoint, request)); + ReturnErrorOnFailure( + chip::Controller::InvokeCommand(mDevices[kIdentityAlpha], this, success, failure, endpoint, request, 10000)); return CHIP_NO_ERROR; } @@ -32823,7 +32830,7 @@ class TV_AccountLoginCluster : public TestCommand CHIP_ERROR TestLoginCommand_2() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::AccountLogin::Commands::Login::Type; + using RequestType = chip::app::Clusters::AccountLogin::Commands::LoginRequest::Type; RequestType request; request.tempAccountIdentifier = chip::Span("asdfgarbage: not in length on purpose", 4); @@ -32837,7 +32844,8 @@ class TV_AccountLoginCluster : public TestCommand (static_cast(context))->OnFailureResponse_2(status); }; - ReturnErrorOnFailure(chip::Controller::InvokeCommand(mDevices[kIdentityAlpha], this, success, failure, endpoint, request)); + ReturnErrorOnFailure( + chip::Controller::InvokeCommand(mDevices[kIdentityAlpha], this, success, failure, endpoint, request, 10000)); return CHIP_NO_ERROR; } @@ -32848,7 +32856,7 @@ class TV_AccountLoginCluster : public TestCommand CHIP_ERROR TestLogoutCommand_3() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::AccountLogin::Commands::Logout::Type; + using RequestType = chip::app::Clusters::AccountLogin::Commands::LogoutRequest::Type; RequestType request; @@ -32860,7 +32868,8 @@ class TV_AccountLoginCluster : public TestCommand (static_cast(context))->OnFailureResponse_3(status); }; - ReturnErrorOnFailure(chip::Controller::InvokeCommand(mDevices[kIdentityAlpha], this, success, failure, endpoint, request)); + ReturnErrorOnFailure( + chip::Controller::InvokeCommand(mDevices[kIdentityAlpha], this, success, failure, endpoint, request, 10000)); return CHIP_NO_ERROR; } @@ -32996,32 +33005,28 @@ class TV_ApplicationBasicCluster : public TestCommand err = TestWaitForTheCommissionedDeviceToBeRetrieved_0(); break; case 1: - ChipLogProgress(chipTool, " ***** Test Step 1 : Change Status Command\n"); - err = TestChangeStatusCommand_1(); + ChipLogProgress(chipTool, " ***** Test Step 1 : Read attribute vendor name\n"); + err = TestReadAttributeVendorName_1(); break; case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute vendor name\n"); - err = TestReadAttributeVendorName_2(); + ChipLogProgress(chipTool, " ***** Test Step 2 : Read attribute vendor id\n"); + err = TestReadAttributeVendorId_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : Read attribute vendor id\n"); - err = TestReadAttributeVendorId_3(); + ChipLogProgress(chipTool, " ***** Test Step 3 : Read attribute application name\n"); + err = TestReadAttributeApplicationName_3(); break; case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : Read attribute application name\n"); - err = TestReadAttributeApplicationName_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : Read attribute product id\n"); + err = TestReadAttributeProductId_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : Read attribute product id\n"); - err = TestReadAttributeProductId_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : Read attribute application status\n"); + err = TestReadAttributeApplicationStatus_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : Read attribute application status\n"); - err = TestReadAttributeApplicationStatus_6(); - break; - case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : Read attribute application version\n"); - err = TestReadAttributeApplicationVersion_7(); + ChipLogProgress(chipTool, " ***** Test Step 6 : Read attribute application version\n"); + err = TestReadAttributeApplicationVersion_6(); break; } @@ -33034,16 +33039,26 @@ class TV_ApplicationBasicCluster : public TestCommand private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 8; + const uint16_t mTestCount = 7; + + static void OnFailureCallback_1(void * context, EmberAfStatus status) + { + (static_cast(context))->OnFailureResponse_1(status); + } + + static void OnSuccessCallback_1(void * context, chip::CharSpan vendorName) + { + (static_cast(context))->OnSuccessResponse_1(vendorName); + } static void OnFailureCallback_2(void * context, EmberAfStatus status) { (static_cast(context))->OnFailureResponse_2(status); } - static void OnSuccessCallback_2(void * context, chip::CharSpan vendorName) + static void OnSuccessCallback_2(void * context, uint16_t vendorId) { - (static_cast(context))->OnSuccessResponse_2(vendorName); + (static_cast(context))->OnSuccessResponse_2(vendorId); } static void OnFailureCallback_3(void * context, EmberAfStatus status) @@ -33051,9 +33066,9 @@ class TV_ApplicationBasicCluster : public TestCommand (static_cast(context))->OnFailureResponse_3(status); } - static void OnSuccessCallback_3(void * context, uint16_t vendorId) + static void OnSuccessCallback_3(void * context, chip::CharSpan applicationName) { - (static_cast(context))->OnSuccessResponse_3(vendorId); + (static_cast(context))->OnSuccessResponse_3(applicationName); } static void OnFailureCallback_4(void * context, EmberAfStatus status) @@ -33061,9 +33076,9 @@ class TV_ApplicationBasicCluster : public TestCommand (static_cast(context))->OnFailureResponse_4(status); } - static void OnSuccessCallback_4(void * context, chip::CharSpan applicationName) + static void OnSuccessCallback_4(void * context, uint16_t productId) { - (static_cast(context))->OnSuccessResponse_4(applicationName); + (static_cast(context))->OnSuccessResponse_4(productId); } static void OnFailureCallback_5(void * context, EmberAfStatus status) @@ -33071,9 +33086,9 @@ class TV_ApplicationBasicCluster : public TestCommand (static_cast(context))->OnFailureResponse_5(status); } - static void OnSuccessCallback_5(void * context, uint16_t productId) + static void OnSuccessCallback_5(void * context, chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum applicationStatus) { - (static_cast(context))->OnSuccessResponse_5(productId); + (static_cast(context))->OnSuccessResponse_5(applicationStatus); } static void OnFailureCallback_6(void * context, EmberAfStatus status) @@ -33081,19 +33096,9 @@ class TV_ApplicationBasicCluster : public TestCommand (static_cast(context))->OnFailureResponse_6(status); } - static void OnSuccessCallback_6(void * context, uint8_t applicationStatus) + static void OnSuccessCallback_6(void * context, chip::CharSpan applicationVersion) { - (static_cast(context))->OnSuccessResponse_6(applicationStatus); - } - - static void OnFailureCallback_7(void * context, EmberAfStatus status) - { - (static_cast(context))->OnFailureResponse_7(status); - } - - static void OnSuccessCallback_7(void * context, chip::CharSpan applicationVersion) - { - (static_cast(context))->OnSuccessResponse_7(applicationVersion); + (static_cast(context))->OnSuccessResponse_6(applicationVersion); } // @@ -33106,144 +33111,120 @@ class TV_ApplicationBasicCluster : public TestCommand return WaitForCommissionee(); } - CHIP_ERROR TestChangeStatusCommand_1() - { - const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::ApplicationBasic::Commands::ChangeStatus::Type; - - RequestType request; - request.status = static_cast(1); - - auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_1(); - }; - - auto failure = [](void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(status); - }; - - ReturnErrorOnFailure(chip::Controller::InvokeCommand(mDevices[kIdentityAlpha], this, success, failure, endpoint, request)); - return CHIP_NO_ERROR; - } - - void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } - - void OnSuccessResponse_1() { NextTest(); } - - CHIP_ERROR TestReadAttributeVendorName_2() + CHIP_ERROR TestReadAttributeVendorName_1() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; chip::Controller::ApplicationBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2)); + this, OnSuccessCallback_1, OnFailureCallback_1)); return CHIP_NO_ERROR; } - void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_2(chip::CharSpan vendorName) + void OnSuccessResponse_1(chip::CharSpan vendorName) { VerifyOrReturn(CheckValueAsString("vendorName", vendorName, chip::CharSpan("exampleVendorName1", 18))); NextTest(); } - CHIP_ERROR TestReadAttributeVendorId_3() + CHIP_ERROR TestReadAttributeVendorId_2() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; chip::Controller::ApplicationBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3)); + this, OnSuccessCallback_2, OnFailureCallback_2)); return CHIP_NO_ERROR; } - void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_3(uint16_t vendorId) + void OnSuccessResponse_2(uint16_t vendorId) { VerifyOrReturn(CheckValue("vendorId", vendorId, 1U)); NextTest(); } - CHIP_ERROR TestReadAttributeApplicationName_4() + CHIP_ERROR TestReadAttributeApplicationName_3() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; chip::Controller::ApplicationBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4)); + this, OnSuccessCallback_3, OnFailureCallback_3)); return CHIP_NO_ERROR; } - void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_4(chip::CharSpan applicationName) + void OnSuccessResponse_3(chip::CharSpan applicationName) { VerifyOrReturn(CheckValueAsString("applicationName", applicationName, chip::CharSpan("exampleName1", 12))); NextTest(); } - CHIP_ERROR TestReadAttributeProductId_5() + CHIP_ERROR TestReadAttributeProductId_4() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; chip::Controller::ApplicationBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5)); + this, OnSuccessCallback_4, OnFailureCallback_4)); return CHIP_NO_ERROR; } - void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_5(uint16_t productId) + void OnSuccessResponse_4(uint16_t productId) { VerifyOrReturn(CheckValue("productId", productId, 1U)); NextTest(); } - CHIP_ERROR TestReadAttributeApplicationStatus_6() + CHIP_ERROR TestReadAttributeApplicationStatus_5() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; chip::Controller::ApplicationBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6)); + this, OnSuccessCallback_5, OnFailureCallback_5)); return CHIP_NO_ERROR; } - void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_6(uint8_t applicationStatus) + void OnSuccessResponse_5(chip::app::Clusters::ApplicationBasic::ApplicationStatusEnum applicationStatus) { VerifyOrReturn(CheckValue("applicationStatus", applicationStatus, 0)); NextTest(); } - CHIP_ERROR TestReadAttributeApplicationVersion_7() + CHIP_ERROR TestReadAttributeApplicationVersion_6() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; chip::Controller::ApplicationBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7)); + this, OnSuccessCallback_6, OnFailureCallback_6)); return CHIP_NO_ERROR; } - void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_7(chip::CharSpan applicationVersion) + void OnSuccessResponse_6(chip::CharSpan applicationVersion) { VerifyOrReturn(CheckValueAsString("applicationVersion", applicationVersion, chip::CharSpan("exampleVersion", 14))); @@ -33371,7 +33352,7 @@ class TV_MediaPlaybackCluster : public TestCommand (static_cast(context))->OnFailureResponse_1(status); } - static void OnSuccessCallback_1(void * context, uint8_t playbackState) + static void OnSuccessCallback_1(void * context, chip::app::Clusters::MediaPlayback::PlaybackStateEnum playbackState) { (static_cast(context))->OnSuccessResponse_1(playbackState); } @@ -33449,7 +33430,7 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_1(uint8_t playbackState) + void OnSuccessResponse_1(chip::app::Clusters::MediaPlayback::PlaybackStateEnum playbackState) { VerifyOrReturn(CheckValue("playbackState", playbackState, 0)); @@ -33559,12 +33540,12 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestMediaPlaybackPlayCommand_7() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::MediaPlayback::Commands::MediaPlay::Type; + using RequestType = chip::app::Clusters::MediaPlayback::Commands::PlayRequest::Type; RequestType request; auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_7(data.mediaPlaybackStatus); + (static_cast(context))->OnSuccessResponse_7(data.status); }; auto failure = [](void * context, EmberAfStatus status) { @@ -33577,9 +33558,9 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_7(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) + void OnSuccessResponse_7(chip::app::Clusters::MediaPlayback::StatusEnum status) { - VerifyOrReturn(CheckValue("mediaPlaybackStatus", mediaPlaybackStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); NextTest(); } @@ -33587,12 +33568,12 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestMediaPlaybackPauseCommand_8() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::MediaPlayback::Commands::MediaPause::Type; + using RequestType = chip::app::Clusters::MediaPlayback::Commands::PauseRequest::Type; RequestType request; auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_8(data.mediaPlaybackStatus); + (static_cast(context))->OnSuccessResponse_8(data.status); }; auto failure = [](void * context, EmberAfStatus status) { @@ -33605,9 +33586,9 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_8(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) + void OnSuccessResponse_8(chip::app::Clusters::MediaPlayback::StatusEnum status) { - VerifyOrReturn(CheckValue("mediaPlaybackStatus", mediaPlaybackStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); NextTest(); } @@ -33615,12 +33596,12 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestMediaPlaybackStopCommand_9() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::MediaPlayback::Commands::MediaStop::Type; + using RequestType = chip::app::Clusters::MediaPlayback::Commands::StopRequest::Type; RequestType request; auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_9(data.mediaPlaybackStatus); + (static_cast(context))->OnSuccessResponse_9(data.status); }; auto failure = [](void * context, EmberAfStatus status) { @@ -33633,9 +33614,9 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_9(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) + void OnSuccessResponse_9(chip::app::Clusters::MediaPlayback::StatusEnum status) { - VerifyOrReturn(CheckValue("mediaPlaybackStatus", mediaPlaybackStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); NextTest(); } @@ -33643,12 +33624,12 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestMediaPlaybackStartOverCommand_10() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::MediaPlayback::Commands::MediaStartOver::Type; + using RequestType = chip::app::Clusters::MediaPlayback::Commands::StartOverRequest::Type; RequestType request; auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_10(data.mediaPlaybackStatus); + (static_cast(context))->OnSuccessResponse_10(data.status); }; auto failure = [](void * context, EmberAfStatus status) { @@ -33661,9 +33642,9 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_10(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) + void OnSuccessResponse_10(chip::app::Clusters::MediaPlayback::StatusEnum status) { - VerifyOrReturn(CheckValue("mediaPlaybackStatus", mediaPlaybackStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); NextTest(); } @@ -33671,12 +33652,12 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestMediaPlaybackPreviousCommand_11() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::MediaPlayback::Commands::MediaPrevious::Type; + using RequestType = chip::app::Clusters::MediaPlayback::Commands::PreviousRequest::Type; RequestType request; auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_11(data.mediaPlaybackStatus); + (static_cast(context))->OnSuccessResponse_11(data.status); }; auto failure = [](void * context, EmberAfStatus status) { @@ -33689,9 +33670,9 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_11(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) + void OnSuccessResponse_11(chip::app::Clusters::MediaPlayback::StatusEnum status) { - VerifyOrReturn(CheckValue("mediaPlaybackStatus", mediaPlaybackStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); NextTest(); } @@ -33699,12 +33680,12 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestMediaPlaybackNextCommand_12() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::MediaPlayback::Commands::MediaNext::Type; + using RequestType = chip::app::Clusters::MediaPlayback::Commands::NextRequest::Type; RequestType request; auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_12(data.mediaPlaybackStatus); + (static_cast(context))->OnSuccessResponse_12(data.status); }; auto failure = [](void * context, EmberAfStatus status) { @@ -33717,9 +33698,9 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_12(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) + void OnSuccessResponse_12(chip::app::Clusters::MediaPlayback::StatusEnum status) { - VerifyOrReturn(CheckValue("mediaPlaybackStatus", mediaPlaybackStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); NextTest(); } @@ -33727,12 +33708,12 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestMediaPlaybackRewindCommand_13() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::MediaPlayback::Commands::MediaRewind::Type; + using RequestType = chip::app::Clusters::MediaPlayback::Commands::RewindRequest::Type; RequestType request; auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_13(data.mediaPlaybackStatus); + (static_cast(context))->OnSuccessResponse_13(data.status); }; auto failure = [](void * context, EmberAfStatus status) { @@ -33745,9 +33726,9 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_13(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) + void OnSuccessResponse_13(chip::app::Clusters::MediaPlayback::StatusEnum status) { - VerifyOrReturn(CheckValue("mediaPlaybackStatus", mediaPlaybackStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); NextTest(); } @@ -33755,12 +33736,12 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestMediaPlaybackFastForwardCommand_14() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::MediaPlayback::Commands::MediaFastForward::Type; + using RequestType = chip::app::Clusters::MediaPlayback::Commands::FastForwardRequest::Type; RequestType request; auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_14(data.mediaPlaybackStatus); + (static_cast(context))->OnSuccessResponse_14(data.status); }; auto failure = [](void * context, EmberAfStatus status) { @@ -33773,9 +33754,9 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_14(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) + void OnSuccessResponse_14(chip::app::Clusters::MediaPlayback::StatusEnum status) { - VerifyOrReturn(CheckValue("mediaPlaybackStatus", mediaPlaybackStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); NextTest(); } @@ -33783,13 +33764,13 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestMediaPlaybackSkipForwardCommand_15() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::MediaPlayback::Commands::MediaSkipForward::Type; + using RequestType = chip::app::Clusters::MediaPlayback::Commands::SkipForwardRequest::Type; RequestType request; request.deltaPositionMilliseconds = 100ULL; auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_15(data.mediaPlaybackStatus); + (static_cast(context))->OnSuccessResponse_15(data.status); }; auto failure = [](void * context, EmberAfStatus status) { @@ -33802,9 +33783,9 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_15(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) + void OnSuccessResponse_15(chip::app::Clusters::MediaPlayback::StatusEnum status) { - VerifyOrReturn(CheckValue("mediaPlaybackStatus", mediaPlaybackStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); NextTest(); } @@ -33812,13 +33793,13 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestMediaPlaybackSkipBackwardCommand_16() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackward::Type; + using RequestType = chip::app::Clusters::MediaPlayback::Commands::SkipBackwardRequest::Type; RequestType request; request.deltaPositionMilliseconds = 100ULL; auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_16(data.mediaPlaybackStatus); + (static_cast(context))->OnSuccessResponse_16(data.status); }; auto failure = [](void * context, EmberAfStatus status) { @@ -33831,9 +33812,9 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_16(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_16(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) + void OnSuccessResponse_16(chip::app::Clusters::MediaPlayback::StatusEnum status) { - VerifyOrReturn(CheckValue("mediaPlaybackStatus", mediaPlaybackStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); NextTest(); } @@ -33841,13 +33822,13 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestMediaPlaybackSeekCommand_17() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 3; - using RequestType = chip::app::Clusters::MediaPlayback::Commands::MediaSeek::Type; + using RequestType = chip::app::Clusters::MediaPlayback::Commands::SeekRequest::Type; RequestType request; request.position = 100ULL; auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_17(data.mediaPlaybackStatus); + (static_cast(context))->OnSuccessResponse_17(data.status); }; auto failure = [](void * context, EmberAfStatus status) { @@ -33860,9 +33841,9 @@ class TV_MediaPlaybackCluster : public TestCommand void OnFailureResponse_17(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_17(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) + void OnSuccessResponse_17(chip::app::Clusters::MediaPlayback::StatusEnum status) { - VerifyOrReturn(CheckValue("mediaPlaybackStatus", mediaPlaybackStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); NextTest(); } @@ -33992,7 +33973,7 @@ class TV_ChannelCluster : public TestCommand CHIP_ERROR TestChangeChannelCommand_2() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::Channel::Commands::ChangeChannel::Type; + using RequestType = chip::app::Clusters::Channel::Commands::ChangeChannelRequest::Type; RequestType request; request.match = chip::Span("CNNgarbage: not in length on purpose", 3); @@ -34012,7 +33993,7 @@ class TV_ChannelCluster : public TestCommand void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(const chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType & channelMatch, - chip::app::Clusters::Channel::ChannelErrorType errorType) + chip::app::Clusters::Channel::ErrorTypeEnum errorType) { VerifyOrReturn(CheckValue("channelMatch.majorNumber", channelMatch.majorNumber, 1U)); VerifyOrReturn(CheckValue("channelMatch.minorNumber", channelMatch.minorNumber, 0U)); @@ -34029,7 +34010,7 @@ class TV_ChannelCluster : public TestCommand CHIP_ERROR TestChangeChannelByNumberCommand_3() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::Channel::Commands::ChangeChannelByNumber::Type; + using RequestType = chip::app::Clusters::Channel::Commands::ChangeChannelByNumberRequest::Type; RequestType request; request.majorNumber = 1U; @@ -34054,7 +34035,7 @@ class TV_ChannelCluster : public TestCommand CHIP_ERROR TestSkipChannelCommand_4() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::Channel::Commands::SkipChannel::Type; + using RequestType = chip::app::Clusters::Channel::Commands::SkipChannelRequest::Type; RequestType request; request.count = 1U; @@ -34303,16 +34284,16 @@ class TV_ContentLauncherCluster : public TestCommand CHIP_ERROR TestLaunchContentCommand_3() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type; + using RequestType = chip::app::Clusters::ContentLauncher::Commands::LaunchContentRequest::Type; RequestType request; request.autoPlay = true; request.data = chip::Span("exampleDatagarbage: not in length on purpose", 11); - request.search = chip::app::DataModel::List(); + request.search = chip::app::DataModel::List(); auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_3(data.contentLaunchStatus, data.data); + (static_cast(context))->OnSuccessResponse_3(data.status, data.data); }; auto failure = [](void * context, EmberAfStatus status) { @@ -34325,9 +34306,9 @@ class TV_ContentLauncherCluster : public TestCommand void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_3(chip::app::Clusters::ContentLauncher::ContentLaunchStatus contentLaunchStatus, chip::CharSpan data) + void OnSuccessResponse_3(chip::app::Clusters::ContentLauncher::StatusEnum status, chip::CharSpan data) { - VerifyOrReturn(CheckValue("contentLaunchStatus", contentLaunchStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); VerifyOrReturn(CheckValueAsString("data", data, chip::CharSpan("exampleData", 11))); @@ -34337,17 +34318,52 @@ class TV_ContentLauncherCluster : public TestCommand CHIP_ERROR TestLaunchUrlCommand_4() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type; + using RequestType = chip::app::Clusters::ContentLauncher::Commands::LaunchURLRequest::Type; RequestType request; request.contentURL = chip::Span("exampleUrlgarbage: not in length on purpose", 10); request.displayString = chip::Span("exampleDisplayStringgarbage: not in length on purpose", 20); - request.brandingInformation = - chip::app::DataModel::List(); + request.brandingInformation.providerName = chip::Span("exampleNamegarbage: not in length on purpose", 11); + + request.brandingInformation.background.imageUrl = chip::Span("exampleUrlgarbage: not in length on purpose", 10); + request.brandingInformation.background.color = chip::Span("exampleColorgarbage: not in length on purpose", 12); + + request.brandingInformation.background.size.width = 0; + request.brandingInformation.background.size.height = 0; + request.brandingInformation.background.size.metric = static_cast(0); + + request.brandingInformation.logo.imageUrl = chip::Span("exampleUrlgarbage: not in length on purpose", 10); + request.brandingInformation.logo.color = chip::Span("exampleColorgarbage: not in length on purpose", 12); + + request.brandingInformation.logo.size.width = 0; + request.brandingInformation.logo.size.height = 0; + request.brandingInformation.logo.size.metric = static_cast(0); + + request.brandingInformation.progressBar.imageUrl = + chip::Span("exampleUrlgarbage: not in length on purpose", 10); + request.brandingInformation.progressBar.color = chip::Span("exampleColorgarbage: not in length on purpose", 12); + + request.brandingInformation.progressBar.size.width = 0; + request.brandingInformation.progressBar.size.height = 0; + request.brandingInformation.progressBar.size.metric = static_cast(0); + + request.brandingInformation.splash.imageUrl = chip::Span("exampleUrlgarbage: not in length on purpose", 10); + request.brandingInformation.splash.color = chip::Span("exampleColorgarbage: not in length on purpose", 12); + + request.brandingInformation.splash.size.width = 0; + request.brandingInformation.splash.size.height = 0; + request.brandingInformation.splash.size.metric = static_cast(0); + + request.brandingInformation.waterMark.imageUrl = chip::Span("exampleUrlgarbage: not in length on purpose", 10); + request.brandingInformation.waterMark.color = chip::Span("exampleColorgarbage: not in length on purpose", 12); + + request.brandingInformation.waterMark.size.width = 0; + request.brandingInformation.waterMark.size.height = 0; + request.brandingInformation.waterMark.size.metric = static_cast(0); auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast(context))->OnSuccessResponse_4(data.contentLaunchStatus, data.data); + (static_cast(context))->OnSuccessResponse_4(data.status, data.data); }; auto failure = [](void * context, EmberAfStatus status) { @@ -34360,9 +34376,9 @@ class TV_ContentLauncherCluster : public TestCommand void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_4(chip::app::Clusters::ContentLauncher::ContentLaunchStatus contentLaunchStatus, chip::CharSpan data) + void OnSuccessResponse_4(chip::app::Clusters::ContentLauncher::StatusEnum status, chip::CharSpan data) { - VerifyOrReturn(CheckValue("contentLaunchStatus", contentLaunchStatus, 0)); + VerifyOrReturn(CheckValue("status", status, 0)); VerifyOrReturn(CheckValueAsString("data", data, chip::CharSpan("exampleData", 11))); @@ -34448,7 +34464,7 @@ class TV_MediaInputCluster : public TestCommand static void OnSuccessCallback_1( void * context, - const chip::app::DataModel::DecodableList & + const chip::app::DataModel::DecodableList & mediaInputList) { (static_cast(context))->OnSuccessResponse_1(mediaInputList); @@ -34488,7 +34504,7 @@ class TV_MediaInputCluster : public TestCommand void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1( - const chip::app::DataModel::DecodableList & + const chip::app::DataModel::DecodableList & mediaInputList) { auto iter = mediaInputList.begin(); @@ -34532,7 +34548,7 @@ class TV_MediaInputCluster : public TestCommand CHIP_ERROR TestSelectInputCommand_3() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::MediaInput::Commands::SelectInput::Type; + using RequestType = chip::app::Clusters::MediaInput::Commands::SelectInputRequest::Type; RequestType request; request.index = 1; @@ -34556,7 +34572,7 @@ class TV_MediaInputCluster : public TestCommand CHIP_ERROR TestHideInputStatusCommand_4() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::MediaInput::Commands::HideInputStatus::Type; + using RequestType = chip::app::Clusters::MediaInput::Commands::HideInputStatusRequest::Type; RequestType request; @@ -34579,7 +34595,7 @@ class TV_MediaInputCluster : public TestCommand CHIP_ERROR TestShowInputStatusCommand_5() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::MediaInput::Commands::ShowInputStatus::Type; + using RequestType = chip::app::Clusters::MediaInput::Commands::ShowInputStatusRequest::Type; RequestType request; @@ -34602,7 +34618,7 @@ class TV_MediaInputCluster : public TestCommand CHIP_ERROR TestRenameInputCommand_6() { const chip::EndpointId endpoint = mEndpointId.HasValue() ? mEndpointId.Value() : 1; - using RequestType = chip::app::Clusters::MediaInput::Commands::RenameInput::Type; + using RequestType = chip::app::Clusters::MediaInput::Commands::RenameInputRequest::Type; RequestType request; request.index = 1; diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp index 04eb97d3d5e9a3..779834df8d925a 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp @@ -237,6 +237,27 @@ void AdministratorCommissioningClusterAttributeListListAttributeFilter(TLV::TLVR cb->mCall(cb->mContext, list); } +void ApplicationBasicClusterAllowedVendorListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback) +{ + chip::app::DataModel::DecodableList list; + CHIP_ERROR err = Decode(*tlvData, list); + if (err != CHIP_NO_ERROR) + { + if (onFailureCallback != nullptr) + { + Callback::Callback * cb = + Callback::Callback::FromCancelable(onFailureCallback); + cb->mCall(cb->mContext, EMBER_ZCL_STATUS_INVALID_VALUE); + } + return; + } + + Callback::Callback * cb = + Callback::Callback::FromCancelable(onSuccessCallback); + cb->mCall(cb->mContext, list); +} + void ApplicationBasicClusterAttributeListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { @@ -304,7 +325,7 @@ void ApplicationLauncherClusterAttributeListListAttributeFilter(TLV::TLVReader * void AudioOutputClusterAudioOutputListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { - chip::app::DataModel::DecodableList list; + chip::app::DataModel::DecodableList list; CHIP_ERROR err = Decode(*tlvData, list); if (err != CHIP_NO_ERROR) { @@ -1238,7 +1259,7 @@ void LowPowerClusterAttributeListListAttributeFilter(TLV::TLVReader * tlvData, C void MediaInputClusterMediaInputListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { - chip::app::DataModel::DecodableList list; + chip::app::DataModel::DecodableList list; CHIP_ERROR err = Decode(*tlvData, list); if (err != CHIP_NO_ERROR) { @@ -1795,8 +1816,7 @@ void TargetNavigatorClusterTargetNavigatorListListAttributeFilter(TLV::TLVReader Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { - chip::app::DataModel::DecodableList - list; + chip::app::DataModel::DecodableList list; CHIP_ERROR err = Decode(*tlvData, list); if (err != CHIP_NO_ERROR) { @@ -2262,47 +2282,17 @@ bool emberAfAccountLoginClusterGetSetupPINResponseCallback(EndpointId endpoint, return true; } -bool emberAfApplicationLauncherClusterHideAppResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status, - chip::CharSpan data) -{ - ChipLogProgress(Zcl, "HideAppResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - ChipLogProgress(Zcl, " data: %.*s", static_cast(data.size()), data.data()); - - GET_CLUSTER_RESPONSE_CALLBACKS("ApplicationLauncherClusterHideAppResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status, data); - return true; -} - -bool emberAfApplicationLauncherClusterLaunchAppResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t status, chip::CharSpan data) +bool emberAfApplicationLauncherClusterLauncherResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status, + chip::CharSpan data) { - ChipLogProgress(Zcl, "LaunchAppResponse:"); + ChipLogProgress(Zcl, "LauncherResponse:"); ChipLogProgress(Zcl, " status: %" PRIu8 "", status); ChipLogProgress(Zcl, " data: %.*s", static_cast(data.size()), data.data()); - GET_CLUSTER_RESPONSE_CALLBACKS("ApplicationLauncherClusterLaunchAppResponseCallback"); + GET_CLUSTER_RESPONSE_CALLBACKS("ApplicationLauncherClusterLauncherResponseCallback"); - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status, data); - return true; -} - -bool emberAfApplicationLauncherClusterStopAppResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status, - chip::CharSpan data) -{ - ChipLogProgress(Zcl, "StopAppResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - ChipLogProgress(Zcl, " data: %.*s", static_cast(data.size()), data.data()); - - GET_CLUSTER_RESPONSE_CALLBACKS("ApplicationLauncherClusterStopAppResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); + Callback::Callback * cb = + Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, status, data); return true; } @@ -2323,33 +2313,18 @@ bool emberAfChannelClusterChangeChannelResponseCallback( return true; } -bool emberAfContentLauncherClusterLaunchContentResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t contentLaunchStatus, chip::CharSpan data) +bool emberAfContentLauncherClusterLaunchResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status, + chip::CharSpan data) { - ChipLogProgress(Zcl, "LaunchContentResponse:"); - ChipLogProgress(Zcl, " contentLaunchStatus: %" PRIu8 "", contentLaunchStatus); - ChipLogProgress(Zcl, " data: %.*s", static_cast(data.size()), data.data()); - - GET_CLUSTER_RESPONSE_CALLBACKS("ContentLauncherClusterLaunchContentResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, contentLaunchStatus, data); - return true; -} - -bool emberAfContentLauncherClusterLaunchURLResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t contentLaunchStatus, chip::CharSpan data) -{ - ChipLogProgress(Zcl, "LaunchURLResponse:"); - ChipLogProgress(Zcl, " contentLaunchStatus: %" PRIu8 "", contentLaunchStatus); + ChipLogProgress(Zcl, "LaunchResponse:"); + ChipLogProgress(Zcl, " status: %" PRIu8 "", status); ChipLogProgress(Zcl, " data: %.*s", static_cast(data.size()), data.data()); - GET_CLUSTER_RESPONSE_CALLBACKS("ContentLauncherClusterLaunchURLResponseCallback"); + GET_CLUSTER_RESPONSE_CALLBACKS("ContentLauncherClusterLaunchResponseCallback"); - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, contentLaunchStatus, data); + Callback::Callback * cb = + Callback::Callback::FromCancelable(onSuccessCallback); + cb->mCall(cb->mContext, status, data); return true; } @@ -2592,157 +2567,16 @@ bool emberAfKeypadInputClusterSendKeyResponseCallback(EndpointId endpoint, app:: return true; } -bool emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) +bool emberAfMediaPlaybackClusterPlaybackResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) { - ChipLogProgress(Zcl, "MediaFastForwardResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaFastForwardResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaNextResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaNextResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaNextResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaPauseResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaPauseResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaPauseResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaPlayResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaPlayResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaPlayResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaPreviousResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaPreviousResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaPreviousResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaRewindResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaRewindResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaRewindResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaSeekResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaSeekResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaSeekResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaSkipBackwardResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaSkipBackwardResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaSkipForwardResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaSkipForwardResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaStartOverResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaStartOverResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaStartOverResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaStopResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaStopResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); + ChipLogProgress(Zcl, "PlaybackResponse:"); + ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaStopResponseCallback"); + GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterPlaybackResponseCallback"); - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); + Callback::Callback * cb = + Callback::Callback::FromCancelable(onSuccessCallback); + cb->mCall(cb->mContext, status); return true; } diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h index 6535fa1fcb60ce..c4551161a6357c 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -36,13 +36,9 @@ // Cluster Specific Response Callbacks typedef void (*AccountLoginClusterGetSetupPINResponseCallback)(void * context, chip::CharSpan setupPIN); -typedef void (*ApplicationLauncherClusterHideAppResponseCallback)(void * context, uint8_t status, chip::CharSpan data); -typedef void (*ApplicationLauncherClusterLaunchAppResponseCallback)(void * context, uint8_t status, chip::CharSpan data); -typedef void (*ApplicationLauncherClusterStopAppResponseCallback)(void * context, uint8_t status, chip::CharSpan data); +typedef void (*ApplicationLauncherClusterLauncherResponseCallback)(void * context, uint8_t status, chip::CharSpan data); typedef void (*ChannelClusterChangeChannelResponseCallback)(void * context, ChannelInfo channelMatch, uint8_t errorType); -typedef void (*ContentLauncherClusterLaunchContentResponseCallback)(void * context, uint8_t contentLaunchStatus, - chip::CharSpan data); -typedef void (*ContentLauncherClusterLaunchURLResponseCallback)(void * context, uint8_t contentLaunchStatus, chip::CharSpan data); +typedef void (*ContentLauncherClusterLaunchResponseCallback)(void * context, uint8_t status, chip::CharSpan data); typedef void (*DiagnosticLogsClusterRetrieveLogsResponseCallback)(void * context, uint8_t status, chip::ByteSpan content, uint32_t timeStamp, uint32_t timeSinceBoot); typedef void (*DoorLockClusterGetCredentialStatusResponseCallback)(void * context, bool credentialExists, uint16_t userIndex, @@ -70,17 +66,7 @@ typedef void (*GroupsClusterRemoveGroupResponseCallback)(void * context, uint8_t typedef void (*GroupsClusterViewGroupResponseCallback)(void * context, uint8_t status, uint16_t groupId, chip::CharSpan groupName); typedef void (*IdentifyClusterIdentifyQueryResponseCallback)(void * context, uint16_t timeout); typedef void (*KeypadInputClusterSendKeyResponseCallback)(void * context, uint8_t status); -typedef void (*MediaPlaybackClusterMediaFastForwardResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaNextResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaPauseResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaPlayResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaPreviousResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaRewindResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaSeekResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaSkipBackwardResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaSkipForwardResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaStartOverResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaStopResponseCallback)(void * context, uint8_t mediaPlaybackStatus); +typedef void (*MediaPlaybackClusterPlaybackResponseCallback)(void * context, uint8_t status); typedef void (*NetworkCommissioningClusterConnectNetworkResponseCallback)(void * context, uint8_t NetworkingStatus, chip::CharSpan DebugText, int32_t ErrorValue); typedef void (*NetworkCommissioningClusterNetworkConfigResponseCallback)(void * context, uint8_t NetworkingStatus, @@ -155,6 +141,11 @@ void AdministratorCommissioningClusterAttributeListListAttributeFilter(chip::TLV chip::Callback::Cancelable * onFailureCallback); typedef void (*AdministratorCommissioningAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); +void ApplicationBasicClusterAllowedVendorListListAttributeFilter(chip::TLV::TLVReader * data, + chip::Callback::Cancelable * onSuccessCallback, + chip::Callback::Cancelable * onFailureCallback); +typedef void (*ApplicationBasicAllowedVendorListListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); void ApplicationBasicClusterAttributeListListAttributeFilter(chip::TLV::TLVReader * data, chip::Callback::Cancelable * onSuccessCallback, chip::Callback::Cancelable * onFailureCallback); @@ -175,7 +166,7 @@ void AudioOutputClusterAudioOutputListListAttributeFilter(chip::TLV::TLVReader * chip::Callback::Cancelable * onFailureCallback); typedef void (*AudioOutputAudioOutputListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); + const chip::app::DataModel::DecodableList & data); void AudioOutputClusterAttributeListListAttributeFilter(chip::TLV::TLVReader * data, chip::Callback::Cancelable * onSuccessCallback, chip::Callback::Cancelable * onFailureCallback); typedef void (*AudioOutputAttributeListListAttributeCallback)(void * context, @@ -389,7 +380,7 @@ void MediaInputClusterMediaInputListListAttributeFilter(chip::TLV::TLVReader * d chip::Callback::Cancelable * onFailureCallback); typedef void (*MediaInputMediaInputListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); + const chip::app::DataModel::DecodableList & data); void MediaInputClusterAttributeListListAttributeFilter(chip::TLV::TLVReader * data, chip::Callback::Cancelable * onSuccessCallback, chip::Callback::Cancelable * onFailureCallback); typedef void (*MediaInputAttributeListListAttributeCallback)(void * context, @@ -522,8 +513,7 @@ void TargetNavigatorClusterTargetNavigatorListListAttributeFilter(chip::TLV::TLV chip::Callback::Cancelable * onFailureCallback); typedef void (*TargetNavigatorTargetNavigatorListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & data); + const chip::app::DataModel::DecodableList & data); void TargetNavigatorClusterAttributeListListAttributeFilter(chip::TLV::TLVReader * data, chip::Callback::Cancelable * onSuccessCallback, chip::Callback::Cancelable * onFailureCallback); diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.cpp b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.cpp index e2ae7d4335d453..681b6afefaf038 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.cpp +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.cpp @@ -37,8 +37,8 @@ namespace Controller { // AccessControl Cluster Commands // AccountLogin Cluster Commands -CHIP_ERROR AccountLoginCluster::GetSetupPIN(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan tempAccountIdentifier) +CHIP_ERROR AccountLoginCluster::GetSetupPINRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, chip::CharSpan tempAccountIdentifier) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -50,7 +50,7 @@ CHIP_ERROR AccountLoginCluster::GetSetupPIN(Callback::Cancelable * onSuccessCall VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AccountLogin::Commands::GetSetupPIN::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AccountLogin::Commands::GetSetupPINRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -78,8 +78,8 @@ CHIP_ERROR AccountLoginCluster::GetSetupPIN(Callback::Cancelable * onSuccessCall return err; } -CHIP_ERROR AccountLoginCluster::Login(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan tempAccountIdentifier, chip::CharSpan setupPIN) +CHIP_ERROR AccountLoginCluster::LoginRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan tempAccountIdentifier, chip::CharSpan setupPIN) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -91,7 +91,7 @@ CHIP_ERROR AccountLoginCluster::Login(Callback::Cancelable * onSuccessCallback, VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AccountLogin::Commands::Login::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AccountLogin::Commands::LoginRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -121,7 +121,7 @@ CHIP_ERROR AccountLoginCluster::Login(Callback::Cancelable * onSuccessCallback, return err; } -CHIP_ERROR AccountLoginCluster::Logout(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR AccountLoginCluster::LogoutRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -133,7 +133,7 @@ CHIP_ERROR AccountLoginCluster::Logout(Callback::Cancelable * onSuccessCallback, VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AccountLogin::Commands::Logout::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AccountLogin::Commands::LogoutRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -299,50 +299,11 @@ CHIP_ERROR AdministratorCommissioningCluster::RevokeCommissioning(Callback::Canc } // ApplicationBasic Cluster Commands -CHIP_ERROR ApplicationBasicCluster::ChangeStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t status) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVWriter * writer = nullptr; - uint8_t argSeqNumber = 0; - - // Used when encoding non-empty command. Suppress error message when encoding empty commands. - (void) writer; - (void) argSeqNumber; - - VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ApplicationBasic::Commands::ChangeStatus::Id, - (app::CommandPathFlags::kEndpointIdValid) }; - - CommandSenderHandle sender( - Platform::New(mDevice->GetInteractionModelDelegate(), mDevice->GetExchangeManager())); - - VerifyOrReturnError(sender != nullptr, CHIP_ERROR_NO_MEMORY); - - SuccessOrExit(err = sender->PrepareCommand(cmdParams)); - - VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // status: applicationBasicStatus - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), status)); - - SuccessOrExit(err = sender->FinishCommand()); - - // #6308: This is a temporary solution before we fully support IM on application side and should be replaced by IMDelegate. - mDevice->AddIMResponseHandler(sender.get(), onSuccessCallback, onFailureCallback); - - SuccessOrExit(err = mDevice->SendCommands(sender.get())); - - // We have successfully sent the command, and the callback handler will be responsible to free the object, release the object - // now. - sender.release(); -exit: - return err; -} // ApplicationLauncher Cluster Commands -CHIP_ERROR ApplicationLauncherCluster::HideApp(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t catalogVendorId, chip::CharSpan applicationId) +CHIP_ERROR ApplicationLauncherCluster::HideAppRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint16_t catalogVendorId, + chip::CharSpan applicationId) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -354,7 +315,7 @@ CHIP_ERROR ApplicationLauncherCluster::HideApp(Callback::Cancelable * onSuccessC VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ApplicationLauncher::Commands::HideApp::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ApplicationLauncher::Commands::HideAppRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -384,8 +345,9 @@ CHIP_ERROR ApplicationLauncherCluster::HideApp(Callback::Cancelable * onSuccessC return err; } -CHIP_ERROR ApplicationLauncherCluster::LaunchApp(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan data, uint16_t catalogVendorId, chip::CharSpan applicationId) +CHIP_ERROR ApplicationLauncherCluster::LaunchAppRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, chip::CharSpan data, + uint16_t catalogVendorId, chip::CharSpan applicationId) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -397,7 +359,8 @@ CHIP_ERROR ApplicationLauncherCluster::LaunchApp(Callback::Cancelable * onSucces VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ApplicationLauncher::Commands::LaunchApp::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, + ApplicationLauncher::Commands::LaunchAppRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -429,8 +392,9 @@ CHIP_ERROR ApplicationLauncherCluster::LaunchApp(Callback::Cancelable * onSucces return err; } -CHIP_ERROR ApplicationLauncherCluster::StopApp(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t catalogVendorId, chip::CharSpan applicationId) +CHIP_ERROR ApplicationLauncherCluster::StopAppRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint16_t catalogVendorId, + chip::CharSpan applicationId) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -442,7 +406,7 @@ CHIP_ERROR ApplicationLauncherCluster::StopApp(Callback::Cancelable * onSuccessC VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ApplicationLauncher::Commands::StopApp::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ApplicationLauncher::Commands::StopAppRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -473,8 +437,8 @@ CHIP_ERROR ApplicationLauncherCluster::StopApp(Callback::Cancelable * onSuccessC } // AudioOutput Cluster Commands -CHIP_ERROR AudioOutputCluster::RenameOutput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t index, chip::CharSpan name) +CHIP_ERROR AudioOutputCluster::RenameOutputRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint8_t index, chip::CharSpan name) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -486,7 +450,7 @@ CHIP_ERROR AudioOutputCluster::RenameOutput(Callback::Cancelable * onSuccessCall VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AudioOutput::Commands::RenameOutput::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AudioOutput::Commands::RenameOutputRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -516,8 +480,8 @@ CHIP_ERROR AudioOutputCluster::RenameOutput(Callback::Cancelable * onSuccessCall return err; } -CHIP_ERROR AudioOutputCluster::SelectOutput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t index) +CHIP_ERROR AudioOutputCluster::SelectOutputRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint8_t index) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -529,7 +493,7 @@ CHIP_ERROR AudioOutputCluster::SelectOutput(Callback::Cancelable * onSuccessCall VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AudioOutput::Commands::SelectOutput::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AudioOutput::Commands::SelectOutputRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -1318,8 +1282,9 @@ CHIP_ERROR BridgedActionsCluster::StopAction(Callback::Cancelable * onSuccessCal // BridgedDeviceBasic Cluster Commands // Channel Cluster Commands -CHIP_ERROR ChannelCluster::ChangeChannel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan match) +CHIP_ERROR ChannelCluster::ChangeChannelByNumberRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint16_t majorNumber, + uint16_t minorNumber) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -1331,7 +1296,8 @@ CHIP_ERROR ChannelCluster::ChangeChannel(Callback::Cancelable * onSuccessCallbac VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, Channel::Commands::ChangeChannel::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, + Channel::Commands::ChangeChannelByNumberRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -1342,8 +1308,10 @@ CHIP_ERROR ChannelCluster::ChangeChannel(Callback::Cancelable * onSuccessCallbac SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // match: charString - SuccessOrExit(err = writer->PutString(TLV::ContextTag(argSeqNumber++), match)); + // majorNumber: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), majorNumber)); + // minorNumber: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), minorNumber)); SuccessOrExit(err = sender->FinishCommand()); @@ -1359,8 +1327,8 @@ CHIP_ERROR ChannelCluster::ChangeChannel(Callback::Cancelable * onSuccessCallbac return err; } -CHIP_ERROR ChannelCluster::ChangeChannelByNumber(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t majorNumber, uint16_t minorNumber) +CHIP_ERROR ChannelCluster::ChangeChannelRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan match) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -1372,7 +1340,7 @@ CHIP_ERROR ChannelCluster::ChangeChannelByNumber(Callback::Cancelable * onSucces VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, Channel::Commands::ChangeChannelByNumber::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, Channel::Commands::ChangeChannelRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -1383,10 +1351,8 @@ CHIP_ERROR ChannelCluster::ChangeChannelByNumber(Callback::Cancelable * onSucces SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // majorNumber: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), majorNumber)); - // minorNumber: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), minorNumber)); + // match: charString + SuccessOrExit(err = writer->PutString(TLV::ContextTag(argSeqNumber++), match)); SuccessOrExit(err = sender->FinishCommand()); @@ -1402,8 +1368,8 @@ CHIP_ERROR ChannelCluster::ChangeChannelByNumber(Callback::Cancelable * onSucces return err; } -CHIP_ERROR ChannelCluster::SkipChannel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t count) +CHIP_ERROR ChannelCluster::SkipChannelRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t count) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -1415,7 +1381,7 @@ CHIP_ERROR ChannelCluster::SkipChannel(Callback::Cancelable * onSuccessCallback, VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, Channel::Commands::SkipChannel::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, Channel::Commands::SkipChannelRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -2388,8 +2354,9 @@ CHIP_ERROR ColorControlCluster::StopMoveStep(Callback::Cancelable * onSuccessCal } // ContentLauncher Cluster Commands -CHIP_ERROR ContentLauncherCluster::LaunchContent(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - bool autoPlay, chip::CharSpan data, uint8_t type, chip::CharSpan value) +CHIP_ERROR ContentLauncherCluster::LaunchContentRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, bool autoPlay, + chip::CharSpan data) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -2401,7 +2368,8 @@ CHIP_ERROR ContentLauncherCluster::LaunchContent(Callback::Cancelable * onSucces VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ContentLauncher::Commands::LaunchContent::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, + ContentLauncher::Commands::LaunchContentRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -2416,10 +2384,6 @@ CHIP_ERROR ContentLauncherCluster::LaunchContent(Callback::Cancelable * onSucces SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), autoPlay)); // data: charString SuccessOrExit(err = writer->PutString(TLV::ContextTag(argSeqNumber++), data)); - // type: contentLaunchParameterEnum - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), type)); - // value: charString - SuccessOrExit(err = writer->PutString(TLV::ContextTag(argSeqNumber++), value)); SuccessOrExit(err = sender->FinishCommand()); @@ -2435,8 +2399,9 @@ CHIP_ERROR ContentLauncherCluster::LaunchContent(Callback::Cancelable * onSucces return err; } -CHIP_ERROR ContentLauncherCluster::LaunchURL(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan contentURL, chip::CharSpan displayString, chip::CharSpan providerName) +CHIP_ERROR ContentLauncherCluster::LaunchURLRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, chip::CharSpan contentURL, + chip::CharSpan displayString, chip::CharSpan providerName) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -2448,7 +2413,7 @@ CHIP_ERROR ContentLauncherCluster::LaunchURL(Callback::Cancelable * onSuccessCal VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ContentLauncher::Commands::LaunchURL::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ContentLauncher::Commands::LaunchURLRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -3628,8 +3593,8 @@ CHIP_ERROR IdentifyCluster::TriggerEffect(Callback::Cancelable * onSuccessCallba // IlluminanceMeasurement Cluster Commands // KeypadInput Cluster Commands -CHIP_ERROR KeypadInputCluster::SendKey(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t keyCode) +CHIP_ERROR KeypadInputCluster::SendKeyRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t keyCode) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -3641,7 +3606,7 @@ CHIP_ERROR KeypadInputCluster::SendKey(Callback::Cancelable * onSuccessCallback, VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, KeypadInput::Commands::SendKey::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, KeypadInput::Commands::SendKeyRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -3652,7 +3617,7 @@ CHIP_ERROR KeypadInputCluster::SendKey(Callback::Cancelable * onSuccessCallback, SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // keyCode: keypadInputCecKeyCode + // keyCode: cecKeyCode SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), keyCode)); SuccessOrExit(err = sender->FinishCommand()); @@ -4067,7 +4032,8 @@ CHIP_ERROR LowPowerCluster::Sleep(Callback::Cancelable * onSuccessCallback, Call } // MediaInput Cluster Commands -CHIP_ERROR MediaInputCluster::HideInputStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaInputCluster::HideInputStatusRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4079,7 +4045,7 @@ CHIP_ERROR MediaInputCluster::HideInputStatus(Callback::Cancelable * onSuccessCa VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::HideInputStatus::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::HideInputStatusRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4105,8 +4071,8 @@ CHIP_ERROR MediaInputCluster::HideInputStatus(Callback::Cancelable * onSuccessCa return err; } -CHIP_ERROR MediaInputCluster::RenameInput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t index, chip::CharSpan name) +CHIP_ERROR MediaInputCluster::RenameInputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t index, chip::CharSpan name) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4118,7 +4084,7 @@ CHIP_ERROR MediaInputCluster::RenameInput(Callback::Cancelable * onSuccessCallba VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::RenameInput::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::RenameInputRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4148,8 +4114,8 @@ CHIP_ERROR MediaInputCluster::RenameInput(Callback::Cancelable * onSuccessCallba return err; } -CHIP_ERROR MediaInputCluster::SelectInput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t index) +CHIP_ERROR MediaInputCluster::SelectInputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t index) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4161,7 +4127,7 @@ CHIP_ERROR MediaInputCluster::SelectInput(Callback::Cancelable * onSuccessCallba VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::SelectInput::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::SelectInputRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4189,7 +4155,8 @@ CHIP_ERROR MediaInputCluster::SelectInput(Callback::Cancelable * onSuccessCallba return err; } -CHIP_ERROR MediaInputCluster::ShowInputStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaInputCluster::ShowInputStatusRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4201,7 +4168,7 @@ CHIP_ERROR MediaInputCluster::ShowInputStatus(Callback::Cancelable * onSuccessCa VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::ShowInputStatus::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::ShowInputStatusRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4228,8 +4195,8 @@ CHIP_ERROR MediaInputCluster::ShowInputStatus(Callback::Cancelable * onSuccessCa } // MediaPlayback Cluster Commands -CHIP_ERROR MediaPlaybackCluster::MediaFastForward(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::FastForwardRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4241,7 +4208,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaFastForward(Callback::Cancelable * onSucce VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaFastForward::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::FastForwardRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4267,7 +4234,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaFastForward(Callback::Cancelable * onSucce return err; } -CHIP_ERROR MediaPlaybackCluster::MediaNext(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::NextRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4279,7 +4246,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaNext(Callback::Cancelable * onSuccessCallb VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaNext::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::NextRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4305,7 +4272,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaNext(Callback::Cancelable * onSuccessCallb return err; } -CHIP_ERROR MediaPlaybackCluster::MediaPause(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::PauseRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4317,7 +4284,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPause(Callback::Cancelable * onSuccessCall VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaPause::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::PauseRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4343,7 +4310,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPause(Callback::Cancelable * onSuccessCall return err; } -CHIP_ERROR MediaPlaybackCluster::MediaPlay(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::PlayRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4355,7 +4322,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPlay(Callback::Cancelable * onSuccessCallb VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaPlay::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::PlayRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4381,7 +4348,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPlay(Callback::Cancelable * onSuccessCallb return err; } -CHIP_ERROR MediaPlaybackCluster::MediaPrevious(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::PreviousRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4393,7 +4360,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPrevious(Callback::Cancelable * onSuccessC VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaPrevious::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::PreviousRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4419,7 +4386,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPrevious(Callback::Cancelable * onSuccessC return err; } -CHIP_ERROR MediaPlaybackCluster::MediaRewind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::RewindRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4431,7 +4398,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaRewind(Callback::Cancelable * onSuccessCal VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaRewind::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::RewindRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4457,8 +4424,8 @@ CHIP_ERROR MediaPlaybackCluster::MediaRewind(Callback::Cancelable * onSuccessCal return err; } -CHIP_ERROR MediaPlaybackCluster::MediaSeek(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint64_t position) +CHIP_ERROR MediaPlaybackCluster::SeekRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint64_t position) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4470,7 +4437,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaSeek(Callback::Cancelable * onSuccessCallb VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaSeek::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::SeekRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4498,8 +4465,8 @@ CHIP_ERROR MediaPlaybackCluster::MediaSeek(Callback::Cancelable * onSuccessCallb return err; } -CHIP_ERROR MediaPlaybackCluster::MediaSkipBackward(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback, uint64_t deltaPositionMilliseconds) +CHIP_ERROR MediaPlaybackCluster::SkipBackwardRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint64_t deltaPositionMilliseconds) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4511,7 +4478,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaSkipBackward(Callback::Cancelable * onSucc VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaSkipBackward::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::SkipBackwardRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4539,8 +4506,8 @@ CHIP_ERROR MediaPlaybackCluster::MediaSkipBackward(Callback::Cancelable * onSucc return err; } -CHIP_ERROR MediaPlaybackCluster::MediaSkipForward(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback, uint64_t deltaPositionMilliseconds) +CHIP_ERROR MediaPlaybackCluster::SkipForwardRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint64_t deltaPositionMilliseconds) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4552,7 +4519,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaSkipForward(Callback::Cancelable * onSucce VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaSkipForward::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::SkipForwardRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4580,7 +4547,8 @@ CHIP_ERROR MediaPlaybackCluster::MediaSkipForward(Callback::Cancelable * onSucce return err; } -CHIP_ERROR MediaPlaybackCluster::MediaStartOver(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::StartOverRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4592,7 +4560,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaStartOver(Callback::Cancelable * onSuccess VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaStartOver::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::StartOverRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -4618,7 +4586,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaStartOver(Callback::Cancelable * onSuccess return err; } -CHIP_ERROR MediaPlaybackCluster::MediaStop(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::StopRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -4630,7 +4598,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaStop(Callback::Cancelable * onSuccessCallb VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaStop::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::StopRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -6177,8 +6145,9 @@ CHIP_ERROR SoftwareDiagnosticsCluster::ResetWatermarks(Callback::Cancelable * on // Switch Cluster Commands // TargetNavigator Cluster Commands -CHIP_ERROR TargetNavigatorCluster::NavigateTarget(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback, uint8_t target, chip::CharSpan data) +CHIP_ERROR TargetNavigatorCluster::NavigateTargetRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint8_t target, + chip::CharSpan data) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -6190,7 +6159,8 @@ CHIP_ERROR TargetNavigatorCluster::NavigateTarget(Callback::Cancelable * onSucce VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, TargetNavigator::Commands::NavigateTarget::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, + TargetNavigator::Commands::NavigateTargetRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h index a10a06c45aadd3..3e6c0b7081c175 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h @@ -44,11 +44,11 @@ class DLL_EXPORT AccountLoginCluster : public ClusterBase ~AccountLoginCluster() {} // Cluster Commands - CHIP_ERROR GetSetupPIN(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan tempAccountIdentifier); - CHIP_ERROR Login(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan tempAccountIdentifier, chip::CharSpan setupPIN); - CHIP_ERROR Logout(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR GetSetupPINRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan tempAccountIdentifier); + CHIP_ERROR LoginRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan tempAccountIdentifier, chip::CharSpan setupPIN); + CHIP_ERROR LogoutRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); }; class DLL_EXPORT AdministratorCommissioningCluster : public ClusterBase @@ -71,9 +71,6 @@ class DLL_EXPORT ApplicationBasicCluster : public ClusterBase public: ApplicationBasicCluster() : ClusterBase(app::Clusters::ApplicationBasic::Id) {} ~ApplicationBasicCluster() {} - - // Cluster Commands - CHIP_ERROR ChangeStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t status); }; class DLL_EXPORT ApplicationLauncherCluster : public ClusterBase @@ -83,12 +80,12 @@ class DLL_EXPORT ApplicationLauncherCluster : public ClusterBase ~ApplicationLauncherCluster() {} // Cluster Commands - CHIP_ERROR HideApp(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t catalogVendorId, - chip::CharSpan applicationId); - CHIP_ERROR LaunchApp(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::CharSpan data, - uint16_t catalogVendorId, chip::CharSpan applicationId); - CHIP_ERROR StopApp(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t catalogVendorId, - chip::CharSpan applicationId); + CHIP_ERROR HideAppRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t catalogVendorId, chip::CharSpan applicationId); + CHIP_ERROR LaunchAppRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan data, uint16_t catalogVendorId, chip::CharSpan applicationId); + CHIP_ERROR StopAppRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t catalogVendorId, chip::CharSpan applicationId); }; class DLL_EXPORT AudioOutputCluster : public ClusterBase @@ -98,9 +95,10 @@ class DLL_EXPORT AudioOutputCluster : public ClusterBase ~AudioOutputCluster() {} // Cluster Commands - CHIP_ERROR RenameOutput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t index, - chip::CharSpan name); - CHIP_ERROR SelectOutput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t index); + CHIP_ERROR RenameOutputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t index, chip::CharSpan name); + CHIP_ERROR SelectOutputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t index); }; class DLL_EXPORT BarrierControlCluster : public ClusterBase @@ -199,11 +197,12 @@ class DLL_EXPORT ChannelCluster : public ClusterBase ~ChannelCluster() {} // Cluster Commands - CHIP_ERROR ChangeChannel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan match); - CHIP_ERROR ChangeChannelByNumber(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t majorNumber, uint16_t minorNumber); - CHIP_ERROR SkipChannel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t count); + CHIP_ERROR ChangeChannelByNumberRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t majorNumber, uint16_t minorNumber); + CHIP_ERROR ChangeChannelRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan match); + CHIP_ERROR SkipChannelRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t count); }; class DLL_EXPORT ColorControlCluster : public ClusterBase @@ -267,10 +266,10 @@ class DLL_EXPORT ContentLauncherCluster : public ClusterBase ~ContentLauncherCluster() {} // Cluster Commands - CHIP_ERROR LaunchContent(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, bool autoPlay, - chip::CharSpan data, uint8_t type, chip::CharSpan value); - CHIP_ERROR LaunchURL(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan contentURL, chip::CharSpan displayString, chip::CharSpan providerName); + CHIP_ERROR LaunchContentRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + bool autoPlay, chip::CharSpan data); + CHIP_ERROR LaunchURLRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan contentURL, chip::CharSpan displayString, chip::CharSpan providerName); }; class DLL_EXPORT DescriptorCluster : public ClusterBase @@ -430,7 +429,7 @@ class DLL_EXPORT KeypadInputCluster : public ClusterBase ~KeypadInputCluster() {} // Cluster Commands - CHIP_ERROR SendKey(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t keyCode); + CHIP_ERROR SendKeyRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t keyCode); }; class DLL_EXPORT LevelControlCluster : public ClusterBase @@ -474,11 +473,12 @@ class DLL_EXPORT MediaInputCluster : public ClusterBase ~MediaInputCluster() {} // Cluster Commands - CHIP_ERROR HideInputStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR RenameInput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t index, - chip::CharSpan name); - CHIP_ERROR SelectInput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t index); - CHIP_ERROR ShowInputStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR HideInputStatusRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR RenameInputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t index, + chip::CharSpan name); + CHIP_ERROR SelectInputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t index); + CHIP_ERROR ShowInputStatusRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); }; class DLL_EXPORT MediaPlaybackCluster : public ClusterBase @@ -488,19 +488,19 @@ class DLL_EXPORT MediaPlaybackCluster : public ClusterBase ~MediaPlaybackCluster() {} // Cluster Commands - CHIP_ERROR MediaFastForward(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaNext(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaPause(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaPlay(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaPrevious(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaRewind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaSeek(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint64_t position); - CHIP_ERROR MediaSkipBackward(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint64_t deltaPositionMilliseconds); - CHIP_ERROR MediaSkipForward(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint64_t deltaPositionMilliseconds); - CHIP_ERROR MediaStartOver(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaStop(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR FastForwardRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR NextRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR PauseRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR PlayRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR PreviousRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR RewindRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR SeekRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint64_t position); + CHIP_ERROR SkipBackwardRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint64_t deltaPositionMilliseconds); + CHIP_ERROR SkipForwardRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint64_t deltaPositionMilliseconds); + CHIP_ERROR StartOverRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR StopRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); }; class DLL_EXPORT ModeSelectCluster : public ClusterBase @@ -704,8 +704,8 @@ class DLL_EXPORT TargetNavigatorCluster : public ClusterBase ~TargetNavigatorCluster() {} // Cluster Commands - CHIP_ERROR NavigateTarget(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t target, - chip::CharSpan data); + CHIP_ERROR NavigateTargetRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t target, chip::CharSpan data); }; class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase diff --git a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp index 6cd45a048b4ea6..5c79540bad0ac2 100644 --- a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp @@ -155,7 +155,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa { switch (aCommandPath.mCommandId) { - case Commands::HideAppResponse::Id: { + case Commands::LauncherResponse::Id: { expectArgumentCount = 2; uint8_t status; chip::CharSpan data; @@ -214,133 +214,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { wasHandled = - emberAfApplicationLauncherClusterHideAppResponseCallback(aCommandPath.mEndpointId, apCommandObj, status, data); - } - break; - } - case Commands::LaunchAppResponse::Id: { - expectArgumentCount = 2; - uint8_t status; - chip::CharSpan data; - bool argExists[2]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 2) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - case 1: - TLVUnpackError = aDataTlv.Get(data); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) - { - wasHandled = emberAfApplicationLauncherClusterLaunchAppResponseCallback(aCommandPath.mEndpointId, apCommandObj, - status, data); - } - break; - } - case Commands::StopAppResponse::Id: { - expectArgumentCount = 2; - uint8_t status; - chip::CharSpan data; - bool argExists[2]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 2) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - case 1: - TLVUnpackError = aDataTlv.Get(data); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) - { - wasHandled = - emberAfApplicationLauncherClusterStopAppResponseCallback(aCommandPath.mEndpointId, apCommandObj, status, data); + emberAfApplicationLauncherClusterLauncherResponseCallback(aCommandPath.mEndpointId, apCommandObj, status, data); } break; } @@ -484,72 +358,9 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa { switch (aCommandPath.mCommandId) { - case Commands::LaunchContentResponse::Id: { - expectArgumentCount = 2; - uint8_t contentLaunchStatus; - chip::CharSpan data; - bool argExists[2]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 2) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(contentLaunchStatus); - break; - case 1: - TLVUnpackError = aDataTlv.Get(data); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) - { - wasHandled = emberAfContentLauncherClusterLaunchContentResponseCallback(aCommandPath.mEndpointId, apCommandObj, - contentLaunchStatus, data); - } - break; - } - case Commands::LaunchURLResponse::Id: { + case Commands::LaunchResponse::Id: { expectArgumentCount = 2; - uint8_t contentLaunchStatus; + uint8_t status; chip::CharSpan data; bool argExists[2]; @@ -581,7 +392,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa switch (currentDecodeTagId) { case 0: - TLVUnpackError = aDataTlv.Get(contentLaunchStatus); + TLVUnpackError = aDataTlv.Get(status); break; case 1: TLVUnpackError = aDataTlv.Get(data); @@ -605,8 +416,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) { - wasHandled = emberAfContentLauncherClusterLaunchURLResponseCallback(aCommandPath.mEndpointId, apCommandObj, - contentLaunchStatus, data); + wasHandled = + emberAfContentLauncherClusterLaunchResponseCallback(aCommandPath.mEndpointId, apCommandObj, status, data); } break; } @@ -1897,68 +1708,9 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa { switch (aCommandPath.mCommandId) { - case Commands::MediaFastForwardResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaNextResponse::Id: { + case Commands::PlaybackResponse::Id: { expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; + uint8_t status; bool argExists[1]; memset(argExists, 0, sizeof argExists); @@ -1989,538 +1741,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa switch (currentDecodeTagId) { case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaNextResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaPauseResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaPauseResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaPlayResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaPlayResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaPreviousResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaPreviousResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaRewindResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaRewindResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaSeekResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaSeekResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaSkipBackwardResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaSkipForwardResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaStartOverResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaStartOverResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaStopResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); + TLVUnpackError = aDataTlv.Get(status); break; default: // Unsupported tag, ignore it. @@ -2541,8 +1762,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) { - wasHandled = emberAfMediaPlaybackClusterMediaStopResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); + wasHandled = emberAfMediaPlaybackClusterPlaybackResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); } break; } diff --git a/zzz_generated/log-source-app/zap-generated/attribute-size.cpp b/zzz_generated/log-source-app/zap-generated/attribute-size.cpp deleted file mode 100644 index 11bb303cbdd145..00000000000000 --- a/zzz_generated/log-source-app/zap-generated/attribute-size.cpp +++ /dev/null @@ -1,232 +0,0 @@ -/* - * - * Copyright (c) 2021 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// THIS FILE IS GENERATED BY ZAP - -#include -#include -#include -#include -#include -#include -#include - -using namespace chip; -using namespace chip::app::List; - -// The first 2 bytes specify the number of entries. A value of 0xFFFF means the list in invalid -// and data is undefined. -constexpr uint16_t kSizeLengthInBytes = 2u; - -void copyListMember(uint8_t * dest, uint8_t * src, bool write, uint16_t * offset, uint16_t length) -{ - if (write) - { - memmove(dest + *offset, src, length); - } - else - { - memmove(dest, src + *offset, length); - } - - *offset = static_cast(*offset + length); -} - -uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, bool write, uint8_t * dest, uint8_t * src, - int32_t index) -{ - if (index == -1) - { - memmove(dest, src, am->size); - return am->size; - } - - if (index == 0) - { - if (write) - { - // src is a pointer to native-endian uint16_t, dest is pointer to buffer that should hold little-endian value - emberAfCopyInt16u(dest, 0, *reinterpret_cast(src)); - } - else - { - // src is pointer to buffer holding little-endian value, dest is a pointer to native-endian uint16_t - *reinterpret_cast(dest) = emberAfGetInt16u(src, 0, kSizeLengthInBytes); - } - return kSizeLengthInBytes; - } - - if (!CanCastTo(index)) - { - ChipLogError(Zcl, "Index %" PRId32 " is invalid. Should be between 1 and 65534", index); - return 0; - } - - uint16_t entryLength = 0; - switch (clusterId) - { - case 0x0030: // General Commissioning Cluster - { - uint16_t entryOffset = kSizeLengthInBytes; - switch (am->attributeId) - { - case 0x0001: // BasicCommissioningInfoList - { - entryLength = 4; - if (((index - 1) * entryLength) > (am->size - entryLength)) - { - ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); - return 0; - } - entryOffset = static_cast(entryOffset + ((index - 1) * entryLength)); - // Struct _BasicCommissioningInfoType - _BasicCommissioningInfoType * entry = reinterpret_cast<_BasicCommissioningInfoType *>(write ? src : dest); - copyListMember(write ? dest : (uint8_t *) &entry->FailSafeExpiryLengthMs, - write ? (uint8_t *) &entry->FailSafeExpiryLengthMs : src, write, &entryOffset, - sizeof(entry->FailSafeExpiryLengthMs)); // INT32U - break; - } - } - break; - } - case 0x003E: // Operational Credentials Cluster - { - uint16_t entryOffset = kSizeLengthInBytes; - switch (am->attributeId) - { - case 0x0001: // fabrics list - { - entryLength = 120; - if (((index - 1) * entryLength) > (am->size - entryLength)) - { - ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); - return 0; - } - entryOffset = static_cast(entryOffset + ((index - 1) * entryLength)); - // Struct _FabricDescriptor - _FabricDescriptor * entry = reinterpret_cast<_FabricDescriptor *>(write ? src : dest); - copyListMember(write ? dest : (uint8_t *) &entry->FabricIndex, write ? (uint8_t *) &entry->FabricIndex : src, write, - &entryOffset, sizeof(entry->FabricIndex)); // INT8U - ByteSpan * RootPublicKeySpan = &entry->RootPublicKey; // OCTET_STRING - if (CHIP_NO_ERROR != - (write ? WriteByteSpan(dest + entryOffset, 67, RootPublicKeySpan) - : ReadByteSpan(src + entryOffset, 67, RootPublicKeySpan))) - { - ChipLogError(Zcl, "Index %" PRId32 " is invalid. Not enough remaining space", index); - return 0; - } - entryOffset = static_cast(entryOffset + 67); - copyListMember(write ? dest : (uint8_t *) &entry->VendorId, write ? (uint8_t *) &entry->VendorId : src, write, - &entryOffset, sizeof(entry->VendorId)); // INT16U - copyListMember(write ? dest : (uint8_t *) &entry->FabricId, write ? (uint8_t *) &entry->FabricId : src, write, - &entryOffset, sizeof(entry->FabricId)); // FABRIC_ID - copyListMember(write ? dest : (uint8_t *) &entry->NodeId, write ? (uint8_t *) &entry->NodeId : src, write, &entryOffset, - sizeof(entry->NodeId)); // NODE_ID - ByteSpan LabelSpanStorage(Uint8::from_const_char(entry->Label.data()), entry->Label.size()); // CHAR_STRING - ByteSpan * LabelSpan = &LabelSpanStorage; - if (CHIP_NO_ERROR != - (write ? WriteByteSpan(dest + entryOffset, 34, LabelSpan) : ReadByteSpan(src + entryOffset, 34, LabelSpan))) - { - ChipLogError(Zcl, "Index %" PRId32 " is invalid. Not enough remaining space", index); - return 0; - } - entryOffset = static_cast(entryOffset + 34); - break; - } - case 0x0004: // TrustedRootCertificates - { - entryOffset = GetByteSpanOffsetFromIndex(write ? dest : src, am->size, static_cast(index - 1)); - if (entryOffset == 0) - { - ChipLogError(Zcl, "Index %" PRId32 " is invalid.", index); - return 0; - } - - ByteSpan * trustedRootCertificatesSpan = reinterpret_cast(write ? src : dest); // OCTET_STRING - uint16_t trustedRootCertificatesRemainingSpace = static_cast(am->size - entryOffset); - if (CHIP_NO_ERROR != - (write ? WriteByteSpan(dest + entryOffset, trustedRootCertificatesRemainingSpace, trustedRootCertificatesSpan) - : ReadByteSpan(src + entryOffset, trustedRootCertificatesRemainingSpace, trustedRootCertificatesSpan))) - { - ChipLogError(Zcl, "Index %" PRId32 " is invalid. Not enough remaining space", index); - return 0; - } - - if (!CanCastTo(trustedRootCertificatesSpan->size())) - { - ChipLogError(Zcl, "Span size %zu is too large", trustedRootCertificatesSpan->size()); - return 0; - } - entryLength = static_cast(trustedRootCertificatesSpan->size()); - break; - } - } - break; - } - } - - return entryLength; -} - -// A list is a collection of entries of the same data type. The data type may be any defined data type. -uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attributeId, const uint8_t * buffer) -{ - // The first 2 bytes specify the number of entries. A value of 0xFFFF means the list in invalid - // and data is undefined. - uint16_t entryCount = emberAfGetInt16u(buffer, 0, kSizeLengthInBytes); - if (entryCount == 0xFFFF) - { - return 0; - } - - uint16_t entryLength = 0; - switch (clusterId) - { - case 0x0030: // General Commissioning Cluster - switch (attributeId) - { - case 0x0001: // BasicCommissioningInfoList - // Struct _BasicCommissioningInfoType - entryLength = 4; - break; - } - break; - case 0x003E: // Operational Credentials Cluster - switch (attributeId) - { - case 0x0001: // fabrics list - // Struct _FabricDescriptor - entryLength = 120; - break; - case 0x0004: // TrustedRootCertificates - // chip::ByteSpan - return GetByteSpanOffsetFromIndex(buffer, 402, entryCount); - break; - } - break; - } - - uint32_t totalSize = kSizeLengthInBytes + (entryCount * entryLength); - if (!CanCastTo(totalSize)) - { - ChipLogError(Zcl, "Cluster " ChipLogFormatMEI ": Size of attribute " ChipLogFormatMEI " is too large.", - ChipLogValueMEI(clusterId), ChipLogValueMEI(attributeId)); - return 0; - } - - return static_cast(totalSize); -} diff --git a/zzz_generated/ota-provider-app/zap-generated/chip-zcl-zpro-codec-api.h b/zzz_generated/ota-provider-app/zap-generated/chip-zcl-zpro-codec-api.h deleted file mode 100644 index 759d13c5028d26..00000000000000 --- a/zzz_generated/ota-provider-app/zap-generated/chip-zcl-zpro-codec-api.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * - * Copyright (c) 2021 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// THIS FILE IS GENERATED BY ZAP diff --git a/zzz_generated/ota-provider-app/zap-generated/encoder.cpp b/zzz_generated/ota-provider-app/zap-generated/encoder.cpp deleted file mode 100644 index 759d13c5028d26..00000000000000 --- a/zzz_generated/ota-provider-app/zap-generated/encoder.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * - * Copyright (c) 2021 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// THIS FILE IS GENERATED BY ZAP diff --git a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp index b7e5b1ebe1e6d9..35ff681fbd77eb 100644 --- a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp @@ -54,30 +54,40 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::GetSetupPIN::Id: { - Commands::GetSetupPIN::DecodableType commandData; + case Commands::GetSetupPINRequest::Id: { + if (!apCommandObj->IsTimedInvoke()) + { + apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::NeedsTimedInteraction); + return; + } + Commands::GetSetupPINRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAccountLoginClusterGetSetupPINCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAccountLoginClusterGetSetupPINRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Login::Id: { - Commands::Login::DecodableType commandData; + case Commands::LoginRequest::Id: { + Commands::LoginRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAccountLoginClusterLoginCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAccountLoginClusterLoginRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::Logout::Id: { - Commands::Logout::DecodableType commandData; + case Commands::LogoutRequest::Id: { + if (!apCommandObj->IsTimedInvoke()) + { + apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::NeedsTimedInteraction); + return; + } + Commands::LogoutRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAccountLoginClusterLogoutCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAccountLoginClusterLogoutRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -162,47 +172,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } // namespace AdministratorCommissioning -namespace ApplicationBasic { - -void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV - // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error. - // Any error value TLVUnpackError means we have received an illegal value. - // The following variables are used for all commands to save code size. - CHIP_ERROR TLVError = CHIP_NO_ERROR; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::ChangeStatus::Id: { - Commands::ChangeStatus::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfApplicationBasicClusterChangeStatusCallback(apCommandObj, aCommandPath, commandData); - } - break; - } - default: { - // Unrecognized command ID, error status will apply. - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); - ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI, - ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId)); - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || !wasHandled) - { - apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand); - ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format()); - } -} - -} // namespace ApplicationBasic - namespace ApplicationLauncher { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -216,30 +185,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::HideApp::Id: { - Commands::HideApp::DecodableType commandData; + case Commands::HideAppRequest::Id: { + Commands::HideAppRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfApplicationLauncherClusterHideAppCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfApplicationLauncherClusterHideAppRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::LaunchApp::Id: { - Commands::LaunchApp::DecodableType commandData; + case Commands::LaunchAppRequest::Id: { + Commands::LaunchAppRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfApplicationLauncherClusterLaunchAppCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfApplicationLauncherClusterLaunchAppRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::StopApp::Id: { - Commands::StopApp::DecodableType commandData; + case Commands::StopAppRequest::Id: { + Commands::StopAppRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfApplicationLauncherClusterStopAppCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfApplicationLauncherClusterStopAppRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -275,21 +244,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::RenameOutput::Id: { - Commands::RenameOutput::DecodableType commandData; + case Commands::RenameOutputRequest::Id: { + Commands::RenameOutputRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAudioOutputClusterRenameOutputCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAudioOutputClusterRenameOutputRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SelectOutput::Id: { - Commands::SelectOutput::DecodableType commandData; + case Commands::SelectOutputRequest::Id: { + Commands::SelectOutputRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfAudioOutputClusterSelectOutputCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfAudioOutputClusterSelectOutputRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -386,30 +355,30 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::ChangeChannel::Id: { - Commands::ChangeChannel::DecodableType commandData; + case Commands::ChangeChannelByNumberRequest::Id: { + Commands::ChangeChannelByNumberRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfChannelClusterChangeChannelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfChannelClusterChangeChannelByNumberRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ChangeChannelByNumber::Id: { - Commands::ChangeChannelByNumber::DecodableType commandData; + case Commands::ChangeChannelRequest::Id: { + Commands::ChangeChannelRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfChannelClusterChangeChannelByNumberCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfChannelClusterChangeChannelRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SkipChannel::Id: { - Commands::SkipChannel::DecodableType commandData; + case Commands::SkipChannelRequest::Id: { + Commands::SkipChannelRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfChannelClusterSkipChannelCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfChannelClusterSkipChannelRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -445,21 +414,21 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::LaunchContent::Id: { - Commands::LaunchContent::DecodableType commandData; + case Commands::LaunchContentRequest::Id: { + Commands::LaunchContentRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfContentLauncherClusterLaunchContentCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfContentLauncherClusterLaunchContentRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::LaunchURL::Id: { - Commands::LaunchURL::DecodableType commandData; + case Commands::LaunchURLRequest::Id: { + Commands::LaunchURLRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfContentLauncherClusterLaunchURLCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfContentLauncherClusterLaunchURLRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -823,12 +792,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::SendKey::Id: { - Commands::SendKey::DecodableType commandData; + case Commands::SendKeyRequest::Id: { + Commands::SendKeyRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfKeypadInputClusterSendKeyCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfKeypadInputClusterSendKeyRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1009,39 +978,39 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::HideInputStatus::Id: { - Commands::HideInputStatus::DecodableType commandData; + case Commands::HideInputStatusRequest::Id: { + Commands::HideInputStatusRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaInputClusterHideInputStatusCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaInputClusterHideInputStatusRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::RenameInput::Id: { - Commands::RenameInput::DecodableType commandData; + case Commands::RenameInputRequest::Id: { + Commands::RenameInputRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaInputClusterRenameInputCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaInputClusterRenameInputRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::SelectInput::Id: { - Commands::SelectInput::DecodableType commandData; + case Commands::SelectInputRequest::Id: { + Commands::SelectInputRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaInputClusterSelectInputCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaInputClusterSelectInputRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::ShowInputStatus::Id: { - Commands::ShowInputStatus::DecodableType commandData; + case Commands::ShowInputStatusRequest::Id: { + Commands::ShowInputStatusRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaInputClusterShowInputStatusCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaInputClusterShowInputStatusRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -1077,102 +1046,102 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::MediaFastForward::Id: { - Commands::MediaFastForward::DecodableType commandData; + case Commands::FastForwardRequest::Id: { + Commands::FastForwardRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterMediaFastForwardCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterFastForwardRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MediaNext::Id: { - Commands::MediaNext::DecodableType commandData; + case Commands::NextRequest::Id: { + Commands::NextRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterMediaNextCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterNextRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MediaPause::Id: { - Commands::MediaPause::DecodableType commandData; + case Commands::PauseRequest::Id: { + Commands::PauseRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterMediaPauseCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterPauseRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MediaPlay::Id: { - Commands::MediaPlay::DecodableType commandData; + case Commands::PlayRequest::Id: { + Commands::PlayRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterMediaPlayCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterPlayRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MediaPrevious::Id: { - Commands::MediaPrevious::DecodableType commandData; + case Commands::PreviousRequest::Id: { + Commands::PreviousRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterMediaPreviousCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterPreviousRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MediaRewind::Id: { - Commands::MediaRewind::DecodableType commandData; + case Commands::RewindRequest::Id: { + Commands::RewindRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterMediaRewindCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterRewindRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MediaSeek::Id: { - Commands::MediaSeek::DecodableType commandData; + case Commands::SeekRequest::Id: { + Commands::SeekRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterMediaSeekCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterSeekRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MediaSkipBackward::Id: { - Commands::MediaSkipBackward::DecodableType commandData; + case Commands::SkipBackwardRequest::Id: { + Commands::SkipBackwardRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterMediaSkipBackwardCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterSkipBackwardRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MediaSkipForward::Id: { - Commands::MediaSkipForward::DecodableType commandData; + case Commands::SkipForwardRequest::Id: { + Commands::SkipForwardRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterMediaSkipForwardCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterSkipForwardRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MediaStartOver::Id: { - Commands::MediaStartOver::DecodableType commandData; + case Commands::StartOverRequest::Id: { + Commands::StartOverRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterMediaStartOverCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterStartOverRequestCallback(apCommandObj, aCommandPath, commandData); } break; } - case Commands::MediaStop::Id: { - Commands::MediaStop::DecodableType commandData; + case Commands::StopRequest::Id: { + Commands::StopRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfMediaPlaybackClusterMediaStopCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfMediaPlaybackClusterStopRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -2064,12 +2033,12 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP { switch (aCommandPath.mCommandId) { - case Commands::NavigateTarget::Id: { - Commands::NavigateTarget::DecodableType commandData; + case Commands::NavigateTargetRequest::Id: { + Commands::NavigateTargetRequest::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfTargetNavigatorClusterNavigateTargetCallback(apCommandObj, aCommandPath, commandData); + wasHandled = emberAfTargetNavigatorClusterNavigateTargetRequestCallback(apCommandObj, aCommandPath, commandData); } break; } @@ -2106,9 +2075,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: case Clusters::AdministratorCommissioning::Id: Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; - case Clusters::ApplicationBasic::Id: - Clusters::ApplicationBasic::DispatchServerCommand(apCommandObj, aCommandPath, aReader); - break; case Clusters::ApplicationLauncher::Id: Clusters::ApplicationLauncher::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index 2232cc2fc28ca8..123045375135b4 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -460,9 +460,15 @@ /* 2945 - supported streaming protocols, */ \ 0x00, 0x00, 0x00, 0x00, \ \ + /* Endpoint: 3, Cluster: Application Basic (server), big-endian */ \ + \ + /* 2949 - allowed vendor list, */ \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + \ /* Endpoint: 4, Cluster: Content Launcher (server), big-endian */ \ \ - /* 2949 - accept header list, */ \ + /* 2981 - accept header list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -478,8 +484,14 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3203 - supported streaming protocols, */ \ + /* 3235 - supported streaming protocols, */ \ 0x00, 0x00, 0x00, 0x00, \ + \ + /* Endpoint: 4, Cluster: Application Basic (server), big-endian */ \ + \ + /* 3239 - allowed vendor list, */ \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ } #else // !BIGENDIAN_CPU @@ -919,9 +931,15 @@ /* 2945 - supported streaming protocols, */ \ 0x00, 0x00, 0x00, 0x00, \ \ + /* Endpoint: 3, Cluster: Application Basic (server), little-endian */ \ + \ + /* 2949 - allowed vendor list, */ \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + \ /* Endpoint: 4, Cluster: Content Launcher (server), little-endian */ \ \ - /* 2949 - accept header list, */ \ + /* 2981 - accept header list, */ \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ @@ -937,13 +955,19 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ \ - /* 3203 - supported streaming protocols, */ \ + /* 3235 - supported streaming protocols, */ \ 0x00, 0x00, 0x00, 0x00, \ + \ + /* Endpoint: 4, Cluster: Application Basic (server), little-endian */ \ + \ + /* 3239 - allowed vendor list, */ \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ } #endif // BIGENDIAN_CPU -#define GENERATED_DEFAULTS_COUNT (91) +#define GENERATED_DEFAULTS_COUNT (93) #define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE #define ZAP_LONG_DEFAULTS_INDEX(index) \ @@ -976,7 +1000,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 276 +#define GENERATED_ATTRIBUTE_COUNT 281 #define GENERATED_ATTRIBUTES \ { \ \ @@ -1318,13 +1342,16 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 3, Cluster: Application Basic (server) */ \ - { 0x0000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* vendor name */ \ - { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* vendor id */ \ - { 0x0002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application name */ \ - { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* product id */ \ - { 0x0005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* application status */ \ - { 0x0006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application version */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + { 0x0000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* vendor name */ \ + { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* vendor id */ \ + { 0x0002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application name */ \ + { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* product id */ \ + { 0x0004, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_EMPTY_DEFAULT() }, /* application app */ \ + { 0x0005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* application status */ \ + { 0x0006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application version */ \ + { 0x0007, ZAP_TYPE(ARRAY), 32, 0, ZAP_LONG_DEFAULTS_INDEX(2949) }, /* allowed vendor list */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 3, Cluster: Account Login (server) */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ @@ -1337,19 +1364,22 @@ { 0xFFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 4, Cluster: Content Launcher (server) */ \ - { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2949) }, /* accept header list */ \ + { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(2981) }, /* accept header list */ \ { 0x0001, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_LONG_DEFAULTS_INDEX(3203) }, /* supported streaming protocols */ \ + ZAP_LONG_DEFAULTS_INDEX(3235) }, /* supported streaming protocols */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 4, Cluster: Application Basic (server) */ \ - { 0x0000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* vendor name */ \ - { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* vendor id */ \ - { 0x0002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application name */ \ - { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* product id */ \ - { 0x0005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* application status */ \ - { 0x0006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application version */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + { 0x0000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* vendor name */ \ + { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* vendor id */ \ + { 0x0002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application name */ \ + { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* product id */ \ + { 0x0004, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_EMPTY_DEFAULT() }, /* application app */ \ + { 0x0005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* application status */ \ + { 0x0006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application version */ \ + { 0x0007, ZAP_TYPE(ARRAY), 32, 0, ZAP_LONG_DEFAULTS_INDEX(3239) }, /* allowed vendor list */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 5, Cluster: Descriptor (server) */ \ { 0x0000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* device list */ \ @@ -1359,10 +1389,12 @@ { 0xFFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 5, Cluster: Application Basic (server) */ \ - { 0x0000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* vendor name */ \ - { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* vendor id */ \ - { 0x0002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application name */ \ - { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* product id */ \ + { 0x0000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* vendor name */ \ + { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* vendor id */ \ + { 0x0002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application name */ \ + { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* product id */ \ + { 0x0004, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_SIMPLE_DEFAULT(0x00) }, /* application app */ \ { 0x0005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* application status */ \ { 0x0006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* application version */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ @@ -1510,25 +1542,25 @@ 0x050A, ZAP_ATTRIBUTE_INDEX(238), 3, 260, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 3, Cluster: Content Launcher (server) */ \ { \ - 0x050D, ZAP_ATTRIBUTE_INDEX(241), 7, 106, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050D, ZAP_ATTRIBUTE_INDEX(241), 9, 138, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 3, Cluster: Application Basic (server) */ \ { \ - 0x050E, ZAP_ATTRIBUTE_INDEX(248), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050E, ZAP_ATTRIBUTE_INDEX(250), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 3, Cluster: Account Login (server) */ \ { \ - 0x001D, ZAP_ATTRIBUTE_INDEX(249), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x001D, ZAP_ATTRIBUTE_INDEX(251), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 4, Cluster: Descriptor (server) */ \ { \ - 0x050A, ZAP_ATTRIBUTE_INDEX(254), 3, 260, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050A, ZAP_ATTRIBUTE_INDEX(256), 3, 260, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 4, Cluster: Content Launcher (server) */ \ { \ - 0x050D, ZAP_ATTRIBUTE_INDEX(257), 7, 106, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050D, ZAP_ATTRIBUTE_INDEX(259), 9, 138, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 4, Cluster: Application Basic (server) */ \ { \ - 0x001D, ZAP_ATTRIBUTE_INDEX(264), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x001D, ZAP_ATTRIBUTE_INDEX(268), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 5, Cluster: Descriptor (server) */ \ { \ - 0x050D, ZAP_ATTRIBUTE_INDEX(269), 7, 106, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050D, ZAP_ATTRIBUTE_INDEX(273), 8, 106, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 5, Cluster: Application Basic (server) */ \ } @@ -1538,7 +1570,7 @@ #define GENERATED_ENDPOINT_TYPES \ { \ { ZAP_CLUSTER_INDEX(0), 21, 1967 }, { ZAP_CLUSTER_INDEX(21), 10, 1328 }, { ZAP_CLUSTER_INDEX(31), 4, 283 }, \ - { ZAP_CLUSTER_INDEX(35), 5, 407 }, { ZAP_CLUSTER_INDEX(40), 3, 366 }, { ZAP_CLUSTER_INDEX(43), 2, 106 }, \ + { ZAP_CLUSTER_INDEX(35), 5, 439 }, { ZAP_CLUSTER_INDEX(40), 3, 398 }, { ZAP_CLUSTER_INDEX(43), 2, 106 }, \ } // Largest attribute size is needed for various buffers @@ -1548,7 +1580,7 @@ #define ATTRIBUTE_SINGLETONS_SIZE (686) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (4457) +#define ATTRIBUTE_MAX_SIZE (4521) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (6) diff --git a/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.cpp index 45575b32e1ed30..1dd55907dc2609 100644 --- a/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.cpp @@ -156,7 +156,7 @@ void ApplicationLauncherClusterApplicationLauncherListListAttributeFilter(TLV::T void AudioOutputClusterAudioOutputListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { - chip::app::DataModel::DecodableList list; + chip::app::DataModel::DecodableList list; CHIP_ERROR err = Decode(*tlvData, list); if (err != CHIP_NO_ERROR) { @@ -219,7 +219,7 @@ void ContentLauncherClusterAcceptHeaderListListAttributeFilter(TLV::TLVReader * void MediaInputClusterMediaInputListListAttributeFilter(TLV::TLVReader * tlvData, Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { - chip::app::DataModel::DecodableList list; + chip::app::DataModel::DecodableList list; CHIP_ERROR err = Decode(*tlvData, list); if (err != CHIP_NO_ERROR) { @@ -241,8 +241,7 @@ void TargetNavigatorClusterTargetNavigatorListListAttributeFilter(TLV::TLVReader Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { - chip::app::DataModel::DecodableList - list; + chip::app::DataModel::DecodableList list; CHIP_ERROR err = Decode(*tlvData, list); if (err != CHIP_NO_ERROR) { @@ -259,246 +258,3 @@ void TargetNavigatorClusterTargetNavigatorListListAttributeFilter(TLV::TLVReader Callback::Callback::FromCancelable(onSuccessCallback); cb->mCall(cb->mContext, list); } - -bool emberAfAccountLoginClusterGetSetupPINResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - chip::CharSpan setupPIN) -{ - ChipLogProgress(Zcl, "GetSetupPINResponse:"); - ChipLogProgress(Zcl, " setupPIN: %.*s", static_cast(setupPIN.size()), setupPIN.data()); - - GET_CLUSTER_RESPONSE_CALLBACKS("AccountLoginClusterGetSetupPINResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, setupPIN); - return true; -} - -bool emberAfApplicationLauncherClusterLaunchAppResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t status, chip::CharSpan data) -{ - ChipLogProgress(Zcl, "LaunchAppResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - ChipLogProgress(Zcl, " data: %.*s", static_cast(data.size()), data.data()); - - GET_CLUSTER_RESPONSE_CALLBACKS("ApplicationLauncherClusterLaunchAppResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status, data); - return true; -} - -bool emberAfChannelClusterChangeChannelResponseCallback( - EndpointId endpoint, app::CommandSender * commandObj, - chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType channelMatch, uint8_t errorType) -{ - ChipLogProgress(Zcl, "ChangeChannelResponse:"); - ChipLogProgress(Zcl, " channelMatch: Not sure how to log struct ChannelInfo"); - ChipLogProgress(Zcl, " errorType: %" PRIu8 "", errorType); - - GET_CLUSTER_RESPONSE_CALLBACKS("ChannelClusterChangeChannelResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, ChannelInfo(), errorType); - return true; -} - -bool emberAfContentLauncherClusterLaunchContentResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t contentLaunchStatus, chip::CharSpan data) -{ - ChipLogProgress(Zcl, "LaunchContentResponse:"); - ChipLogProgress(Zcl, " contentLaunchStatus: %" PRIu8 "", contentLaunchStatus); - ChipLogProgress(Zcl, " data: %.*s", static_cast(data.size()), data.data()); - - GET_CLUSTER_RESPONSE_CALLBACKS("ContentLauncherClusterLaunchContentResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, contentLaunchStatus, data); - return true; -} - -bool emberAfContentLauncherClusterLaunchURLResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t contentLaunchStatus, chip::CharSpan data) -{ - ChipLogProgress(Zcl, "LaunchURLResponse:"); - ChipLogProgress(Zcl, " contentLaunchStatus: %" PRIu8 "", contentLaunchStatus); - ChipLogProgress(Zcl, " data: %.*s", static_cast(data.size()), data.data()); - - GET_CLUSTER_RESPONSE_CALLBACKS("ContentLauncherClusterLaunchURLResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, contentLaunchStatus, data); - return true; -} - -bool emberAfKeypadInputClusterSendKeyResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status) -{ - ChipLogProgress(Zcl, "SendKeyResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - - GET_CLUSTER_RESPONSE_CALLBACKS("KeypadInputClusterSendKeyResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status); - return true; -} - -bool emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaFastForwardResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaFastForwardResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaNextResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaNextResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaNextResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaPauseResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaPauseResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaPauseResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaPlayResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaPlayResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaPlayResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaPreviousResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaPreviousResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaPreviousResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaRewindResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaRewindResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaRewindResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaSkipBackwardResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaSkipBackwardResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaSkipForwardResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaSkipForwardResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaStartOverResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaStartOverResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaStartOverResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfMediaPlaybackClusterMediaStopResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t mediaPlaybackStatus) -{ - ChipLogProgress(Zcl, "MediaStopResponse:"); - ChipLogProgress(Zcl, " mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus); - - GET_CLUSTER_RESPONSE_CALLBACKS("MediaPlaybackClusterMediaStopResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, mediaPlaybackStatus); - return true; -} - -bool emberAfTargetNavigatorClusterNavigateTargetResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, - uint8_t status, chip::CharSpan data) -{ - ChipLogProgress(Zcl, "NavigateTargetResponse:"); - ChipLogProgress(Zcl, " status: %" PRIu8 "", status); - ChipLogProgress(Zcl, " data: %.*s", static_cast(data.size()), data.data()); - - GET_CLUSTER_RESPONSE_CALLBACKS("TargetNavigatorClusterNavigateTargetResponseCallback"); - - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext, status, data); - return true; -} diff --git a/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.h b/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.h index 4ca1c714a0e2ec..dcbde910989226 100644 --- a/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/tv-casting-app/zap-generated/CHIPClientCallbacks.h @@ -35,24 +35,6 @@ // #6308 should handle IM error code on the application side, either modify this function or remove this. // Cluster Specific Response Callbacks -typedef void (*AccountLoginClusterGetSetupPINResponseCallback)(void * context, chip::CharSpan setupPIN); -typedef void (*ApplicationLauncherClusterLaunchAppResponseCallback)(void * context, uint8_t status, chip::CharSpan data); -typedef void (*ChannelClusterChangeChannelResponseCallback)(void * context, ChannelInfo channelMatch, uint8_t errorType); -typedef void (*ContentLauncherClusterLaunchContentResponseCallback)(void * context, uint8_t contentLaunchStatus, - chip::CharSpan data); -typedef void (*ContentLauncherClusterLaunchURLResponseCallback)(void * context, uint8_t contentLaunchStatus, chip::CharSpan data); -typedef void (*KeypadInputClusterSendKeyResponseCallback)(void * context, uint8_t status); -typedef void (*MediaPlaybackClusterMediaFastForwardResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaNextResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaPauseResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaPlayResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaPreviousResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaRewindResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaSkipBackwardResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaSkipForwardResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaStartOverResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*MediaPlaybackClusterMediaStopResponseCallback)(void * context, uint8_t mediaPlaybackStatus); -typedef void (*TargetNavigatorClusterNavigateTargetResponseCallback)(void * context, uint8_t status, chip::CharSpan data); // List specific responses void ApplicationLauncherClusterApplicationLauncherListListAttributeFilter(chip::TLV::TLVReader * data, @@ -65,7 +47,7 @@ void AudioOutputClusterAudioOutputListListAttributeFilter(chip::TLV::TLVReader * chip::Callback::Cancelable * onFailureCallback); typedef void (*AudioOutputAudioOutputListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); + const chip::app::DataModel::DecodableList & data); void ChannelClusterChannelListListAttributeFilter(chip::TLV::TLVReader * data, chip::Callback::Cancelable * onSuccessCallback, chip::Callback::Cancelable * onFailureCallback); typedef void (*ChannelChannelListListAttributeCallback)( @@ -80,11 +62,10 @@ void MediaInputClusterMediaInputListListAttributeFilter(chip::TLV::TLVReader * d chip::Callback::Cancelable * onFailureCallback); typedef void (*MediaInputMediaInputListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); + const chip::app::DataModel::DecodableList & data); void TargetNavigatorClusterTargetNavigatorListListAttributeFilter(chip::TLV::TLVReader * data, chip::Callback::Cancelable * onSuccessCallback, chip::Callback::Cancelable * onFailureCallback); typedef void (*TargetNavigatorTargetNavigatorListListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & data); + const chip::app::DataModel::DecodableList & data); diff --git a/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.cpp b/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.cpp index 903b13ffdea105..2bdd88c361e647 100644 --- a/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.cpp @@ -35,8 +35,8 @@ namespace Controller { // TODO(#4503): Commands should take group id as an argument. // AccountLogin Cluster Commands -CHIP_ERROR AccountLoginCluster::GetSetupPIN(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan tempAccountIdentifier) +CHIP_ERROR AccountLoginCluster::GetSetupPINRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, chip::CharSpan tempAccountIdentifier) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -48,7 +48,7 @@ CHIP_ERROR AccountLoginCluster::GetSetupPIN(Callback::Cancelable * onSuccessCall VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AccountLogin::Commands::GetSetupPIN::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AccountLogin::Commands::GetSetupPINRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -76,8 +76,8 @@ CHIP_ERROR AccountLoginCluster::GetSetupPIN(Callback::Cancelable * onSuccessCall return err; } -CHIP_ERROR AccountLoginCluster::Login(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan tempAccountIdentifier, chip::CharSpan setupPIN) +CHIP_ERROR AccountLoginCluster::LoginRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan tempAccountIdentifier, chip::CharSpan setupPIN) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -89,7 +89,7 @@ CHIP_ERROR AccountLoginCluster::Login(Callback::Cancelable * onSuccessCallback, VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AccountLogin::Commands::Login::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AccountLogin::Commands::LoginRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -119,11 +119,94 @@ CHIP_ERROR AccountLoginCluster::Login(Callback::Cancelable * onSuccessCallback, return err; } +CHIP_ERROR AccountLoginCluster::LogoutRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVWriter * writer = nullptr; + uint8_t argSeqNumber = 0; + + // Used when encoding non-empty command. Suppress error message when encoding empty commands. + (void) writer; + (void) argSeqNumber; + + VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); + + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AccountLogin::Commands::LogoutRequest::Id, + (app::CommandPathFlags::kEndpointIdValid) }; + + CommandSenderHandle sender( + Platform::New(mDevice->GetInteractionModelDelegate(), mDevice->GetExchangeManager())); + + VerifyOrReturnError(sender != nullptr, CHIP_ERROR_NO_MEMORY); + + SuccessOrExit(err = sender->PrepareCommand(cmdParams)); + + // Command takes no arguments. + + SuccessOrExit(err = sender->FinishCommand()); + + // #6308: This is a temporary solution before we fully support IM on application side and should be replaced by IMDelegate. + mDevice->AddIMResponseHandler(sender.get(), onSuccessCallback, onFailureCallback); + + SuccessOrExit(err = mDevice->SendCommands(sender.get())); + + // We have successfully sent the command, and the callback handler will be responsible to free the object, release the object + // now. + sender.release(); +exit: + return err; +} + // ApplicationBasic Cluster Commands // ApplicationLauncher Cluster Commands -CHIP_ERROR ApplicationLauncherCluster::LaunchApp(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan data, uint16_t catalogVendorId, chip::CharSpan applicationId) +CHIP_ERROR ApplicationLauncherCluster::HideAppRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint16_t catalogVendorId, + chip::CharSpan applicationId) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVWriter * writer = nullptr; + uint8_t argSeqNumber = 0; + + // Used when encoding non-empty command. Suppress error message when encoding empty commands. + (void) writer; + (void) argSeqNumber; + + VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); + + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ApplicationLauncher::Commands::HideAppRequest::Id, + (app::CommandPathFlags::kEndpointIdValid) }; + + CommandSenderHandle sender( + Platform::New(mDevice->GetInteractionModelDelegate(), mDevice->GetExchangeManager())); + + VerifyOrReturnError(sender != nullptr, CHIP_ERROR_NO_MEMORY); + + SuccessOrExit(err = sender->PrepareCommand(cmdParams)); + + VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); + // catalogVendorId: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), catalogVendorId)); + // applicationId: charString + SuccessOrExit(err = writer->PutString(TLV::ContextTag(argSeqNumber++), applicationId)); + + SuccessOrExit(err = sender->FinishCommand()); + + // #6308: This is a temporary solution before we fully support IM on application side and should be replaced by IMDelegate. + mDevice->AddIMResponseHandler(sender.get(), onSuccessCallback, onFailureCallback); + + SuccessOrExit(err = mDevice->SendCommands(sender.get())); + + // We have successfully sent the command, and the callback handler will be responsible to free the object, release the object + // now. + sender.release(); +exit: + return err; +} + +CHIP_ERROR ApplicationLauncherCluster::LaunchAppRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, chip::CharSpan data, + uint16_t catalogVendorId, chip::CharSpan applicationId) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -135,7 +218,8 @@ CHIP_ERROR ApplicationLauncherCluster::LaunchApp(Callback::Cancelable * onSucces VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ApplicationLauncher::Commands::LaunchApp::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, + ApplicationLauncher::Commands::LaunchAppRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -167,9 +251,53 @@ CHIP_ERROR ApplicationLauncherCluster::LaunchApp(Callback::Cancelable * onSucces return err; } +CHIP_ERROR ApplicationLauncherCluster::StopAppRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint16_t catalogVendorId, + chip::CharSpan applicationId) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVWriter * writer = nullptr; + uint8_t argSeqNumber = 0; + + // Used when encoding non-empty command. Suppress error message when encoding empty commands. + (void) writer; + (void) argSeqNumber; + + VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); + + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ApplicationLauncher::Commands::StopAppRequest::Id, + (app::CommandPathFlags::kEndpointIdValid) }; + + CommandSenderHandle sender( + Platform::New(mDevice->GetInteractionModelDelegate(), mDevice->GetExchangeManager())); + + VerifyOrReturnError(sender != nullptr, CHIP_ERROR_NO_MEMORY); + + SuccessOrExit(err = sender->PrepareCommand(cmdParams)); + + VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); + // catalogVendorId: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), catalogVendorId)); + // applicationId: charString + SuccessOrExit(err = writer->PutString(TLV::ContextTag(argSeqNumber++), applicationId)); + + SuccessOrExit(err = sender->FinishCommand()); + + // #6308: This is a temporary solution before we fully support IM on application side and should be replaced by IMDelegate. + mDevice->AddIMResponseHandler(sender.get(), onSuccessCallback, onFailureCallback); + + SuccessOrExit(err = mDevice->SendCommands(sender.get())); + + // We have successfully sent the command, and the callback handler will be responsible to free the object, release the object + // now. + sender.release(); +exit: + return err; +} + // AudioOutput Cluster Commands -CHIP_ERROR AudioOutputCluster::RenameOutput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t index, chip::CharSpan name) +CHIP_ERROR AudioOutputCluster::RenameOutputRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint8_t index, chip::CharSpan name) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -181,7 +309,7 @@ CHIP_ERROR AudioOutputCluster::RenameOutput(Callback::Cancelable * onSuccessCall VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AudioOutput::Commands::RenameOutput::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AudioOutput::Commands::RenameOutputRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -211,8 +339,8 @@ CHIP_ERROR AudioOutputCluster::RenameOutput(Callback::Cancelable * onSuccessCall return err; } -CHIP_ERROR AudioOutputCluster::SelectOutput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t index) +CHIP_ERROR AudioOutputCluster::SelectOutputRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint8_t index) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -224,7 +352,7 @@ CHIP_ERROR AudioOutputCluster::SelectOutput(Callback::Cancelable * onSuccessCall VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AudioOutput::Commands::SelectOutput::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, AudioOutput::Commands::SelectOutputRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -253,8 +381,9 @@ CHIP_ERROR AudioOutputCluster::SelectOutput(Callback::Cancelable * onSuccessCall } // Channel Cluster Commands -CHIP_ERROR ChannelCluster::ChangeChannel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan match) +CHIP_ERROR ChannelCluster::ChangeChannelByNumberRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint16_t majorNumber, + uint16_t minorNumber) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -266,7 +395,8 @@ CHIP_ERROR ChannelCluster::ChangeChannel(Callback::Cancelable * onSuccessCallbac VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, Channel::Commands::ChangeChannel::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, + Channel::Commands::ChangeChannelByNumberRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -277,8 +407,10 @@ CHIP_ERROR ChannelCluster::ChangeChannel(Callback::Cancelable * onSuccessCallbac SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // match: charString - SuccessOrExit(err = writer->PutString(TLV::ContextTag(argSeqNumber++), match)); + // majorNumber: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), majorNumber)); + // minorNumber: int16u + SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), minorNumber)); SuccessOrExit(err = sender->FinishCommand()); @@ -294,8 +426,8 @@ CHIP_ERROR ChannelCluster::ChangeChannel(Callback::Cancelable * onSuccessCallbac return err; } -CHIP_ERROR ChannelCluster::ChangeChannelByNumber(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t majorNumber, uint16_t minorNumber) +CHIP_ERROR ChannelCluster::ChangeChannelRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan match) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -307,7 +439,7 @@ CHIP_ERROR ChannelCluster::ChangeChannelByNumber(Callback::Cancelable * onSucces VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, Channel::Commands::ChangeChannelByNumber::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, Channel::Commands::ChangeChannelRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -318,10 +450,8 @@ CHIP_ERROR ChannelCluster::ChangeChannelByNumber(Callback::Cancelable * onSucces SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // majorNumber: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), majorNumber)); - // minorNumber: int16u - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), minorNumber)); + // match: charString + SuccessOrExit(err = writer->PutString(TLV::ContextTag(argSeqNumber++), match)); SuccessOrExit(err = sender->FinishCommand()); @@ -337,8 +467,8 @@ CHIP_ERROR ChannelCluster::ChangeChannelByNumber(Callback::Cancelable * onSucces return err; } -CHIP_ERROR ChannelCluster::SkipChannel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t count) +CHIP_ERROR ChannelCluster::SkipChannelRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t count) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -350,7 +480,7 @@ CHIP_ERROR ChannelCluster::SkipChannel(Callback::Cancelable * onSuccessCallback, VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, Channel::Commands::SkipChannel::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, Channel::Commands::SkipChannelRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -379,8 +509,9 @@ CHIP_ERROR ChannelCluster::SkipChannel(Callback::Cancelable * onSuccessCallback, } // ContentLauncher Cluster Commands -CHIP_ERROR ContentLauncherCluster::LaunchContent(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - bool autoPlay, chip::CharSpan data, uint8_t type, chip::CharSpan value) +CHIP_ERROR ContentLauncherCluster::LaunchContentRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, bool autoPlay, + chip::CharSpan data) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -392,7 +523,8 @@ CHIP_ERROR ContentLauncherCluster::LaunchContent(Callback::Cancelable * onSucces VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ContentLauncher::Commands::LaunchContent::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, + ContentLauncher::Commands::LaunchContentRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -407,10 +539,6 @@ CHIP_ERROR ContentLauncherCluster::LaunchContent(Callback::Cancelable * onSucces SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), autoPlay)); // data: charString SuccessOrExit(err = writer->PutString(TLV::ContextTag(argSeqNumber++), data)); - // type: contentLaunchParameterEnum - SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), type)); - // value: charString - SuccessOrExit(err = writer->PutString(TLV::ContextTag(argSeqNumber++), value)); SuccessOrExit(err = sender->FinishCommand()); @@ -426,8 +554,9 @@ CHIP_ERROR ContentLauncherCluster::LaunchContent(Callback::Cancelable * onSucces return err; } -CHIP_ERROR ContentLauncherCluster::LaunchURL(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan contentURL, chip::CharSpan displayString, chip::CharSpan providerName) +CHIP_ERROR ContentLauncherCluster::LaunchURLRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, chip::CharSpan contentURL, + chip::CharSpan displayString, chip::CharSpan providerName) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -439,7 +568,7 @@ CHIP_ERROR ContentLauncherCluster::LaunchURL(Callback::Cancelable * onSuccessCal VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ContentLauncher::Commands::LaunchURL::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, ContentLauncher::Commands::LaunchURLRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -472,8 +601,8 @@ CHIP_ERROR ContentLauncherCluster::LaunchURL(Callback::Cancelable * onSuccessCal } // KeypadInput Cluster Commands -CHIP_ERROR KeypadInputCluster::SendKey(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t keyCode) +CHIP_ERROR KeypadInputCluster::SendKeyRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t keyCode) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -485,7 +614,7 @@ CHIP_ERROR KeypadInputCluster::SendKey(Callback::Cancelable * onSuccessCallback, VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, KeypadInput::Commands::SendKey::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, KeypadInput::Commands::SendKeyRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -496,7 +625,7 @@ CHIP_ERROR KeypadInputCluster::SendKey(Callback::Cancelable * onSuccessCallback, SuccessOrExit(err = sender->PrepareCommand(cmdParams)); VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // keyCode: keypadInputCecKeyCode + // keyCode: cecKeyCode SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), keyCode)); SuccessOrExit(err = sender->FinishCommand()); @@ -514,7 +643,8 @@ CHIP_ERROR KeypadInputCluster::SendKey(Callback::Cancelable * onSuccessCallback, } // MediaInput Cluster Commands -CHIP_ERROR MediaInputCluster::HideInputStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaInputCluster::HideInputStatusRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -526,7 +656,7 @@ CHIP_ERROR MediaInputCluster::HideInputStatus(Callback::Cancelable * onSuccessCa VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::HideInputStatus::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::HideInputStatusRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -552,8 +682,8 @@ CHIP_ERROR MediaInputCluster::HideInputStatus(Callback::Cancelable * onSuccessCa return err; } -CHIP_ERROR MediaInputCluster::RenameInput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t index, chip::CharSpan name) +CHIP_ERROR MediaInputCluster::RenameInputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t index, chip::CharSpan name) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -565,7 +695,7 @@ CHIP_ERROR MediaInputCluster::RenameInput(Callback::Cancelable * onSuccessCallba VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::RenameInput::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::RenameInputRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -595,8 +725,8 @@ CHIP_ERROR MediaInputCluster::RenameInput(Callback::Cancelable * onSuccessCallba return err; } -CHIP_ERROR MediaInputCluster::SelectInput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint8_t index) +CHIP_ERROR MediaInputCluster::SelectInputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t index) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -608,7 +738,7 @@ CHIP_ERROR MediaInputCluster::SelectInput(Callback::Cancelable * onSuccessCallba VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::SelectInput::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::SelectInputRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -636,7 +766,8 @@ CHIP_ERROR MediaInputCluster::SelectInput(Callback::Cancelable * onSuccessCallba return err; } -CHIP_ERROR MediaInputCluster::ShowInputStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaInputCluster::ShowInputStatusRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -648,7 +779,7 @@ CHIP_ERROR MediaInputCluster::ShowInputStatus(Callback::Cancelable * onSuccessCa VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::ShowInputStatus::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaInput::Commands::ShowInputStatusRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -675,8 +806,8 @@ CHIP_ERROR MediaInputCluster::ShowInputStatus(Callback::Cancelable * onSuccessCa } // MediaPlayback Cluster Commands -CHIP_ERROR MediaPlaybackCluster::MediaFastForward(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::FastForwardRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -688,7 +819,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaFastForward(Callback::Cancelable * onSucce VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaFastForward::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::FastForwardRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -714,7 +845,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaFastForward(Callback::Cancelable * onSucce return err; } -CHIP_ERROR MediaPlaybackCluster::MediaNext(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::NextRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -726,7 +857,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaNext(Callback::Cancelable * onSuccessCallb VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaNext::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::NextRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -752,7 +883,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaNext(Callback::Cancelable * onSuccessCallb return err; } -CHIP_ERROR MediaPlaybackCluster::MediaPause(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::PauseRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -764,7 +895,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPause(Callback::Cancelable * onSuccessCall VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaPause::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::PauseRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -790,7 +921,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPause(Callback::Cancelable * onSuccessCall return err; } -CHIP_ERROR MediaPlaybackCluster::MediaPlay(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::PlayRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -802,7 +933,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPlay(Callback::Cancelable * onSuccessCallb VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaPlay::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::PlayRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -828,7 +959,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPlay(Callback::Cancelable * onSuccessCallb return err; } -CHIP_ERROR MediaPlaybackCluster::MediaPrevious(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::PreviousRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -840,7 +971,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPrevious(Callback::Cancelable * onSuccessC VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaPrevious::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::PreviousRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -866,7 +997,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaPrevious(Callback::Cancelable * onSuccessC return err; } -CHIP_ERROR MediaPlaybackCluster::MediaRewind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::RewindRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -878,7 +1009,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaRewind(Callback::Cancelable * onSuccessCal VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaRewind::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::RewindRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -904,8 +1035,8 @@ CHIP_ERROR MediaPlaybackCluster::MediaRewind(Callback::Cancelable * onSuccessCal return err; } -CHIP_ERROR MediaPlaybackCluster::MediaSeek(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint64_t position) +CHIP_ERROR MediaPlaybackCluster::SeekRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint64_t position) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -917,7 +1048,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaSeek(Callback::Cancelable * onSuccessCallb VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaSeek::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::SeekRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -945,8 +1076,8 @@ CHIP_ERROR MediaPlaybackCluster::MediaSeek(Callback::Cancelable * onSuccessCallb return err; } -CHIP_ERROR MediaPlaybackCluster::MediaSkipBackward(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback, uint64_t deltaPositionMilliseconds) +CHIP_ERROR MediaPlaybackCluster::SkipBackwardRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint64_t deltaPositionMilliseconds) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -958,7 +1089,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaSkipBackward(Callback::Cancelable * onSucc VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaSkipBackward::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::SkipBackwardRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -986,8 +1117,8 @@ CHIP_ERROR MediaPlaybackCluster::MediaSkipBackward(Callback::Cancelable * onSucc return err; } -CHIP_ERROR MediaPlaybackCluster::MediaSkipForward(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback, uint64_t deltaPositionMilliseconds) +CHIP_ERROR MediaPlaybackCluster::SkipForwardRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint64_t deltaPositionMilliseconds) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -999,7 +1130,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaSkipForward(Callback::Cancelable * onSucce VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaSkipForward::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::SkipForwardRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -1027,7 +1158,8 @@ CHIP_ERROR MediaPlaybackCluster::MediaSkipForward(Callback::Cancelable * onSucce return err; } -CHIP_ERROR MediaPlaybackCluster::MediaStartOver(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::StartOverRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -1039,7 +1171,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaStartOver(Callback::Cancelable * onSuccess VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaStartOver::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::StartOverRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -1065,7 +1197,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaStartOver(Callback::Cancelable * onSuccess return err; } -CHIP_ERROR MediaPlaybackCluster::MediaStop(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) +CHIP_ERROR MediaPlaybackCluster::StopRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -1077,7 +1209,7 @@ CHIP_ERROR MediaPlaybackCluster::MediaStop(Callback::Cancelable * onSuccessCallb VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::MediaStop::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, MediaPlayback::Commands::StopRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( @@ -1104,8 +1236,9 @@ CHIP_ERROR MediaPlaybackCluster::MediaStop(Callback::Cancelable * onSuccessCallb } // TargetNavigator Cluster Commands -CHIP_ERROR TargetNavigatorCluster::NavigateTarget(Callback::Cancelable * onSuccessCallback, - Callback::Cancelable * onFailureCallback, uint8_t target, chip::CharSpan data) +CHIP_ERROR TargetNavigatorCluster::NavigateTargetRequest(Callback::Cancelable * onSuccessCallback, + Callback::Cancelable * onFailureCallback, uint8_t target, + chip::CharSpan data) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -1117,7 +1250,8 @@ CHIP_ERROR TargetNavigatorCluster::NavigateTarget(Callback::Cancelable * onSucce VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE); - app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, TargetNavigator::Commands::NavigateTarget::Id, + app::CommandPathParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, + TargetNavigator::Commands::NavigateTargetRequest::Id, (app::CommandPathFlags::kEndpointIdValid) }; CommandSenderHandle sender( diff --git a/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.h b/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.h index 84e7e33071f5c9..1e9116df464206 100644 --- a/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.h +++ b/zzz_generated/tv-casting-app/zap-generated/CHIPClusters.h @@ -37,10 +37,11 @@ class DLL_EXPORT AccountLoginCluster : public ClusterBase ~AccountLoginCluster() {} // Cluster Commands - CHIP_ERROR GetSetupPIN(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan tempAccountIdentifier); - CHIP_ERROR Login(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan tempAccountIdentifier, chip::CharSpan setupPIN); + CHIP_ERROR GetSetupPINRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan tempAccountIdentifier); + CHIP_ERROR LoginRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan tempAccountIdentifier, chip::CharSpan setupPIN); + CHIP_ERROR LogoutRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); }; class DLL_EXPORT ApplicationBasicCluster : public ClusterBase @@ -57,8 +58,12 @@ class DLL_EXPORT ApplicationLauncherCluster : public ClusterBase ~ApplicationLauncherCluster() {} // Cluster Commands - CHIP_ERROR LaunchApp(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::CharSpan data, - uint16_t catalogVendorId, chip::CharSpan applicationId); + CHIP_ERROR HideAppRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t catalogVendorId, chip::CharSpan applicationId); + CHIP_ERROR LaunchAppRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan data, uint16_t catalogVendorId, chip::CharSpan applicationId); + CHIP_ERROR StopAppRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t catalogVendorId, chip::CharSpan applicationId); }; class DLL_EXPORT AudioOutputCluster : public ClusterBase @@ -68,9 +73,10 @@ class DLL_EXPORT AudioOutputCluster : public ClusterBase ~AudioOutputCluster() {} // Cluster Commands - CHIP_ERROR RenameOutput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t index, - chip::CharSpan name); - CHIP_ERROR SelectOutput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t index); + CHIP_ERROR RenameOutputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t index, chip::CharSpan name); + CHIP_ERROR SelectOutputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t index); }; class DLL_EXPORT ChannelCluster : public ClusterBase @@ -80,11 +86,12 @@ class DLL_EXPORT ChannelCluster : public ClusterBase ~ChannelCluster() {} // Cluster Commands - CHIP_ERROR ChangeChannel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan match); - CHIP_ERROR ChangeChannelByNumber(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint16_t majorNumber, uint16_t minorNumber); - CHIP_ERROR SkipChannel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t count); + CHIP_ERROR ChangeChannelByNumberRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t majorNumber, uint16_t minorNumber); + CHIP_ERROR ChangeChannelRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan match); + CHIP_ERROR SkipChannelRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint16_t count); }; class DLL_EXPORT ContentLauncherCluster : public ClusterBase @@ -94,10 +101,10 @@ class DLL_EXPORT ContentLauncherCluster : public ClusterBase ~ContentLauncherCluster() {} // Cluster Commands - CHIP_ERROR LaunchContent(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, bool autoPlay, - chip::CharSpan data, uint8_t type, chip::CharSpan value); - CHIP_ERROR LaunchURL(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - chip::CharSpan contentURL, chip::CharSpan displayString, chip::CharSpan providerName); + CHIP_ERROR LaunchContentRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + bool autoPlay, chip::CharSpan data); + CHIP_ERROR LaunchURLRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + chip::CharSpan contentURL, chip::CharSpan displayString, chip::CharSpan providerName); }; class DLL_EXPORT KeypadInputCluster : public ClusterBase @@ -107,7 +114,7 @@ class DLL_EXPORT KeypadInputCluster : public ClusterBase ~KeypadInputCluster() {} // Cluster Commands - CHIP_ERROR SendKey(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t keyCode); + CHIP_ERROR SendKeyRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t keyCode); }; class DLL_EXPORT MediaInputCluster : public ClusterBase @@ -117,11 +124,12 @@ class DLL_EXPORT MediaInputCluster : public ClusterBase ~MediaInputCluster() {} // Cluster Commands - CHIP_ERROR HideInputStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR RenameInput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t index, - chip::CharSpan name); - CHIP_ERROR SelectInput(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t index); - CHIP_ERROR ShowInputStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR HideInputStatusRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR RenameInputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t index, + chip::CharSpan name); + CHIP_ERROR SelectInputRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t index); + CHIP_ERROR ShowInputStatusRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); }; class DLL_EXPORT MediaPlaybackCluster : public ClusterBase @@ -131,19 +139,19 @@ class DLL_EXPORT MediaPlaybackCluster : public ClusterBase ~MediaPlaybackCluster() {} // Cluster Commands - CHIP_ERROR MediaFastForward(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaNext(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaPause(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaPlay(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaPrevious(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaRewind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaSeek(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint64_t position); - CHIP_ERROR MediaSkipBackward(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint64_t deltaPositionMilliseconds); - CHIP_ERROR MediaSkipForward(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, - uint64_t deltaPositionMilliseconds); - CHIP_ERROR MediaStartOver(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); - CHIP_ERROR MediaStop(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR FastForwardRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR NextRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR PauseRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR PlayRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR PreviousRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR RewindRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR SeekRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint64_t position); + CHIP_ERROR SkipBackwardRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint64_t deltaPositionMilliseconds); + CHIP_ERROR SkipForwardRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint64_t deltaPositionMilliseconds); + CHIP_ERROR StartOverRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); + CHIP_ERROR StopRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback); }; class DLL_EXPORT TargetNavigatorCluster : public ClusterBase @@ -153,8 +161,8 @@ class DLL_EXPORT TargetNavigatorCluster : public ClusterBase ~TargetNavigatorCluster() {} // Cluster Commands - CHIP_ERROR NavigateTarget(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t target, - chip::CharSpan data); + CHIP_ERROR NavigateTargetRequest(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, + uint8_t target, chip::CharSpan data); }; } // namespace Controller diff --git a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp index 93a8130f9f3b61..f9ae2a36e6d1ae 100644 --- a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp @@ -41,103 +41,6 @@ namespace app { namespace Clusters { -namespace AccountLogin { - -void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV - // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error. - // Any error value TLVUnpackError means we have received an illegal value. - // The following variables are used for all commands to save code size. - CHIP_ERROR TLVError = CHIP_NO_ERROR; - CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR; - uint32_t validArgumentCount = 0; - uint32_t expectArgumentCount = 0; - uint32_t currentDecodeTagId = 0; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::GetSetupPINResponse::Id: { - expectArgumentCount = 1; - chip::CharSpan setupPIN; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(setupPIN); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = - emberAfAccountLoginClusterGetSetupPINResponseCallback(aCommandPath.mEndpointId, apCommandObj, setupPIN); - } - break; - } - default: { - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || CHIP_NO_ERROR != TLVUnpackError || expectArgumentCount != validArgumentCount || !wasHandled) - { - ChipLogProgress(Zcl, - "Failed to dispatch command, %" PRIu32 "/%" PRIu32 " arguments parsed, TLVError=%" CHIP_ERROR_FORMAT - ", UnpackError=%" CHIP_ERROR_FORMAT " (last decoded tag = %" PRIu32, - validArgumentCount, expectArgumentCount, TLVError.Format(), TLVUnpackError.Format(), currentDecodeTagId); - // A command with no arguments would never write currentDecodeTagId. If - // progress logging is also disabled, it would look unused. Silence that - // warning. - UNUSED_VAR(currentDecodeTagId); - } -} - -} // namespace AccountLogin - namespace AdministratorCommissioning { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -200,107 +103,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } // namespace AdministratorCommissioning -namespace ApplicationLauncher { - -void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV - // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error. - // Any error value TLVUnpackError means we have received an illegal value. - // The following variables are used for all commands to save code size. - CHIP_ERROR TLVError = CHIP_NO_ERROR; - CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR; - uint32_t validArgumentCount = 0; - uint32_t expectArgumentCount = 0; - uint32_t currentDecodeTagId = 0; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::LaunchAppResponse::Id: { - expectArgumentCount = 2; - uint8_t status; - chip::CharSpan data; - bool argExists[2]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 2) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - case 1: - TLVUnpackError = aDataTlv.Get(data); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) - { - wasHandled = emberAfApplicationLauncherClusterLaunchAppResponseCallback(aCommandPath.mEndpointId, apCommandObj, - status, data); - } - break; - } - default: { - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || CHIP_NO_ERROR != TLVUnpackError || expectArgumentCount != validArgumentCount || !wasHandled) - { - ChipLogProgress(Zcl, - "Failed to dispatch command, %" PRIu32 "/%" PRIu32 " arguments parsed, TLVError=%" CHIP_ERROR_FORMAT - ", UnpackError=%" CHIP_ERROR_FORMAT " (last decoded tag = %" PRIu32, - validArgumentCount, expectArgumentCount, TLVError.Format(), TLVUnpackError.Format(), currentDecodeTagId); - // A command with no arguments would never write currentDecodeTagId. If - // progress logging is also disabled, it would look unused. Silence that - // warning. - UNUSED_VAR(currentDecodeTagId); - } -} - -} // namespace ApplicationLauncher - namespace BarrierControl { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -412,108 +214,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } // namespace Binding -namespace Channel { - -void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV - // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error. - // Any error value TLVUnpackError means we have received an illegal value. - // The following variables are used for all commands to save code size. - CHIP_ERROR TLVError = CHIP_NO_ERROR; - CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR; - uint32_t validArgumentCount = 0; - uint32_t expectArgumentCount = 0; - uint32_t currentDecodeTagId = 0; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::ChangeChannelResponse::Id: { - expectArgumentCount = 2; - chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType channelMatch; - uint8_t errorType; - bool argExists[2]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 2) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - // Not supported, just error out. - TLVUnpackError = CHIP_ERROR_UNEXPECTED_TLV_ELEMENT; - break; - case 1: - TLVUnpackError = aDataTlv.Get(errorType); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) - { - wasHandled = emberAfChannelClusterChangeChannelResponseCallback(aCommandPath.mEndpointId, apCommandObj, - channelMatch, errorType); - } - break; - } - default: { - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || CHIP_NO_ERROR != TLVUnpackError || expectArgumentCount != validArgumentCount || !wasHandled) - { - ChipLogProgress(Zcl, - "Failed to dispatch command, %" PRIu32 "/%" PRIu32 " arguments parsed, TLVError=%" CHIP_ERROR_FORMAT - ", UnpackError=%" CHIP_ERROR_FORMAT " (last decoded tag = %" PRIu32, - validArgumentCount, expectArgumentCount, TLVError.Format(), TLVUnpackError.Format(), currentDecodeTagId); - // A command with no arguments would never write currentDecodeTagId. If - // progress logging is also disabled, it would look unused. Silence that - // warning. - UNUSED_VAR(currentDecodeTagId); - } -} - -} // namespace Channel - namespace ColorControl { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -672,170 +372,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } // namespace ColorControl -namespace ContentLauncher { - -void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV - // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error. - // Any error value TLVUnpackError means we have received an illegal value. - // The following variables are used for all commands to save code size. - CHIP_ERROR TLVError = CHIP_NO_ERROR; - CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR; - uint32_t validArgumentCount = 0; - uint32_t expectArgumentCount = 0; - uint32_t currentDecodeTagId = 0; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::LaunchContentResponse::Id: { - expectArgumentCount = 2; - uint8_t contentLaunchStatus; - chip::CharSpan data; - bool argExists[2]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 2) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(contentLaunchStatus); - break; - case 1: - TLVUnpackError = aDataTlv.Get(data); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) - { - wasHandled = emberAfContentLauncherClusterLaunchContentResponseCallback(aCommandPath.mEndpointId, apCommandObj, - contentLaunchStatus, data); - } - break; - } - case Commands::LaunchURLResponse::Id: { - expectArgumentCount = 2; - uint8_t contentLaunchStatus; - chip::CharSpan data; - bool argExists[2]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 2) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(contentLaunchStatus); - break; - case 1: - TLVUnpackError = aDataTlv.Get(data); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) - { - wasHandled = emberAfContentLauncherClusterLaunchURLResponseCallback(aCommandPath.mEndpointId, apCommandObj, - contentLaunchStatus, data); - } - break; - } - default: { - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || CHIP_NO_ERROR != TLVUnpackError || expectArgumentCount != validArgumentCount || !wasHandled) - { - ChipLogProgress(Zcl, - "Failed to dispatch command, %" PRIu32 "/%" PRIu32 " arguments parsed, TLVError=%" CHIP_ERROR_FORMAT - ", UnpackError=%" CHIP_ERROR_FORMAT " (last decoded tag = %" PRIu32, - validArgumentCount, expectArgumentCount, TLVError.Format(), TLVUnpackError.Format(), currentDecodeTagId); - // A command with no arguments would never write currentDecodeTagId. If - // progress logging is also disabled, it would look unused. Silence that - // warning. - UNUSED_VAR(currentDecodeTagId); - } -} - -} // namespace ContentLauncher - namespace DiagnosticLogs { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -1218,102 +754,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } // namespace Identify -namespace KeypadInput { - -void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV - // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error. - // Any error value TLVUnpackError means we have received an illegal value. - // The following variables are used for all commands to save code size. - CHIP_ERROR TLVError = CHIP_NO_ERROR; - CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR; - uint32_t validArgumentCount = 0; - uint32_t expectArgumentCount = 0; - uint32_t currentDecodeTagId = 0; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::SendKeyResponse::Id: { - expectArgumentCount = 1; - uint8_t status; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfKeypadInputClusterSendKeyResponseCallback(aCommandPath.mEndpointId, apCommandObj, status); - } - break; - } - default: { - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || CHIP_NO_ERROR != TLVUnpackError || expectArgumentCount != validArgumentCount || !wasHandled) - { - ChipLogProgress(Zcl, - "Failed to dispatch command, %" PRIu32 "/%" PRIu32 " arguments parsed, TLVError=%" CHIP_ERROR_FORMAT - ", UnpackError=%" CHIP_ERROR_FORMAT " (last decoded tag = %" PRIu32, - validArgumentCount, expectArgumentCount, TLVError.Format(), TLVUnpackError.Format(), currentDecodeTagId); - // A command with no arguments would never write currentDecodeTagId. If - // progress logging is also disabled, it would look unused. Silence that - // warning. - UNUSED_VAR(currentDecodeTagId); - } -} - -} // namespace KeypadInput - namespace LevelControl { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -1418,634 +858,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } // namespace LevelControl -namespace MediaPlayback { - -void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV - // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error. - // Any error value TLVUnpackError means we have received an illegal value. - // The following variables are used for all commands to save code size. - CHIP_ERROR TLVError = CHIP_NO_ERROR; - CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR; - uint32_t validArgumentCount = 0; - uint32_t expectArgumentCount = 0; - uint32_t currentDecodeTagId = 0; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::MediaFastForwardResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaNextResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaNextResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaPauseResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaPauseResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaPlayResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaPlayResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaPreviousResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaPreviousResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaRewindResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaRewindResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaSkipBackwardResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaSkipForwardResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaStartOverResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaStartOverResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - case Commands::MediaStopResponse::Id: { - expectArgumentCount = 1; - uint8_t mediaPlaybackStatus; - bool argExists[1]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 1) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(mediaPlaybackStatus); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount) - { - wasHandled = emberAfMediaPlaybackClusterMediaStopResponseCallback(aCommandPath.mEndpointId, apCommandObj, - mediaPlaybackStatus); - } - break; - } - default: { - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || CHIP_NO_ERROR != TLVUnpackError || expectArgumentCount != validArgumentCount || !wasHandled) - { - ChipLogProgress(Zcl, - "Failed to dispatch command, %" PRIu32 "/%" PRIu32 " arguments parsed, TLVError=%" CHIP_ERROR_FORMAT - ", UnpackError=%" CHIP_ERROR_FORMAT " (last decoded tag = %" PRIu32, - validArgumentCount, expectArgumentCount, TLVError.Format(), TLVUnpackError.Format(), currentDecodeTagId); - // A command with no arguments would never write currentDecodeTagId. If - // progress logging is also disabled, it would look unused. Silence that - // warning. - UNUSED_VAR(currentDecodeTagId); - } -} - -} // namespace MediaPlayback - namespace NetworkCommissioning { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -2466,107 +1278,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } // namespace Scenes -namespace TargetNavigator { - -void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) -{ - // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV - // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error. - // Any error value TLVUnpackError means we have received an illegal value. - // The following variables are used for all commands to save code size. - CHIP_ERROR TLVError = CHIP_NO_ERROR; - CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR; - uint32_t validArgumentCount = 0; - uint32_t expectArgumentCount = 0; - uint32_t currentDecodeTagId = 0; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) - { - case Commands::NavigateTargetResponse::Id: { - expectArgumentCount = 2; - uint8_t status; - chip::CharSpan data; - bool argExists[2]; - - memset(argExists, 0, sizeof argExists); - - while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) - { - // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. - // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. - if (!TLV::IsContextTag(aDataTlv.GetTag())) - { - continue; - } - currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); - if (currentDecodeTagId < 2) - { - if (argExists[currentDecodeTagId]) - { - ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; - break; - } - else - { - argExists[currentDecodeTagId] = true; - validArgumentCount++; - } - } - switch (currentDecodeTagId) - { - case 0: - TLVUnpackError = aDataTlv.Get(status); - break; - case 1: - TLVUnpackError = aDataTlv.Get(data); - break; - default: - // Unsupported tag, ignore it. - ChipLogProgress(Zcl, "Unknown TLV tag during processing."); - break; - } - if (CHIP_NO_ERROR != TLVUnpackError) - { - break; - } - } - - if (CHIP_END_OF_TLV == TLVError) - { - // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. - TLVError = CHIP_NO_ERROR; - } - - if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount) - { - wasHandled = emberAfTargetNavigatorClusterNavigateTargetResponseCallback(aCommandPath.mEndpointId, apCommandObj, - status, data); - } - break; - } - default: { - return; - } - } - } - - if (CHIP_NO_ERROR != TLVError || CHIP_NO_ERROR != TLVUnpackError || expectArgumentCount != validArgumentCount || !wasHandled) - { - ChipLogProgress(Zcl, - "Failed to dispatch command, %" PRIu32 "/%" PRIu32 " arguments parsed, TLVError=%" CHIP_ERROR_FORMAT - ", UnpackError=%" CHIP_ERROR_FORMAT " (last decoded tag = %" PRIu32, - validArgumentCount, expectArgumentCount, TLVError.Format(), TLVUnpackError.Format(), currentDecodeTagId); - // A command with no arguments would never write currentDecodeTagId. If - // progress logging is also disabled, it would look unused. Silence that - // warning. - UNUSED_VAR(currentDecodeTagId); - } -} - -} // namespace TargetNavigator - namespace TestCluster { void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) @@ -2706,27 +1417,6 @@ void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPa SuccessOrExit(aReader.EnterContainer(dataTlvType)); switch (aCommandPath.mClusterId) { - case Clusters::AccountLogin::Id: - Clusters::AccountLogin::DispatchClientCommand(apCommandObj, aCommandPath, aReader); - break; - case Clusters::ApplicationLauncher::Id: - Clusters::ApplicationLauncher::DispatchClientCommand(apCommandObj, aCommandPath, aReader); - break; - case Clusters::Channel::Id: - Clusters::Channel::DispatchClientCommand(apCommandObj, aCommandPath, aReader); - break; - case Clusters::ContentLauncher::Id: - Clusters::ContentLauncher::DispatchClientCommand(apCommandObj, aCommandPath, aReader); - break; - case Clusters::KeypadInput::Id: - Clusters::KeypadInput::DispatchClientCommand(apCommandObj, aCommandPath, aReader); - break; - case Clusters::MediaPlayback::Id: - Clusters::MediaPlayback::DispatchClientCommand(apCommandObj, aCommandPath, aReader); - break; - case Clusters::TargetNavigator::Id: - Clusters::TargetNavigator::DispatchClientCommand(apCommandObj, aCommandPath, aReader); - break; default: ChipLogError(Zcl, "Unknown cluster " ChipLogFormatMEI, ChipLogValueMEI(aCommandPath.mClusterId)); break;