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

Make breadcrumb optional in network commissioning cluster commands. #17007

Merged
merged 3 commits into from
Apr 4, 2022
Merged

Make breadcrumb optional in network commissioning cluster commands. #17007

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2929a63
Make breadcrumb optional in network commissioning cluster commands.
bzbarsky-apple Apr 4, 2022
86db700
Address review comments
bzbarsky-apple Apr 4, 2022
9cb9b85
Fix ZAP job
bzbarsky-apple Apr 4, 2022
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
12 changes: 6 additions & 6 deletions src/app/zap-templates/zcl/data-model/chip/commissioning.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ limitations under the License.
<command source="client" code="0x00" name="ScanNetworks" optional="false" response="ScanNetworksResponse" cli="chip network_commissioning scannetworks">
<description>TODO</description>
<arg name="SSID" type="OCTET_STRING"/>
<arg name="Breadcrumb" type="INT64U"/>
<arg name="Breadcrumb" type="INT64U" optional="true"/>
</command>
<command source="server" code="0x01" name="ScanNetworksResponse" optional="false" cli="chip network_commissioning scannetworksresponse">
<description>TODO</description>
Expand All @@ -107,17 +107,17 @@ limitations under the License.
<description>TODO</description>
<arg name="SSID" type="OCTET_STRING"/>
<arg name="Credentials" type="OCTET_STRING"/>
<arg name="breadcrumb" type="INT64U"/>
<arg name="breadcrumb" type="INT64U" optional="true"/>
</command>
<command source="client" code="0x03" name="AddOrUpdateThreadNetwork" optional="true" response="NetworkConfigResponse" cli="chip network_commissioning addorupdatethreadnetwork">
<description>TODO</description>
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved
<arg name="OperationalDataset" type="OCTET_STRING"/>
<arg name="Breadcrumb" type="INT64U"/>
<arg name="Breadcrumb" type="INT64U" optional="true"/>
</command>
<command source="client" code="0x04" name="RemoveNetwork" optional="false" response="NetworkConfigResponse" cli="chip network_commissioning removenetwork">
<description>TODO</description>
<arg name="NetworkID" type="OCTET_STRING"/>
<arg name="Breadcrumb" type="INT64U"/>
<arg name="Breadcrumb" type="INT64U" optional="true"/>
</command>
<command source="server" code="0x05" name="NetworkConfigResponse" optional="true" cli="chip network_commissioning addwifiresponse">
<description>TODO</description>
Expand All @@ -128,7 +128,7 @@ limitations under the License.
<command source="client" code="0x06" name="ConnectNetwork" optional="false" response="ConnectNetworkResponse" cli="chip network_commissioning connectnetwork">
<description>TODO</description>
<arg name="NetworkID" type="OCTET_STRING"/>
<arg name="Breadcrumb" type="INT64U"/>
<arg name="Breadcrumb" type="INT64U" optional="true"/>
</command>
<command source="server" code="0x07" name="ConnectNetworkResponse" optional="false" cli="chip network_commissioning connectnetworkresponse">
<description>TODO</description>
Expand All @@ -140,7 +140,7 @@ limitations under the License.
<description>TODO</description>
<arg name="NetworkID" type="OCTET_STRING"/>
<arg name="NetworkIndex" type="INT8U"/>
<arg name="Breadcrumb" type="INT64U"/>
<arg name="Breadcrumb" type="INT64U" optional="true"/>
</command>
</cluster>
<bitmap name="NetworkCommissioningFeature" type="BITMAP32">
Expand Down
12 changes: 6 additions & 6 deletions src/controller/CHIPDeviceController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1879,7 +1879,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
NetworkCommissioning::Commands::AddOrUpdateWiFiNetwork::Type request;
request.ssid = params.GetWiFiCredentials().Value().ssid;
request.credentials = params.GetWiFiCredentials().Value().credentials;
request.breadcrumb = breadcrumb;
request.breadcrumb.Emplace(breadcrumb);
SendCommand<NetworkCommissioningCluster>(proxy, request, OnNetworkConfigResponse, OnBasicFailure, endpoint, timeout);
}
break;
Expand All @@ -1892,7 +1892,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
}
NetworkCommissioning::Commands::AddOrUpdateThreadNetwork::Type request;
request.operationalDataset = params.GetThreadOperationalDataset().Value();
request.breadcrumb = breadcrumb;
request.breadcrumb.Emplace(breadcrumb);
SendCommand<NetworkCommissioningCluster>(proxy, request, OnNetworkConfigResponse, OnBasicFailure, endpoint, timeout);
}
break;
Expand All @@ -1904,8 +1904,8 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
return;
}
NetworkCommissioning::Commands::ConnectNetwork::Type request;
request.networkID = params.GetWiFiCredentials().Value().ssid;
request.breadcrumb = breadcrumb;
request.networkID = params.GetWiFiCredentials().Value().ssid;
request.breadcrumb.Emplace(breadcrumb);
SendCommand<NetworkCommissioningCluster>(proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout);
}
break;
Expand All @@ -1921,8 +1921,8 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
return;
}
NetworkCommissioning::Commands::ConnectNetwork::Type request;
request.networkID = extendedPanId;
request.breadcrumb = breadcrumb;
request.networkID = extendedPanId;
request.breadcrumb.Emplace(breadcrumb);
SendCommand<NetworkCommissioningCluster>(proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout);
}
break;
Expand Down
24 changes: 12 additions & 12 deletions zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
View file
Open in desktop

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