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

[chip-tool] Add pairing already-discovered command #24917

Merged
merged 3 commits into from
Feb 9, 2023
Merged

[chip-tool] Add pairing already-discovered command #24917

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
324f52c
[chip-tool] Add pairing already-discovered command
yufengwangca Feb 8, 2023
fca0b0f
Address review comments
yufengwangca Feb 8, 2023
9255e17
Use PairingNetworkType::None instead of PairingNetworkType::Network
yufengwangca Feb 9, 2023
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
2 changes: 1 addition & 1 deletion examples/chip-tool/commands/pairing/Commands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ class PairAlreadyDiscovered : public PairingCommand
{
public:
PairAlreadyDiscovered(CredentialIssuerCommands * credsIssuerConfig) :
PairingCommand("already-discovered", PairingMode::AlreadyDiscovered, PairingNetworkType::Ethernet, credsIssuerConfig)
PairingCommand("already-discovered", PairingMode::AlreadyDiscovered, PairingNetworkType::Network, credsIssuerConfig)
yufengwangca marked this conversation as resolved.
Show resolved Hide resolved
{}
};

Expand Down
2 changes: 1 addition & 1 deletion examples/chip-tool/commands/pairing/PairingCommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ CommissioningParameters PairingCommand::GetCommissioningParameters()
case PairingNetworkType::Thread:
params.SetThreadOperationalDataset(mOperationalDataset);
break;
case PairingNetworkType::Ethernet:
case PairingNetworkType::Network:
case PairingNetworkType::None:
break;
}
Expand Down
5 changes: 2 additions & 3 deletions examples/chip-tool/commands/pairing/PairingCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ enum class PairingNetworkType
None,
WiFi,
Thread,
Ethernet,
Network,
};

class PairingCommand : public CHIPCommand,
Expand All @@ -69,7 +69,7 @@ class PairingCommand : public CHIPCommand,
switch (networkType)
{
case PairingNetworkType::None:
case PairingNetworkType::Ethernet:
case PairingNetworkType::Network:
break;
case PairingNetworkType::WiFi:
AddArgument("ssid", &mSSID);
Expand Down Expand Up @@ -112,7 +112,6 @@ class PairingCommand : public CHIPCommand,
case PairingMode::AlreadyDiscovered:
AddArgument("skip-commissioning-complete", 0, 1, &mSkipCommissioningComplete);
AddArgument("setup-pin-code", 0, 134217727, &mSetupPINCode);
AddArgument("discriminator", 0, 4096, &mDiscriminator);
AddArgument("device-remote-ip", &mRemoteAddr);
AddArgument("device-remote-port", 0, UINT16_MAX, &mRemotePort);
AddArgument("pase-only", 0, 1, &mPaseOnly);
Expand Down