Skip to content

Commit

Permalink
[Feature] RVC operational state cluster xml (#26989)
Browse files Browse the repository at this point in the history
* add non-generated code

* add generated files

* Update .github/workflows/tests.yaml

* address code review feedback

* Update src/controller/data_model/BUILD.gn

* Apply suggestions from code review

* add generated code

* Update src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml

* add generated code

* add missing EOL

* address code review feedback

* update the RVC and the generic OpState XMLs

* fix typo + indentation

* enable the stop and start commands in the controller clusters zap file

* add RVC OpState cluster to OpState struct definitions

* remove spaces at the end of the line
  • Loading branch information
plauric authored and pull[bot] committed Aug 29, 2023
1 parent 4e776a7 commit 4801123
Show file tree
Hide file tree
Showing 112 changed files with 10,214 additions and 361 deletions.
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml \
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,4 @@ examples/thermostat/ameba/build
# https://github.com/espressif/idf-component-manager#using-with-a-project
examples/*/esp32/managed_components
examples/*/esp32/dependencies.lock
examples/all-clusters-app/all-clusters-common/all-clusters-app.zap.old
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
11 changes: 11 additions & 0 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
11 changes: 11 additions & 0 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
11 changes: 11 additions & 0 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
11 changes: 11 additions & 0 deletions examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
11 changes: 11 additions & 0 deletions examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
11 changes: 11 additions & 0 deletions examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
11 changes: 11 additions & 0 deletions examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
11 changes: 11 additions & 0 deletions examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
11 changes: 11 additions & 0 deletions examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
11 changes: 11 additions & 0 deletions examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ struct ApplicationStruct {
char_string applicationID = 1;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct LabelStruct {
char_string<16> label = 0;
char_string<16> value = 1;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
server cluster Identify = 3 {
enum EffectIdentifierEnum : ENUM8 {
Expand Down
Loading

0 comments on commit 4801123

Please sign in to comment.