From 55f1aa65d376c2102bc2bb30836864fc0647b73b Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 1 Oct 2021 22:32:33 -0400 Subject: [PATCH] Update cluster callback signatures to the new signature. This commit was generated by running: find src/app/clusters examples/tv-app/linux/include/content-launcher examples/window-app/common/src -name "*.cpp" | xargs perl -pi -e 'BEGIN { $/ = undef; } s/bool emberAf([a-zA-Z0-9]*)Cluster([a-zA-Z0-9]*)Callback\((?:chip::)?EndpointId (aEndpoint|endpoint|aEndpointId),\s*(?:chip::)?((?:app::)?CommandHandler \*(?: commandObj| command| apCommandObj|))([^)]*)\)/bool emberAf\1Cluster\2Callback(\4, const app::ConcreteCommandPath & commandPath, EndpointId \3\5, Commands::\2::DecodableType & commandData)/g;' and then restyling the modified files. --- .../ContentLauncherManager.cpp | 10 +- .../window-app/common/src/ZclCallbacks.cpp | 3 +- .../account-login-server.cpp | 10 +- .../administrator-commissioning-server.cpp | 19 +-- .../application-basic-server.cpp | 6 +- .../application-launcher-server.cpp | 10 +- .../audio-output-server.cpp | 9 +- .../barrier-control-server.cpp | 10 +- src/app/clusters/bindings/bindings.cpp | 10 +- .../color-control-server.cpp | 126 +++++++++++------- .../diagnostic-logs-server.cpp | 7 +- .../door-lock-server-logging.cpp | 4 +- .../door-lock-server-schedule.cpp | 57 +++++--- .../door-lock-server-user.cpp | 48 ++++--- .../ethernet_network_diagnostics_server.cpp | 4 +- .../general-commissioning-server.cpp | 19 ++- .../clusters/groups-server/groups-server.cpp | 26 ++-- .../ias-zone-server/ias-zone-server.cpp | 5 +- .../identify-server/identify-server.cpp | 12 +- .../keypad-input-server.cpp | 3 +- .../clusters/level-control/level-control.cpp | 39 +++--- .../low-power-server/low-power-server.cpp | 3 +- .../media-input-server/media-input-server.cpp | 14 +- .../media-playback-server.cpp | 41 ++++-- .../network-commissioning-ember.cpp | 57 +++++--- .../clusters/on-off-server/on-off-server.cpp | 9 +- .../operational-credentials-server.cpp | 53 +++++--- .../clusters/ota-provider/ota-provider.cpp | 24 ++-- src/app/clusters/scenes/scenes.cpp | 32 +++-- .../software_diagnostics_server.cpp | 4 +- .../target-navigator-server.cpp | 6 +- .../test-cluster-server.cpp | 15 ++- .../thermostat-server/thermostat-server.cpp | 26 ++-- .../thread_network_diagnostics_server.cpp | 4 +- .../tv-channel-server/tv-channel-server.cpp | 14 +- .../wifi_network_diagnostics_server.cpp | 4 +- .../window-covering-server.cpp | 28 ++-- 37 files changed, 502 insertions(+), 269 deletions(-) diff --git a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp index bf48a63915005b..6185ba17a570df 100644 --- a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp +++ b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp @@ -103,8 +103,9 @@ static void sendResponse(const char * responseName, ContentLaunchResponse launch } } -bool emberAfContentLauncherClusterLaunchContentCallback(chip::EndpointId endpoint, chip::app::CommandHandler * command, - bool autoplay, unsigned char * data) +bool emberAfContentLauncherClusterLaunchContentCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, bool autoplay, unsigned char * data, + Commands::LaunchContent::DecodableType & commandData) { string dataString(reinterpret_cast(data)); @@ -114,8 +115,9 @@ bool emberAfContentLauncherClusterLaunchContentCallback(chip::EndpointId endpoin return true; } -bool emberAfContentLauncherClusterLaunchURLCallback(chip::EndpointId endpoint, chip::app::CommandHandler * command, - unsigned char * contentUrl, unsigned char * displayString) +bool emberAfContentLauncherClusterLaunchURLCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, unsigned char * contentUrl, unsigned char * displayString, + Commands::LaunchURL::DecodableType & commandData) { string contentUrlString(reinterpret_cast(contentUrl)); string displayStringString(reinterpret_cast(displayString)); diff --git a/examples/window-app/common/src/ZclCallbacks.cpp b/examples/window-app/common/src/ZclCallbacks.cpp index 4b965ef5639c02..4aab974c6d61f8 100644 --- a/examples/window-app/common/src/ZclCallbacks.cpp +++ b/examples/window-app/common/src/ZclCallbacks.cpp @@ -94,7 +94,8 @@ void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::Cluster /** * @brief Cluster StopMotion Command callback (from client) */ -bool emberAfWindowCoveringClusterStopMotionCallback(chip::EndpointId endpoint, chip::app::CommandHandler * commandObj) +bool emberAfWindowCoveringClusterStopMotionCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::StopMotion::DecodableType & commandData) { ChipLogProgress(Zcl, "StopMotion command received"); WindowApp::Instance().PostEvent(WindowApp::Event(WindowApp::EventId::StopMotion, endpoint)); 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 a7b422dcc7e82e..9a1c9916b49f78 100644 --- a/src/app/clusters/account-login-server/account-login-server.cpp +++ b/src/app/clusters/account-login-server/account-login-server.cpp @@ -49,8 +49,9 @@ void sendResponse(app::CommandHandler * command, const char * responseSetupPin) } } -bool emberAfAccountLoginClusterGetSetupPINCallback(EndpointId endpoint, app::CommandHandler * command, - uint8_t * tempAccountIdentifier) +bool emberAfAccountLoginClusterGetSetupPINCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t * tempAccountIdentifier, + Commands::GetSetupPIN::DecodableType & commandData) { // TODO: char is not null terminated, verify this code once #7963 gets merged. std::string tempAccountIdentifierString(reinterpret_cast(tempAccountIdentifier)); @@ -59,8 +60,9 @@ bool emberAfAccountLoginClusterGetSetupPINCallback(EndpointId endpoint, app::Com return true; } -bool emberAfAccountLoginClusterLoginCallback(EndpointId endpoint, app::CommandHandler * command, uint8_t * tempAccountIdentifier, - uint8_t * tempSetupPin) +bool emberAfAccountLoginClusterLoginCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t * tempAccountIdentifier, uint8_t * tempSetupPin, + Commands::Login::DecodableType & commandData) { // TODO: char is not null terminated, verify this code once #7963 gets merged. std::string tempAccountIdentifierString(reinterpret_cast(tempAccountIdentifier)); diff --git a/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp b/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp index 0cea2193498336..6444db51ebdd4c 100644 --- a/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp +++ b/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp @@ -32,10 +32,10 @@ using namespace chip; // Specifications section 5.4.2.3. Announcement Duration constexpr uint32_t kMaxCommissionioningTimeoutSeconds = 15 * 60; -bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(EndpointId endpoint, app::CommandHandler * commandObj, - uint16_t commissioningTimeout, ByteSpan pakeVerifier, - uint16_t discriminator, uint32_t iterations, - ByteSpan salt, uint16_t passcodeID) +bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback( + app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint16_t commissioningTimeout, ByteSpan pakeVerifier, uint16_t discriminator, uint32_t iterations, ByteSpan salt, + uint16_t passcodeID, Commands::OpenCommissioningWindow::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; PASEVerifier verifier; @@ -70,9 +70,9 @@ bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(End return true; } -bool emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback(EndpointId endpoint, - app::CommandHandler * commandObj, - uint16_t commissioningTimeout) +bool emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( + app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint16_t commissioningTimeout, Commands::OpenBasicCommissioningWindow::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; ChipLogProgress(Zcl, "Received command to open basic commissioning window"); @@ -93,7 +93,10 @@ bool emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallbac return true; } -bool emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, + Commands::RevokeCommissioning::DecodableType & commandData) { ChipLogProgress(Zcl, "Received command to close commissioning window"); Server::GetInstance().GetCommissioningWindowManager().CloseCommissioningWindow(); 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 c8eaaf8c976edd..ba6885d7658b01 100644 --- a/src/app/clusters/application-basic-server/application-basic-server.cpp +++ b/src/app/clusters/application-basic-server/application-basic-server.cpp @@ -31,8 +31,10 @@ using namespace chip; bool applicationBasicClusterChangeApplicationStatus(EmberAfApplicationBasicStatus status, EndpointId endpoint); -bool emberAfApplicationBasicClusterChangeStatusCallback(EndpointId endpoint, app::CommandHandler * commandObj, - uint8_t newApplicationStatus) +bool emberAfApplicationBasicClusterChangeStatusCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t newApplicationStatus, + Commands::ChangeStatus::DecodableType & commandData) { bool success = applicationBasicClusterChangeApplicationStatus(static_cast(newApplicationStatus), emberAfCurrentEndpoint()); 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 414c47f52eaedc..780236a0491346 100644 --- a/src/app/clusters/application-launcher-server/application-launcher-server.cpp +++ b/src/app/clusters/application-launcher-server/application-launcher-server.cpp @@ -34,7 +34,9 @@ using namespace chip; ApplicationLauncherResponse applicationLauncherClusterLaunchApp(ApplicationLauncherApp application, std::string data); -bool emberAfApplicationLauncherClusterLaunchAppCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t *, uint8_t *) +bool emberAfApplicationLauncherClusterLaunchAppCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t *, uint8_t *, Commands::LaunchApp::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); @@ -67,8 +69,10 @@ ApplicationLauncherApp getApplicationFromCommand(uint16_t catalogVendorId, uint8 return application; } -bool emberAfApplicationLauncherClusterLaunchAppCallback(EndpointId endpoint, app::CommandHandler * command, uint8_t * requestData, - uint16_t requestApplicationCatalogVendorId, uint8_t * requestApplicationId) +bool emberAfApplicationLauncherClusterLaunchAppCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t * requestData, + uint16_t requestApplicationCatalogVendorId, uint8_t * requestApplicationId, + Commands::LaunchApp::DecodableType & commandData) { ApplicationLauncherApp application = getApplicationFromCommand(requestApplicationCatalogVendorId, requestApplicationId); // TODO: Char is not null terminated, verify this code once #7963 gets merged. 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 72a20a119d1232..01b00204c7840b 100644 --- a/src/app/clusters/audio-output-server/audio-output-server.cpp +++ b/src/app/clusters/audio-output-server/audio-output-server.cpp @@ -30,8 +30,9 @@ using namespace chip; bool audioOutputClusterSelectOutput(uint8_t index); bool audioOutputClusterRenameOutput(uint8_t index, uint8_t * name); -bool emberAfAudioOutputClusterRenameOutputCallback(EndpointId endpoint, app::CommandHandler * command, uint8_t index, - uint8_t * name) +bool emberAfAudioOutputClusterRenameOutputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t index, uint8_t * name, + Commands::RenameOutput::DecodableType & commandData) { bool success = audioOutputClusterRenameOutput(index, name); EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; @@ -39,7 +40,9 @@ bool emberAfAudioOutputClusterRenameOutputCallback(EndpointId endpoint, app::Com return true; } -bool emberAfAudioOutputClusterSelectOutputCallback(EndpointId endpoint, app::CommandHandler * command, uint8_t index) +bool emberAfAudioOutputClusterSelectOutputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t index, + Commands::SelectOutput::DecodableType & commandData) { bool success = audioOutputClusterSelectOutput(index); EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; diff --git a/src/app/clusters/barrier-control-server/barrier-control-server.cpp b/src/app/clusters/barrier-control-server/barrier-control-server.cpp index 12b668d3bebd9a..e9d499c731d218 100644 --- a/src/app/clusters/barrier-control-server/barrier-control-server.cpp +++ b/src/app/clusters/barrier-control-server/barrier-control-server.cpp @@ -296,8 +296,10 @@ static void sendDefaultResponse(EmberAfStatus status) } } -bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, - uint8_t percentOpen) +bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, + EndpointId aEndpoint, uint8_t percentOpen, + Commands::BarrierControlGoToPercent::DecodableType & commandData) { EndpointId endpoint = emberAfCurrentCommand()->apsFrame->destinationEndpoint; EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; @@ -339,7 +341,9 @@ bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(EndpointId aE return true; } -bool emberAfBarrierControlClusterBarrierControlStopCallback(EndpointId aEndpoint, app::CommandHandler * commandObj) +bool emberAfBarrierControlClusterBarrierControlStopCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint, + Commands::BarrierControlStop::DecodableType & commandData) { EndpointId endpoint = emberAfCurrentCommand()->apsFrame->destinationEndpoint; emberAfDeactivateServerTick(endpoint, BarrierControl::Id); diff --git a/src/app/clusters/bindings/bindings.cpp b/src/app/clusters/bindings/bindings.cpp index c3d93776b99132..fe30eb52d588e3 100644 --- a/src/app/clusters/bindings/bindings.cpp +++ b/src/app/clusters/bindings/bindings.cpp @@ -88,8 +88,9 @@ EmberStatus getUnusedBindingIndex(uint8_t * bindingIndex) return EMBER_NOT_FOUND; } -bool emberAfBindingClusterBindCallback(EndpointId endpoint, app::CommandHandler * commandObj, NodeId nodeId, GroupId groupId, - EndpointId endpointId, ClusterId clusterId) +bool emberAfBindingClusterBindCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, NodeId nodeId, GroupId groupId, EndpointId endpointId, + ClusterId clusterId, Commands::Bind::DecodableType & commandData) { ChipLogDetail(Zcl, "RX: BindCallback"); @@ -118,8 +119,9 @@ bool emberAfBindingClusterBindCallback(EndpointId endpoint, app::CommandHandler return true; } -bool emberAfBindingClusterUnbindCallback(EndpointId endpoint, app::CommandHandler * commandObj, NodeId nodeId, GroupId groupId, - EndpointId endpointId, ClusterId clusterId) +bool emberAfBindingClusterUnbindCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, NodeId nodeId, GroupId groupId, EndpointId endpointId, + ClusterId clusterId, Commands::Unbind::DecodableType & commandData) { ChipLogDetail(Zcl, "RX: UnbindCallback"); diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp index b0c74ecf562806..c1ab2f360adc84 100644 --- a/src/app/clusters/color-control-server/color-control-server.cpp +++ b/src/app/clusters/color-control-server/color-control-server.cpp @@ -2284,89 +2284,109 @@ void emberAfPluginColorControlServerStopTransition(void) #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV -bool emberAfColorControlClusterMoveHueCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t moveMode, - uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterMoveHueCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, + uint8_t optionsOverride, Commands::MoveHue::DecodableType & commandData) { return ColorControlServer::Instance().moveHueCommand(moveMode, static_cast(rate), optionsMask, optionsOverride, false); } -bool emberAfColorControlClusterMoveSaturationCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, uint8_t moveMode, - uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterMoveSaturationCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint, + uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride, + Commands::MoveSaturation::DecodableType & commandData) { return ColorControlServer::Instance().moveSaturationCommand(moveMode, rate, optionsMask, optionsOverride); } -bool emberAfColorControlClusterMoveToHueCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t hue, - uint8_t hueMoveMode, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterMoveToHueCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t hue, uint8_t hueMoveMode, uint16_t transitionTime, + uint8_t optionsMask, uint8_t optionsOverride, + Commands::MoveToHue::DecodableType & commandData) { return ColorControlServer::Instance().moveToHueCommand(static_cast(hue), hueMoveMode, transitionTime, optionsMask, optionsOverride, false); } -bool emberAfColorControlClusterMoveToSaturationCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, uint8_t saturation, - uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterMoveToSaturationCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint, + uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, + uint8_t optionsOverride, + Commands::MoveToSaturation::DecodableType & commandData) { return ColorControlServer::Instance().moveToSaturationCommand(saturation, transitionTime, optionsMask, optionsOverride); } -bool emberAfColorControlClusterMoveToHueAndSaturationCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t hue, - uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterMoveToHueAndSaturationCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t hue, uint8_t saturation, uint16_t transitionTime, + uint8_t optionsMask, uint8_t optionsOverride, + Commands::MoveToHueAndSaturation::DecodableType & commandData) { return ColorControlServer::Instance().moveToHueAndSaturationCommand(static_cast(hue), saturation, transitionTime, optionsMask, optionsOverride, false); } -bool emberAfColorControlClusterStepHueCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t stepMode, - uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterStepHueCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, + uint8_t optionsMask, uint8_t optionsOverride, + Commands::StepHue::DecodableType & commandData) { return ColorControlServer::Instance().stepHueCommand( stepMode, static_cast(stepSize), static_cast(transitionTime), optionsMask, optionsOverride, false); } -bool emberAfColorControlClusterStepSaturationCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, uint8_t stepMode, - uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterStepSaturationCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint, + uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, + uint8_t optionsMask, uint8_t optionsOverride, + Commands::StepSaturation::DecodableType & commandData) { return ColorControlServer::Instance().stepSaturationCommand(stepMode, stepSize, transitionTime, optionsMask, optionsOverride); } -bool emberAfColorControlClusterEnhancedMoveHueCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t moveMode, - uint16_t rate, uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterEnhancedMoveHueCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t moveMode, uint16_t rate, uint8_t optionsMask, + uint8_t optionsOverride, + Commands::EnhancedMoveHue::DecodableType & commandData) { return ColorControlServer::Instance().moveHueCommand(moveMode, rate, optionsMask, optionsOverride, true); } -bool emberAfColorControlClusterEnhancedMoveToHueCallback(EndpointId endpoint, app::CommandHandler * commandObj, +bool emberAfColorControlClusterEnhancedMoveToHueCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint16_t enhancedHue, uint8_t direction, uint16_t transitionTime, - uint8_t optionsMask, uint8_t optionsOverride) + uint8_t optionsMask, uint8_t optionsOverride, + Commands::EnhancedMoveToHue::DecodableType & commandData) { return ColorControlServer::Instance().moveToHueCommand(enhancedHue, direction, transitionTime, optionsMask, optionsOverride, true); } -bool emberAfColorControlClusterEnhancedMoveToHueAndSaturationCallback(EndpointId endpoint, app::CommandHandler * commandObj, - uint16_t enhancedHue, uint8_t saturation, - uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterEnhancedMoveToHueAndSaturationCallback( + app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint16_t enhancedHue, + uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride, + Commands::EnhancedMoveToHueAndSaturation::DecodableType & commandData) { return ColorControlServer::Instance().moveToHueAndSaturationCommand(enhancedHue, saturation, transitionTime, optionsMask, optionsOverride, true); } -bool emberAfColorControlClusterEnhancedStepHueCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t stepMode, - uint16_t stepSize, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterEnhancedStepHueCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, + uint8_t optionsMask, uint8_t optionsOverride, + Commands::EnhancedStepHue::DecodableType & commandData) { return ColorControlServer::Instance().stepHueCommand(stepMode, stepSize, transitionTime, optionsMask, optionsOverride, true); } -bool emberAfColorControlClusterColorLoopSetCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, uint8_t updateFlags, - uint8_t action, uint8_t direction, uint16_t time, uint16_t startHue, - uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterColorLoopSetCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId aEndpoint, uint8_t updateFlags, uint8_t action, uint8_t direction, + uint16_t time, uint16_t startHue, uint8_t optionsMask, uint8_t optionsOverride, + Commands::ColorLoopSet::DecodableType & commandData) { return ColorControlServer::Instance().colorLoopCommand(updateFlags, action, direction, time, startHue, optionsMask, optionsOverride); @@ -2376,22 +2396,25 @@ bool emberAfColorControlClusterColorLoopSetCallback(EndpointId aEndpoint, app::C #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY -bool emberAfColorControlClusterMoveToColorCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, uint16_t colorX, - uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterMoveToColorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId aEndpoint, uint16_t colorX, uint16_t colorY, uint16_t transitionTime, + uint8_t optionsMask, uint8_t optionsOverride, + Commands::MoveToColor::DecodableType & commandData) { return ColorControlServer::Instance().moveToColorCommand(colorX, colorY, transitionTime, optionsMask, optionsOverride); } -bool emberAfColorControlClusterMoveColorCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, int16_t rateX, - int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride) +bool emberAfColorControlClusterMoveColorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId aEndpoint, int16_t rateX, int16_t rateY, uint8_t optionsMask, + uint8_t optionsOverride, Commands::MoveColor::DecodableType & commandData) { return ColorControlServer::Instance().moveColorCommand(rateX, rateY, optionsMask, optionsOverride); } -bool emberAfColorControlClusterStepColorCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, int16_t stepX, - int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterStepColorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId aEndpoint, int16_t stepX, int16_t stepY, uint16_t transitionTime, + uint8_t optionsMask, uint8_t optionsOverride, + Commands::StepColor::DecodableType & commandData) { return ColorControlServer::Instance().stepColorCommand(stepX, stepY, transitionTime, optionsMask, optionsOverride); } @@ -2400,26 +2423,32 @@ bool emberAfColorControlClusterStepColorCallback(EndpointId aEndpoint, app::Comm #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP -bool emberAfColorControlClusterMoveToColorTemperatureCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, +bool emberAfColorControlClusterMoveToColorTemperatureCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint, uint16_t colorTemperature, uint16_t transitionTime, - uint8_t optionsMask, uint8_t optionsOverride) + uint8_t optionsMask, uint8_t optionsOverride, + Commands::MoveToColorTemperature::DecodableType & commandData) { return ColorControlServer::Instance().moveToColorTempCommand(colorTemperature, transitionTime, optionsMask, optionsOverride); } -bool emberAfColorControlClusterMoveColorTemperatureCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, +bool emberAfColorControlClusterMoveColorTemperatureCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint, uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, - uint8_t optionsOverride) + uint8_t optionsOverride, + Commands::MoveColorTemperature::DecodableType & commandData) { return ColorControlServer::Instance().moveColorTempCommand(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride); } -bool emberAfColorControlClusterStepColorTemperatureCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, +bool emberAfColorControlClusterStepColorTemperatureCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint, uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, - uint8_t optionsMask, uint8_t optionsOverride) + uint8_t optionsMask, uint8_t optionsOverride, + Commands::StepColorTemperature::DecodableType & commandData) { return ColorControlServer::Instance().stepColorTempCommand(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride); @@ -2432,8 +2461,9 @@ void emberAfPluginLevelControlCoupledColorTempChangeCallback(EndpointId endpoint #endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP -bool emberAfColorControlClusterStopMoveStepCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, uint8_t optionsMask, - uint8_t optionsOverride) +bool emberAfColorControlClusterStopMoveStepCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId aEndpoint, uint8_t optionsMask, uint8_t optionsOverride, + Commands::StopMoveStep::DecodableType & commandData) { return ColorControlServer::Instance().stopMoveStepCommand(optionsMask, optionsOverride); } diff --git a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp index 5a4ff7ad2383af..0418f6cb8d3108 100644 --- a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp +++ b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp @@ -20,8 +20,11 @@ using namespace chip; -bool emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t intent, - uint8_t requestedProtocol, ByteSpan transferFileDesignator) +bool emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t intent, uint8_t requestedProtocol, + ByteSpan transferFileDesignator, + Commands::RetrieveLogsRequest::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/door-lock-server/door-lock-server-logging.cpp b/src/app/clusters/door-lock-server/door-lock-server-logging.cpp index 0c9e1fe5de06da..8bff9bffd0c0b0 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-logging.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-logging.cpp @@ -117,7 +117,9 @@ bool emberAfPluginDoorLockServerGetLogEntry(uint16_t * entryId, EmberAfPluginDoo return true; } -bool emberAfDoorLockClusterGetLogRecordCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint16_t entryId) +bool emberAfDoorLockClusterGetLogRecordCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t entryId, + Commands::GetLogRecord::DecodableType & commandData) { EmberStatus status; EmberAfPluginDoorLockServerLogEntry entry; diff --git a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp index a1839748b8a41e..f8a35ba3aaff5b 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp @@ -120,9 +120,11 @@ void emAfPluginDoorLockServerInitSchedule(void) #endif } -bool emberAfDoorLockClusterSetWeekdayScheduleCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t scheduleId, - uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, - uint8_t stopHour, uint8_t stopMinute) +bool emberAfDoorLockClusterSetWeekdayScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, + uint8_t startMinute, uint8_t stopHour, uint8_t stopMinute, + Commands::SetWeekdaySchedule::DecodableType & commandData) { uint8_t status = 0x00; uint8_t userPin = 0x00; @@ -178,8 +180,10 @@ bool emberAfDoorLockClusterSetWeekdayScheduleCallback(EndpointId endpoint, app:: return true; } -bool emberAfDoorLockClusterGetWeekdayScheduleCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t scheduleId, - uint16_t userId) +bool emberAfDoorLockClusterGetWeekdayScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t scheduleId, uint16_t userId, + Commands::GetWeekdaySchedule::DecodableType & commandData) { EmberAfStatus zclStatus = ((scheduleId > EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_WEEKDAY_SCHEDULE_TABLE_SIZE) ? EMBER_ZCL_STATUS_INVALID_FIELD @@ -218,8 +222,10 @@ bool emberAfDoorLockClusterGetWeekdayScheduleCallback(EndpointId endpoint, app:: return true; } -bool emberAfDoorLockClusterClearWeekdayScheduleCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t scheduleId, - uint16_t userId) +bool emberAfDoorLockClusterClearWeekdayScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t scheduleId, uint16_t userId, + Commands::ClearWeekdaySchedule::DecodableType & commandData) { EmberAfStatus zclStatus = ((scheduleId > EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_WEEKDAY_SCHEDULE_TABLE_SIZE) ? EMBER_ZCL_STATUS_INVALID_FIELD @@ -249,8 +255,11 @@ bool emberAfDoorLockClusterClearWeekdayScheduleCallback(EndpointId endpoint, app return true; } -bool emberAfDoorLockClusterSetYeardayScheduleCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t scheduleId, - uint16_t userId, uint32_t localStartTime, uint32_t localEndTime) +bool emberAfDoorLockClusterSetYeardayScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, + uint32_t localEndTime, + Commands::SetYeardaySchedule::DecodableType & commandData) { uint8_t status; CHIP_ERROR err = CHIP_NO_ERROR; @@ -285,8 +294,10 @@ bool emberAfDoorLockClusterSetYeardayScheduleCallback(EndpointId endpoint, app:: return true; } -bool emberAfDoorLockClusterGetYeardayScheduleCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t scheduleId, - uint16_t userId) +bool emberAfDoorLockClusterGetYeardayScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t scheduleId, uint16_t userId, + Commands::GetYeardaySchedule::DecodableType & commandData) { EmberAfPluginDoorLockServerYeardayScheduleEntry * entry = &yeardayScheduleTable[0]; EmberAfStatus zclStatus; @@ -331,8 +342,10 @@ bool emberAfDoorLockClusterGetYeardayScheduleCallback(EndpointId endpoint, app:: return true; } -bool emberAfDoorLockClusterClearYeardayScheduleCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t scheduleId, - uint16_t userId) +bool emberAfDoorLockClusterClearYeardayScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t scheduleId, uint16_t userId, + Commands::ClearYeardaySchedule::DecodableType & commandData) { uint8_t status; CHIP_ERROR err = CHIP_NO_ERROR; @@ -365,9 +378,11 @@ bool emberAfDoorLockClusterClearYeardayScheduleCallback(EndpointId endpoint, app return true; } -bool emberAfDoorLockClusterSetHolidayScheduleCallback(EndpointId endpoint, app::CommandHandler * commandObj, +bool emberAfDoorLockClusterSetHolidayScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t holidayScheduleId, uint32_t localStartTime, uint32_t localEndTime, - uint8_t operatingModeDuringHoliday) + uint8_t operatingModeDuringHoliday, + Commands::SetHolidaySchedule::DecodableType & commandData) { uint8_t status; CHIP_ERROR err = CHIP_NO_ERROR; @@ -404,8 +419,10 @@ bool emberAfDoorLockClusterSetHolidayScheduleCallback(EndpointId endpoint, app:: return true; } -bool emberAfDoorLockClusterGetHolidayScheduleCallback(EndpointId endpoint, app::CommandHandler * commandObj, - uint8_t holidayScheduleId) +bool emberAfDoorLockClusterGetHolidayScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t holidayScheduleId, + Commands::GetHolidaySchedule::DecodableType & commandData) { EmberAfPluginDoorLockServerHolidayScheduleEntry * entry = &holidayScheduleTable[0]; EmberAfStatus zclStatus; @@ -449,8 +466,10 @@ bool emberAfDoorLockClusterGetHolidayScheduleCallback(EndpointId endpoint, app:: return true; } -bool emberAfDoorLockClusterClearHolidayScheduleCallback(EndpointId endpoint, app::CommandHandler * commandObj, - uint8_t holidayScheduleId) +bool emberAfDoorLockClusterClearHolidayScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t holidayScheduleId, + Commands::ClearHolidaySchedule::DecodableType & commandData) { uint8_t status; CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/app/clusters/door-lock-server/door-lock-server-user.cpp b/src/app/clusters/door-lock-server/door-lock-server-user.cpp index 8a1e5c41424973..75cb5b493b2812 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-user.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-user.cpp @@ -220,7 +220,9 @@ static uint8_t clearUserPinOrRfid(uint16_t userId, EmberAfPluginDoorLockServerUs return (success ? 0x00 : 0x01); // See 7.3.2.17.8 and 7.3.2.17.25). } -bool emberAfDoorLockClusterGetUserTypeCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint16_t userId) +bool emberAfDoorLockClusterGetUserTypeCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t userId, + Commands::GetUserType::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; if (emAfPluginDoorLockServerCheckForSufficientSpace(userId, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE)) @@ -246,8 +248,9 @@ bool emberAfDoorLockClusterGetUserTypeCallback(EndpointId endpoint, app::Command return true; } -bool emberAfDoorLockClusterSetUserTypeCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint16_t userId, - uint8_t userType) +bool emberAfDoorLockClusterSetUserTypeCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t userId, uint8_t userType, + Commands::SetUserType::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; // TODO: Need to validate userType. https://github.com/project-chip/connectedhomeip/issues/3580 @@ -288,8 +291,9 @@ bool emAfPluginDoorLockServerSetPinUserType(uint16_t userId, EmberAfDoorLockUser // ------------------------------------------------------------------------------ // PIN handling -bool emberAfDoorLockClusterSetPinCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint16_t userId, - uint8_t userStatus, uint8_t userType, uint8_t * pin) +bool emberAfDoorLockClusterSetPinCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin, + Commands::SetPin::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; // send response @@ -340,7 +344,8 @@ static bool getSendPinOverTheAir(void) return sendPinOverTheAir; } -bool emberAfDoorLockClusterGetPinCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint16_t userId) +bool emberAfDoorLockClusterGetPinCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t userId, Commands::GetPin::DecodableType & commandData) { EmberAfPluginDoorLockServerUser user; EmberStatus status = EMBER_SUCCESS; @@ -384,7 +389,8 @@ bool emberAfDoorLockClusterGetPinCallback(EndpointId endpoint, app::CommandHandl return true; } -bool emberAfDoorLockClusterClearPinCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint16_t userId) +bool emberAfDoorLockClusterClearPinCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t userId, Commands::ClearPin::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; uint8_t status = clearUserPinOrRfid(userId, pinUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE); @@ -426,7 +432,8 @@ bool emberAfDoorLockClusterClearPinCallback(EndpointId endpoint, app::CommandHan return true; } -bool emberAfDoorLockClusterClearAllPinsCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfDoorLockClusterClearAllPinsCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::ClearAllPins::DecodableType & commandData) { uint8_t i; CHIP_ERROR err = CHIP_NO_ERROR; @@ -456,8 +463,9 @@ bool emberAfDoorLockClusterClearAllPinsCallback(EndpointId endpoint, app::Comman // ------------------------------------------------------------------------------ // RFID handling -bool emberAfDoorLockClusterSetRfidCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint16_t userId, - uint8_t userStatus, uint8_t userType, uint8_t * rfid) +bool emberAfDoorLockClusterSetRfidCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t userId, uint8_t userStatus, uint8_t userType, + uint8_t * rfid, Commands::SetRfid::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; uint8_t status = @@ -480,7 +488,8 @@ bool emberAfDoorLockClusterSetRfidCallback(EndpointId endpoint, app::CommandHand return true; } -bool emberAfDoorLockClusterGetRfidCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint16_t userId) +bool emberAfDoorLockClusterGetRfidCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t userId, Commands::GetRfid::DecodableType & commandData) { EmberAfPluginDoorLockServerUser user; EmberStatus status = EMBER_SUCCESS; @@ -517,7 +526,8 @@ bool emberAfDoorLockClusterGetRfidCallback(EndpointId endpoint, app::CommandHand return true; } -bool emberAfDoorLockClusterClearRfidCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint16_t userId) +bool emberAfDoorLockClusterClearRfidCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t userId, Commands::ClearRfid::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; uint8_t status = clearUserPinOrRfid(userId, rfidUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE); @@ -539,7 +549,8 @@ bool emberAfDoorLockClusterClearRfidCallback(EndpointId endpoint, app::CommandHa return true; } -bool emberAfDoorLockClusterClearAllRfidsCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfDoorLockClusterClearAllRfidsCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::ClearAllRfids::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; for (uint8_t i = 0; i < EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE; i++) @@ -620,7 +631,8 @@ static bool verifyPin(uint8_t * pin, uint8_t * userId) return false; } -bool emberAfDoorLockClusterLockDoorCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t * PIN) +bool emberAfDoorLockClusterLockDoorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t * PIN, Commands::LockDoor::DecodableType & commandData) { uint8_t userId = 0; bool pinVerified = verifyPin(PIN, &userId); @@ -684,7 +696,8 @@ bool emberAfDoorLockClusterLockDoorCallback(EndpointId endpoint, app::CommandHan return true; } -bool emberAfDoorLockClusterUnlockDoorCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t * pin) +bool emberAfDoorLockClusterUnlockDoorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t * pin, Commands::UnlockDoor::DecodableType & commandData) { uint8_t userId = 0; bool pinVerified = verifyPin(pin, &userId); @@ -873,8 +886,9 @@ void emberAfDoorLockClusterServerAttributeChangedCallback(EndpointId endpoint, A } } -bool emberAfDoorLockClusterUnlockWithTimeoutCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint16_t timeoutS, - uint8_t * pin) +bool emberAfDoorLockClusterUnlockWithTimeoutCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t timeoutS, uint8_t * pin, + Commands::UnlockWithTimeout::DecodableType & commandData) { uint8_t userId; uint8_t status; diff --git a/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp b/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp index 8b943526779bdc..9d9f49e4b87c1d 100644 --- a/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp +++ b/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp @@ -100,7 +100,9 @@ CHIP_ERROR EthernetDiagosticsAttrAccess::ReadIfSupported(CHIP_ERROR (Connectivit } } // anonymous namespace -bool emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + Commands::ResetCounts::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; diff --git a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp index c4d7ce5511f3f6..81139e7a692730 100644 --- a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp +++ b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp @@ -29,8 +29,10 @@ using namespace chip; -bool emberAfGeneralCommissioningClusterArmFailSafeCallback(EndpointId endpoint, app::CommandHandler * commandObj, - uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs) +bool emberAfGeneralCommissioningClusterArmFailSafeCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs, + Commands::ArmFailSafe::DecodableType & commandData) { CHIP_ERROR err = DeviceLayer::Internal::DeviceControlServer::DeviceControlSvr().ArmFailSafe(expiryLengthSeconds); emberAfSendImmediateDefaultResponse(err == CHIP_NO_ERROR ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE); @@ -38,7 +40,10 @@ bool emberAfGeneralCommissioningClusterArmFailSafeCallback(EndpointId endpoint, return true; } -bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, + Commands::CommissioningComplete::DecodableType & commandData) { CHIP_ERROR err = DeviceLayer::Internal::DeviceControlServer::DeviceControlSvr().CommissioningComplete(); emberAfSendImmediateDefaultResponse(err == CHIP_NO_ERROR ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE); @@ -46,9 +51,11 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(EndpointId return true; } -bool emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(EndpointId endpoint, app::CommandHandler * commandObj, - uint8_t location, uint8_t * countryCode, uint64_t breadcrumb, - uint32_t timeoutMs) +bool emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t location, uint8_t * countryCode, + uint64_t breadcrumb, uint32_t timeoutMs, + Commands::SetRegulatoryConfig::DecodableType & commandData) { CHIP_ERROR err = DeviceLayer::Internal::DeviceControlServer::DeviceControlSvr().SetRegulatoryConfig( location, reinterpret_cast(countryCode), breadcrumb); diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp index 76079666f52def..78d6d04c20f0d6 100644 --- a/src/app/clusters/groups-server/groups-server.cpp +++ b/src/app/clusters/groups-server/groups-server.cpp @@ -151,8 +151,9 @@ static EmberAfStatus removeEntryFromGroupTable(EndpointId endpoint, GroupId grou return EMBER_ZCL_STATUS_NOT_FOUND; } -bool emberAfGroupsClusterAddGroupCallback(EndpointId endpoint, app::CommandHandler * commandObj, GroupId groupId, - uint8_t * groupName) +bool emberAfGroupsClusterAddGroupCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, GroupId groupId, uint8_t * groupName, + Commands::AddGroup::DecodableType & commandData) { EmberAfStatus status; CHIP_ERROR err = CHIP_NO_ERROR; @@ -188,7 +189,8 @@ bool emberAfGroupsClusterAddGroupCallback(EndpointId endpoint, app::CommandHandl return true; } -bool emberAfGroupsClusterViewGroupCallback(EndpointId endpoint, app::CommandHandler * commandObj, GroupId groupId) +bool emberAfGroupsClusterViewGroupCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, GroupId groupId, Commands::ViewGroup::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_NOT_FOUND; CHIP_ERROR err = CHIP_NO_ERROR; @@ -230,8 +232,9 @@ bool emberAfGroupsClusterViewGroupCallback(EndpointId endpoint, app::CommandHand return true; } -bool emberAfGroupsClusterGetGroupMembershipCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t groupCount, - uint8_t * groupList) +bool emberAfGroupsClusterGetGroupMembershipCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t groupCount, uint8_t * groupList, + Commands::GetGroupMembership::DecodableType & commandData) { EmberStatus status = EMBER_ZCL_STATUS_FAILURE; uint8_t i, j; @@ -328,7 +331,9 @@ bool emberAfGroupsClusterGetGroupMembershipCallback(EndpointId endpoint, app::Co return true; } -bool emberAfGroupsClusterRemoveGroupCallback(EndpointId endpoint, app::CommandHandler * commandObj, GroupId groupId) +bool emberAfGroupsClusterRemoveGroupCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, GroupId groupId, + Commands::RemoveGroup::DecodableType & commandData) { EmberAfStatus status; CHIP_ERROR err = CHIP_NO_ERROR; @@ -366,7 +371,8 @@ bool emberAfGroupsClusterRemoveGroupCallback(EndpointId endpoint, app::CommandHa return true; } -bool emberAfGroupsClusterRemoveAllGroupsCallback(EndpointId aEndpoint, app::CommandHandler * commandObj) +bool emberAfGroupsClusterRemoveAllGroupsCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId aEndpoint, Commands::RemoveAllGroups::DecodableType & commandData) { EmberStatus sendStatus = EMBER_SUCCESS; uint8_t i; @@ -414,8 +420,10 @@ bool emberAfGroupsClusterRemoveAllGroupsCallback(EndpointId aEndpoint, app::Comm return true; } -bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(EndpointId endpoint, app::CommandHandler * commandObj, GroupId groupId, - uint8_t * groupName) +bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + GroupId groupId, uint8_t * groupName, + Commands::AddGroupIfIdentifying::DecodableType & commandData) { EmberAfStatus status; EmberStatus sendStatus = EMBER_SUCCESS; diff --git a/src/app/clusters/ias-zone-server/ias-zone-server.cpp b/src/app/clusters/ias-zone-server/ias-zone-server.cpp index 2a50e1584aad4a..be823610b0502a 100644 --- a/src/app/clusters/ias-zone-server/ias-zone-server.cpp +++ b/src/app/clusters/ias-zone-server/ias-zone-server.cpp @@ -348,8 +348,9 @@ static void updateEnrollState(EndpointId endpoint, bool enrolled) emberAfIasZoneClusterPrintln("IAS Zone Server State: %pEnrolled", (enrolled ? "" : "NOT ")); } -bool emberAfIasZoneClusterZoneEnrollResponseCallback(EndpointId aEndpoint, app::CommandHandler * commandObj, - uint8_t enrollResponseCode, uint8_t zoneId) +bool emberAfIasZoneClusterZoneEnrollResponseCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId aEndpoint, uint8_t enrollResponseCode, uint8_t zoneId, + Commands::ZoneEnrollResponse::DecodableType & commandData) { EndpointId endpoint; uint8_t epZoneId; diff --git a/src/app/clusters/identify-server/identify-server.cpp b/src/app/clusters/identify-server/identify-server.cpp index 8e80c687947716..a9cf165ca9e889 100644 --- a/src/app/clusters/identify-server/identify-server.cpp +++ b/src/app/clusters/identify-server/identify-server.cpp @@ -205,14 +205,17 @@ void emberAfIdentifyClusterServerAttributeChangedCallback(EndpointId endpoint, A } } -bool emberAfIdentifyClusterIdentifyCallback(EndpointId endpoint, CommandHandler * commandObj, uint16_t identifyTime) +bool emberAfIdentifyClusterIdentifyCallback(CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t identifyTime, + Commands::Identify::DecodableType & commandData) { // cmd Identify return EMBER_SUCCESS == emberAfSendImmediateDefaultResponse(Clusters::Identify::Attributes::IdentifyTime::Set(endpoint, identifyTime)); } -bool emberAfIdentifyClusterIdentifyQueryCallback(EndpointId endpoint, CommandHandler * commandObj) +bool emberAfIdentifyClusterIdentifyQueryCallback(CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::IdentifyQuery::DecodableType & commandData) { // cmd IdentifyQuery uint16_t identifyTime = 0; @@ -265,8 +268,9 @@ bool emberAfIdentifyClusterIdentifyQueryCallback(EndpointId endpoint, CommandHan return true; } -bool emberAfIdentifyClusterTriggerEffectCallback(EndpointId endpoint, CommandHandler * commandObj, uint8_t effectIdentifier, - uint8_t effectVariant) +bool emberAfIdentifyClusterTriggerEffectCallback(CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t effectIdentifier, uint8_t effectVariant, + Commands::TriggerEffect::DecodableType & commandData) { // cmd TriggerEffect Identify * identify = inst(endpoint); 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 ad6ea596bdc109..c1807fcf9ae364 100644 --- a/src/app/clusters/keypad-input-server/keypad-input-server.cpp +++ b/src/app/clusters/keypad-input-server/keypad-input-server.cpp @@ -51,7 +51,8 @@ static void sendResponse(app::CommandHandler * command, EmberAfKeypadInputStatus } } -bool emberAfKeypadInputClusterSendKeyCallback(EndpointId endpoint, app::CommandHandler * command, uint8_t keyCode) +bool emberAfKeypadInputClusterSendKeyCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t keyCode, Commands::SendKey::DecodableType & commandData) { EmberAfKeypadInputStatus status = keypadInputClusterSendKey(static_cast(keyCode)); sendResponse(command, status); diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp index c0863174c8bcdf..bbef9ca0e5cc82 100644 --- a/src/app/clusters/level-control/level-control.cpp +++ b/src/app/clusters/level-control/level-control.cpp @@ -406,8 +406,9 @@ static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, uint8_t #endif } -bool emberAfLevelControlClusterMoveToLevelCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t level, - uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride) +bool emberAfLevelControlClusterMoveToLevelCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t level, uint16_t transitionTime, uint8_t optionMask, + uint8_t optionOverride, Commands::MoveToLevel::DecodableType & commandData) { emberAfLevelControlClusterPrintln("%pMOVE_TO_LEVEL %x %2x %x %x", "RX level-control:", level, transitionTime, optionMask, optionOverride); @@ -416,8 +417,10 @@ bool emberAfLevelControlClusterMoveToLevelCallback(EndpointId endpoint, app::Com return true; } -bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t level, - uint16_t transitionTime) +bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t level, uint16_t transitionTime, + Commands::MoveToLevelWithOnOff::DecodableType & commandData) { emberAfLevelControlClusterPrintln("%pMOVE_TO_LEVEL_WITH_ON_OFF %x %2x", "RX level-control:", level, transitionTime); moveToLevelHandler(ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, level, transitionTime, 0xFF, 0xFF, @@ -425,47 +428,53 @@ bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(EndpointId endpoint, return true; } -bool emberAfLevelControlClusterMoveCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t moveMode, uint8_t rate, - uint8_t optionMask, uint8_t optionOverride) +bool emberAfLevelControlClusterMoveCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t moveMode, uint8_t rate, uint8_t optionMask, + uint8_t optionOverride, Commands::Move::DecodableType & commandData) { emberAfLevelControlClusterPrintln("%pMOVE %x %x", "RX level-control:", moveMode, rate); moveHandler(ZCL_MOVE_COMMAND_ID, moveMode, rate, optionMask, optionOverride); return true; } -bool emberAfLevelControlClusterMoveWithOnOffCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t moveMode, - uint8_t rate) +bool emberAfLevelControlClusterMoveWithOnOffCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t moveMode, uint8_t rate, + Commands::MoveWithOnOff::DecodableType & commandData) { emberAfLevelControlClusterPrintln("%pMOVE_WITH_ON_OFF %x %x", "RX level-control:", moveMode, rate); moveHandler(ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, moveMode, rate, 0xFF, 0xFF); return true; } -bool emberAfLevelControlClusterStepCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t stepMode, - uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride) +bool emberAfLevelControlClusterStepCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, + uint8_t optionMask, uint8_t optionOverride, Commands::Step::DecodableType & commandData) { emberAfLevelControlClusterPrintln("%pSTEP %x %x %2x", "RX level-control:", stepMode, stepSize, transitionTime); stepHandler(ZCL_STEP_COMMAND_ID, stepMode, stepSize, transitionTime, optionMask, optionOverride); return true; } -bool emberAfLevelControlClusterStepWithOnOffCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t stepMode, - uint8_t stepSize, uint16_t transitionTime) +bool emberAfLevelControlClusterStepWithOnOffCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t stepMode, uint8_t stepSize, + uint16_t transitionTime, Commands::StepWithOnOff::DecodableType & commandData) { emberAfLevelControlClusterPrintln("%pSTEP_WITH_ON_OFF %x %x %2x", "RX level-control:", stepMode, stepSize, transitionTime); stepHandler(ZCL_STEP_WITH_ON_OFF_COMMAND_ID, stepMode, stepSize, transitionTime, 0xFF, 0xFF); return true; } -bool emberAfLevelControlClusterStopCallback(EndpointId endpoint, app::CommandHandler * commandObj, uint8_t optionMask, - uint8_t optionOverride) +bool emberAfLevelControlClusterStopCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t optionMask, uint8_t optionOverride, + Commands::Stop::DecodableType & commandData) { emberAfLevelControlClusterPrintln("%pSTOP", "RX level-control:"); stopHandler(ZCL_STOP_COMMAND_ID, optionMask, optionOverride); return true; } -bool emberAfLevelControlClusterStopWithOnOffCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfLevelControlClusterStopWithOnOffCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::StopWithOnOff::DecodableType & commandData) { emberAfLevelControlClusterPrintln("%pSTOP_WITH_ON_OFF", "RX level-control:"); stopHandler(ZCL_STOP_WITH_ON_OFF_COMMAND_ID, 0xFF, 0xFF); diff --git a/src/app/clusters/low-power-server/low-power-server.cpp b/src/app/clusters/low-power-server/low-power-server.cpp index d95632107dd3c9..08a4401c15301c 100644 --- a/src/app/clusters/low-power-server/low-power-server.cpp +++ b/src/app/clusters/low-power-server/low-power-server.cpp @@ -29,7 +29,8 @@ using namespace chip; bool lowPowerClusterSleep(); -bool emberAfLowPowerClusterSleepCallback(EndpointId endpoint, app::CommandHandler * command) +bool emberAfLowPowerClusterSleepCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::Sleep::DecodableType & commandData) { bool success = lowPowerClusterSleep(); EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; 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 c111bf23749867..77bd4717b41903 100644 --- a/src/app/clusters/media-input-server/media-input-server.cpp +++ b/src/app/clusters/media-input-server/media-input-server.cpp @@ -46,7 +46,9 @@ static void storeCurrentInput(EndpointId endpoint, uint8_t currentInput) } } -bool emberAfMediaInputClusterSelectInputCallback(EndpointId endpoint, app::CommandHandler * command, uint8_t input) +bool emberAfMediaInputClusterSelectInputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t input, + Commands::SelectInput::DecodableType & commandData) { bool success = mediaInputClusterSelectInput(input); EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; @@ -58,7 +60,8 @@ bool emberAfMediaInputClusterSelectInputCallback(EndpointId endpoint, app::Comma return true; } -bool emberAfMediaInputClusterShowInputStatusCallback(EndpointId endpoint, app::CommandHandler * command) +bool emberAfMediaInputClusterShowInputStatusCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::ShowInputStatus::DecodableType & commandData) { bool success = mediaInputClusterShowInputStatus(); EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; @@ -66,7 +69,8 @@ bool emberAfMediaInputClusterShowInputStatusCallback(EndpointId endpoint, app::C return true; } -bool emberAfMediaInputClusterHideInputStatusCallback(EndpointId endpoint, app::CommandHandler * command) +bool emberAfMediaInputClusterHideInputStatusCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::HideInputStatus::DecodableType & commandData) { bool success = mediaInputClusterHideInputStatus(); EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; @@ -74,7 +78,9 @@ bool emberAfMediaInputClusterHideInputStatusCallback(EndpointId endpoint, app::C return true; } -bool emberAfMediaInputClusterRenameInputCallback(EndpointId endpoint, app::CommandHandler * command, uint8_t input, uint8_t * name) +bool emberAfMediaInputClusterRenameInputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t input, uint8_t * name, + Commands::RenameInput::DecodableType & commandData) { // TODO: char is not null terminated, verify this code once #7963 gets merged. std::string nameString(reinterpret_cast(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 30eb359544f7d0..cf5be8fa35b66b 100644 --- a/src/app/clusters/media-playback-server/media-playback-server.cpp +++ b/src/app/clusters/media-playback-server/media-playback-server.cpp @@ -94,7 +94,8 @@ static void sendResponse(app::CommandHandler * command, const char * responseNam } } -bool emberAfMediaPlaybackClusterMediaPlayCallback(EndpointId endpoint, app::CommandHandler * command) +bool emberAfMediaPlaybackClusterMediaPlayCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::MediaPlay::DecodableType & commandData) { EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PLAY, 0); storeNewPlaybackState(emberAfCurrentEndpoint(), EMBER_ZCL_MEDIA_PLAYBACK_STATE_PLAYING); @@ -102,7 +103,8 @@ bool emberAfMediaPlaybackClusterMediaPlayCallback(EndpointId endpoint, app::Comm return true; } -bool emberAfMediaPlaybackClusterMediaPauseCallback(EndpointId endpoint, app::CommandHandler * command) +bool emberAfMediaPlaybackClusterMediaPauseCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::MediaPause::DecodableType & commandData) { EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PAUSE, 0); storeNewPlaybackState(emberAfCurrentEndpoint(), EMBER_ZCL_MEDIA_PLAYBACK_STATE_PAUSED); @@ -110,7 +112,8 @@ bool emberAfMediaPlaybackClusterMediaPauseCallback(EndpointId endpoint, app::Com return true; } -bool emberAfMediaPlaybackClusterMediaStopCallback(EndpointId endpoint, app::CommandHandler * command) +bool emberAfMediaPlaybackClusterMediaStopCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::MediaStop::DecodableType & commandData) { EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_STOP, 0); storeNewPlaybackState(emberAfCurrentEndpoint(), EMBER_ZCL_MEDIA_PLAYBACK_STATE_NOT_PLAYING); @@ -118,29 +121,35 @@ bool emberAfMediaPlaybackClusterMediaStopCallback(EndpointId endpoint, app::Comm return true; } -bool emberAfMediaPlaybackClusterMediaFastForwardCallback(EndpointId endpoint, app::CommandHandler * command) +bool emberAfMediaPlaybackClusterMediaFastForwardCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + Commands::MediaFastForward::DecodableType & commandData) { EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_FAST_FORWARD, 0); sendResponse(command, "MediaFastForward", ZCL_MEDIA_FAST_FORWARD_RESPONSE_COMMAND_ID, status); return true; } -bool emberAfMediaPlaybackClusterMediaPreviousCallback(EndpointId endpoint, app::CommandHandler * command) +bool emberAfMediaPlaybackClusterMediaPreviousCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::MediaPrevious::DecodableType & commandData) { EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PREVIOUS, 0); sendResponse(command, "MediaPrevious", ZCL_MEDIA_PREVIOUS_RESPONSE_COMMAND_ID, status); return true; } -bool emberAfMediaPlaybackClusterMediaRewindCallback(EndpointId endpoint, app::CommandHandler * command) +bool emberAfMediaPlaybackClusterMediaRewindCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::MediaRewind::DecodableType & commandData) { EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_REWIND, 0); sendResponse(command, "MediaRewind", ZCL_MEDIA_REWIND_RESPONSE_COMMAND_ID, status); return true; } -bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback(EndpointId endpoint, app::CommandHandler * command, - uint64_t deltaPositionMilliseconds) +bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint64_t deltaPositionMilliseconds, + Commands::MediaSkipBackward::DecodableType & commandData) { EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_SKIP_BACKWARD, deltaPositionMilliseconds); @@ -148,8 +157,10 @@ bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback(EndpointId endpoint, a return true; } -bool emberAfMediaPlaybackClusterMediaSkipForwardCallback(EndpointId endpoint, app::CommandHandler * command, - uint64_t deltaPositionMilliseconds) +bool emberAfMediaPlaybackClusterMediaSkipForwardCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint64_t deltaPositionMilliseconds, + Commands::MediaSkipForward::DecodableType & commandData) { EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_SKIP_FORWARD, deltaPositionMilliseconds); @@ -157,7 +168,9 @@ bool emberAfMediaPlaybackClusterMediaSkipForwardCallback(EndpointId endpoint, ap return true; } -bool emberAfMediaPlaybackClusterMediaSeekCallback(EndpointId endpoint, app::CommandHandler * command, uint64_t positionMilliseconds) +bool emberAfMediaPlaybackClusterMediaSeekCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint64_t positionMilliseconds, + Commands::MediaSeek::DecodableType & commandData) { EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_SEEK, positionMilliseconds); @@ -165,13 +178,15 @@ bool emberAfMediaPlaybackClusterMediaSeekCallback(EndpointId endpoint, app::Comm return true; } -bool emberAfMediaPlaybackClusterMediaNextCallback(EndpointId endpoint, app::CommandHandler * command) +bool emberAfMediaPlaybackClusterMediaNextCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::MediaNext::DecodableType & commandData) { EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_NEXT, 0); sendResponse(command, "MediaNext", ZCL_MEDIA_NEXT_RESPONSE_COMMAND_ID, status); return true; } -bool emberAfMediaPlaybackClusterMediaStartOverCallback(EndpointId endpoint, app::CommandHandler * command) +bool emberAfMediaPlaybackClusterMediaStartOverCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::MediaStartOver::DecodableType & commandData) { EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_START_OVER, 0); sendResponse(command, "MediaStartOver", ZCL_MEDIA_START_OVER_RESPONSE_COMMAND_ID, status); diff --git a/src/app/clusters/network-commissioning/network-commissioning-ember.cpp b/src/app/clusters/network-commissioning/network-commissioning-ember.cpp index 70ad28ca0edf02..c8e37ece7eadae 100644 --- a/src/app/clusters/network-commissioning/network-commissioning-ember.cpp +++ b/src/app/clusters/network-commissioning/network-commissioning-ember.cpp @@ -32,9 +32,11 @@ using namespace chip; -bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(EndpointId endpoint, app::CommandHandler * commandObj, +bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, ByteSpan operationalDataset, uint64_t breadcrumb, - uint32_t timeoutMs) + uint32_t timeoutMs, + Commands::AddThreadNetwork::DecodableType & commandData) { EmberAfNetworkCommissioningError err = app::Clusters::NetworkCommissioning::OnAddThreadNetworkCommandCallbackInternal( nullptr, emberAfCurrentEndpoint(), operationalDataset, breadcrumb, timeoutMs); @@ -43,8 +45,11 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(EndpointId endpo return true; } -bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(EndpointId endpoint, app::CommandHandler * commandObj, ByteSpan ssid, - ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + ByteSpan ssid, ByteSpan credentials, uint64_t breadcrumb, + uint32_t timeoutMs, + Commands::AddWiFiNetwork::DecodableType & commandData) { EmberAfNetworkCommissioningError err = app::Clusters::NetworkCommissioning::OnAddWiFiNetworkCommandCallbackInternal( nullptr, emberAfCurrentEndpoint(), ssid, credentials, breadcrumb, timeoutMs); @@ -53,8 +58,10 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(EndpointId endpoin return true; } -bool emberAfNetworkCommissioningClusterEnableNetworkCallback(EndpointId endpoint, app::CommandHandler * commandObj, - ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterEnableNetworkCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs, + Commands::EnableNetwork::DecodableType & commandData) { EmberAfNetworkCommissioningError err = app::Clusters::NetworkCommissioning::OnEnableNetworkCommandCallbackInternal( nullptr, emberAfCurrentEndpoint(), networkID, breadcrumb, timeoutMs); @@ -66,40 +73,50 @@ bool emberAfNetworkCommissioningClusterEnableNetworkCallback(EndpointId endpoint // TODO: The following commands needed to be implemented. // These commands are not implemented thus not handled yet, return false so ember will return a error. -bool emberAfNetworkCommissioningClusterDisableNetworkCallback(EndpointId endpoint, app::CommandHandler * commandObj, - ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterDisableNetworkCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs, + Commands::DisableNetwork::DecodableType & commandData) { return false; } -bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(EndpointId endpoint, - app::CommandHandler * commandObj, - uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback( + app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint32_t timeoutMs, + Commands::GetLastNetworkCommissioningResult::DecodableType & commandData) { return false; } -bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(EndpointId endpoint, app::CommandHandler * commandObj, - ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs) +bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs, + Commands::RemoveNetwork::DecodableType & commandData) { return false; } -bool emberAfNetworkCommissioningClusterScanNetworksCallback(EndpointId endpoint, app::CommandHandler * commandObj, ByteSpan ssid, - uint64_t breadcrumb, uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterScanNetworksCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs, + Commands::ScanNetworks::DecodableType & commandData) { return false; } -bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(EndpointId endpoint, app::CommandHandler * commandObj, - ByteSpan operationalDataset, uint64_t breadcrumb, - uint32_t timeoutMs) +bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, ByteSpan operationalDataset, + uint64_t breadcrumb, uint32_t timeoutMs, + Commands::UpdateThreadNetwork::DecodableType & commandData) { return false; } -bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(EndpointId endpoint, app::CommandHandler * commandObj, +bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, ByteSpan ssid, ByteSpan credentials, uint64_t breadcrumb, - uint32_t timeoutMs) + uint32_t timeoutMs, + Commands::UpdateWiFiNetwork::DecodableType & commandData) { return false; } diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp index 6bb6b9138a4cdc..511230ed109ecd 100644 --- a/src/app/clusters/on-off-server/on-off-server.cpp +++ b/src/app/clusters/on-off-server/on-off-server.cpp @@ -165,7 +165,8 @@ EmberAfStatus emberAfOnOffClusterSetValueCallback(EndpointId endpoint, uint8_t c return EMBER_ZCL_STATUS_SUCCESS; } -bool emberAfOnOffClusterOffCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfOnOffClusterOffCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::Off::DecodableType & commandData) { EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_OFF_COMMAND_ID, false); #ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER @@ -178,7 +179,8 @@ bool emberAfOnOffClusterOffCallback(EndpointId endpoint, app::CommandHandler * c return true; } -bool emberAfOnOffClusterOnCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfOnOffClusterOnCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::On::DecodableType & commandData) { EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_ON_COMMAND_ID, false); #ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER @@ -191,7 +193,8 @@ bool emberAfOnOffClusterOnCallback(EndpointId endpoint, app::CommandHandler * co return true; } -bool emberAfOnOffClusterToggleCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfOnOffClusterToggleCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::Toggle::DecodableType & commandData) { EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_TOGGLE_COMMAND_ID, false); #ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp index 55f57145697b20..d6a22e50b0bd22 100644 --- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp +++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp @@ -270,8 +270,10 @@ FabricCleanupExchangeDelegate gFabricCleanupExchangeDelegate; } // namespace -bool emberAfOperationalCredentialsClusterRemoveFabricCallback(EndpointId endpoint, app::CommandHandler * commandObj, - FabricIndex fabricBeingRemoved) +bool emberAfOperationalCredentialsClusterRemoveFabricCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + FabricIndex fabricBeingRemoved, + Commands::RemoveFabric::DecodableType & commandData) { emberAfPrintln(EMBER_AF_PRINT_DEBUG, "OpCreds: RemoveFabric"); // TODO: Generate emberAfFabricClusterPrintln @@ -304,8 +306,10 @@ bool emberAfOperationalCredentialsClusterRemoveFabricCallback(EndpointId endpoin return true; } -bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(EndpointId endpoint, app::CommandHandler * commandObj, - uint8_t * Label) +bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t * Label, + Commands::UpdateFabricLabel::DecodableType & commandData) { emberAfPrintln(EMBER_AF_PRINT_DEBUG, "OpCreds: UpdateFabricLabel"); @@ -386,9 +390,11 @@ EmberAfNodeOperationalCertStatus ConvertToNOCResponseStatus(CHIP_ERROR err) } // namespace -bool emberAfOperationalCredentialsClusterAddNOCCallback(EndpointId endpoint, app::CommandHandler * commandObj, ByteSpan NOCValue, - ByteSpan ICACValue, ByteSpan IPKValue, NodeId adminNodeId, - uint16_t adminVendorId) +bool emberAfOperationalCredentialsClusterAddNOCCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + ByteSpan NOCValue, ByteSpan ICACValue, ByteSpan IPKValue, + NodeId adminNodeId, uint16_t adminVendorId, + Commands::AddNOC::DecodableType & commandData) { EmberAfNodeOperationalCertStatus nocResponse = EMBER_ZCL_NODE_OPERATIONAL_CERT_STATUS_SUCCESS; @@ -427,8 +433,10 @@ bool emberAfOperationalCredentialsClusterAddNOCCallback(EndpointId endpoint, app return true; } -bool emberAfOperationalCredentialsClusterUpdateNOCCallback(EndpointId endpoint, app::CommandHandler * commandObj, ByteSpan NOCValue, - ByteSpan ICACValue) +bool emberAfOperationalCredentialsClusterUpdateNOCCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + ByteSpan NOCValue, ByteSpan ICACValue, + Commands::UpdateNOC::DecodableType & commandData) { EmberAfNodeOperationalCertStatus nocResponse = EMBER_ZCL_NODE_OPERATIONAL_CERT_STATUS_SUCCESS; @@ -467,8 +475,9 @@ bool emberAfOperationalCredentialsClusterUpdateNOCCallback(EndpointId endpoint, return true; } -bool emberAfOperationalCredentialsClusterCertificateChainRequestCallback(EndpointId endpoint, app::CommandHandler * commandObj, - uint8_t certificateType) +bool emberAfOperationalCredentialsClusterCertificateChainRequestCallback( + app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t certificateType, + Commands::CertificateChainRequest::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -523,8 +532,10 @@ bool emberAfOperationalCredentialsClusterCertificateChainRequestCallback(Endpoin return true; } -bool emberAfOperationalCredentialsClusterAttestationRequestCallback(EndpointId endpoint, app::CommandHandler * commandObj, - ByteSpan attestationNonce) +bool emberAfOperationalCredentialsClusterAttestationRequestCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, ByteSpan attestationNonce, + Commands::AttestationRequest::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVWriter * writer = nullptr; @@ -607,8 +618,10 @@ bool emberAfOperationalCredentialsClusterAttestationRequestCallback(EndpointId e return true; } -bool emberAfOperationalCredentialsClusterOpCSRRequestCallback(EndpointId endpoint, app::CommandHandler * commandObj, - ByteSpan CSRNonce) +bool emberAfOperationalCredentialsClusterOpCSRRequestCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + ByteSpan CSRNonce, + Commands::OpCSRRequest::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; @@ -675,8 +688,9 @@ bool emberAfOperationalCredentialsClusterOpCSRRequestCallback(EndpointId endpoin return true; } -bool emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(EndpointId endpoint, app::CommandHandler * commandObj, - ByteSpan RootCertificate) +bool emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback( + app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, ByteSpan RootCertificate, + Commands::AddTrustedRootCertificate::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; @@ -695,8 +709,9 @@ bool emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(Endpo return true; } -bool emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(EndpointId endpoint, app::CommandHandler * commandObj, - ByteSpan TrustedRootIdentifier) +bool emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback( + app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + ByteSpan TrustedRootIdentifier, Commands::RemoveTrustedRootCertificate::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_FAILURE; emberAfSendImmediateDefaultResponse(status); diff --git a/src/app/clusters/ota-provider/ota-provider.cpp b/src/app/clusters/ota-provider/ota-provider.cpp index 5e7142d5373170..f724e8eaea365f 100644 --- a/src/app/clusters/ota-provider/ota-provider.cpp +++ b/src/app/clusters/ota-provider/ota-provider.cpp @@ -68,8 +68,11 @@ bool SendStatusIfDelegateNull(EndpointId endpoint) * @param newVersion The SoftwareVersion value of the new Software Image that the client is ready to apply. */ -bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestCallback(EndpointId endpoint, app::CommandHandler * commandObj, - ByteSpan updateToken, uint32_t newVersion) +bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, ByteSpan updateToken, + uint32_t newVersion, + Commands::ApplyUpdateRequest::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; OTAProviderDelegate * delegate = GetDelegate(endpoint); @@ -105,9 +108,11 @@ bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestCallback(EndpointI * OTA Requestor's Basic Information Cluster. */ -bool emberAfOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedCallback(chip::EndpointId endpoint, - chip::app::CommandHandler * commandObj, - chip::ByteSpan updateToken, uint32_t softwareVersion) +bool emberAfOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, chip::ByteSpan updateToken, + uint32_t softwareVersion, + Commands::NotifyUpdateApplied::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; OTAProviderDelegate * delegate = GetDelegate(endpoint); @@ -151,11 +156,10 @@ bool emberAfOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedCallback(chip::En * @param metadataForProvider Optional, max 512 octets. A TLV-encoded Vendor-specific payload. */ -bool emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(chip::EndpointId endpoint, chip::app::CommandHandler * commandObj, - uint16_t vendorId, uint16_t productId, uint16_t hardwareVersion, - uint32_t softwareVersion, uint8_t protocolsSupported, - uint8_t * location, bool requestorCanConsent, - chip::ByteSpan metadataForProvider) +bool emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback( + app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint16_t vendorId, + uint16_t productId, uint16_t hardwareVersion, uint32_t softwareVersion, uint8_t protocolsSupported, uint8_t * location, + bool requestorCanConsent, chip::ByteSpan metadataForProvider, Commands::QueryImage::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; OTAProviderDelegate * delegate = GetDelegate(endpoint); diff --git a/src/app/clusters/scenes/scenes.cpp b/src/app/clusters/scenes/scenes.cpp index f399238ddb8b69..d56f7e1d0d5a5b 100644 --- a/src/app/clusters/scenes/scenes.cpp +++ b/src/app/clusters/scenes/scenes.cpp @@ -216,20 +216,25 @@ void emAfPluginScenesServerPrintInfo(void) } } -bool emberAfScenesClusterAddSceneCallback(EndpointId endpoint, app::CommandHandler * commandObj, GroupId groupId, uint8_t sceneId, - uint16_t transitionTime, uint8_t * sceneName, uint8_t * extensionFieldSets) +bool emberAfScenesClusterAddSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, GroupId groupId, uint8_t sceneId, uint16_t transitionTime, + uint8_t * sceneName, uint8_t * extensionFieldSets, + Commands::AddScene::DecodableType & commandData) { return emberAfPluginScenesServerParseAddScene(commandObj, emberAfCurrentCommand(), groupId, sceneId, transitionTime, sceneName, extensionFieldSets); } -bool emberAfScenesClusterViewSceneCallback(EndpointId endpoint, app::CommandHandler * commandObj, GroupId groupId, uint8_t sceneId) +bool emberAfScenesClusterViewSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, GroupId groupId, uint8_t sceneId, + Commands::ViewScene::DecodableType & commandData) { return emberAfPluginScenesServerParseViewScene(commandObj, emberAfCurrentCommand(), groupId, sceneId); } -bool emberAfScenesClusterRemoveSceneCallback(EndpointId endpoint, app::CommandHandler * commandObj, GroupId groupId, - uint8_t sceneId) +bool emberAfScenesClusterRemoveSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, GroupId groupId, uint8_t sceneId, + Commands::RemoveScene::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_NOT_FOUND; CHIP_ERROR err = CHIP_NO_ERROR; @@ -283,7 +288,9 @@ bool emberAfScenesClusterRemoveSceneCallback(EndpointId endpoint, app::CommandHa return true; } -bool emberAfScenesClusterRemoveAllScenesCallback(EndpointId endpoint, app::CommandHandler * commandObj, GroupId groupId) +bool emberAfScenesClusterRemoveAllScenesCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, GroupId groupId, + Commands::RemoveAllScenes::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_INVALID_FIELD; CHIP_ERROR err = CHIP_NO_ERROR; @@ -332,7 +339,9 @@ bool emberAfScenesClusterRemoveAllScenesCallback(EndpointId endpoint, app::Comma return true; } -bool emberAfScenesClusterStoreSceneCallback(EndpointId endpoint, app::CommandHandler * commandObj, GroupId groupId, uint8_t sceneId) +bool emberAfScenesClusterStoreSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, GroupId groupId, uint8_t sceneId, + Commands::StoreScene::DecodableType & commandData) { EmberAfStatus status; CHIP_ERROR err = CHIP_NO_ERROR; @@ -363,8 +372,9 @@ bool emberAfScenesClusterStoreSceneCallback(EndpointId endpoint, app::CommandHan return true; } -bool emberAfScenesClusterRecallSceneCallback(EndpointId endpoint, app::CommandHandler * commandObj, GroupId groupId, - uint8_t sceneId, uint16_t transitionTime) +bool emberAfScenesClusterRecallSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, GroupId groupId, uint8_t sceneId, uint16_t transitionTime, + Commands::RecallScene::DecodableType & commandData) { // NOTE: TransitionTime field in the RecallScene command is currently // ignored. Per Zigbee Alliance ZCL 7 (07-5123-07): @@ -397,7 +407,9 @@ bool emberAfScenesClusterRecallSceneCallback(EndpointId endpoint, app::CommandHa return true; } -bool emberAfScenesClusterGetSceneMembershipCallback(EndpointId endpoint, app::CommandHandler * commandObj, GroupId groupId) +bool emberAfScenesClusterGetSceneMembershipCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, GroupId groupId, + Commands::GetSceneMembership::DecodableType & commandData) { CHIP_ERROR err = CHIP_NO_ERROR; EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; diff --git a/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp b/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp index 83022ec828c36a..c3f292eab61b16 100644 --- a/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp +++ b/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp @@ -94,7 +94,9 @@ CHIP_ERROR SoftwareDiagosticsAttrAccess::ReadIfSupported(CHIP_ERROR (PlatformMan } } // anonymous namespace -bool emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + Commands::ResetWatermarks::DecodableType & commandData) { uint64_t currentHeapUsed; 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 66d8213fa50561..cdf61fe1c1239d 100644 --- a/src/app/clusters/target-navigator-server/target-navigator-server.cpp +++ b/src/app/clusters/target-navigator-server/target-navigator-server.cpp @@ -52,8 +52,10 @@ void sendResponse(app::CommandHandler * command, TargetNavigatorResponse respons } } -bool emberAfTargetNavigatorClusterNavigateTargetCallback(EndpointId endpoint, app::CommandHandler * command, uint8_t target, - uint8_t * data) +bool emberAfTargetNavigatorClusterNavigateTargetCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t target, uint8_t * data, + Commands::NavigateTarget::DecodableType & commandData) { // TODO: char is not null terminated, verify this code once #7963 gets merged. std::string dataString(reinterpret_cast(data)); diff --git a/src/app/clusters/test-cluster-server/test-cluster-server.cpp b/src/app/clusters/test-cluster-server/test-cluster-server.cpp index f517274e99faad..956a3c26600520 100644 --- a/src/app/clusters/test-cluster-server/test-cluster-server.cpp +++ b/src/app/clusters/test-cluster-server/test-cluster-server.cpp @@ -148,7 +148,8 @@ void emberAfPluginTestClusterServerInitCallback(void) } } -bool emberAfTestClusterClusterTestCallback(EndpointId endpoint, app::CommandHandler *) +bool emberAfTestClusterClusterTestCallback(app::CommandHandler *, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + Commands::Test::DecodableType & commandData) { emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS); return true; @@ -177,18 +178,22 @@ bool sendNumericResponse(EndpointId endpoint, app::CommandHandler * apCommandObj return true; } -bool emberAfTestClusterClusterTestSpecificCallback(EndpointId endpoint, app::CommandHandler * apCommandObj) +bool emberAfTestClusterClusterTestSpecificCallback(app::CommandHandler * apCommandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::TestSpecific::DecodableType & commandData) { return sendNumericResponse(endpoint, apCommandObj, Commands::TestSpecificResponse::Id, 7); } -bool emberAfTestClusterClusterTestNotHandledCallback(EndpointId endpoint, app::CommandHandler *) +bool emberAfTestClusterClusterTestNotHandledCallback(app::CommandHandler *, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::TestNotHandled::DecodableType & commandData) { return false; } -bool emberAfTestClusterClusterTestAddArgumentsCallback(EndpointId endpoint, app::CommandHandler * apCommandObj, uint8_t arg1, - uint8_t arg2) +bool emberAfTestClusterClusterTestAddArgumentsCallback(app::CommandHandler * apCommandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t arg1, uint8_t arg2, + Commands::TestAddArguments::DecodableType & commandData) { if (arg1 > UINT8_MAX - arg2) { diff --git a/src/app/clusters/thermostat-server/thermostat-server.cpp b/src/app/clusters/thermostat-server/thermostat-server.cpp index b79f4e9a95d11b..b4d4583185c517 100644 --- a/src/app/clusters/thermostat-server/thermostat-server.cpp +++ b/src/app/clusters/thermostat-server/thermostat-server.cpp @@ -253,27 +253,35 @@ EmberAfStatus emberAfThermostatClusterServerPreAttributeChangedCallback(chip::En return status; } -bool emberAfThermostatClusterClearWeeklyScheduleCallback(EndpointId aEndpointId, chip::app::CommandHandler * commandObj) +bool emberAfThermostatClusterClearWeeklyScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpointId, + Commands::ClearWeeklySchedule::DecodableType & commandData) { // TODO return false; } -bool emberAfThermostatClusterGetRelayStatusLogCallback(EndpointId aEndpointId, chip::app::CommandHandler * commandObj) +bool emberAfThermostatClusterGetRelayStatusLogCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpointId, + Commands::GetRelayStatusLog::DecodableType & commandData) { // TODO return false; } -bool emberAfThermostatClusterGetWeeklyScheduleCallback(EndpointId aEndpointId, chip::app::CommandHandler * commandObj, - uint8_t daysToReturn, uint8_t modeToReturn) +bool emberAfThermostatClusterGetWeeklyScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpointId, + uint8_t daysToReturn, uint8_t modeToReturn, + Commands::GetWeeklySchedule::DecodableType & commandData) { // TODO return false; } -bool emberAfThermostatClusterSetWeeklyScheduleCallback(EndpointId aEndpointId, chip::app::CommandHandler * commandObj, +bool emberAfThermostatClusterSetWeeklyScheduleCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpointId, uint8_t numberOfTransitionsForSequence, uint8_t daysOfWeekForSequence, - uint8_t modeForSequence, uint8_t * payload) + uint8_t modeForSequence, uint8_t * payload, + Commands::SetWeeklySchedule::DecodableType & commandData) { // TODO return false; @@ -422,8 +430,10 @@ int16_t EnforceCoolingSetpointLimits(int16_t CoolingSetpoint, EndpointId endpoin return CoolingSetpoint; } -bool emberAfThermostatClusterSetpointRaiseLowerCallback(EndpointId aEndpointId, chip::app::CommandHandler * commandObj, - uint8_t mode, int8_t amount) +bool emberAfThermostatClusterSetpointRaiseLowerCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId aEndpointId, + uint8_t mode, int8_t amount, + Commands::SetpointRaiseLower::DecodableType & commandData) { int16_t HeatingSetpoint = kDefaultHeatingSetpoint, CoolingSetpoint = kDefaultCoolingSetpoint; // Set to defaults to be safe EmberAfStatus status = EMBER_ZCL_STATUS_FAILURE; diff --git a/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp b/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp index f89fc496bcfc72..a844aeb68e1a4e 100644 --- a/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp +++ b/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp @@ -74,7 +74,9 @@ CHIP_ERROR ThreadDiagosticsAttrAccess::Read(ClusterInfo & aClusterInfo, const At } } // anonymous namespace -bool emberAfThreadNetworkDiagnosticsClusterResetCountsCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfThreadNetworkDiagnosticsClusterResetCountsCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + Commands::ResetCounts::DecodableType & commandData) { EmberAfStatus status = ThreadNetworkDiagnostics::Attributes::OverrunCount::Set(endpoint, 0); if (status != EMBER_ZCL_STATUS_SUCCESS) diff --git a/src/app/clusters/tv-channel-server/tv-channel-server.cpp b/src/app/clusters/tv-channel-server/tv-channel-server.cpp index 5fd96c8bc697e5..78b05fdb10ab68 100644 --- a/src/app/clusters/tv-channel-server/tv-channel-server.cpp +++ b/src/app/clusters/tv-channel-server/tv-channel-server.cpp @@ -70,7 +70,9 @@ void sendResponse(app::CommandHandler * command, TvChannelInfo channelInfo) } } -bool emberAfTvChannelClusterChangeChannelCallback(EndpointId endpoint, app::CommandHandler * command, uint8_t * match) +bool emberAfTvChannelClusterChangeChannelCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint8_t * match, + Commands::ChangeChannel::DecodableType & commandData) { // TODO: char is not null terminated, verify this code once #7963 gets merged. std::string matchString(reinterpret_cast(match)); @@ -81,8 +83,10 @@ bool emberAfTvChannelClusterChangeChannelCallback(EndpointId endpoint, app::Comm return true; } -bool emberAfTvChannelClusterChangeChannelByNumberCallback(EndpointId endpoint, app::CommandHandler * command, uint16_t majorNumber, - uint16_t minorNumber) +bool emberAfTvChannelClusterChangeChannelByNumberCallback(app::CommandHandler * command, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint16_t majorNumber, uint16_t minorNumber, + Commands::ChangeChannelByNumber::DecodableType & commandData) { bool success = tvChannelClusterChangeChannelByNumber(majorNumber, minorNumber); EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; @@ -90,7 +94,9 @@ bool emberAfTvChannelClusterChangeChannelByNumberCallback(EndpointId endpoint, a return true; } -bool emberAfTvChannelClusterSkipChannelCallback(EndpointId endpoint, app::CommandHandler * command, uint16_t count) +bool emberAfTvChannelClusterSkipChannelCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, uint16_t count, + Commands::SkipChannel::DecodableType & commandData) { bool success = tvChannelClusterSkipChannel(count); EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE; diff --git a/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp b/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp index 0fc10a46f3c061..78f7d917810ba5 100644 --- a/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp +++ b/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp @@ -123,7 +123,9 @@ CHIP_ERROR WiFiDiagosticsAttrAccess::Read(ClusterInfo & aClusterInfo, const Attr } } // anonymous namespace -bool emberAfWiFiNetworkDiagnosticsClusterResetCountsCallback(EndpointId endpoint, app::CommandHandler * commandObj) +bool emberAfWiFiNetworkDiagnosticsClusterResetCountsCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + Commands::ResetCounts::DecodableType & commandData) { EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp index aa96a7218f1b64..aeaada9563392e 100644 --- a/src/app/clusters/window-covering-server/window-covering-server.cpp +++ b/src/app/clusters/window-covering-server/window-covering-server.cpp @@ -378,7 +378,8 @@ void emberAfWindowCoveringClusterInitCallback(chip::EndpointId endpoint) /** * @brief Cluster UpOrOpen Command callback (from client) */ -bool emberAfWindowCoveringClusterUpOrOpenCallback(chip::EndpointId endpoint, chip::app::CommandHandler * commandObj) +bool emberAfWindowCoveringClusterUpOrOpenCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::UpOrOpen::DecodableType & commandData) { emberAfWindowCoveringClusterPrint("UpOrOpen command received"); if (HasFeature(endpoint, Features::Lift)) @@ -396,7 +397,8 @@ bool emberAfWindowCoveringClusterUpOrOpenCallback(chip::EndpointId endpoint, chi /** * @brief Cluster DownOrClose Command callback (from client) */ -bool emberAfWindowCoveringClusterDownOrCloseCallback(chip::EndpointId endpoint, chip::app::CommandHandler * commandObj) +bool emberAfWindowCoveringClusterDownOrCloseCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + EndpointId endpoint, Commands::DownOrClose::DecodableType & commandData) { emberAfWindowCoveringClusterPrint("DownOrClose command received"); if (HasFeature(endpoint, Features::Lift)) @@ -426,8 +428,9 @@ emberAfWindowCoveringClusterStopMotionCallback(chip::EndpointId endpoint, chip:: /** * @brief Cluster GoToLiftValue Command callback (from client) */ -bool emberAfWindowCoveringClusterGoToLiftValueCallback(chip::EndpointId endpoint, chip::app::CommandHandler * commandObj, - uint16_t liftValue) +bool emberAfWindowCoveringClusterGoToLiftValueCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint16_t liftValue, Commands::GoToLiftValue::DecodableType & commandData) { bool hasLift = HasFeature(endpoint, Features::Lift); bool isPositionAware = HasFeature(endpoint, Features::PositionAware); @@ -449,8 +452,10 @@ bool emberAfWindowCoveringClusterGoToLiftValueCallback(chip::EndpointId endpoint /** * @brief Cluster GoToLiftPercentage Command callback (from client) */ -bool emberAfWindowCoveringClusterGoToLiftPercentageCallback(chip::EndpointId endpoint, chip::app::CommandHandler * commandObj, - uint8_t liftPercentageValue, uint16_t liftPercent100thsValue) +bool emberAfWindowCoveringClusterGoToLiftPercentageCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t liftPercentageValue, uint16_t liftPercent100thsValue, + Commands::GoToLiftPercentage::DecodableType & commandData) { bool hasLift = HasFeature(endpoint, Features::Lift); bool isPositionAware = HasFeature(endpoint, Features::PositionAware); @@ -473,8 +478,9 @@ bool emberAfWindowCoveringClusterGoToLiftPercentageCallback(chip::EndpointId end /** * @brief Cluster GoToTiltValue Command callback (from client) */ -bool emberAfWindowCoveringClusterGoToTiltValueCallback(chip::EndpointId endpoint, chip::app::CommandHandler * commandObj, - uint16_t tiltValue) +bool emberAfWindowCoveringClusterGoToTiltValueCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint16_t tiltValue, Commands::GoToTiltValue::DecodableType & commandData) { bool hasTilt = HasFeature(endpoint, Features::Tilt); bool isPositionAware = HasFeature(endpoint, Features::PositionAware); @@ -496,8 +502,10 @@ bool emberAfWindowCoveringClusterGoToTiltValueCallback(chip::EndpointId endpoint /** * @brief Cluster GoToTiltPercentage Command callback (from client) */ -bool emberAfWindowCoveringClusterGoToTiltPercentageCallback(chip::EndpointId endpoint, chip::app::CommandHandler * commandObj, - uint8_t tiltPercentageValue, uint16_t tiltPercent100thsValue) +bool emberAfWindowCoveringClusterGoToTiltPercentageCallback(app::CommandHandler * commandObj, + const app::ConcreteCommandPath & commandPath, EndpointId endpoint, + uint8_t tiltPercentageValue, uint16_t tiltPercent100thsValue, + Commands::GoToTiltPercentage::DecodableType & commandData) { bool hasTilt = HasFeature(endpoint, Features::Tilt); bool isPositionAware = HasFeature(endpoint, Features::PositionAware);