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

Support FeatureMap in Network Commissioning cluster #12184

Merged
merged 2 commits into from
Nov 24, 2021
Merged

Support FeatureMap in Network Commissioning cluster #12184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2898a0
Support FeatureMap in Network Commissioning cluster
yufengwangca Nov 23, 2021
2f10710
Run codegen
yufengwangca Nov 23, 2021
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
4 changes: 2 additions & 2 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 @@ -1723,7 +1723,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"defaultValue": "1",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -19660,4 +19660,4 @@
}
],
"log": []
}
}
15 changes: 15 additions & 0 deletions examples/bridge-app/bridge-common/bridge-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down
15 changes: 15 additions & 0 deletions examples/lighting-app/lighting-common/lighting-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1666,6 +1666,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down
15 changes: 15 additions & 0 deletions examples/lock-app/lock-common/lock-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,6 +1481,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down
17 changes: 16 additions & 1 deletion examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 63,
"featureLevel": 67,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -1429,6 +1429,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down
17 changes: 16 additions & 1 deletion examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 63,
"featureLevel": 67,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -1452,6 +1452,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down
17 changes: 16 additions & 1 deletion examples/pump-app/pump-common/pump-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,6 +1395,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down Expand Up @@ -4070,7 +4085,7 @@
},
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "Pump",
"deviceTypeName": "MA-pump",
"deviceTypeCode": 771,
"deviceTypeProfileId": 2457,
"clusters": [
Expand Down
15 changes: 15 additions & 0 deletions examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,6 +1395,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down
15 changes: 15 additions & 0 deletions examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down
15 changes: 15 additions & 0 deletions examples/thermostat/thermostat-common/thermostat.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down
15 changes: 15 additions & 0 deletions examples/tv-app/tv-common/tv-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1594,6 +1594,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down
15 changes: 15 additions & 0 deletions examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down
19 changes: 17 additions & 2 deletions examples/window-app/common/window-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,6 +1162,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down Expand Up @@ -3527,7 +3542,7 @@
],
"attributes": [
{
"name": "IdentifyTime",
"name": "identify time",
"code": 0,
"mfgCode": null,
"side": "server",
Expand All @@ -3542,7 +3557,7 @@
"reportableChange": 0
},
{
"name": "IdentifyType",
"name": "identify type",
"code": 1,
"mfgCode": null,
"side": "server",
Expand Down
5 changes: 5 additions & 0 deletions src/app/zap-templates/zcl/data-model/chip/commissioning.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,9 @@ limitations under the License.
<arg name="debugText" type="CHAR_STRING"/>
</command>
</cluster>
<bitmap name="NetworkCommissioningFeature" type="BITMAP32">
<field name="WiFiNetworkInterface" mask="0x1"/>
<field name="ThreadNetworkInterface" mask="0x2"/>
<field name="EthernetNetworkInterface" mask="0x4"/>
</bitmap>
</configurator>
15 changes: 15 additions & 0 deletions src/controller/data_model/controller-clusters.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2831,6 +2831,21 @@
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "client",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand Down
4 changes: 2 additions & 2 deletions zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions zzz_generated/app-common/app-common/zap-generated/enums.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading