diff --git a/examples/microwave-oven-app/microwave-oven-common/include/microwave-oven-control-delegate.h b/examples/microwave-oven-app/microwave-oven-common/include/microwave-oven-control-delegate.h index 85d129226f36b9..50ceb8173c5274 100644 --- a/examples/microwave-oven-app/microwave-oven-common/include/microwave-oven-control-delegate.h +++ b/examples/microwave-oven-app/microwave-oven-common/include/microwave-oven-control-delegate.h @@ -45,13 +45,13 @@ class ExampleMicrowaveOvenControlDelegate : public MicrowaveOvenControl::Delegat /** * Handle Command Callback in application: set-cooking-parameters */ - Protocols::InteractionModel::Status HandleSetCookingParametersCallback(uint8_t cookMode, uint32_t cookTime, + Protocols::InteractionModel::Status HandleSetCookingParametersCommandCallback(uint8_t cookMode, uint32_t cookTime, uint8_t powerSetting) override; /** * Handle Command Callback in application: add-more-time */ - Protocols::InteractionModel::Status HandleAddMoreTimeCallback(uint32_t finalCookTime) override; + Protocols::InteractionModel::Status HandleAddMoreTimeCommandCallback(uint32_t finalCookTime) override; /** * Get the value of MinPower. diff --git a/examples/microwave-oven-app/microwave-oven-common/include/microwave-oven-device.h b/examples/microwave-oven-app/microwave-oven-common/include/microwave-oven-device.h index a8f114c226aa1e..a205b9748df1a2 100644 --- a/examples/microwave-oven-app/microwave-oven-common/include/microwave-oven-device.h +++ b/examples/microwave-oven-app/microwave-oven-common/include/microwave-oven-device.h @@ -31,10 +31,10 @@ class MicrowaveOvenDevice { // set callback functions mMicrowaveOvenControlDelegate.SetMicrowaveOvenControlSetCookingParametersCallback( - std::bind(&MicrowaveOvenDevice::HandleMicrowaveOvenSetCookingParametersCallback, this, std::placeholders::_1, + std::bind(&MicrowaveOvenDevice::HandleMicrowaveOvenSetCookingParametersCommandCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); mMicrowaveOvenControlDelegate.SetMicrowaveOvenControlAddMoreTimeCallback( - std::bind(&MicrowaveOvenDevice::HandleMicrowaveOvenAddMoreTimeCallback, this, std::placeholders::_1)); + std::bind(&MicrowaveOvenDevice::HandleMicrowaveOvenAddMoreTimeCommandCallback, this, std::placeholders::_1)); mOperationalStateDelegate.SetOpStatePauseCallback( std::bind(&MicrowaveOvenDevice::HandleMicrowaveOvenOpStatePauseCallback, this, std::placeholders::_1)); mOperationalStateDelegate.SetOpStateResumeCallback( @@ -55,13 +55,13 @@ class MicrowaveOvenDevice /** * handle command for microwave oven control: set cooking parameters */ - Protocols::InteractionModel::Status HandleMicrowaveOvenSetCookingParametersCallback(uint8_t cookMode, uint32_t cookTime, + Protocols::InteractionModel::Status HandleMicrowaveOvenSetCookingParametersCommandCallback(uint8_t cookMode, uint32_t cookTime, uint8_t powerSetting); /** * handle command for microwave oven control: add more time */ - Protocols::InteractionModel::Status HandleMicrowaveOvenAddMoreTimeCallback(uint32_t finalCookTime); + Protocols::InteractionModel::Status HandleMicrowaveOvenAddMoreTimeCommandCallback(uint32_t finalCookTime); /** * handle command for operational state: pause diff --git a/examples/microwave-oven-app/microwave-oven-common/src/microwave-oven-control-delegate.cpp b/examples/microwave-oven-app/microwave-oven-common/src/microwave-oven-control-delegate.cpp index 0d1f225225e5a2..54aec4d75d6ddd 100644 --- a/examples/microwave-oven-app/microwave-oven-common/src/microwave-oven-control-delegate.cpp +++ b/examples/microwave-oven-app/microwave-oven-common/src/microwave-oven-control-delegate.cpp @@ -24,12 +24,12 @@ using namespace chip::app::Clusters::MicrowaveOvenControl; // Microwave Oven Control command callbacks Protocols::InteractionModel::Status -ExampleMicrowaveOvenControlDelegate::HandleSetCookingParametersCallback(uint8_t cookMode, uint32_t cookTime, uint8_t powerSetting) +ExampleMicrowaveOvenControlDelegate::HandleSetCookingParametersCommandCallback(uint8_t cookMode, uint32_t cookTime, uint8_t powerSetting) { return (*mHandleSetCookingParametersCallback.get())(cookMode, cookTime, powerSetting); } -Protocols::InteractionModel::Status ExampleMicrowaveOvenControlDelegate::HandleAddMoreTimeCallback(uint32_t finalCookTime) +Protocols::InteractionModel::Status ExampleMicrowaveOvenControlDelegate::HandleAddMoreTimeCommandCallback(uint32_t finalCookTime) { return (*mHandleAddMoreTimeCallback.get())(finalCookTime); } diff --git a/examples/microwave-oven-app/microwave-oven-common/src/microwave-oven-device.cpp b/examples/microwave-oven-app/microwave-oven-common/src/microwave-oven-device.cpp index 7b1e55a6e60e87..6fc605b231def3 100644 --- a/examples/microwave-oven-app/microwave-oven-common/src/microwave-oven-device.cpp +++ b/examples/microwave-oven-app/microwave-oven-common/src/microwave-oven-device.cpp @@ -26,7 +26,7 @@ using OperationalStateEnum = chip::app::Clusters::OperationalState::OperationalS using Status = Protocols::InteractionModel::Status; Protocols::InteractionModel::Status -MicrowaveOvenDevice::HandleMicrowaveOvenSetCookingParametersCallback(uint8_t cookMode, uint32_t cookTime, uint8_t powerSetting) +MicrowaveOvenDevice::HandleMicrowaveOvenSetCookingParametersCommandCallback(uint8_t cookMode, uint32_t cookTime, uint8_t powerSetting) { // placeholder implementation // TODO(#30609): set Microwave Oven cooking mode by cookMode.Value(). @@ -35,7 +35,7 @@ MicrowaveOvenDevice::HandleMicrowaveOvenSetCookingParametersCallback(uint8_t coo return Status::Success; } -Protocols::InteractionModel::Status MicrowaveOvenDevice::HandleMicrowaveOvenAddMoreTimeCallback(uint32_t finalCookTime) +Protocols::InteractionModel::Status MicrowaveOvenDevice::HandleMicrowaveOvenAddMoreTimeCommandCallback(uint32_t finalCookTime) { // placeholder implementation mMicrowaveOvenControlInstance.SetCookTime(finalCookTime); diff --git a/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp b/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp index 8c6207dae37e32..c57ac6a3928075 100644 --- a/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp +++ b/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp @@ -230,7 +230,7 @@ void Instance::HandleSetCookingParameters(HandlerContext & ctx, const Commands:: // set Microwave Oven cooking power to max power(default). reqPowerSetting = mDelegate->GetMaxPower(); } - status = mDelegate->HandleSetCookingParametersCallback(reqCookMode, reqCookTime, reqPowerSetting); + status = mDelegate->HandleSetCookingParametersCommandCallback(reqCookMode, reqCookTime, reqPowerSetting); goto exit; } else @@ -268,7 +268,7 @@ void Instance::HandleAddMoreTime(HandlerContext & ctx, const Commands::AddMoreTi // if the added cooking time is greater than the max cooking time, the cooking time stay unchanged. if (finalCookTime < kMaxCookTime) { - status = mDelegate->HandleAddMoreTimeCallback(finalCookTime); + status = mDelegate->HandleAddMoreTimeCommandCallback(finalCookTime); goto exit; } else diff --git a/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.h b/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.h index 3866d02bf21fe5..64a29f4ebc0c2e 100644 --- a/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.h +++ b/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.h @@ -121,14 +121,14 @@ class Delegate * @brief Handle Command Callback in application: SetCookingParameters * @return Returns the Interaction Model status code which was user determined in the business logic */ - virtual Protocols::InteractionModel::Status HandleSetCookingParametersCallback(uint8_t cookMode, uint32_t cookTime, + virtual Protocols::InteractionModel::Status HandleSetCookingParametersCommandCallback(uint8_t cookMode, uint32_t cookTime, uint8_t powerSetting) = 0; /** * @brief Handle Command Callback in application: AddMoreTime * @return Returns the Interaction Model status code which was user determined in the business logic */ - virtual Protocols::InteractionModel::Status HandleAddMoreTimeCallback(uint32_t finalCookTime) = 0; + virtual Protocols::InteractionModel::Status HandleAddMoreTimeCommandCallback(uint32_t finalCookTime) = 0; /** * @brief get the MinPower