Skip to content

Commit 27e2c06

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 edec6a9 commit 27e2c06

File tree

119 files changed

+4753
-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

+4753
-8
lines changed

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

+22
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,9 @@ cluster GeneralCommissioning = 48 {
420420
kInvalidAuthentication = 2;
421421
kNoFailSafe = 3;
422422
kBusyWithOtherAdmin = 4;
423+
kRequiredTCNotAccepted = 5;
424+
kTCAcknowledgementsNotReceived = 6;
425+
kTCMinVersionNotMet = 7;
423426
}
424427

425428
enum RegulatoryLocationTypeEnum : enum8 {
@@ -428,6 +431,10 @@ cluster GeneralCommissioning = 48 {
428431
kIndoorOutdoor = 2;
429432
}
430433

434+
bitmap Feature : bitmap32 {
435+
kTermsAndConditions = 0x1;
436+
}
437+
431438
struct BasicCommissioningInfo {
432439
int16u failSafeExpiryLengthSeconds = 0;
433440
int16u maxCumulativeFailsafeSeconds = 1;
@@ -438,6 +445,10 @@ cluster GeneralCommissioning = 48 {
438445
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
439446
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
440447
readonly attribute boolean supportsConcurrentConnection = 4;
448+
readonly attribute access(read: administer) optional nullable int16u TCAcceptedVersion = 5;
449+
readonly attribute access(read: administer) optional nullable int16u TCMinRequiredVersion = 6;
450+
readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
451+
readonly attribute access(read: administer) optional nullable boolean TCAcknowledgementsRequired = 8;
441452
readonly attribute command_id generatedCommandList[] = 65528;
442453
readonly attribute command_id acceptedCommandList[] = 65529;
443454
readonly attribute event_id eventList[] = 65530;
@@ -471,12 +482,23 @@ cluster GeneralCommissioning = 48 {
471482
char_string debugText = 1;
472483
}
473484

485+
request struct SetTCAcknowledgementsRequest {
486+
int16u TCVersion = 0;
487+
bitmap16 TCUserResponse = 1;
488+
}
489+
490+
response struct SetTCAcknowledgementsResponse = 7 {
491+
CommissioningErrorEnum errorCode = 0;
492+
}
493+
474494
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
475495
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
476496
/** Set the regulatory configuration to be used during commissioning */
477497
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
478498
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
479499
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
500+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
501+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
480502
}
481503

482504
/** 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
@@ -420,6 +420,9 @@ cluster GeneralCommissioning = 48 {
420420
kInvalidAuthentication = 2;
421421
kNoFailSafe = 3;
422422
kBusyWithOtherAdmin = 4;
423+
kRequiredTCNotAccepted = 5;
424+
kTCAcknowledgementsNotReceived = 6;
425+
kTCMinVersionNotMet = 7;
423426
}
424427

425428
enum RegulatoryLocationTypeEnum : enum8 {
@@ -428,6 +431,10 @@ cluster GeneralCommissioning = 48 {
428431
kIndoorOutdoor = 2;
429432
}
430433

434+
bitmap Feature : bitmap32 {
435+
kTermsAndConditions = 0x1;
436+
}
437+
431438
struct BasicCommissioningInfo {
432439
int16u failSafeExpiryLengthSeconds = 0;
433440
int16u maxCumulativeFailsafeSeconds = 1;
@@ -438,6 +445,10 @@ cluster GeneralCommissioning = 48 {
438445
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
439446
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
440447
readonly attribute boolean supportsConcurrentConnection = 4;
448+
readonly attribute access(read: administer) optional nullable int16u TCAcceptedVersion = 5;
449+
readonly attribute access(read: administer) optional nullable int16u TCMinRequiredVersion = 6;
450+
readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
451+
readonly attribute access(read: administer) optional nullable boolean TCAcknowledgementsRequired = 8;
441452
readonly attribute command_id generatedCommandList[] = 65528;
442453
readonly attribute command_id acceptedCommandList[] = 65529;
443454
readonly attribute event_id eventList[] = 65530;
@@ -471,12 +482,23 @@ cluster GeneralCommissioning = 48 {
471482
char_string debugText = 1;
472483
}
473484

485+
request struct SetTCAcknowledgementsRequest {
486+
int16u TCVersion = 0;
487+
bitmap16 TCUserResponse = 1;
488+
}
489+
490+
response struct SetTCAcknowledgementsResponse = 7 {
491+
CommissioningErrorEnum errorCode = 0;
492+
}
493+
474494
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
475495
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
476496
/** Set the regulatory configuration to be used during commissioning */
477497
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
478498
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
479499
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
500+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
501+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
480502
}
481503

482504
/** 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
@@ -1358,6 +1358,9 @@ cluster GeneralCommissioning = 48 {
13581358
kInvalidAuthentication = 2;
13591359
kNoFailSafe = 3;
13601360
kBusyWithOtherAdmin = 4;
1361+
kRequiredTCNotAccepted = 5;
1362+
kTCAcknowledgementsNotReceived = 6;
1363+
kTCMinVersionNotMet = 7;
13611364
}
13621365

13631366
enum RegulatoryLocationTypeEnum : enum8 {
@@ -1366,6 +1369,10 @@ cluster GeneralCommissioning = 48 {
13661369
kIndoorOutdoor = 2;
13671370
}
13681371

1372+
bitmap Feature : bitmap32 {
1373+
kTermsAndConditions = 0x1;
1374+
}
1375+
13691376
struct BasicCommissioningInfo {
13701377
int16u failSafeExpiryLengthSeconds = 0;
13711378
int16u maxCumulativeFailsafeSeconds = 1;
@@ -1376,6 +1383,10 @@ cluster GeneralCommissioning = 48 {
13761383
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
13771384
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
13781385
readonly attribute boolean supportsConcurrentConnection = 4;
1386+
readonly attribute access(read: administer) optional nullable int16u TCAcceptedVersion = 5;
1387+
readonly attribute access(read: administer) optional nullable int16u TCMinRequiredVersion = 6;
1388+
readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
1389+
readonly attribute access(read: administer) optional nullable boolean TCAcknowledgementsRequired = 8;
13791390
readonly attribute command_id generatedCommandList[] = 65528;
13801391
readonly attribute command_id acceptedCommandList[] = 65529;
13811392
readonly attribute event_id eventList[] = 65530;
@@ -1409,12 +1420,23 @@ cluster GeneralCommissioning = 48 {
14091420
char_string debugText = 1;
14101421
}
14111422

1423+
request struct SetTCAcknowledgementsRequest {
1424+
int16u TCVersion = 0;
1425+
bitmap16 TCUserResponse = 1;
1426+
}
1427+
1428+
response struct SetTCAcknowledgementsResponse = 7 {
1429+
CommissioningErrorEnum errorCode = 0;
1430+
}
1431+
14121432
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
14131433
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
14141434
/** Set the regulatory configuration to be used during commissioning */
14151435
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
14161436
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
14171437
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
1438+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
1439+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
14181440
}
14191441

