From 46535375e5093c64214c91b7be82b04296add8d3 Mon Sep 17 00:00:00 2001
From: Alex Tsitsiura <s07641069@gmail.com>
Date: Thu, 1 Dec 2022 17:09:24 +0200
Subject: [PATCH] [Telink] Add shell commands support (#23796)

* Added shell CLI command "matter factoryreset" to Telink lighting-app

* [Telink] Restyled

* [Telink] use correct zephyr include path

* [Telink] reverted to using default shell commands set

Co-authored-by: Dmytro Huz <diman1436@gmail.com>
---
 config/telink/app/zephyr.conf     | 3 ++-
 src/lib/shell/MainLoopZephyr.cpp  | 4 ++--
 src/lib/shell/streamer_zephyr.cpp | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/telink/app/zephyr.conf b/config/telink/app/zephyr.conf
index c83f5aeccca9c4..bd920eff8b4d49 100644
--- a/config/telink/app/zephyr.conf
+++ b/config/telink/app/zephyr.conf
@@ -106,5 +106,6 @@ CONFIG_DYNAMIC_INTERRUPTS=y
 # nvs_sector_size = flash_page_size * mult = 256 * 8 = 2048
 CONFIG_SETTINGS_NVS_SECTOR_SIZE_MULT=8
 
-# Shall settings
+# Shell settings
+CONFIG_SHELL=n
 CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=255
\ No newline at end of file
diff --git a/src/lib/shell/MainLoopZephyr.cpp b/src/lib/shell/MainLoopZephyr.cpp
index e70a29c52c9dce..17b5d8438499a5 100644
--- a/src/lib/shell/MainLoopZephyr.cpp
+++ b/src/lib/shell/MainLoopZephyr.cpp
@@ -14,8 +14,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include <init.h>
-#include <shell/shell.h>
+#include <zephyr/init.h>
+#include <zephyr/shell/shell.h>
 
 #include <lib/core/CHIPError.h>
 #include <lib/shell/Engine.h>
diff --git a/src/lib/shell/streamer_zephyr.cpp b/src/lib/shell/streamer_zephyr.cpp
index 40a16d56fbbd94..aad69438ab24b0 100644
--- a/src/lib/shell/streamer_zephyr.cpp
+++ b/src/lib/shell/streamer_zephyr.cpp
@@ -24,8 +24,8 @@
 
 #include <cassert>
 
-#include <shell/shell.h>
-#include <shell/shell_uart.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_uart.h>
 
 namespace chip {
 namespace Shell {