Skip to content

Commit

Permalink
Modified the zap files to remove warnings, modified the xml files to …
Browse files Browse the repository at this point in the history 
…reflect spec and generated the .matter files

Replace hardcoded assumption with one dynamically calculated (project-chip#32291)

* Replace hardcoded assumption with one dynamically calculated

* Quick Fix

* Restyled by whitespace

* Restyled by clang-format

* Address PR comments

---------

Co-authored-by: Restyled.io <commits@restyled.io>

Cleanup and fix batch command tests in TestCommandInteraction (project-chip#32288)

* Have unit test build batch command using CommandSender

* Restyled by clang-format

* Fix CI

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <commits@restyled.io>
  • Loading branch information
@Sarthak-Shaha @restyled-commits
Sarthak-Shaha and restyled-commits committed Mar 5, 2024
1 parent 4393200 commit f92f209
Show file tree
Hide file tree
Showing 11 changed files with 80 additions and 6 deletions.
1 change: 1 addition & 0 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2628,6 +2628,7 @@ endpoint 0 {
ram attribute clusterRevision default = 1;

handle command RetrieveLogsRequest;
handle command RetrieveLogsResponse;
}

server cluster GeneralDiagnostics {
Expand Down
26 changes: 26 additions & 0 deletions examples/light-switch-app/light-switch-common/light-switch-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,14 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "RetrieveLogsResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down Expand Up @@ -4605,6 +4613,24 @@
"define": "IDENTIFY_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
{
"name": "Identify",
"code": 0,
"mfgCode": null,
"source": "client",
"isIncoming": 0,
"isEnabled": 1
},
{
"name": "TriggerEffect",
"code": 64,
"mfgCode": null,
"source": "client",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
{
"name": "ClusterRevision",
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/silabs/data_model/lighting-thread-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2520,6 +2520,7 @@ endpoint 0 {
ram attribute clusterRevision default = 1;

handle command RetrieveLogsRequest;
handle command RetrieveLogsResponse;
}

server cluster GeneralDiagnostics {
Expand Down
8 changes: 8 additions & 0 deletions examples/lighting-app/silabs/data_model/lighting-thread-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1509,6 +1509,14 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "RetrieveLogsResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2430,6 +2430,7 @@ endpoint 0 {
ram attribute clusterRevision default = 1;

handle command RetrieveLogsRequest;
handle command RetrieveLogsResponse;
}

server cluster GeneralDiagnostics {
Expand Down
8 changes: 8 additions & 0 deletions examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1493,6 +1493,14 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "RetrieveLogsResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down
1 change: 1 addition & 0 deletions examples/lock-app/lock-common/lock-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2663,6 +2663,7 @@ endpoint 0 {
ram attribute clusterRevision default = 1;

handle command RetrieveLogsRequest;
handle command RetrieveLogsResponse;
}

server cluster GeneralDiagnostics {
Expand Down
8 changes: 8 additions & 0 deletions examples/lock-app/lock-common/lock-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2126,6 +2126,14 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "RetrieveLogsResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down
2 changes: 2 additions & 0 deletions examples/thermostat/thermostat-common/thermostat.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2097,6 +2097,7 @@ endpoint 0 {

server cluster Identify {
ram attribute identifyTime default = 0x0000;
ram attribute identifyType default = 0x00;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 4;

Expand Down Expand Up @@ -2240,6 +2241,7 @@ endpoint 0 {
ram attribute clusterRevision default = 1;

handle command RetrieveLogsRequest;
handle command RetrieveLogsResponse;
}

server cluster GeneralDiagnostics {
Expand Down
24 changes: 24 additions & 0 deletions examples/thermostat/thermostat-common/thermostat.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,22 @@
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "IdentifyType",
"code": 1,
"mfgCode": null,
"side": "server",
"type": "IdentifyTypeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "FeatureMap",
"code": 65532,
Expand Down Expand Up @@ -1707,6 +1723,14 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "RetrieveLogsResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down
6 changes: 0 additions & 6 deletions src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ limitations under the License.
<requireAttribute>ACTIVE_LOCALE</requireAttribute>
<requireAttribute>SUPPORTED_LOCALES</requireAttribute>
</include>
<include cluster="Time Format Localization" client="false" server="true" clientLocked="true" serverLocked="false">
<requireAttribute>HOUR_FORMAT</requireAttribute>
</include>
<include cluster="Unit Localization" client="false" server="true" clientLocked="true" serverLocked="false"></include>
<include cluster="General Diagnostics" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>UP_TIME</requireAttribute>
</include>
Expand Down Expand Up @@ -1417,7 +1413,6 @@ limitations under the License.
<requireAttribute>IDENTIFY_TYPE</requireAttribute>
<requireCommand>Identify</requireCommand>
<requireCommand>IdentifyQuery</requireCommand>
<requireCommand>TriggerEffect</requireCommand>
</include>
<include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>DEVICE_TYPE_LIST</requireAttribute>
Expand Down Expand Up @@ -1475,7 +1470,6 @@ limitations under the License.
<requireAttribute>IDENTIFY_TYPE</requireAttribute>
<requireCommand>Identify</requireCommand>
<requireCommand>IdentifyQuery</requireCommand>
<requireCommand>TriggerEffect</requireCommand>
</include>
<include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>DEVICE_TYPE_LIST</requireAttribute>
Expand Down

0 comments on commit f92f209

Please sign in to comment.