Skip to content

Commit

Permalink
Renamed the mode select alias clusters to match the latest spec chang…
Browse files Browse the repository at this point in the history
…es. Fixes issue #26551.
  • Loading branch information
hicklin committed May 22, 2023
1 parent 42ef060 commit 1550392
Show file tree
Hide file tree
Showing 67 changed files with 4,614 additions and 2,756 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/proxy-valid-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/rvc-clean-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/rvc-run-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/scene.xml \
src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2334,6 +2334,7 @@ server cluster ModeSelect = 80 {
}

readonly attribute char_string<64> description = 0;
readonly attribute nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
readonly attribute int8u currentMode = 3;
attribute nullable int8u startUpMode = 4;
Expand Down Expand Up @@ -5155,6 +5156,7 @@ endpoint 1 {

server cluster ModeSelect {
ram attribute description default = "Coffee";
ram attribute standardNamespace default = 0;
callback attribute supportedModes default = 0;
persist attribute currentMode default = 0;
persist attribute startUpMode default = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2067,6 +2067,7 @@ server cluster ModeSelect = 80 {
}

readonly attribute char_string<64> description = 0;
readonly attribute nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
readonly attribute int8u currentMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
Expand Down Expand Up @@ -4269,6 +4270,7 @@ endpoint 1 {

server cluster ModeSelect {
ram attribute description default = "Coffee";
ram attribute standardNamespace default = 0;
callback attribute supportedModes default = 0;
persist attribute currentMode default = 0;
callback attribute generatedCommandList;
Expand Down
3 changes: 3 additions & 0 deletions examples/placeholder/linux/apps/app1/config.matter
Original file line number Diff line number Diff line change
Expand Up @@ -2136,6 +2136,7 @@ client cluster ModeSelect = 80 {
}

readonly attribute char_string<64> description = 0;
readonly attribute optional nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
readonly attribute int8u currentMode = 3;
attribute optional nullable int8u startUpMode = 4;
Expand Down Expand Up @@ -2207,6 +2208,7 @@ server cluster ModeSelect = 80 {
}

readonly attribute char_string<64> description = 0;
readonly attribute nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
readonly attribute int8u currentMode = 3;
attribute nullable int8u startUpMode = 4;
Expand Down Expand Up @@ -3708,6 +3710,7 @@ endpoint 0 {

server cluster ModeSelect {
ram attribute description;
callback attribute standardNamespace;
callback attribute supportedModes default = 255;
ram attribute currentMode;
ram attribute startUpMode;
Expand Down
3 changes: 3 additions & 0 deletions examples/placeholder/linux/apps/app2/config.matter
Original file line number Diff line number Diff line change
Expand Up @@ -2097,6 +2097,7 @@ client cluster ModeSelect = 80 {
}

readonly attribute char_string<64> description = 0;
readonly attribute optional nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
readonly attribute int8u currentMode = 3;
attribute optional nullable int8u startUpMode = 4;
Expand Down Expand Up @@ -2168,6 +2169,7 @@ server cluster ModeSelect = 80 {
}

readonly attribute char_string<64> description = 0;
readonly attribute nullable enum16 standardNamespace = 1;
readonly attribute ModeOptionStruct supportedModes[] = 2;
readonly attribute int8u currentMode = 3;
attribute nullable int8u startUpMode = 4;
Expand Down Expand Up @@ -3688,6 +3690,7 @@ endpoint 0 {

server cluster ModeSelect {
ram attribute description;
callback attribute standardNamespace;
callback attribute supportedModes default = 255;
ram attribute currentMode;
ram attribute startUpMode;
Expand Down
6 changes: 3 additions & 3 deletions scripts/rules.matterlint
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ load "../src/app/zap-templates/zcl/data-model/chip/proxy-discovery-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/proxy-valid-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/rvc-clean-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/rvc-run-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/scene.xml";
load "../src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml";
Expand Down
Loading

0 comments on commit 1550392

Please sign in to comment.