14201442
/** 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
@@ -1238,6 +1238,9 @@ cluster GeneralCommissioning = 48 {
12381238
kInvalidAuthentication = 2;
12391239
kNoFailSafe = 3;
12401240
kBusyWithOtherAdmin = 4;
1241+
kRequiredTCNotAccepted = 5;
1242+
kTCAcknowledgementsNotReceived = 6;
1243+
kTCMinVersionNotMet = 7;
12411244
}
12421245

12431246
enum RegulatoryLocationTypeEnum : enum8 {
@@ -1246,6 +1249,10 @@ cluster GeneralCommissioning = 48 {
12461249
kIndoorOutdoor = 2;
12471250
}
12481251

1252+
bitmap Feature : bitmap32 {
1253+
kTermsAndConditions = 0x1;
1254+
}
1255+
12491256
struct BasicCommissioningInfo {
12501257
int16u failSafeExpiryLengthSeconds = 0;
12511258
int16u maxCumulativeFailsafeSeconds = 1;
@@ -1256,6 +1263,10 @@ cluster GeneralCommissioning = 48 {
12561263
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
12571264
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
12581265
readonly attribute boolean supportsConcurrentConnection = 4;
1266+
readonly attribute access(read: administer) optional nullable int16u TCAcceptedVersion = 5;
1267+
readonly attribute access(read: administer) optional nullable int16u TCMinRequiredVersion = 6;
1268+
readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
1269+
readonly attribute access(read: administer) optional nullable boolean TCAcknowledgementsRequired = 8;
12591270
readonly attribute command_id generatedCommandList[] = 65528;
12601271
readonly attribute command_id acceptedCommandList[] = 65529;
12611272
readonly attribute event_id eventList[] = 65530;
@@ -1289,12 +1300,23 @@ cluster GeneralCommissioning = 48 {
12891300
char_string debugText = 1;
12901301
}
12911302

1303+
request struct SetTCAcknowledgementsRequest {
1304+
int16u TCVersion = 0;
1305+
bitmap16 TCUserResponse = 1;
1306+
}
1307+
1308+
response struct SetTCAcknowledgementsResponse = 7 {
1309+
CommissioningErrorEnum errorCode = 0;
1310+
}
1311+
12921312
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
12931313
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
12941314
/** Set the regulatory configuration to be used during commissioning */
12951315
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
12961316
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
12971317
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
1318+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
1319+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
12981320
}
12991321

