diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index f989ede4b43533..423b2729d3b663 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -451,7 +451,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -459,7 +459,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; @@ -3606,7 +3606,7 @@ server cluster TestCluster = 4294048773 { } info event TestFabricScopedEvent = 2 { - fabric_idx arg1 = 254; + fabric_idx fabricIndex = 254; } attribute boolean boolean = 0; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 9ef0f1ff6fe4ff..0c19fb115256af 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -396,7 +396,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -404,7 +404,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; @@ -3032,7 +3032,7 @@ server cluster TestCluster = 4294048773 { } info event TestFabricScopedEvent = 2 { - fabric_idx arg1 = 254; + fabric_idx fabricIndex = 254; } attribute boolean boolean = 0; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 192d27b2c8fff6..e3cf707e7f5a5e 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -254,7 +254,7 @@ client cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -262,7 +262,7 @@ client cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; @@ -322,7 +322,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -330,7 +330,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 97da0f40421653..e92672968a4a06 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -429,7 +429,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -437,7 +437,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 9ea4e7a9963e51..4e84e732f57bde 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -185,7 +185,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -193,7 +193,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index c6a9904c988bdd..5e0ea37afc471c 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -429,7 +429,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -437,7 +437,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 141d0f66ecf8e0..6792c9660a8701 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -198,7 +198,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -206,7 +206,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index b2b5e7487480f0..4a05d9bc6bb37f 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -422,7 +422,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -430,7 +430,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index ff04b5f9934278..5c6811536f3735 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -198,7 +198,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -206,7 +206,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index bd384a12d8524f..61defb3cd4693e 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -198,7 +198,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -206,7 +206,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 4570dcfa4b4ad1..a396aacde855d6 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -198,7 +198,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -206,7 +206,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 08849f0bb0845c..82bef801de3fe3 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -429,7 +429,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -437,7 +437,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index b60a868d1b3999..5fec94dc080cc9 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -499,7 +499,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -507,7 +507,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 3c6021167fc804..92474f5d1c20b8 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -346,7 +346,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -354,7 +354,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index bfdddb25db7e7e..fc7f5f348f8437 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -198,7 +198,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -206,7 +206,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 971e68e9f8ee8d..0f9fb6156862b6 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -309,7 +309,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -317,7 +317,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 0d7c1ffbde0ea6..2f46f5261ecc90 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -198,7 +198,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -206,7 +206,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 638550bb8a7c23..e662ad83da30dc 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -296,7 +296,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -304,7 +304,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index bb699502abca33..62fffed60474d2 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -296,7 +296,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -304,7 +304,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/chip-tool/templates/ComplexArgumentParser-src.zapt b/examples/chip-tool/templates/ComplexArgumentParser-src.zapt index 580118b3d014a8..24614f96f4768e 100644 --- a/examples/chip-tool/templates/ComplexArgumentParser-src.zapt +++ b/examples/chip-tool/templates/ComplexArgumentParser-src.zapt @@ -11,7 +11,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, {{zapTypeToEncodable {{#unless isOptional}} {{~! Fabric index fields are not sent on writes, so don't force people to provide them. ~}} - {{#unless (isStrEqual label ../struct_fabric_idx_field)}} + {{#unless (is_num_equal fieldIdentifier 254)}} ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("{{parent.name}}.{{asLowerCamelCase label}}", "{{asLowerCamelCase label}}", value.isMember("{{asLowerCamelCase label}}"))); {{/unless}} {{/unless}} @@ -22,7 +22,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, {{zapTypeToEncodable {{#if isOptional}} if (value.isMember("{{asLowerCamelCase label}}")) { - {{else if (isStrEqual label ../struct_fabric_idx_field)}} + {{else if (is_num_equal fieldIdentifier 254)}} if (value.isMember("{{asLowerCamelCase label}}")) { {{/if}} @@ -30,7 +30,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, {{zapTypeToEncodable ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.{{asLowerCamelCase label}}, value["{{asLowerCamelCase label}}"])); {{#if isOptional}} } - {{else if (isStrEqual label ../struct_fabric_idx_field)}} + {{else if (is_num_equal fieldIdentifier 254)}} } {{/if}} diff --git a/examples/chip-tool/templates/helper.js b/examples/chip-tool/templates/helper.js index a59280c155ae2d..742cbf703ed8b2 100644 --- a/examples/chip-tool/templates/helper.js +++ b/examples/chip-tool/templates/helper.js @@ -116,14 +116,7 @@ async function structs_with_cluster_name(options) continue; } - s.items.forEach(i => { - if (i.type.toLowerCase() == "fabric_idx") { - s.struct_fabric_idx_field = i.label; - } - }) - - if (s.struct_cluster_count == 1) - { + if (s.struct_cluster_count == 1) { const clusters = await zclQuery.selectStructClusters(this.global.db, s.id); blocks.push( { id : s.id, name : s.name, struct_fabric_idx_field : s.struct_fabric_idx_field, clusterName : clusters[0].name }); diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 308151883ecf10..85b9ddeefa32bd 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -374,7 +374,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -382,7 +382,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 5f4d31853f35ed..16b5a83dd68cf1 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -314,7 +314,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -322,7 +322,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 1473357623a139..8f3fcfd2a1df4f 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -207,7 +207,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -215,7 +215,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index 75377e1ac9f1a8..0abcc87051b916 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -46,7 +46,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -54,7 +54,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index 07fd85e68d3432..6c0966d0acd0e6 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -51,7 +51,7 @@ client cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -59,7 +59,7 @@ client cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; @@ -117,7 +117,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -125,7 +125,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 80d3b3e88cf779..cafac56cfeb1a6 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -51,7 +51,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -59,7 +59,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index ab85bf6228eb19..bf56559f5cb4f7 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -245,7 +245,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -253,7 +253,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 5448d745c86373..28eae7cc109e4b 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -160,7 +160,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -168,7 +168,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 76830d443cbb17..32cadb0a1f2cf1 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -65,7 +65,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -73,7 +73,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 9dedf82c5c8911..d7c8994b4e1177 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -317,7 +317,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -325,7 +325,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 553ba3577bd5ca..6788dd20cca3f4 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -223,7 +223,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -231,7 +231,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 3047552b9c7abe..3dbe063aa95494 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -572,7 +572,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -580,7 +580,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 9efbdd12b4de60..199c57678687c9 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -286,7 +286,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -294,7 +294,7 @@ server cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; diff --git a/src/app/clusters/access-control-server/access-control-server.cpp b/src/app/clusters/access-control-server/access-control-server.cpp index d03900855d182f..988f082c8c7cf2 100644 --- a/src/app/clusters/access-control-server/access-control-server.cpp +++ b/src/app/clusters/access-control-server/access-control-server.cpp @@ -86,7 +86,7 @@ CHIP_ERROR LogExtensionChangedEvent(const AccessControlCluster::Structs::Extensi const Access::SubjectDescriptor & subjectDescriptor, AccessControlCluster::ChangeTypeEnum changeType) { - ExtensionEvent event{ .changeType = changeType, .adminFabricIndex = subjectDescriptor.fabricIndex }; + ExtensionEvent event{ .changeType = changeType, .fabricIndex = subjectDescriptor.fabricIndex }; if (subjectDescriptor.authMode == Access::AuthMode::kCase) { @@ -387,7 +387,7 @@ void AccessControlAttribute::OnEntryChanged(const SubjectDescriptor * subjectDes } CHIP_ERROR err; - AclEvent event{ .changeType = ChangeTypeEnum::kChanged, .adminFabricIndex = subjectDescriptor->fabricIndex }; + AclEvent event{ .changeType = ChangeTypeEnum::kChanged, .fabricIndex = subjectDescriptor->fabricIndex }; if (changeType == ChangeType::kAdded) { diff --git a/src/app/zap-templates/partials/cluster-objects-struct.zapt b/src/app/zap-templates/partials/cluster-objects-struct.zapt index 2939e4c375a664..23d22ef5965496 100644 --- a/src/app/zap-templates/partials/cluster-objects-struct.zapt +++ b/src/app/zap-templates/partials/cluster-objects-struct.zapt @@ -16,15 +16,15 @@ namespace {{asUpperCamelCase name}} { CHIP_ERROR Decode(TLV::TLVReader &reader); {{/unless}} - static constexpr bool kIsFabricScoped = {{struct_is_fabric_scoped}}; + static constexpr bool kIsFabricScoped = {{isFabricScoped}}; - {{#if struct_is_fabric_scoped}} + {{#if isFabricScoped}} auto GetFabricIndex() const { - return {{ asLowerCamelCase struct_fabric_idx_field }}; + return fabricIndex; } void SetFabricIndex(chip::FabricIndex fabricIndex_) { - {{ asLowerCamelCase struct_fabric_idx_field }} = fabricIndex_; + fabricIndex = fabricIndex_; } CHIP_ERROR EncodeForWrite(TLV::TLVWriter &writer, TLV::Tag tag) const; @@ -46,15 +46,15 @@ namespace {{asUpperCamelCase name}} { CHIP_ERROR Decode(TLV::TLVReader &reader); - static constexpr bool kIsFabricScoped = {{struct_is_fabric_scoped}}; + static constexpr bool kIsFabricScoped = {{isFabricScoped}}; - {{#if struct_is_fabric_scoped}} + {{#if isFabricScoped}} auto GetFabricIndex() const { - return {{ asLowerCamelCase struct_fabric_idx_field }}; + return fabricIndex; } void SetFabricIndex(chip::FabricIndex fabricIndex_) { - {{ asLowerCamelCase struct_fabric_idx_field }} = fabricIndex_; + fabricIndex = fabricIndex_; } {{/if}} }; @@ -65,7 +65,7 @@ namespace {{asUpperCamelCase name}} { } // namespace {{asUpperCamelCase name}} {{else}} namespace {{asUpperCamelCase name}} { -{{#if struct_is_fabric_scoped}} +{{#if isFabricScoped}} CHIP_ERROR Type::EncodeForWrite(TLV::TLVWriter &writer, TLV::Tag tag) const { return DoEncode(writer, tag, NullOptional); @@ -79,12 +79,12 @@ CHIP_ERROR Type::EncodeForRead(TLV::TLVWriter &writer, TLV::Tag tag, FabricIndex CHIP_ERROR Type::DoEncode(TLV::TLVWriter &writer, TLV::Tag tag, const Optional & accessingFabricIndex) const { {{#if struct_has_fabric_sensitive_fields}} - bool includeSensitive = !accessingFabricIndex.HasValue() || (accessingFabricIndex.Value() == {{ asLowerCamelCase struct_fabric_idx_field }}); + bool includeSensitive = !accessingFabricIndex.HasValue() || (accessingFabricIndex.Value() == fabricIndex); {{/if}} TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); {{#zcl_struct_items}} - {{#if (isStrEqual label ../struct_fabric_idx_field)}} + {{#if (is_num_equal fieldIdentifier 254)}} if (accessingFabricIndex.HasValue()) { ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::k{{asUpperCamelCase label}})), {{asLowerCamelCase label}})); } diff --git a/src/app/zap-templates/partials/idl/structure_definition.zapt b/src/app/zap-templates/partials/idl/structure_definition.zapt index af6fbaea7124c0..9d58faef6735be 100644 --- a/src/app/zap-templates/partials/idl/structure_definition.zapt +++ b/src/app/zap-templates/partials/idl/structure_definition.zapt @@ -1,5 +1,6 @@ -{{#if struct_is_fabric_scoped}} -{{indent extraIndent~}} [fabric_scoped_by={{asUpperCamelCase struct_fabric_idx_field}}] +{{! TODO: IDL consumers can't parse the square bracket syntax }} +{{#if isFabricScoped_DISABLED_FOR_NOW}} +{{indent extraIndent~}} [fabric_scoped_by=FabricIndex] {{/if}} {{indent extraIndent~}} struct {{name}} { {{#zcl_struct_items}} diff --git a/src/app/zap-templates/templates/app/cluster-objects.zapt b/src/app/zap-templates/templates/app/cluster-objects.zapt index 93d7637b5005be..f88a85f578974b 100644 --- a/src/app/zap-templates/templates/app/cluster-objects.zapt +++ b/src/app/zap-templates/templates/app/cluster-objects.zapt @@ -177,15 +177,15 @@ public: static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; } static constexpr EventId GetEventId() { return Events::{{asUpperCamelCase name}}::Id; } static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; } - static constexpr bool kIsFabricScoped = {{event_is_fabric_scoped}}; + static constexpr bool kIsFabricScoped = {{isFabricSensitive}}; {{#zcl_event_fields}} {{zapTypeToEncodableClusterObjectType type}} {{asLowerCamelCase name}}{{> cluster_objects_field_init}}; {{/zcl_event_fields}} - {{#if event_is_fabric_scoped}} + {{#if isFabricSensitive}} auto GetFabricIndex() const { - return {{ asLowerCamelCase event_fabric_idx_field }}; + return fabricIndex; } {{/if}} diff --git a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml index 97b8b8ad8b4f9b..e85f6c220f2c04 100644 --- a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml @@ -47,19 +47,17 @@ limitations under the License. - + - - + - @@ -103,22 +101,20 @@ limitations under the License. - + The cluster SHALL send AccessControlEntryChanged events whenever its ACL attribute data is changed by an Administrator. - - + The cluster SHALL send AccessControlExtensionChanged events whenever its extension attribute data is changed by an Administrator. - diff --git a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml index f7cecaf94bf083..61db59a1b29c74 100644 --- a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml @@ -17,13 +17,12 @@ limitations under the License. - + - diff --git a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml index 5dd8b9d7ba0aae..99d2fc6483e396 100644 --- a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml +++ b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml @@ -108,11 +108,10 @@ limitations under the License. - + - OTA Software Update Requestor diff --git a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml index 3bfaeb980a6d32..5addebd25e05cf 100644 --- a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml @@ -17,19 +17,17 @@ limitations under the License. - + - - + - diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml index cb35cbdf3666a1..ce0c3d27ce4faf 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml @@ -17,14 +17,13 @@ limitations under the License. - + - @@ -41,11 +40,10 @@ limitations under the License. - + - diff --git a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml index 2af47d21b36e31..ba5db80d1708ef 100644 --- a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml @@ -22,7 +22,7 @@ limitations under the License. - + @@ -31,7 +31,6 @@ limitations under the License. - @@ -575,9 +574,8 @@ limitations under the License. - + Example test event - diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index b6933d5f7d681e..4400662d22371b 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -478,7 +478,7 @@ client cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } info event access(read: administer) AccessControlExtensionChanged = 1 { @@ -486,7 +486,7 @@ client cluster AccessControl = 31 { nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; - fabric_idx adminFabricIndex = 254; + fabric_idx fabricIndex = 254; } attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0; @@ -4168,7 +4168,7 @@ client cluster TestCluster = 4294048773 { } info event TestFabricScopedEvent = 2 { - fabric_idx arg1 = 254; + fabric_idx fabricIndex = 254; } attribute boolean boolean = 0; diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp index de6775d3df51d3..71daf31d9f8617 100644 --- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp @@ -319,12 +319,12 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & value_latestValue_fabricIndex); } - jobject value_adminFabricIndex; - std::string value_adminFabricIndexClassName = "java/lang/Integer"; - std::string value_adminFabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(value_adminFabricIndexClassName.c_str(), - value_adminFabricIndexCtorSignature.c_str(), - cppValue.adminFabricIndex, value_adminFabricIndex); + jobject value_fabricIndex; + std::string value_fabricIndexClassName = "java/lang/Integer"; + std::string value_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(value_fabricIndexClassName.c_str(), + value_fabricIndexCtorSignature.c_str(), + cppValue.fabricIndex, value_fabricIndex); jclass accessControlEntryChangedStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -347,7 +347,7 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & jobject value = env->NewObject(accessControlEntryChangedStructClass, accessControlEntryChangedStructCtor, value_adminNodeID, - value_adminPasscodeID, value_changeType, value_latestValue, value_adminFabricIndex); + value_adminPasscodeID, value_changeType, value_latestValue, value_fabricIndex); return value; } @@ -434,12 +434,12 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & value_latestValue_fabricIndex); } - jobject value_adminFabricIndex; - std::string value_adminFabricIndexClassName = "java/lang/Integer"; - std::string value_adminFabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(value_adminFabricIndexClassName.c_str(), - value_adminFabricIndexCtorSignature.c_str(), - cppValue.adminFabricIndex, value_adminFabricIndex); + jobject value_fabricIndex; + std::string value_fabricIndexClassName = "java/lang/Integer"; + std::string value_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(value_fabricIndexClassName.c_str(), + value_fabricIndexCtorSignature.c_str(), + cppValue.fabricIndex, value_fabricIndex); jclass accessControlExtensionChangedStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -463,7 +463,7 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & jobject value = env->NewObject(accessControlExtensionChangedStructClass, accessControlExtensionChangedStructCtor, value_adminNodeID, - value_adminPasscodeID, value_changeType, value_latestValue, value_adminFabricIndex); + value_adminPasscodeID, value_changeType, value_latestValue, value_fabricIndex); return value; } @@ -3394,11 +3394,12 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & { return nullptr; } - jobject value_arg1; - std::string value_arg1ClassName = "java/lang/Integer"; - std::string value_arg1CtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - value_arg1ClassName.c_str(), value_arg1CtorSignature.c_str(), cppValue.arg1, value_arg1); + jobject value_fabricIndex; + std::string value_fabricIndexClassName = "java/lang/Integer"; + std::string value_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(value_fabricIndexClassName.c_str(), + value_fabricIndexCtorSignature.c_str(), + cppValue.fabricIndex, value_fabricIndex); jclass testFabricScopedEventStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -3417,7 +3418,7 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & return nullptr; } - jobject value = env->NewObject(testFabricScopedEventStructClass, testFabricScopedEventStructCtor, value_arg1); + jobject value = env->NewObject(testFabricScopedEventStructClass, testFabricScopedEventStructCtor, value_fabricIndex); return value; } diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java index aac77c2687c54b..35c9fcf7626359 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java @@ -29,19 +29,19 @@ public static class AccessControlClusterAccessControlEntryChangedEvent { public @Nullable Integer adminPasscodeID; public Integer changeType; public @Nullable ChipStructs.AccessControlClusterAccessControlEntry latestValue; - public Integer adminFabricIndex; + public Integer fabricIndex; public AccessControlClusterAccessControlEntryChangedEvent( @Nullable Long adminNodeID, @Nullable Integer adminPasscodeID, Integer changeType, @Nullable ChipStructs.AccessControlClusterAccessControlEntry latestValue, - Integer adminFabricIndex) { + Integer fabricIndex) { this.adminNodeID = adminNodeID; this.adminPasscodeID = adminPasscodeID; this.changeType = changeType; this.latestValue = latestValue; - this.adminFabricIndex = adminFabricIndex; + this.fabricIndex = fabricIndex; } @Override @@ -60,8 +60,8 @@ public String toString() { output.append("\tlatestValue: "); output.append(latestValue); output.append("\n"); - output.append("\tadminFabricIndex: "); - output.append(adminFabricIndex); + output.append("\tfabricIndex: "); + output.append(fabricIndex); output.append("\n"); output.append("}\n"); return output.toString(); @@ -73,19 +73,19 @@ public static class AccessControlClusterAccessControlExtensionChangedEvent { public @Nullable Integer adminPasscodeID; public Integer changeType; public @Nullable ChipStructs.AccessControlClusterExtensionEntry latestValue; - public Integer adminFabricIndex; + public Integer fabricIndex; public AccessControlClusterAccessControlExtensionChangedEvent( @Nullable Long adminNodeID, @Nullable Integer adminPasscodeID, Integer changeType, @Nullable ChipStructs.AccessControlClusterExtensionEntry latestValue, - Integer adminFabricIndex) { + Integer fabricIndex) { this.adminNodeID = adminNodeID; this.adminPasscodeID = adminPasscodeID; this.changeType = changeType; this.latestValue = latestValue; - this.adminFabricIndex = adminFabricIndex; + this.fabricIndex = fabricIndex; } @Override @@ -104,8 +104,8 @@ public String toString() { output.append("\tlatestValue: "); output.append(latestValue); output.append("\n"); - output.append("\tadminFabricIndex: "); - output.append(adminFabricIndex); + output.append("\tfabricIndex: "); + output.append(fabricIndex); output.append("\n"); output.append("}\n"); return output.toString(); @@ -1248,18 +1248,18 @@ public String toString() { } public static class TestClusterClusterTestFabricScopedEventEvent { - public Integer arg1; + public Integer fabricIndex; - public TestClusterClusterTestFabricScopedEventEvent(Integer arg1) { - this.arg1 = arg1; + public TestClusterClusterTestFabricScopedEventEvent(Integer fabricIndex) { + this.fabricIndex = fabricIndex; } @Override public String toString() { StringBuilder output = new StringBuilder(); output.append("TestClusterClusterTestFabricScopedEventEvent {\n"); - output.append("\targ1: "); - output.append(arg1); + output.append("\tfabricIndex: "); + output.append(fabricIndex); output.append("\n"); output.append("}\n"); return output.toString(); diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 93586fc2196954..d2054cc4454748 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -3106,14 +3106,14 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="adminPasscodeID", Tag=2, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="changeType", Tag=3, Type=AccessControl.Enums.ChangeTypeEnum), ClusterObjectFieldDescriptor(Label="latestValue", Tag=4, Type=typing.Union[Nullable, AccessControl.Structs.AccessControlEntry]), - ClusterObjectFieldDescriptor(Label="adminFabricIndex", Tag=254, Type=uint), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) adminNodeID: 'typing.Union[Nullable, uint]' = NullValue adminPasscodeID: 'typing.Union[Nullable, uint]' = NullValue changeType: 'AccessControl.Enums.ChangeTypeEnum' = 0 latestValue: 'typing.Union[Nullable, AccessControl.Structs.AccessControlEntry]' = NullValue - adminFabricIndex: 'uint' = 0 + fabricIndex: 'uint' = 0 @dataclass class AccessControlExtensionChanged(ClusterEvent): @@ -3133,14 +3133,14 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="adminPasscodeID", Tag=2, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="changeType", Tag=3, Type=AccessControl.Enums.ChangeTypeEnum), ClusterObjectFieldDescriptor(Label="latestValue", Tag=4, Type=typing.Union[Nullable, AccessControl.Structs.ExtensionEntry]), - ClusterObjectFieldDescriptor(Label="adminFabricIndex", Tag=254, Type=uint), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) adminNodeID: 'typing.Union[Nullable, uint]' = NullValue adminPasscodeID: 'typing.Union[Nullable, uint]' = NullValue changeType: 'AccessControl.Enums.ChangeTypeEnum' = 0 latestValue: 'typing.Union[Nullable, AccessControl.Structs.ExtensionEntry]' = NullValue - adminFabricIndex: 'uint' = 0 + fabricIndex: 'uint' = 0 @dataclass @@ -28681,9 +28681,9 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="arg1", Tag=254, Type=uint), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) - arg1: 'uint' = 0 + fabricIndex: 'uint' = 0 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm index 4fd720ab45c0d1..37267dd5dc387e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm @@ -235,8 +235,8 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead } while (0); do { NSNumber * _Nonnull memberValue; - memberValue = [NSNumber numberWithUnsignedChar:cppValue.adminFabricIndex]; - value.adminFabricIndex = memberValue; + memberValue = [NSNumber numberWithUnsignedChar:cppValue.fabricIndex]; + value.fabricIndex = memberValue; } while (0); return value; @@ -289,8 +289,8 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead } while (0); do { NSNumber * _Nonnull memberValue; - memberValue = [NSNumber numberWithUnsignedChar:cppValue.adminFabricIndex]; - value.adminFabricIndex = memberValue; + memberValue = [NSNumber numberWithUnsignedChar:cppValue.fabricIndex]; + value.fabricIndex = memberValue; } while (0); return value; @@ -2173,8 +2173,8 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead do { NSNumber * _Nonnull memberValue; - memberValue = [NSNumber numberWithUnsignedChar:cppValue.arg1]; - value.arg1 = memberValue; + memberValue = [NSNumber numberWithUnsignedChar:cppValue.fabricIndex]; + value.fabricIndex = memberValue; } while (0); return value; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index a5d12d54ddb15b..828bdf0babb0c7 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -82,7 +82,7 @@ NS_ASSUME_NONNULL_BEGIN @property (strong, nonatomic) NSNumber * _Nullable adminPasscodeID; @property (strong, nonatomic) NSNumber * _Nonnull changeType; @property (strong, nonatomic) MTRAccessControlClusterAccessControlEntry * _Nullable latestValue; -@property (strong, nonatomic) NSNumber * _Nonnull adminFabricIndex; +@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @end @interface MTRAccessControlClusterAccessControlExtensionChangedEvent : NSObject @@ -90,7 +90,7 @@ NS_ASSUME_NONNULL_BEGIN @property (strong, nonatomic) NSNumber * _Nullable adminPasscodeID; @property (strong, nonatomic) NSNumber * _Nonnull changeType; @property (strong, nonatomic) MTRAccessControlClusterExtensionEntry * _Nullable latestValue; -@property (strong, nonatomic) NSNumber * _Nonnull adminFabricIndex; +@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @end @interface MTRBridgedActionsClusterActionStruct : NSObject @@ -790,7 +790,7 @@ NS_ASSUME_NONNULL_BEGIN @end @interface MTRTestClusterClusterTestFabricScopedEventEvent : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull arg1; +@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @end NS_ASSUME_NONNULL_END diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index ca7bfb733f967a..a4e5b887e80bfa 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -196,16 +196,16 @@ - (instancetype)init _latestValue = nil; - _adminFabricIndex = @(0); + _fabricIndex = @(0); } return self; } - (NSString *)description { - NSString * descriptionString = [NSString - stringWithFormat:@"<%@: adminNodeID:%@; adminPasscodeID:%@; changeType:%@; latestValue:%@; adminFabricIndex:%@; >", - NSStringFromClass([self class]), _adminNodeID, _adminPasscodeID, _changeType, _latestValue, _adminFabricIndex]; + NSString * descriptionString = + [NSString stringWithFormat:@"<%@: adminNodeID:%@; adminPasscodeID:%@; changeType:%@; latestValue:%@; fabricIndex:%@; >", + NSStringFromClass([self class]), _adminNodeID, _adminPasscodeID, _changeType, _latestValue, _fabricIndex]; return descriptionString; } @@ -224,16 +224,16 @@ - (instancetype)init _latestValue = nil; - _adminFabricIndex = @(0); + _fabricIndex = @(0); } return self; } - (NSString *)description { - NSString * descriptionString = [NSString - stringWithFormat:@"<%@: adminNodeID:%@; adminPasscodeID:%@; changeType:%@; latestValue:%@; adminFabricIndex:%@; >", - NSStringFromClass([self class]), _adminNodeID, _adminPasscodeID, _changeType, _latestValue, _adminFabricIndex]; + NSString * descriptionString = + [NSString stringWithFormat:@"<%@: adminNodeID:%@; adminPasscodeID:%@; changeType:%@; latestValue:%@; fabricIndex:%@; >", + NSStringFromClass([self class]), _adminNodeID, _adminPasscodeID, _changeType, _latestValue, _fabricIndex]; return descriptionString; } @@ -2599,14 +2599,15 @@ - (instancetype)init { if (self = [super init]) { - _arg1 = @(0); + _fabricIndex = @(0); } return self; } - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: arg1:%@; >", NSStringFromClass([self class]), _arg1]; + NSString * descriptionString = + [NSString stringWithFormat:@"<%@: fabricIndex:%@; >", NSStringFromClass([self class]), _fabricIndex]; return descriptionString; } diff --git a/third_party/zap/repo b/third_party/zap/repo index 4d97641953d88a..ea78da2e195f07 160000 --- a/third_party/zap/repo +++ b/third_party/zap/repo @@ -1 +1 @@ -Subproject commit 4d97641953d88a0449565d9fe6093fb95e239f87 +Subproject commit ea78da2e195f079f6b2d06c13bafea84b903c5e7 diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h index cfa3a10c40693a..c617ca134c91a3 100644 --- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h +++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h @@ -53,7 +53,7 @@ typedef struct _TestFabricScoped chip::CharSpan fabricSensitiveCharString; SimpleStruct fabricSensitiveStruct; /* TYPE WARNING: array array defaults to */ uint8_t * fabricSensitiveInt8uList; - chip::FabricIndex fabricIndex; + chip::FabricIndex FabricIndex; } TestFabricScoped; // Struct for Dimension diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index b7f9abcae5b4b8..dcdb87c0bd91c4 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -2989,7 +2989,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kChangeType)), changeType)); ReturnErrorOnFailure( DataModel::EncodeForRead(writer, TLV::ContextTag(to_underlying(Fields::kLatestValue)), GetFabricIndex(), latestValue)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAdminFabricIndex)), adminFabricIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -3020,8 +3020,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kLatestValue): ReturnErrorOnFailure(DataModel::Decode(reader, latestValue)); break; - case to_underlying(Fields::kAdminFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, adminFabricIndex)); + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); break; default: break; @@ -3043,7 +3043,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kChangeType)), changeType)); ReturnErrorOnFailure( DataModel::EncodeForRead(writer, TLV::ContextTag(to_underlying(Fields::kLatestValue)), GetFabricIndex(), latestValue)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAdminFabricIndex)), adminFabricIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -3074,8 +3074,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kLatestValue): ReturnErrorOnFailure(DataModel::Decode(reader, latestValue)); break; - case to_underlying(Fields::kAdminFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, adminFabricIndex)); + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); break; default: break; @@ -20598,7 +20598,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kArg1)), arg1)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -20617,8 +20617,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kArg1): - ReturnErrorOnFailure(DataModel::Decode(reader, arg1)); + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); break; default: break; diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index d6b1c9d3e85fd9..23e672ef00be1c 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -3514,11 +3514,11 @@ static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; enum class Fields { - kAdminNodeID = 1, - kAdminPasscodeID = 2, - kChangeType = 3, - kLatestValue = 4, - kAdminFabricIndex = 254, + kAdminNodeID = 1, + kAdminPasscodeID = 2, + kChangeType = 3, + kLatestValue = 4, + kFabricIndex = 254, }; struct Type @@ -3533,9 +3533,9 @@ struct Type DataModel::Nullable adminPasscodeID; ChangeTypeEnum changeType = static_cast(0); DataModel::Nullable latestValue; - chip::FabricIndex adminFabricIndex = static_cast(0); + chip::FabricIndex fabricIndex = static_cast(0); - auto GetFabricIndex() const { return adminFabricIndex; } + auto GetFabricIndex() const { return fabricIndex; } CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -3551,7 +3551,7 @@ struct DecodableType DataModel::Nullable adminPasscodeID; ChangeTypeEnum changeType = static_cast(0); DataModel::Nullable latestValue; - chip::FabricIndex adminFabricIndex = static_cast(0); + chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -3561,11 +3561,11 @@ static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; enum class Fields { - kAdminNodeID = 1, - kAdminPasscodeID = 2, - kChangeType = 3, - kLatestValue = 4, - kAdminFabricIndex = 254, + kAdminNodeID = 1, + kAdminPasscodeID = 2, + kChangeType = 3, + kLatestValue = 4, + kFabricIndex = 254, }; struct Type @@ -3580,9 +3580,9 @@ struct Type DataModel::Nullable adminPasscodeID; ChangeTypeEnum changeType = static_cast(0); DataModel::Nullable latestValue; - chip::FabricIndex adminFabricIndex = static_cast(0); + chip::FabricIndex fabricIndex = static_cast(0); - auto GetFabricIndex() const { return adminFabricIndex; } + auto GetFabricIndex() const { return fabricIndex; } CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -3598,7 +3598,7 @@ struct DecodableType DataModel::Nullable adminPasscodeID; ChangeTypeEnum changeType = static_cast(0); DataModel::Nullable latestValue; - chip::FabricIndex adminFabricIndex = static_cast(0); + chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -27747,7 +27747,7 @@ static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; enum class Fields { - kArg1 = 254, + kFabricIndex = 254, }; struct Type @@ -27758,9 +27758,9 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; } static constexpr bool kIsFabricScoped = true; - chip::FabricIndex arg1 = static_cast(0); + chip::FabricIndex fabricIndex = static_cast(0); - auto GetFabricIndex() const { return arg1; } + auto GetFabricIndex() const { return fabricIndex; } CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; @@ -27772,7 +27772,7 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::TestFabricScopedEvent::Id; } static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; } - chip::FabricIndex arg1 = static_cast(0); + chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index dd46baf9a08ba2..d1fa65531f150e 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -2382,10 +2382,10 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, } } { - CHIP_ERROR err = DataModelLogger::LogValue("AdminFabricIndex", indent + 1, value.adminFabricIndex); + CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminFabricIndex'"); + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'"); return err; } } @@ -2430,10 +2430,10 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, } } { - CHIP_ERROR err = DataModelLogger::LogValue("AdminFabricIndex", indent + 1, value.adminFabricIndex); + CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminFabricIndex'"); + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'"); return err; } } @@ -3454,10 +3454,10 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = DataModelLogger::LogValue("Arg1", indent + 1, value.arg1); + CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Arg1'"); + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'"); return err; } }