Revert "[shell] Add 'server' command to shell app. (#13060)" (#13368)

This reverts commit 6bfde31.
project-chip · Jan 7, 2022 · 16bdace · 16bdace
1 parent b81facc
commit 16bdace
Show file tree

Hide file tree

Showing 22 changed files with 19 additions and 515 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -1,13 +1,14 @@
-
 14
 15
 16
 17
+ContentApp's
 18
 19
 20
 21
 22
+
 AAAA
 aabbccddeeff
 aarch
@@ -24,9 +25,9 @@ ACL
 AdapterAddress
 AdapterName
 adb
+addr
 AddOrUpdateThreadNetwork
 AddOrUpdateWiFiNetwork
-addr
 adk
 adoc
 AdvAutonomous
@@ -216,13 +217,11 @@ ConnectionData
 ConnectIP
 ConnectivityManager
 ConnectivityManagerImpl
-ConnectNetwork
 connstring
 conntype
 const
 ContentApp
 ContentAppPlatform
-ContentApp's
 ContentLaunch
 ContentLauncher
 contrib
@@ -355,6 +354,7 @@ elftools
 elock
 emberAfExternalAttributeReadCallback
 emberAfExternalAttributeWriteCallback
+ConnectNetwork
 EnableWiFiNetwork
 EndpointId
 endpointName
@@ -383,7 +383,6 @@ ExtendedPAN
 extern
 extpanid
 FabricId
-fabricIdx
 factoryreset
 fb
 fbb
@@ -751,8 +750,6 @@ pcaps
 PDFs
 PDK
 peerAddrStr
-peerNodeId
-peerSessionId
 pem
 percentageLiftValue
 pexpect
@@ -1009,9 +1006,8 @@ ttyUSB
 TXD
 txt
 UART
-udc
 UDC
-udcport
+udc
 udhcpc
 UDP
 UDPEndPoint

diff --git a/examples/platform/efr32/matter_shell.cpp b/examples/platform/efr32/matter_shell.cpp
@@ -71,7 +71,7 @@ void WaitForShellActivity()
 
 void startShellTask()
 {
-    int status = chip::Shell::Engine::Root().Init();
+    int status = chip::Shell::streamer_init(chip::Shell::streamer_get());
     assert(status == 0);
 
     // For now also register commands from shell_common (shell app).

diff --git a/examples/shell/README.md b/examples/shell/README.md
@@ -36,7 +36,6 @@ Done
 -   [otcli](README_OTCLI.md)
 -   [ping](#ping)
 -   [rand](#rand)
--   [server](README_SERVER.md)
 -   [version](#version)
 
 ## Matter Shell Command Details

diff --git a/examples/shell/README_SERVER.md b/examples/shell/README_SERVER.md
diff --git a/examples/shell/esp32/main/main.cpp b/examples/shell/esp32/main/main.cpp
@@ -36,10 +36,6 @@ extern "C" void app_main(void)
     chip::Platform::MemoryInit();
     chip::DeviceLayer::PlatformMgr().InitChipStack();
     chip::DeviceLayer::PlatformMgr().StartEventLoopTask();
-
-    int ret = Engine::Root().Init();
-    assert(ret == 0);
-
     cmd_ping_init();
     xTaskCreate(&chip_shell_task, "chip_shell", 2048, NULL, 5, NULL);
 }
diff --git a/examples/shell/mbed/main/main.cpp b/examples/shell/mbed/main/main.cpp
@@ -84,7 +84,7 @@ int main()
     }
 
     // Initialize the default streamer that was linked.
-    ret = Engine::Root().Init();
+    ret = streamer_init(streamer_get());
     if (ret)
     {
         ChipLogError(Shell, "Streamer initialization failed [%d]", ret);

diff --git a/examples/shell/shell_common/BUILD.gn b/examples/shell/shell_common/BUILD.gn
@@ -17,11 +17,6 @@ import("//build_overrides/openthread.gni")
 
 import("${chip_root}/src/platform/device.gni")
 
-declare_args() {
-  # Enable server command only on linux for now.
-  chip_shell_cmd_server = current_os == "linux" || current_os == "mac"
-}
-
 config("shell_common_config") {
   include_dirs = [
     ".",
@@ -32,7 +27,6 @@ config("shell_common_config") {
   defines = [
     "ENABLE_CHIP_SHELL",
     "OPENTHREAD_CONFIG_CLI_TRANSPORT=OT_CLI_TRANSPORT_CONSOLE",
-    "CHIP_SHELL_ENABLE_CMD_SERVER=${chip_shell_cmd_server}",
   ]
 }
 
@@ -67,23 +61,5 @@ static_library("shell_common") {
     }
   }
 
-  if (chip_shell_cmd_server) {
-    sources += [ "cmd_server.cpp" ]
-
-    import("${chip_root}/src/app/chip_data_model.gni")
-
-    sources += [
-      "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
-      "${chip_root}/examples/all-clusters-app/all-clusters-common/src/ota-requestor-stub.cpp",
-      "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
-    ]
-
-    include_dirs =
-        [ "${chip_root}/examples/all-clusters-app/all-clusters-common/include" ]
-
-    public_deps +=
-        [ "${chip_root}/examples/all-clusters-app/all-clusters-common" ]
-  }
-
   public_configs = [ ":shell_common_config" ]
 }