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

Align Administrator Commissioning XML with the spec again. #24473

Merged
merged 3 commits into from
Jan 19, 2023
Merged

Align Administrator Commissioning XML with the spec again. #24473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70e0681
Align Administrator Commissioning XML with the spec again.
bzbarsky-apple Jan 17, 2023
3f33e64
Auto-update ZAP files from the XML.
bzbarsky-apple Jan 17, 2023
c09e713
Regenerate generated code.
bzbarsky-apple Jan 17, 2023
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.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ server cluster Switch = 59 {
}

server cluster AdministratorCommissioning = 60 {
enum CommissioningWindowStatus : ENUM8 {
enum CommissioningWindowStatusEnum : ENUM8 {
kWindowNotOpen = 0;
kEnhancedWindowOpen = 1;
kBasicWindowOpen = 2;
Expand All @@ -1553,7 +1553,7 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
6 changes: 3 additions & 3 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 @@ -5395,7 +5395,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand Down Expand Up @@ -5447,7 +5447,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand All @@ -5459,7 +5459,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "CommissioningWindowStatus",
"type": "CommissioningWindowStatusEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,7 @@ server cluster Switch = 59 {
}

server cluster AdministratorCommissioning = 60 {
enum CommissioningWindowStatus : ENUM8 {
enum CommissioningWindowStatusEnum : ENUM8 {
kWindowNotOpen = 0;
kEnhancedWindowOpen = 1;
kBasicWindowOpen = 2;
Expand All @@ -1403,7 +1403,7 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
6 changes: 3 additions & 3 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5395,7 +5395,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand Down Expand Up @@ -5447,7 +5447,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand All @@ -5459,7 +5459,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "CommissioningWindowStatus",
"type": "CommissioningWindowStatusEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,7 @@ server cluster Switch = 59 {
}

server cluster AdministratorCommissioning = 60 {
enum CommissioningWindowStatus : ENUM8 {
enum CommissioningWindowStatusEnum : ENUM8 {
kWindowNotOpen = 0;
kEnhancedWindowOpen = 1;
kBasicWindowOpen = 2;
Expand All @@ -1225,7 +1225,7 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute command_id generatedCommandList[] = 65528;
Expand Down
6 changes: 3 additions & 3 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 @@ -4029,7 +4029,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand Down Expand Up @@ -4097,7 +4097,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand All @@ -4109,7 +4109,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "CommissioningWindowStatus",
"type": "CommissioningWindowStatusEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ server cluster Switch = 59 {
}

server cluster AdministratorCommissioning = 60 {
enum CommissioningWindowStatus : ENUM8 {
enum CommissioningWindowStatusEnum : ENUM8 {
kWindowNotOpen = 0;
kEnhancedWindowOpen = 1;
kBasicWindowOpen = 2;
Expand All @@ -1080,7 +1080,7 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
6 changes: 3 additions & 3 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4489,7 +4489,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand Down Expand Up @@ -4541,7 +4541,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand All @@ -4553,7 +4553,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "CommissioningWindowStatus",
"type": "CommissioningWindowStatusEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ server cluster SoftwareDiagnostics = 52 {
}

server cluster AdministratorCommissioning = 60 {
enum CommissioningWindowStatus : ENUM8 {
enum CommissioningWindowStatusEnum : ENUM8 {
kWindowNotOpen = 0;
kEnhancedWindowOpen = 1;
kBasicWindowOpen = 2;
Expand All @@ -899,7 +899,7 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
6 changes: 3 additions & 3 deletions examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4617,7 +4617,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand Down Expand Up @@ -4669,7 +4669,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand All @@ -4681,7 +4681,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "CommissioningWindowStatus",
"type": "CommissioningWindowStatusEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ server cluster Switch = 59 {
}

server cluster AdministratorCommissioning = 60 {
enum CommissioningWindowStatus : ENUM8 {
enum CommissioningWindowStatusEnum : ENUM8 {
kWindowNotOpen = 0;
kEnhancedWindowOpen = 1;
kBasicWindowOpen = 2;
Expand All @@ -815,7 +815,7 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
6 changes: 3 additions & 3 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4489,7 +4489,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand Down Expand Up @@ -4541,7 +4541,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand All @@ -4553,7 +4553,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "CommissioningWindowStatus",
"type": "CommissioningWindowStatusEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ server cluster Switch = 59 {
}

server cluster AdministratorCommissioning = 60 {
enum CommissioningWindowStatus : ENUM8 {
enum CommissioningWindowStatusEnum : ENUM8 {
kWindowNotOpen = 0;
kEnhancedWindowOpen = 1;
kBasicWindowOpen = 2;
Expand All @@ -964,7 +964,7 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
6 changes: 3 additions & 3 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4489,7 +4489,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand Down Expand Up @@ -4541,7 +4541,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand All @@ -4553,7 +4553,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "CommissioningWindowStatus",
"type": "CommissioningWindowStatusEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ server cluster Switch = 59 {
}

server cluster AdministratorCommissioning = 60 {
enum CommissioningWindowStatus : ENUM8 {
enum CommissioningWindowStatusEnum : ENUM8 {
kWindowNotOpen = 0;
kEnhancedWindowOpen = 1;
kBasicWindowOpen = 2;
Expand All @@ -815,7 +815,7 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
6 changes: 3 additions & 3 deletions examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4489,7 +4489,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand Down Expand Up @@ -4541,7 +4541,7 @@
]
},
{
"name": "AdministratorCommissioning",
"name": "Administrator Commissioning",
"code": 60,
"mfgCode": null,
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
Expand All @@ -4553,7 +4553,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "CommissioningWindowStatus",
"type": "CommissioningWindowStatusEnum",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ server cluster Switch = 59 {
}

server cluster AdministratorCommissioning = 60 {
enum CommissioningWindowStatus : ENUM8 {
enum CommissioningWindowStatusEnum : ENUM8 {
kWindowNotOpen = 0;
kEnhancedWindowOpen = 1;
kBasicWindowOpen = 2;
Expand All @@ -964,7 +964,7 @@ server cluster AdministratorCommissioning = 60 {
kWindowNotOpen = 4;
}

readonly attribute CommissioningWindowStatus windowStatus = 0;
readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
readonly attribute nullable fabric_idx adminFabricIndex = 1;
readonly attribute nullable int16u adminVendorId = 2;
readonly attribute bitmap32 featureMap = 65532;
Expand Down
Loading