13001322
/** 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
@@ -823,6 +823,9 @@ cluster GeneralCommissioning = 48 {
823823
kInvalidAuthentication = 2;
824824
kNoFailSafe = 3;
825825
kBusyWithOtherAdmin = 4;
826+
kRequiredTCNotAccepted = 5;
827+
kTCAcknowledgementsNotReceived = 6;
828+
kTCMinVersionNotMet = 7;
826829
}
827830

828831
enum RegulatoryLocationTypeEnum : enum8 {
@@ -831,6 +834,10 @@ cluster GeneralCommissioning = 48 {
831834
kIndoorOutdoor = 2;
832835
}
833836

837+
bitmap Feature : bitmap32 {
838+
kTermsAndConditions = 0x1;
839+
}
840+
834841
struct BasicCommissioningInfo {
835842
int16u failSafeExpiryLengthSeconds = 0;
836843
int16u maxCumulativeFailsafeSeconds = 1;
@@ -841,6 +848,10 @@ cluster GeneralCommissioning = 48 {
841848
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
842849
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
843850
readonly attribute boolean supportsConcurrentConnection = 4;
851+
readonly attribute access(read: administer) optional nullable int16u TCAcceptedVersion = 5;
852+
readonly attribute access(read: administer) optional nullable int16u TCMinRequiredVersion = 6;
853+
readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
854+
readonly attribute access(read: administer) optional nullable boolean TCAcknowledgementsRequired = 8;
844855
readonly attribute command_id generatedCommandList[] = 65528;
845856
readonly attribute command_id acceptedCommandList[] = 65529;
846857
readonly attribute event_id eventList[] = 65530;
@@ -874,12 +885,23 @@ cluster GeneralCommissioning = 48 {
874885
char_string debugText = 1;
875886
}
876887

888+
request struct SetTCAcknowledgementsRequest {
889+
int16u TCVersion = 0;
890+
bitmap16 TCUserResponse = 1;
891+
}
892+
893+
response struct SetTCAcknowledgementsResponse = 7 {
894+
CommissioningErrorEnum errorCode = 0;
895+
}
896+
877897
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
878898
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
879899
/** Set the regulatory configuration to be used during commissioning */
880900
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
881901
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
882902
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
903+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
904+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
883905
}
884906

