From daf589d8afca02e02e4793ac0da3344609609610 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 17 Jun 2022 22:33:51 -0400 Subject: [PATCH] Stop using emberAfCurrentEndpoint in level control cluster. (#19701) We should use the endpoint we were passed instead. --- .../clusters/level-control/level-control.cpp | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp index 2c58daf93eff67..bb479039bac543 100644 --- a/src/app/clusters/level-control/level-control.cpp +++ b/src/app/clusters/level-control/level-control.cpp @@ -115,10 +115,11 @@ static EmberAfLevelControlState * getState(EndpointId endpoint); static EmberAfStatus moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8_t level, uint16_t transitionTimeDs, uint8_t optionMask, uint8_t optionOverride, uint16_t storedLevel); -static void moveHandler(CommandId commandId, uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride); -static void stepHandler(CommandId commandId, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTimeDs, uint8_t optionMask, +static void moveHandler(EndpointId endpoint, CommandId commandId, uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride); -static void stopHandler(CommandId commandId, uint8_t optionMask, uint8_t optionOverride); +static void stepHandler(EndpointId endpoint, CommandId commandId, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTimeDs, + uint8_t optionMask, uint8_t optionOverride); +static void stopHandler(EndpointId endpoint, CommandId commandId, uint8_t optionMask, uint8_t optionOverride); static void setOnOffValue(EndpointId endpoint, bool onOff); static void writeRemainingTime(EndpointId endpoint, uint16_t remainingTimeMs); @@ -457,7 +458,7 @@ bool emberAfLevelControlClusterMoveCallback(app::CommandHandler * commandObj, co auto & optionOverride = commandData.optionOverride; emberAfLevelControlClusterPrintln("%pMOVE %x %x", "RX level-control:", moveMode, rate); - moveHandler(Commands::Move::Id, moveMode, rate, optionMask, optionOverride); + moveHandler(commandPath.mEndpointId, Commands::Move::Id, moveMode, rate, optionMask, optionOverride); return true; } @@ -468,7 +469,7 @@ bool emberAfLevelControlClusterMoveWithOnOffCallback(app::CommandHandler * comma auto & rate = commandData.rate; emberAfLevelControlClusterPrintln("%pMOVE_WITH_ON_OFF %x %x", "RX level-control:", moveMode, rate); - moveHandler(Commands::MoveWithOnOff::Id, moveMode, rate, 0xFF, 0xFF); + moveHandler(commandPath.mEndpointId, Commands::MoveWithOnOff::Id, moveMode, rate, 0xFF, 0xFF); return true; } @@ -482,7 +483,7 @@ bool emberAfLevelControlClusterStepCallback(app::CommandHandler * commandObj, co auto & optionOverride = commandData.optionOverride; emberAfLevelControlClusterPrintln("%pSTEP %x %x %2x", "RX level-control:", stepMode, stepSize, transitionTime); - stepHandler(Commands::Step::Id, stepMode, stepSize, transitionTime, optionMask, optionOverride); + stepHandler(commandPath.mEndpointId, Commands::Step::Id, stepMode, stepSize, transitionTime, optionMask, optionOverride); return true; } @@ -494,7 +495,7 @@ bool emberAfLevelControlClusterStepWithOnOffCallback(app::CommandHandler * comma auto & transitionTime = commandData.transitionTime; emberAfLevelControlClusterPrintln("%pSTEP_WITH_ON_OFF %x %x %2x", "RX level-control:", stepMode, stepSize, transitionTime); - stepHandler(Commands::StepWithOnOff::Id, stepMode, stepSize, transitionTime, 0xFF, 0xFF); + stepHandler(commandPath.mEndpointId, Commands::StepWithOnOff::Id, stepMode, stepSize, transitionTime, 0xFF, 0xFF); return true; } @@ -505,7 +506,7 @@ bool emberAfLevelControlClusterStopCallback(app::CommandHandler * commandObj, co auto & optionOverride = commandData.optionOverride; emberAfLevelControlClusterPrintln("%pSTOP", "RX level-control:"); - stopHandler(Commands::Stop::Id, optionMask, optionOverride); + stopHandler(commandPath.mEndpointId, Commands::Stop::Id, optionMask, optionOverride); return true; } @@ -513,7 +514,7 @@ bool emberAfLevelControlClusterStopWithOnOffCallback(app::CommandHandler * comma const Commands::StopWithOnOff::DecodableType & commandData) { emberAfLevelControlClusterPrintln("%pSTOP_WITH_ON_OFF", "RX level-control:"); - stopHandler(Commands::StopWithOnOff::Id, 0xFF, 0xFF); + stopHandler(commandPath.mEndpointId, Commands::StopWithOnOff::Id, 0xFF, 0xFF); return true; } @@ -656,9 +657,9 @@ static EmberAfStatus moveToLevelHandler(EndpointId endpoint, CommandId commandId return status; } -static void moveHandler(CommandId commandId, uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride) +static void moveHandler(EndpointId endpoint, CommandId commandId, uint8_t moveMode, uint8_t rate, uint8_t optionMask, + uint8_t optionOverride) { - EndpointId endpoint = emberAfCurrentEndpoint(); EmberAfLevelControlState * state = getState(endpoint); EmberAfStatus status; uint8_t currentLevel; @@ -768,10 +769,9 @@ static void moveHandler(CommandId commandId, uint8_t moveMode, uint8_t rate, uin emberAfSendImmediateDefaultResponse(status); } -static void stepHandler(CommandId commandId, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTimeDs, uint8_t optionMask, - uint8_t optionOverride) +static void stepHandler(EndpointId endpoint, CommandId commandId, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTimeDs, + uint8_t optionMask, uint8_t optionOverride) { - EndpointId endpoint = emberAfCurrentEndpoint(); EmberAfLevelControlState * state = getState(endpoint); EmberAfStatus status; uint8_t currentLevel; @@ -890,9 +890,8 @@ static void stepHandler(CommandId commandId, uint8_t stepMode, uint8_t stepSize, emberAfSendImmediateDefaultResponse(status); } -static void stopHandler(CommandId commandId, uint8_t optionMask, uint8_t optionOverride) +static void stopHandler(EndpointId endpoint, CommandId commandId, uint8_t optionMask, uint8_t optionOverride) { - EndpointId endpoint = emberAfCurrentEndpoint(); EmberAfLevelControlState * state = getState(endpoint); EmberAfStatus status;