Fix OnOff state shadowing by the LevelControl cluster while OnOff tra… #36922
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Review changes with |
|
|
lmapii
commented
Dec 20, 2024
lmapii
commented
Dec 20, 2024
| @@ -1425,22 +1436,55 @@ void emberAfOnOffClusterLevelControlEffectCallback(EndpointId endpoint, bool new | |||
| transitionTime.SetNull(); | |||
| #endif // IGNORE_LEVEL_CONTROL_CLUSTER_ON_OFF_TRANSITION_TIME | |||
|
|
|||
| // Check if we're already performing an on/off transition. | |||
| if (state->commandIsOnOff) | |||
There was a problem hiding this comment.
It may be possible to introduce some state instead of comparing the moveToLevel against the limits?
|
PR #36922: Size comparison from c1afc02 to 94b7b33 Full report (31 builds for cc32xx, linux, nrfconnect, stm32, telink, tizen)
|
|
PR #36922: Size comparison from c1afc02 to 61bf11c Full report (31 builds for cc32xx, linux, nrfconnect, stm32, telink, tizen)
|
|
PR #36922: Size comparison from c1afc02 to 10a81a9 Full report (69 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
lmapii
commented
Dec 20, 2024
| // | ||
| // this restriction does not exist for the "Off" command since level movements by definition | ||
| // are only available while the OnOff state is "On". | ||
| if (!LevelControlWithOnOffFeaturePresent(endpoint) || (command == Commands::Off::Id)) |
There was a problem hiding this comment.
It might be necessary to restrict this to lighting applications in the future. I don't, however, see how not having this behavior can be useful for other applications - but I might be missing the bigger picture here.
…nsitions are in progress
|
PR #36922: Size comparison from c1afc02 to aac41fc Full report (69 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The
LevelControlserver shadows theOnOffstate if it is performing an On/Off transition and incorrectly changes theCurrentLevelin case an On transition is interrupted by anOnOff::Command::Off.In short: When receiving a new command, the
CurrentLevelis updated with the temporary level that is used by an On/Off effect transition. For lighting applications this is very undesirable since you don't want to change the lighting level just because you pushed the On/Off switch while a dimming effect was in progress.Fixes/see #36579
Discussion
This PR introduces a new
emberAfOnOffClusterLevelControlIsEffectActiveCallback- I didn't know what else to use since the information about a state transition is stored in theLevelControlcluster.I'm also not very happy with the way I'm checking whether a transition is in progress (comparing against the levels) but I didn't want to introduce too many breaking changes to the state information tracked by the
LevelControlandOnOffclusters.