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

[controller] Network commissioning support on Controller #4622

Merged
merged 22 commits into from
Feb 22, 2021
Merged

[controller] Network commissioning support on Controller #4622

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
40fe28a
Add network provisioning cluster xml
erjiaqing Feb 2, 2021
c4a4c88
Update cluster according to spec
erjiaqing Feb 3, 2021
a7b4a8c
Add Network Provisioning Support in Controller
erjiaqing Feb 3, 2021
0b0cf1d
Fix type
erjiaqing Feb 3, 2021
9c877da
Restyled by prettier-json
restyled-commits Feb 3, 2021
f1b7b31
Fix python type
erjiaqing Feb 4, 2021
7518d57
Merge remote-tracking branch 'chip/master' into network_provisioning_…
erjiaqing Feb 5, 2021
ac49cf6
Update generated files
erjiaqing Feb 5, 2021
44a7846
Update xml
erjiaqing Feb 5, 2021
0b26e37
Fix
erjiaqing Feb 5, 2021
9fea1a3
Merge remote-tracking branch 'chip/master' into network_provisioning_…
erjiaqing Feb 7, 2021
8c124a3
run gen
erjiaqing Feb 7, 2021
6d84f2a
Restyled by clang-format
restyled-commits Feb 7, 2021
2a15345
Restyled by prettier-json
restyled-commits Feb 7, 2021
c07a01f
Merge remote-tracking branch 'chip/master' into network_provisioning_…
erjiaqing Feb 9, 2021
a16570d
Merge remote-tracking branch 'chip/master' into network_provisioning_…
erjiaqing Feb 18, 2021
bc58c62
Provisioning -> Commissioning
erjiaqing Feb 18, 2021
429d3ea
Update zap
erjiaqing Feb 18, 2021
5709bff
Regenerate files
erjiaqing Feb 18, 2021
dfc0eea
Create controller-clusters.zap
erjiaqing Feb 18, 2021
1846f29
Restyled by prettier-json
restyled-commits Feb 18, 2021
4d60c7c
fix
erjiaqing Feb 20, 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
298 changes: 225 additions & 73 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
@@ -1,5 +1,5 @@
{
"writeTime": "Fri Jan 15 2021 19:21:16 GMT+0100 (Central European Standard Time)",
"writeTime": "Sun Feb 07 2021 10:10:20 GMT+0800 (China Standard Time)",
"featureLevel": 6,
"creator": "zap",
"keyValuePairs": [
Expand All @@ -22,12 +22,6 @@
"path": "../../../../src/app/zap-templates/zcl/zcl.json",
"version": "ZCL Test Data",
"type": "zcl-properties"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../../src/app/zap-templates/app-templates.json",
"version": "chip-v1",
"type": "gen-templates-json"
}
],
"endpointTypes": [
Expand Down Expand Up @@ -178,6 +172,16 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
{
"name": "IdentifyQueryResponse",
"code": 0,
"mfgCode": null,
"source": "server",
"incoming": 1,
"outgoing": 1
}
],
"attributes": [
{
"name": "cluster revision",
Expand Down Expand Up @@ -209,16 +213,6 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"commands": [
{
"name": "IdentifyQueryResponse",
"code": 0,
"mfgCode": null,
"source": "server",
"incoming": 1,
"outgoing": 1
}
]
},
{
Expand Down Expand Up @@ -2815,8 +2809,8 @@
{
"name": "Anonymous Endpoint Type",
"deviceTypeName": "CHIP-All-Clusters-Server",
"deviceTypeCode": "0x0000",
"deviceTypeProfileId": "0x0103",
"deviceTypeCode": 0,
"deviceTypeProfileId": 259,
"clusters": [
{
"name": "Basic",
Expand All @@ -2825,23 +2819,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
"attributes": [
{
"name": "cluster revision",
"code": 65533,
"mfgCode": null,
"side": "client",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
}
],
"commands": [
{
"name": "ResetToFactoryDefaults",
Expand Down Expand Up @@ -2885,6 +2862,7 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
"commands": [],
"attributes": [
{
"name": "cluster revision",
Expand Down Expand Up @@ -2931,8 +2909,7 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"commands": []
]
},
{
"name": "Identify",
Expand All @@ -2941,6 +2918,23 @@
"define": "IDENTIFY_CLUSTER",
"side": "client",
"enabled": 0,
"attributes": [
{
"name": "cluster revision",
"code": 65533,
"mfgCode": null,
"side": "client",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
}
],
"commands": [
{
"name": "Identify",
Expand All @@ -2958,23 +2952,6 @@
"incoming": 1,
"outgoing": 1
}
],
"attributes": [
{
"name": "cluster revision",
"code": 65533,
"mfgCode": null,
"side": "client",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
}
]
},
{
Expand Down Expand Up @@ -3416,23 +3393,6 @@
"define": "ON_OFF_CLUSTER",
"side": "client",
"enabled": 0,
"attributes": [
{
"name": "cluster revision",
"code": 65533,
"mfgCode": null,
"side": "client",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
}
],
"commands": [
{
"name": "Off",
Expand Down Expand Up @@ -5633,6 +5593,196 @@
}
]
},
{
"name": "Network Provisioning",
"code": 43690,
"mfgCode": null,
"define": "NETWORK_PROVISIONING_CLUSTER",
"side": "client",
erjiaqing marked this conversation as resolved.
Show resolved Hide resolved
"enabled": 1,
"commands": [
{
"name": "ScanNetworks",
"code": 0,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "AddWiFiNetwork",
"code": 2,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "UpdateWiFiNetwork",
"code": 4,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "AddThreadNetwork",
"code": 6,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "UpdateThreadNetwork",
"code": 8,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveNetwork",
"code": 10,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "EnableNetwork",
"code": 12,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "DisableNetwork",
"code": 14,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
},
{
"name": "GetLastNetworkProvisioningResult",
"code": 16,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 1
}
],
"attributes": [
{
"name": "cluster revision",
"code": 65533,
"mfgCode": null,
"side": "client",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0001",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
}
]
},
{
"name": "Network Provisioning",
"code": 43690,
"mfgCode": null,
"define": "NETWORK_PROVISIONING_CLUSTER",
"side": "server",
"enabled": 1,
erjiaqing marked this conversation as resolved.
Show resolved Hide resolved
"commands": [
{
"name": "ScanNetworksResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"incoming": 1,
"outgoing": 1
},
{
"name": "AddWiFiNetworkResponse",
"code": 3,
"mfgCode": null,
"source": "server",
"incoming": 1,
"outgoing": 1
},
{
"name": "UpdateWiFiNetworkResponse",
"code": 5,
"mfgCode": null,
"source": "server",
"incoming": 1,
"outgoing": 1
},
{
"name": "AddThreadNetworkResponse",
"code": 7,
"mfgCode": null,
"source": "server",
"incoming": 1,
"outgoing": 1
},
{
"name": "UpdateThreadNetworkResponse",
"code": 9,
"mfgCode": null,
"source": "server",
"incoming": 1,
"outgoing": 1
},
{
"name": "RemoveNetworkResponse",
"code": 11,
"mfgCode": null,
"source": "server",
"incoming": 1,
"outgoing": 1
},
{
"name": "EnableNetworkResponse",
"code": 13,
"mfgCode": null,
"source": "server",
"incoming": 1,
"outgoing": 1
},
{
"name": "DisableNetworkResponse",
"code": 15,
"mfgCode": null,
"source": "server",
"incoming": 1,
"outgoing": 1
}
],
"attributes": [
{
"name": "cluster revision",
"code": 65533,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0001",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
}
]
},
{
"name": "Binding",
"code": 61440,
Expand Down Expand Up @@ -5709,16 +5859,18 @@
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"endpointTypeRef": 9,
"profileId": "0x0103",
"endpointId": 1,
"networkId": 0
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 0,
"endpointTypeRef": 8,
"profileId": "0x0103",
"endpointId": 2,
"networkId": 0
}
]
}
}
Loading