Address review comments

project-chip · Feb 8, 2023 · fca0b0f · fca0b0f
1 parent 324f52c
commit fca0b0f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/examples/chip-tool/commands/pairing/Commands.h b/examples/chip-tool/commands/pairing/Commands.h
@@ -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)
     {}
 };
 

diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp
@@ -100,7 +100,7 @@ CommissioningParameters PairingCommand::GetCommissioningParameters()
     case PairingNetworkType::Thread:
         params.SetThreadOperationalDataset(mOperationalDataset);
         break;
-    case PairingNetworkType::Ethernet:
+    case PairingNetworkType::Network:
     case PairingNetworkType::None:
         break;
     }

diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h
@@ -43,7 +43,7 @@ enum class PairingNetworkType
     None,
     WiFi,
     Thread,
-    Ethernet,
+    Network,
 };
 
 class PairingCommand : public CHIPCommand,
@@ -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);
@@ -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);
-Original file 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)
         {}
     };
@@ Expand Down @@