Skip to content

Commit 783f268

Browse files
swan-amazonswan-amazon
committed
Zap regen for Enhanced Setup Flow, Terms and Conditions (TC)
* Auto-update ZAP files. ```bash python3 ./scripts/tools/zap_regen_all.py ```
1 parent 3c7cc7c commit 783f268

File tree

119 files changed

+4437
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+4437
-8
lines changed

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+22
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,9 @@ cluster GeneralCommissioning = 48 {
437437
kInvalidAuthentication = 2;
438438
kNoFailSafe = 3;
439439
kBusyWithOtherAdmin = 4;
440+
kRequiredTCNotAccepted = 5;
441+
kTCAcknowledgementsNotReceived = 6;
442+
kTCMinVersionNotMet = 7;
440443
}
441444

442445
enum RegulatoryLocationTypeEnum : enum8 {
@@ -445,6 +448,10 @@ cluster GeneralCommissioning = 48 {
445448
kIndoorOutdoor = 2;
446449
}
447450

451+
bitmap Feature : bitmap32 {
452+
kTermsAndConditions = 0x1;
453+
}
454+
448455
struct BasicCommissioningInfo {
449456
int16u failSafeExpiryLengthSeconds = 0;
450457
int16u maxCumulativeFailsafeSeconds = 1;
@@ -455,6 +462,10 @@ cluster GeneralCommissioning = 48 {
455462
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
456463
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
457464
readonly attribute boolean supportsConcurrentConnection = 4;
465+
provisional readonly attribute access(read: administer) optional int16u TCAcceptedVersion = 5;
466+
provisional readonly attribute access(read: administer) optional int16u TCMinRequiredVersion = 6;
467+
provisional readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
468+
provisional readonly attribute access(read: administer) optional boolean TCAcknowledgementsRequired = 8;
458469
readonly attribute command_id generatedCommandList[] = 65528;
459470
readonly attribute command_id acceptedCommandList[] = 65529;
460471
readonly attribute event_id eventList[] = 65530;
@@ -488,12 +499,23 @@ cluster GeneralCommissioning = 48 {
488499
char_string debugText = 1;
489500
}
490501

502+
request struct SetTCAcknowledgementsRequest {
503+
int16u TCVersion = 0;
504+
bitmap16 TCUserResponse = 1;
505+
}
506+
507+
response struct SetTCAcknowledgementsResponse = 7 {
508+
CommissioningErrorEnum errorCode = 0;
509+
}
510+
491511
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
492512
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
493513
/** Set the regulatory configuration to be used during commissioning */
494514
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
495515
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
496516
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
517+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
518+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
497519
}
498520

499521
/** Functionality to configure, enable, disable network credentials and access on a Matter device. */

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

+22
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,9 @@ cluster GeneralCommissioning = 48 {
437437
kInvalidAuthentication = 2;
438438
kNoFailSafe = 3;
439439
kBusyWithOtherAdmin = 4;
440+
kRequiredTCNotAccepted = 5;
441+
kTCAcknowledgementsNotReceived = 6;
442+
kTCMinVersionNotMet = 7;
440443
}
441444

442445
enum RegulatoryLocationTypeEnum : enum8 {
@@ -445,6 +448,10 @@ cluster GeneralCommissioning = 48 {
445448
kIndoorOutdoor = 2;
446449
}
447450

451+
bitmap Feature : bitmap32 {
452+
kTermsAndConditions = 0x1;
453+
}
454+
448455
struct BasicCommissioningInfo {
449456
int16u failSafeExpiryLengthSeconds = 0;
450457
int16u maxCumulativeFailsafeSeconds = 1;
@@ -455,6 +462,10 @@ cluster GeneralCommissioning = 48 {
455462
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
456463
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
457464
readonly attribute boolean supportsConcurrentConnection = 4;
465+
provisional readonly attribute access(read: administer) optional int16u TCAcceptedVersion = 5;
466+
provisional readonly attribute access(read: administer) optional int16u TCMinRequiredVersion = 6;
467+
provisional readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
468+
provisional readonly attribute access(read: administer) optional boolean TCAcknowledgementsRequired = 8;
458469
readonly attribute command_id generatedCommandList[] = 65528;
459470
readonly attribute command_id acceptedCommandList[] = 65529;
460471
readonly attribute event_id eventList[] = 65530;
@@ -488,12 +499,23 @@ cluster GeneralCommissioning = 48 {
488499
char_string debugText = 1;
489500
}
490501

502+
request struct SetTCAcknowledgementsRequest {
503+
int16u TCVersion = 0;
504+
bitmap16 TCUserResponse = 1;
505+
}
506+
507+
response struct SetTCAcknowledgementsResponse = 7 {
508+
CommissioningErrorEnum errorCode = 0;
509+
}
510+
491511
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
492512
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
493513
/** Set the regulatory configuration to be used during commissioning */
494514
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
495515
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
496516
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
517+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
518+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
497519
}
498520

499521
/** Functionality to configure, enable, disable network credentials and access on a Matter device. */

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+22
Original file line numberDiff line numberDiff line change
@@ -1375,6 +1375,9 @@ cluster GeneralCommissioning = 48 {
13751375
kInvalidAuthentication = 2;
13761376
kNoFailSafe = 3;
13771377
kBusyWithOtherAdmin = 4;
1378+
kRequiredTCNotAccepted = 5;
1379+
kTCAcknowledgementsNotReceived = 6;
1380+
kTCMinVersionNotMet = 7;
13781381
}
13791382

13801383
enum RegulatoryLocationTypeEnum : enum8 {
@@ -1383,6 +1386,10 @@ cluster GeneralCommissioning = 48 {
13831386
kIndoorOutdoor = 2;
13841387
}
13851388

1389+
bitmap Feature : bitmap32 {
1390+
kTermsAndConditions = 0x1;
1391+
}
1392+
13861393
struct BasicCommissioningInfo {
13871394
int16u failSafeExpiryLengthSeconds = 0;
13881395
int16u maxCumulativeFailsafeSeconds = 1;
@@ -1393,6 +1400,10 @@ cluster GeneralCommissioning = 48 {
13931400
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
13941401
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
13951402
readonly attribute boolean supportsConcurrentConnection = 4;
1403+
provisional readonly attribute access(read: administer) optional int16u TCAcceptedVersion = 5;
1404+
provisional readonly attribute access(read: administer) optional int16u TCMinRequiredVersion = 6;
1405+
provisional readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
1406+
provisional readonly attribute access(read: administer) optional boolean TCAcknowledgementsRequired = 8;
13961407
readonly attribute command_id generatedCommandList[] = 65528;
13971408
readonly attribute command_id acceptedCommandList[] = 65529;
13981409
readonly attribute event_id eventList[] = 65530;
@@ -1426,12 +1437,23 @@ cluster GeneralCommissioning = 48 {
14261437
char_string debugText = 1;
14271438
}
14281439

1440+
request struct SetTCAcknowledgementsRequest {
1441+
int16u TCVersion = 0;
1442+
bitmap16 TCUserResponse = 1;
1443+
}
1444+
1445+
response struct SetTCAcknowledgementsResponse = 7 {
1446+
CommissioningErrorEnum errorCode = 0;
1447+
}
1448+
14291449
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
14301450
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
14311451
/** Set the regulatory configuration to be used during commissioning */
14321452
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
14331453
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
14341454
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
1455+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
1456+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
14351457
}
14361458

14371459
/** Functionality to configure, enable, disable network credentials and access on a Matter device. */

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+22
Original file line numberDiff line numberDiff line change
@@ -1255,6 +1255,9 @@ cluster GeneralCommissioning = 48 {
12551255
kInvalidAuthentication = 2;
12561256
kNoFailSafe = 3;
12571257
kBusyWithOtherAdmin = 4;
1258+
kRequiredTCNotAccepted = 5;
1259+
kTCAcknowledgementsNotReceived = 6;
1260+
kTCMinVersionNotMet = 7;
12581261
}
12591262

12601263
enum RegulatoryLocationTypeEnum : enum8 {
@@ -1263,6 +1266,10 @@ cluster GeneralCommissioning = 48 {
12631266
kIndoorOutdoor = 2;
12641267
}
12651268

1269+
bitmap Feature : bitmap32 {
1270+
kTermsAndConditions = 0x1;
1271+
}
1272+
12661273
struct BasicCommissioningInfo {
12671274
int16u failSafeExpiryLengthSeconds = 0;
12681275
int16u maxCumulativeFailsafeSeconds = 1;
@@ -1273,6 +1280,10 @@ cluster GeneralCommissioning = 48 {
12731280
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
12741281
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
12751282
readonly attribute boolean supportsConcurrentConnection = 4;
1283+
provisional readonly attribute access(read: administer) optional int16u TCAcceptedVersion = 5;
1284+
provisional readonly attribute access(read: administer) optional int16u TCMinRequiredVersion = 6;
1285+
provisional readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
1286+
provisional readonly attribute access(read: administer) optional boolean TCAcknowledgementsRequired = 8;
12761287
readonly attribute command_id generatedCommandList[] = 65528;
12771288
readonly attribute command_id acceptedCommandList[] = 65529;
12781289
readonly attribute event_id eventList[] = 65530;
@@ -1306,12 +1317,23 @@ cluster GeneralCommissioning = 48 {
13061317
char_string debugText = 1;
13071318
}
13081319

1320+
request struct SetTCAcknowledgementsRequest {
1321+
int16u TCVersion = 0;
1322+
bitmap16 TCUserResponse = 1;
1323+
}
1324+
1325+
response struct SetTCAcknowledgementsResponse = 7 {
1326+
CommissioningErrorEnum errorCode = 0;
1327+
}
1328+
13091329
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
13101330
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
13111331
/** Set the regulatory configuration to be used during commissioning */
13121332
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
13131333
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
13141334
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
1335+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
1336+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
13151337
}
13161338

13171339
/** Functionality to configure, enable, disable network credentials and access on a Matter device. */

‎examples/bridge-app/bridge-common/bridge-app.matter

+22
Original file line numberDiff line numberDiff line change
@@ -840,6 +840,9 @@ cluster GeneralCommissioning = 48 {
840840
kInvalidAuthentication = 2;
841841
kNoFailSafe = 3;
842842
kBusyWithOtherAdmin = 4;
843+
kRequiredTCNotAccepted = 5;
844+
kTCAcknowledgementsNotReceived = 6;
845+
kTCMinVersionNotMet = 7;
843846
}
844847

845848
enum RegulatoryLocationTypeEnum : enum8 {
@@ -848,6 +851,10 @@ cluster GeneralCommissioning = 48 {
848851
kIndoorOutdoor = 2;
849852
}
850853

854+
bitmap Feature : bitmap32 {
855+
kTermsAndConditions = 0x1;
856+
}
857+
851858
struct BasicCommissioningInfo {
852859
int16u failSafeExpiryLengthSeconds = 0;
853860
int16u maxCumulativeFailsafeSeconds = 1;
@@ -858,6 +865,10 @@ cluster GeneralCommissioning = 48 {
858865
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
859866
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
860867
readonly attribute boolean supportsConcurrentConnection = 4;
868+
provisional readonly attribute access(read: administer) optional int16u TCAcceptedVersion = 5;
869+
provisional readonly attribute access(read: administer) optional int16u TCMinRequiredVersion = 6;
870+
provisional readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
871+
provisional readonly attribute access(read: administer) optional boolean TCAcknowledgementsRequired = 8;
861872
readonly attribute command_id generatedCommandList[] = 65528;
862873
readonly attribute command_id acceptedCommandList[] = 65529;
863874
readonly attribute event_id eventList[] = 65530;
@@ -891,12 +902,23 @@ cluster GeneralCommissioning = 48 {
891902
char_string debugText = 1;
892903
}
893904

905+
request struct SetTCAcknowledgementsRequest {
906+
int16u TCVersion = 0;
907+
bitmap16 TCUserResponse = 1;
908+
}
909+
910+
response struct SetTCAcknowledgementsResponse = 7 {
911+
CommissioningErrorEnum errorCode = 0;
912+
}
913+
894914
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
895915
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
896916
/** Set the regulatory configuration to be used during commissioning */
897917
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
898918
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
899919
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
920+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
921+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
900922
}
901923

902924
/** Functionality to configure, enable, disable network credentials and access on a Matter device. */

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

+22
Original file line numberDiff line numberDiff line change
@@ -793,6 +793,9 @@ cluster GeneralCommissioning = 48 {
793793
kInvalidAuthentication = 2;
794794
kNoFailSafe = 3;
795795
kBusyWithOtherAdmin = 4;
796+
kRequiredTCNotAccepted = 5;
797+
kTCAcknowledgementsNotReceived = 6;
798+
kTCMinVersionNotMet = 7;
796799
}
797800

798801
enum RegulatoryLocationTypeEnum : enum8 {
@@ -801,6 +804,10 @@ cluster GeneralCommissioning = 48 {
801804
kIndoorOutdoor = 2;
802805
}
803806

807+
bitmap Feature : bitmap32 {
808+
kTermsAndConditions = 0x1;
809+
}
810+
804811
struct BasicCommissioningInfo {
805812
int16u failSafeExpiryLengthSeconds = 0;
806813
int16u maxCumulativeFailsafeSeconds = 1;
@@ -811,6 +818,10 @@ cluster GeneralCommissioning = 48 {
811818
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
812819
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
813820
readonly attribute boolean supportsConcurrentConnection = 4;
821+
provisional readonly attribute access(read: administer) optional int16u TCAcceptedVersion = 5;
822+
provisional readonly attribute access(read: administer) optional int16u TCMinRequiredVersion = 6;
823+
provisional readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
824+
provisional readonly attribute access(read: administer) optional boolean TCAcknowledgementsRequired = 8;
814825
readonly attribute command_id generatedCommandList[] = 65528;
815826
readonly attribute command_id acceptedCommandList[] = 65529;
816827
readonly attribute event_id eventList[] = 65530;
@@ -844,12 +855,23 @@ cluster GeneralCommissioning = 48 {
844855
char_string debugText = 1;
845856
}
846857

858+
request struct SetTCAcknowledgementsRequest {
859+
int16u TCVersion = 0;
860+
bitmap16 TCUserResponse = 1;
861+
}
862+
863+
response struct SetTCAcknowledgementsResponse = 7 {
864+
CommissioningErrorEnum errorCode = 0;
865+
}
866+
847867
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
848868
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
849869
/** Set the regulatory configuration to be used during commissioning */
850870
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
851871
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
852872
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
873+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
874+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
853875
}
854876

855877
/** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */

‎examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter

+22
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,9 @@ cluster GeneralCommissioning = 48 {
509509
kInvalidAuthentication = 2;
510510
kNoFailSafe = 3;
511511
kBusyWithOtherAdmin = 4;
512+
kRequiredTCNotAccepted = 5;
513+
kTCAcknowledgementsNotReceived = 6;
514+
kTCMinVersionNotMet = 7;
512515
}
513516

514517
enum RegulatoryLocationTypeEnum : enum8 {
@@ -517,6 +520,10 @@ cluster GeneralCommissioning = 48 {
517520
kIndoorOutdoor = 2;
518521
}
519522

523+
bitmap Feature : bitmap32 {
524+
kTermsAndConditions = 0x1;
525+
}
526+
520527
struct BasicCommissioningInfo {
521528
int16u failSafeExpiryLengthSeconds = 0;
522529
int16u maxCumulativeFailsafeSeconds = 1;
@@ -527,6 +534,10 @@ cluster GeneralCommissioning = 48 {
527534
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
528535
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
529536
readonly attribute boolean supportsConcurrentConnection = 4;
537+
provisional readonly attribute access(read: administer) optional int16u TCAcceptedVersion = 5;
538+
provisional readonly attribute access(read: administer) optional int16u TCMinRequiredVersion = 6;
539+
provisional readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
540+
provisional readonly attribute access(read: administer) optional boolean TCAcknowledgementsRequired = 8;
530541
readonly attribute command_id generatedCommandList[] = 65528;
531542
readonly attribute command_id acceptedCommandList[] = 65529;
532543
readonly attribute event_id eventList[] = 65530;
@@ -560,12 +571,23 @@ cluster GeneralCommissioning = 48 {
560571
char_string debugText = 1;
561572
}
562573

574+
request struct SetTCAcknowledgementsRequest {
575+
int16u TCVersion = 0;
576+
bitmap16 TCUserResponse = 1;
577+
}
578+
579+
response struct SetTCAcknowledgementsResponse = 7 {
580+
CommissioningErrorEnum errorCode = 0;
581+
}
582+
563583
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
564584
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
565585
/** Set the regulatory configuration to be used during commissioning */
566586
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
567587
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
568588
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
589+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
590+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
569591
}
570592

571593
/** Functionality to configure, enable, disable network credentials and access on a Matter device. */

0 commit comments

Comments
 (0)