From 2160403f3ce041afd776d04c6cf78a3d11e34024 Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Tue, 7 Feb 2023 06:40:51 -0800 Subject: [PATCH] [chip-tool] Remove pairing ethernet command (#24892) --- examples/chip-tool/commands/pairing/Commands.h | 9 --------- .../chip-tool/commands/pairing/PairingCommand.cpp | 4 ---- examples/chip-tool/commands/pairing/PairingCommand.h | 11 ----------- 3 files changed, 24 deletions(-) diff --git a/examples/chip-tool/commands/pairing/Commands.h b/examples/chip-tool/commands/pairing/Commands.h index 0401c8888fffd7..25ddf5dd5a2593 100644 --- a/examples/chip-tool/commands/pairing/Commands.h +++ b/examples/chip-tool/commands/pairing/Commands.h @@ -173,14 +173,6 @@ class PairSoftAP : public PairingCommand {} }; -class Ethernet : public PairingCommand -{ -public: - Ethernet(CredentialIssuerCommands * credsIssuerConfig) : - PairingCommand("ethernet", PairingMode::Ethernet, PairingNetworkType::Ethernet, credsIssuerConfig) - {} -}; - class StartUdcServerCommand : public CHIPCommand { public: @@ -207,7 +199,6 @@ void registerCommandsPairing(Commands & commands, CredentialIssuerCommands * cre make_unique(credsIssuerConfig), make_unique(credsIssuerConfig), make_unique(credsIssuerConfig), - make_unique(credsIssuerConfig), make_unique(credsIssuerConfig), make_unique(credsIssuerConfig), make_unique(credsIssuerConfig), diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp index 6467e8ffcbe989..1c64a872371c26 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.cpp +++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp @@ -75,9 +75,6 @@ CHIP_ERROR PairingCommand::RunInternal(NodeId remoteId) case PairingMode::SoftAP: err = Pair(remoteId, PeerAddress::UDP(mRemoteAddr.address, mRemotePort, mRemoteAddr.interfaceId)); break; - case PairingMode::Ethernet: - err = Pair(remoteId, PeerAddress::UDP(mRemoteAddr.address, mRemotePort, mRemoteAddr.interfaceId)); - break; } return err; @@ -100,7 +97,6 @@ CommissioningParameters PairingCommand::GetCommissioningParameters() case PairingNetworkType::Thread: params.SetThreadOperationalDataset(mOperationalDataset); break; - case PairingNetworkType::Ethernet: case PairingNetworkType::None: break; } diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h index 656b4c60d4db02..0f8dbf4ad5fa71 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.h +++ b/examples/chip-tool/commands/pairing/PairingCommand.h @@ -34,7 +34,6 @@ enum class PairingMode CodePaseOnly, Ble, SoftAP, - Ethernet, OnNetwork, }; @@ -43,7 +42,6 @@ enum class PairingNetworkType None, WiFi, Thread, - Ethernet, }; class PairingCommand : public CHIPCommand, @@ -69,7 +67,6 @@ class PairingCommand : public CHIPCommand, switch (networkType) { case PairingNetworkType::None: - case PairingNetworkType::Ethernet: break; case PairingNetworkType::WiFi: AddArgument("ssid", &mSSID); @@ -109,14 +106,6 @@ class PairingCommand : public CHIPCommand, AddArgument("device-remote-port", 0, UINT16_MAX, &mRemotePort); AddArgument("pase-only", 0, 1, &mPaseOnly); break; - case PairingMode::Ethernet: - 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); - break; } switch (filterType)