Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the spec-required FabricIndex field to Leave event. #21247

Merged
merged 1 commit into from
Jul 28, 2022
Merged

Add the spec-required FabricIndex field to Leave event. #21247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
12 changes: 6 additions & 6 deletions examples/chip-tool/templates/logging/DataModelLogger-src.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,26 +135,26 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
ChipLogProgress(chipTool, "Endpoint: %u Cluster: " ChipLogFormatMEI " Event " ChipLogFormatMEI, header.mPath.mEndpointId,
ChipLogValueMEI(header.mPath.mClusterId), ChipLogValueMEI(header.mPath.mEventId));

ChipLogProgress(chipTool, "\t Event number: %" PRIu64, header.mEventNumber);
ChipLogProgress(chipTool, " Event number: %" PRIu64, header.mEventNumber);

if (header.mPriorityLevel == chip::app::PriorityLevel::Info)
{
ChipLogProgress(chipTool, "\t Priority: Info");
ChipLogProgress(chipTool, " Priority: Info");
}
else if (header.mPriorityLevel == chip::app::PriorityLevel::Critical)
{
ChipLogProgress(chipTool, "\t Priority: Critical");
ChipLogProgress(chipTool, " Priority: Critical");
}
else if (header.mPriorityLevel == chip::app::PriorityLevel::Debug)
{
ChipLogProgress(chipTool, "\t Priority: Debug");
ChipLogProgress(chipTool, " Priority: Debug");
}
else
{
ChipLogProgress(chipTool, "\t Priority: Unknown");
ChipLogProgress(chipTool, " Priority: Unknown");
}

ChipLogProgress(chipTool, "\t Timestamp: %" PRIu64, header.mTimestamp.mValue);
ChipLogProgress(chipTool, " Timestamp: %" PRIu64, header.mTimestamp.mValue);

switch (header.mPath.mClusterId)
{
Expand Down
1 change: 1 addition & 0 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/lighting-common/lighting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/lock-app/lock-common/lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/pump-app/pump-common/pump-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/thermostat/thermostat-common/thermostat.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/tv-app/tv-common/tv-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions examples/window-app/common/window-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ server cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
1 change: 1 addition & 0 deletions src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ class OpCredsFabricTableDelegate : public chip::FabricTable::Delegate
{
// If Basic cluster is implemented on this endpoint
Basic::Events::Leave::Type event;
event.fabricIndex = fabricIndex;
EventNumber eventNumber;

if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
Expand Down
1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ limitations under the License.
</event>
<event side="server" code="0x02" name="Leave" priority="info" optional="false">
<description>The Leave event SHOULD be emitted by a Node prior to permanently leaving the Fabric.</description>
<field id="0" name="FabricIndex" type="fabric_idx"/>
</event>
<event side="server" code="0x03" name="ReachableChanged" priority="info" optional="true">
<description>This event (when supported) SHALL be generated when there is a change in the Reachable attribute.</description>
Expand Down
1 change: 1 addition & 0 deletions src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,7 @@ client cluster Basic = 40 {
}

info event Leave = 2 {
fabric_idx fabricIndex = 0;
}

info event ReachableChanged = 3 {
Expand Down
11 changes: 9 additions & 2 deletions src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/controller/python/chip/clusters/Objects.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading