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

Quickfix/test app te2 laundry washer controls #28698

Merged
merged 7 commits into from
Aug 22, 2023
Merged

Quickfix/test app te2 laundry washer controls #28698

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd2d36e
Adding laundry washer controls to all clusters
abeck-riis Aug 9, 2023
739762e
Updating
abeck-riis Aug 10, 2023
a3e1373
Updating to set rinse features to 0 as featuremap is now set to 1 to …
abeck-riis Aug 10, 2023
62de4bc
Updating and regen
abeck-riis Aug 11, 2023
1b3c525
Running full regen since it is still failing
abeck-riis Aug 11, 2023
103b335
Merge branch 'master' into quickfix/TestAppTE2LaundryWasherControls
abeck-riis Aug 22, 2023
aea279d
Zap regen (this ran ktfmt)
andy31415 Aug 22, 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
Updating and regen
  • Loading branch information
@abeck-riis
abeck-riis committed Aug 11, 2023
commit 62de4bc8552d2ba66413414efb0e84d49cdfba6f
39 changes: 39 additions & 0 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 @@ -2585,6 +2585,32 @@ server cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
}

/** This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine. */
server cluster LaundryWasherControls = 83 {
enum NumberOfRinsesEnum : ENUM8 {
kNone = 0;
kNormal = 1;
kExtra = 2;
kMax = 3;
}

bitmap Feature : BITMAP32 {
kSpin = 0x1;
kRinse = 0x2;
}

readonly attribute CHAR_STRING spinSpeeds[] = 0;
attribute nullable int8u spinSpeedCurrent = 1;
attribute NumberOfRinsesEnum numberOfRinses = 2;
readonly attribute NumberOfRinsesEnum supportedRinses[] = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for selecting a mode from a list of supported options. */
server cluster RvcRunMode = 84 {
enum ModeTag : ENUM16 {
Expand Down Expand Up @@ -6617,6 +6643,19 @@ endpoint 1 {
ram attribute clusterRevision default = 1;
}

server cluster LaundryWasherControls {
callback attribute spinSpeeds;
ram attribute spinSpeedCurrent;
ram attribute numberOfRinses;
callback attribute supportedRinses;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 3;
ram attribute clusterRevision default = 1;
}

server cluster RvcRunMode {
callback attribute supportedModes;
callback attribute currentMode;
Expand Down
14 changes: 7 additions & 7 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
],
"endpointTypes": [
{
"id": 12,
"id": 13,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 177,
Expand Down Expand Up @@ -9506,7 +9506,7 @@
]
},
{
"id": 10,
"id": 16,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 183,
Expand Down Expand Up @@ -14157,7 +14157,7 @@
"mfgCode": null,
"side": "server",
"type": "NumberOfRinsesEnum",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -14173,7 +14173,7 @@
"mfgCode": null,
"side": "server",
"type": "array",
"included": 0,
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
Expand Down Expand Up @@ -14257,7 +14257,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -29197,7 +29197,7 @@
]
},
{
"id": 9,
"id": 15,
"name": "MA-onofflight",
"deviceTypeRef": {
"id": 183,
Expand Down Expand Up @@ -32829,7 +32829,7 @@
]
},
{
"id": 11,
"id": 14,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 228,
Expand Down