885907
/** 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
@@ -776,6 +776,9 @@ cluster GeneralCommissioning = 48 {
776776
kInvalidAuthentication = 2;
777777
kNoFailSafe = 3;
778778
kBusyWithOtherAdmin = 4;
779+
kRequiredTCNotAccepted = 5;
780+
kTCAcknowledgementsNotReceived = 6;
781+
kTCMinVersionNotMet = 7;
779782
}
780783

781784
enum RegulatoryLocationTypeEnum : enum8 {
@@ -784,6 +787,10 @@ cluster GeneralCommissioning = 48 {
784787
kIndoorOutdoor = 2;
785788
}
786789

790+
bitmap Feature : bitmap32 {
791+
kTermsAndConditions = 0x1;
792+
}
793+
787794
struct BasicCommissioningInfo {
788795
int16u failSafeExpiryLengthSeconds = 0;
789796
int16u maxCumulativeFailsafeSeconds = 1;
@@ -794,6 +801,10 @@ cluster GeneralCommissioning = 48 {
794801
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
795802
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
796803
readonly attribute boolean supportsConcurrentConnection = 4;
804+
readonly attribute access(read: administer) optional nullable int16u TCAcceptedVersion = 5;
805+
readonly attribute access(read: administer) optional nullable int16u TCMinRequiredVersion = 6;
806+
readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
807+
readonly attribute access(read: administer) optional nullable boolean TCAcknowledgementsRequired = 8;
797808
readonly attribute command_id generatedCommandList[] = 65528;
798809
readonly attribute command_id acceptedCommandList[] = 65529;
799810
readonly attribute event_id eventList[] = 65530;
@@ -827,12 +838,23 @@ cluster GeneralCommissioning = 48 {
827838
char_string debugText = 1;
828839
}
829840

841+
request struct SetTCAcknowledgementsRequest {
842+
int16u TCVersion = 0;
843+
bitmap16 TCUserResponse = 1;
844+
}
845+
846+
response struct SetTCAcknowledgementsResponse = 7 {
847+
CommissioningErrorEnum errorCode = 0;
848+
}
849+
830850
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
831851
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
832852
/** Set the regulatory configuration to be used during commissioning */
833853
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
834854
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
835855
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
856+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
857+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
836858
}
837859

838860
/** 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
@@ -492,6 +492,9 @@ cluster GeneralCommissioning = 48 {
492492
kInvalidAuthentication = 2;
493493
kNoFailSafe = 3;
494494
kBusyWithOtherAdmin = 4;
495+
kRequiredTCNotAccepted = 5;
496+
kTCAcknowledgementsNotReceived = 6;
497+
kTCMinVersionNotMet = 7;
495498
}
496499

497500
enum RegulatoryLocationTypeEnum : enum8 {
@@ -500,6 +503,10 @@ cluster GeneralCommissioning = 48 {
500503
kIndoorOutdoor = 2;
501504
}
502505

506+
bitmap Feature : bitmap32 {
507+
kTermsAndConditions = 0x1;
508+
}
509+
503510
struct BasicCommissioningInfo {
504511
int16u failSafeExpiryLengthSeconds = 0;
505512
int16u maxCumulativeFailsafeSeconds = 1;
@@ -510,6 +517,10 @@ cluster GeneralCommissioning = 48 {
510517
readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
511518
readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
512519
readonly attribute boolean supportsConcurrentConnection = 4;
520+
readonly attribute access(read: administer) optional nullable int16u TCAcceptedVersion = 5;
521+
readonly attribute access(read: administer) optional nullable int16u TCMinRequiredVersion = 6;
522+
readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
523+
readonly attribute access(read: administer) optional nullable boolean TCAcknowledgementsRequired = 8;
513524
readonly attribute command_id generatedCommandList[] = 65528;
514525
readonly attribute command_id acceptedCommandList[] = 65529;
515526
readonly attribute event_id eventList[] = 65530;
@@ -543,12 +554,23 @@ cluster GeneralCommissioning = 48 {
543554
char_string debugText = 1;
544555
}
545556

557+
request struct SetTCAcknowledgementsRequest {
558+
int16u TCVersion = 0;
559+
bitmap16 TCUserResponse = 1;
560+
}
561+
562+
response struct SetTCAcknowledgementsResponse = 7 {
563+
CommissioningErrorEnum errorCode = 0;
564+
}
565+
546566
/** Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock */
547567
command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
548568
/** Set the regulatory configuration to be used during commissioning */
549569
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
550570
/** Signals the Server that the Client has successfully completed all steps of Commissioning/Recofiguration needed during fail-safe period. */
551571
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
572+
/** This command sets the user acknowledgements received in the Enhanced Setup Flow Terms and Conditions into the node. */
573+
command access(invoke: administer) SetTCAcknowledgements(SetTCAcknowledgementsRequest): SetTCAcknowledgementsResponse = 6;
552574
}
553575

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

0 commit comments

Comments
 (0)