Update operational state server and related examples #28577
Merged
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
…ational state delegate change in location.
…onalStateClusterObjects.cpp
…ed cluters. Updated the examples to work with this change.
pullapprove
bot
requested review from
andyg-apple,
anush-apple,
arkq,
bzbarsky-apple,
carol-apple,
cecille,
chrisdecenzo,
chshu,
chulspro,
cliffamzn,
Damian-Nordic,
dhrishi,
electrocucaracha,
emargolis,
gjc13,
harsha-rajendran,
hawk248 and
jepenven-silabs
|
PR #28577: Size comparison from 4111aac to 18d65c1 Increases above 0.2%:
Increases (48 builds for bl602, bl702, bl702l, cc32xx, cyw30739, esp32, k32w, linux, mbed, nrfconnect, psoc6, telink)
Decreases (7 builds for efr32, k32w, linux, psoc6, telink)
Full report (60 builds for bl602, bl702, bl702l, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
plauric
approved these changes
Aug 10, 2023
bzbarsky-apple
previously requested changes
Aug 10, 2023
src/app/clusters/operational-state-server/operational-state-server.h
Outdated
Show resolved
Hide resolved
src/app/clusters/operational-state-server/operational-state-server.h
Outdated
Show resolved
Hide resolved
src/app/clusters/operational-state-server/operational-state-server.h
Outdated
Show resolved
Hide resolved
src/app/clusters/operational-state-server/operational-state-server.cpp
Outdated
Show resolved
Hide resolved
src/app/clusters/operational-state-server/operational-state-server.cpp
Outdated
Show resolved
Hide resolved
src/app/clusters/operational-state-server/operational-state-server.cpp
Outdated
Show resolved
Hide resolved
src/app/clusters/operational-state-server/operational-state-server.cpp
Outdated
Show resolved
Hide resolved
examples/dishwasher-app/dishwasher-common/src/operational-state-delegate-impl.cpp
Show resolved
Hide resolved
…ttribute to the delegate.
…Instance classes.
… state and the ability to set the OperationalError. These can only be set via the ErrorDetected event.
…t the value given is valid.
src/app/clusters/operational-state-server/operational-state-server.h
Outdated
Show resolved
Hide resolved
src/app/clusters/operational-state-server/operational-state-server.cpp
Outdated
Show resolved
Hide resolved
Co-authored-by: Boris Zbarsky <[email protected]>
|
PR #28577: Size comparison from b0b0d58 to 568acd5 Increases (15 builds for bl702l, esp32, linux, nrfconnect, psoc6, telink)
Decreases (15 builds for bl602, bl702, cc32xx, cyw30739, efr32, linux, psoc6, telink)
Full report (60 builds for bl602, bl702, bl702l, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
tobiasgraf
approved these changes
Aug 15, 2023
hicklin
dismissed
bzbarsky-apple’s stale review
All of the comments have been resolved and the final outstanding comment has been looked at by other reviewers to ensure that it has been resolved since this reviewer is off for 12 days.
s07641069
pushed a commit
to s07641069/connectedhomeip
that referenced
this pull request
Aug 22, 2023
) * Reordered Mode Base functions. * Moved generic OpState cluster objects into one header file. * Reordered OperationalStateServer functions. * Moved OpState delegate in the server header file. * Updated the TestOperationalStateDelegate inctludes following the operational state delegate change in location. * Renamed TestOperationalStateDelegate.cpp -> src/app/tests/TestOperationalStateClusterObjects.cpp * Restyled by clang-format * Minor corrections following revision. * Refactored the OperationalState server code to match with other derived cluters. Updated the examples to work with this change. * Explicitly initialised the edpoint ID in the operational state examples to improve readability. * OpState: Made OpState getters return const. * Restyled by clang-format * Moved the responsibility of storing and managing the countdown time attribute to the delegate. * Applied minor review changes. * OpState: Made the improved the relationship between the Delegate and Instance classes. * OpState: Removed the ability to set the OperationalState to the Error state and the ability to set the OperationalError. These can only be set via the ErrorDetected event. * OpState: Fixed GetCurrentOperationalError * Restyled by clang-format * Added checks to the phase and operational state setters to ensure that the value given is valid. * Added a safe method to check if two GenericOperationalError objects are equal. * GetInstance returns a const pointer. Co-authored-by: Boris Zbarsky <[email protected]> * Restyled by clang-format --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: Boris Zbarsky <[email protected]>
| @@ -138,6 +138,35 @@ struct GenericOperationalError : public app::Clusters::detail::Structs::ErrorSta | |||
| } | |||
| } | |||
|
|
|||
| bool IsEqual(const Structs::ErrorStateStruct::Type & rhs) | |||
There was a problem hiding this comment.
Is there a reason this is not a const method?
| else if (opState == to_underlying(OperationalStateEnum::kPaused)) | ||
|
|
||
| // Set the OperationalError attribute | ||
| if (mOperationalError.IsEqual(aError)) |
There was a problem hiding this comment.
This check is backward, so this code does not work correctly. Was this tested? Why is it not being tested as part of this PR?
HunsupJung
pushed a commit
to HunsupJung/connectedhomeip
that referenced
this pull request
Oct 23, 2023
) * Reordered Mode Base functions. * Moved generic OpState cluster objects into one header file. * Reordered OperationalStateServer functions. * Moved OpState delegate in the server header file. * Updated the TestOperationalStateDelegate inctludes following the operational state delegate change in location. * Renamed TestOperationalStateDelegate.cpp -> src/app/tests/TestOperationalStateClusterObjects.cpp * Restyled by clang-format * Minor corrections following revision. * Refactored the OperationalState server code to match with other derived cluters. Updated the examples to work with this change. * Explicitly initialised the edpoint ID in the operational state examples to improve readability. * OpState: Made OpState getters return const. * Restyled by clang-format * Moved the responsibility of storing and managing the countdown time attribute to the delegate. * Applied minor review changes. * OpState: Made the improved the relationship between the Delegate and Instance classes. * OpState: Removed the ability to set the OperationalState to the Error state and the ability to set the OperationalError. These can only be set via the ErrorDetected event. * OpState: Fixed GetCurrentOperationalError * Restyled by clang-format * Added checks to the phase and operational state setters to ensure that the value given is valid. * Added a safe method to check if two GenericOperationalError objects are equal. * GetInstance returns a const pointer. Co-authored-by: Boris Zbarsky <[email protected]> * Restyled by clang-format --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: Boris Zbarsky <[email protected]>
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.
Updates the Operational State server
Makes the server and the delegate classes have pointers to each other. This will
Move the attributes and their accessor functions from the Delegate to the Server. This will