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.

Sign up for GitHub

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

Sort Sources attribute in power source configuration cluster based on order of the power source cluster #17840

Merged
merged 18 commits into from
May 5, 2022
Merged

Sort Sources attribute in power source configuration cluster based on order of the power source cluster #17840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4e85acf
register attributeaccessinterface only on endpoint 0
fessehaeve Apr 28, 2022
57b6bd6
sort endpoints based on power source cluster order attribute
fessehaeve Apr 28, 2022
b5f1712
extended power source cluster example on all-clusters-app
fessehaeve Apr 28, 2022
84c95b0
regenerate all
fessehaeve Apr 28, 2022
4d216dc
removed using map and using qsort instead
fessehaeve May 3, 2022
57957be
update test to reflect added power source server cluster on ep 0
fessehaeve May 3, 2022
075672a
regenerate
fessehaeve May 3, 2022
7da47d8
attempt to fix conversion error
fessehaeve May 3, 2022
6419b46
second attempt to fix conversion error
fessehaeve May 3, 2022
2f38091
next attempt to fix conversion error
fessehaeve May 3, 2022
f95503b
update max power source count and new compare mechanism
fessehaeve May 4, 2022
540780b
convert loop variable to int
fessehaeve May 4, 2022
2844419
update power source cluster expected featuremap value to 2
fessehaeve May 4, 2022
f167711
regenerate all
fessehaeve May 4, 2022
ed5d196
allign power source cluster yaml tests
fessehaeve May 4, 2022
3b59980
regenerate all
fessehaeve May 4, 2022
255bae1
regenerate after rebase on ToT
fessehaeve May 4, 2022
92e51da
changed scope of few variables
fessehaeve May 5, 2022
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
9 changes: 4 additions & 5 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2623,12 +2623,9 @@ server cluster PowerSource = 47 {
readonly attribute enum8 status = 0;
readonly attribute int8u order = 1;
readonly attribute char_string<60> description = 2;
readonly attribute int32u batteryVoltage = 11;
readonly attribute int8u batteryPercentRemaining = 12;
readonly attribute int32u batteryTimeRemaining = 13;
readonly attribute enum8 batteryChargeLevel = 14;
readonly attribute ENUM8 activeBatteryFaults[] = 18;
readonly attribute enum8 batteryChargeState = 26;
readonly attribute boolean batteryReplacementNeeded = 15;
readonly attribute enum8 batteryReplaceability = 16;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}
Expand Down Expand Up @@ -3777,6 +3774,7 @@ endpoint 0 {
binding cluster OtaSoftwareUpdateProvider;
server cluster OtaSoftwareUpdateRequestor;
server cluster OperationalCredentials;
server cluster PowerSource;
server cluster PowerSourceConfiguration;
server cluster RelativeHumidityMeasurement;
server cluster SoftwareDiagnostics;
Expand Down Expand Up @@ -3840,6 +3838,7 @@ endpoint 2 {
server cluster Groups;
server cluster OccupancySensing;
server cluster OnOff;
server cluster PowerSource;
}

endpoint 65534 {
Expand Down
Loading