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

Delete log-only delegate from platform app for 'device address resolved' #15736

Merged
merged 2 commits into from
Mar 2, 2022
Merged

Delete log-only delegate from platform app for 'device address resolved' #15736

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9875cfe
Delete log-only delegate from platform app
andy31415 Mar 2, 2022
93bcf08
Remove the derive in pairing command
andy31415 Mar 2, 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
11 changes: 1 addition & 10 deletions examples/platform/linux/AppMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ CHIP_ERROR ShutdownCommissioner()
return CHIP_NO_ERROR;
}

class PairingCommand : public Controller::DevicePairingDelegate, public Controller::DeviceAddressUpdateDelegate
class PairingCommand : public Controller::DevicePairingDelegate
{
public:
PairingCommand() :
Expand All @@ -389,9 +389,6 @@ class PairingCommand : public Controller::DevicePairingDelegate, public Controll
void OnPairingDeleted(CHIP_ERROR error) override;
void OnCommissioningComplete(NodeId deviceId, CHIP_ERROR error) override;

/////////// DeviceAddressUpdateDelegate Interface /////////
void OnAddressUpdateComplete(NodeId nodeId, CHIP_ERROR error) override;

CHIP_ERROR UpdateNetworkAddress();

private:
Expand All @@ -413,11 +410,6 @@ CHIP_ERROR PairingCommand::UpdateNetworkAddress()
return gCommissioner.UpdateDevice(gRemoteId);
}

void PairingCommand::OnAddressUpdateComplete(NodeId nodeId, CHIP_ERROR err)
{
ChipLogProgress(AppServer, "OnAddressUpdateComplete: %s", ErrorStr(err));
}

void PairingCommand::OnStatusUpdate(DevicePairingDelegate::Status status)
{
switch (status)
Expand Down Expand Up @@ -527,7 +519,6 @@ CHIP_ERROR CommissionerPairOnNetwork(uint32_t pincode, uint16_t disc, Transport:
{
RendezvousParameters params = RendezvousParameters().SetSetupPINCode(pincode).SetDiscriminator(disc).SetPeerAddress(address);

gCommissioner.RegisterDeviceAddressUpdateDelegate(&gPairingCommand);
gCommissioner.RegisterPairingDelegate(&gPairingCommand);
gCommissioner.PairDevice(gRemoteId, params);

Expand Down