Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update operational state server and related examples #28577

Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7d8b78e
Reordered Mode Base functions.
hicklin Aug 8, 2023
17b53a6
Moved generic OpState cluster objects into one header file.
hicklin Aug 8, 2023
fce49a6
Reordered OperationalStateServer functions.
hicklin Aug 8, 2023
c78803b
Moved OpState delegate in the server header file.
hicklin Aug 8, 2023
d15ceb7
Updated the TestOperationalStateDelegate inctludes following the oper…
hicklin Aug 8, 2023
9aa030a
Renamed TestOperationalStateDelegate.cpp -> src/app/tests/TestOperati…
hicklin Aug 8, 2023
414520c
Restyled by clang-format
restyled-commits Aug 8, 2023
80f7f84
Minor corrections following revision.
hicklin Aug 8, 2023
b867ba2
Refactored the OperationalState server code to match with other deriv…
hicklin Aug 8, 2023
6064b1b
Merge branch 'master' into refactor_operational_state_and_update_exam…
hicklin Aug 9, 2023
77a1df4
Explicitly initialised the edpoint ID in the operational state exampl…
hicklin Aug 10, 2023
092a645
OpState: Made OpState getters return const.
hicklin Aug 10, 2023
18d65c1
Restyled by clang-format
restyled-commits Aug 10, 2023
143ed43
Moved the responsibility of storing and managing the countdown time a…
hicklin Aug 11, 2023
2a46918
Applied minor review changes.
hicklin Aug 11, 2023
b599b97
OpState: Made the improved the relationship between the Delegate and …
hicklin Aug 11, 2023
516ace1
OpState: Removed the ability to set the OperationalState to the Error…
hicklin Aug 11, 2023
450beb2
OpState: Fixed GetCurrentOperationalError
hicklin Aug 11, 2023
40b0ddb
Restyled by clang-format
restyled-commits Aug 11, 2023
5eafc03
Added checks to the phase and operational state setters to ensure tha…
hicklin Aug 11, 2023
3dfe2c2
Added a safe method to check if two GenericOperationalError objects a…
hicklin Aug 14, 2023
4f0d333
GetInstance returns a const pointer.
hicklin Aug 14, 2023
1c3ae5e
Merge branch 'master' into refactor_operational_state_and_update_exam…
hicklin Aug 14, 2023
568acd5
Restyled by clang-format
restyled-commits Aug 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restyled by clang-format
restyled-commits authored and hicklin committed Aug 11, 2023
commit 40b0ddbc7479d7cb7e8cb13e6383cf4088ed4759
Original file line number Diff line number Diff line change
@@ -128,7 +128,7 @@ void Instance::OnOperationalErrorDetected(const Structs::ErrorStateStruct::Type
// Set the OperationalState attribute to Error
if (mOperationalState != to_underlying(OperationalStateEnum::kError))
{
mOperationalState = to_underlying(OperationalStateEnum::kError);
mOperationalState = to_underlying(OperationalStateEnum::kError);
ConcreteAttributePath path = ConcreteAttributePath(mEndpointId, mClusterId, Attributes::OperationalState::Id);
MatterReportingAttributeChangeCallback(path);
}
Original file line number Diff line number Diff line change
@@ -143,7 +143,7 @@ class Instance : public CommandHandlerInterface, public AttributeAccessInterface

// Attribute Data Store
app::DataModel::Nullable<uint8_t> mCurrentPhase;
uint8_t mOperationalState = 0; // assume 0 for now.
uint8_t mOperationalState = 0; // assume 0 for now.
GenericOperationalError mOperationalError = to_underlying(ErrorStateEnum::kNoError);

// Inherited from CommandHandlerInterface
@@ -258,7 +258,7 @@ class Delegate
void SetServer(Instance * aInstance) { mInstance = aInstance; }

protected:
Instance* GetInstance() { return mInstance; }
Instance * GetInstance() { return mInstance; }
hicklin marked this conversation as resolved.
Show resolved Hide resolved
};

} // namespace OperationalState