Disable OT CLI for non-shell apps + Disable OT joiner feature (#20223)

Co-authored-by: Dieter Van der Meulen <[email protected]>
project-chip · Jul 5, 2022 · 7025469 · 7025469
1 parent 346dbc0
commit 7025469
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/examples/lighting-app/qpg/include/CHIPProjectConfig.h b/examples/lighting-app/qpg/include/CHIPProjectConfig.h
@@ -117,13 +117,6 @@
  */
 #define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
 
-/**
- * CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI
- *
- * Enable Thread CLI interface at initialisation.
- */
-#define CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI 1
-
 /**
  *  @def CHIP_CONFIG_MAX_FABRICS
  *

diff --git a/examples/lock-app/qpg/include/CHIPProjectConfig.h b/examples/lock-app/qpg/include/CHIPProjectConfig.h
@@ -106,13 +106,6 @@
  */
 #define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
 
-/**
- * CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI
- *
- * Enable Thread CLI interface at initialisation.
- */
-#define CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI 1
-
 /**
  *  @def CHIP_CONFIG_MAX_FABRICS
  *

diff --git a/examples/platform/qpg/BUILD.gn b/examples/platform/qpg/BUILD.gn
@@ -39,6 +39,7 @@ source_set("qpg-matter-shell") {
     defines = [
       "OPENTHREAD_CONFIG_CLI_TRANSPORT=OT_CLI_TRANSPORT_CONSOLE",
       "ENABLE_CHIP_SHELL",
+      "CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI=1",
     ]
 
     sources = [

diff --git a/examples/platform/qpg/project_include/OpenThreadConfig.h b/examples/platform/qpg/project_include/OpenThreadConfig.h
@@ -73,7 +73,7 @@
 #define OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE 0
 
 #define OPENTHREAD_CONFIG_COAP_API_ENABLE 0
-#define OPENTHREAD_CONFIG_JOINER_ENABLE 1
+#define OPENTHREAD_CONFIG_JOINER_ENABLE 0
 #define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 0
 #define OPENTHREAD_CONFIG_UDP_FORWARD_ENABLE 0
 #define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 0