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

Jump to bottom

Update init params for controller to include ble layer #6315

Merged
merged 6 commits into from
Apr 28, 2021
Merged

Update init params for controller to include ble layer #6315

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d48ae22
Update init parameters for controller and commisioner, change CPP ref…
andy31415 Apr 27, 2021
19991f3
Update iOS arguments to controller init
andy31415 Apr 27, 2021
39ae79d
Revert unintentional changes in xml/settings files
andy31415 Apr 27, 2021
b53e560
Merge branch 'master' into 01_cleanup_controller_init
andy31415 Apr 28, 2021
07e2c16
Merge branch 'master' into 01_cleanup_controller_init
andy31415 Apr 28, 2021
c853210
Merge branch 'master' into 01_cleanup_controller_init
andy31415 Apr 28, 2021
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
3 changes: 3 additions & 0 deletions examples/chip-tool/commands/pairing/PairingCommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ CHIP_ERROR PairingCommand::Run(PersistentStorage & storage, NodeId localId, Node
params.mDeviceAddressUpdateDelegate = this;
params.pairingDelegate = this;

err = mCommissioner.SetUdpListenPort(storage.GetListenPort());
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if the UDP listen port should instead be part of the 'Init'.

Do we expect the UDP port to be changed/set up at a different point than init?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vivien-apple - should we create some PR later that puts this in the initializing parameters?

VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Init failure! Commissioner: %s", ErrorStr(err)));

err = mCommissioner.Init(localId, params);
VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Init failure! Commissioner: %s", ErrorStr(err)));

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.