Fixed BACnet Shell CMakeLists to include C shell files.

Author: skarg

zephyr/subsys/CMakeLists.txt

@@ -1,13 +1,11 @@
 # Copyright (c) 2020 Legrand North America, LLC.
 # SPDX-License-Identifier: Apache-2.0
-message(STATUS "BACNETSTACK: CONFIG_BACNETSTACK_BACNET_SETTINGS \"${CONFIG_BACNETSTACK_BACNET_SETTINGS}\"")
-message(STATUS "BACNETSTACK: CONFIG_BACNETSTACK_BACNET_SHELL \"${CONFIG_BACNETSTACK_BACNET_SHELL}\"")
 message(STATUS "BACNETSTACK: CONFIG_BACNETSTACK_BACNET_SERVER \"${CONFIG_BACNETSTACK_BACNET_SERVER}\"")
 message(STATUS "BACNETSTACK: CONFIG_BACNETSTACK_BACNET_OBJECT \"${CONFIG_BACNETSTACK_BACNET_OBJECT}\"")
 
 add_subdirectory(bacnet_datalink)
 add_subdirectory(bacnet_osif)
-add_subdirectory_ifdef(CONFIG_BACNETSTACK_BACNET_SETTINGS bacnet_settings)
-add_subdirectory_ifdef(CONFIG_BACNETSTACK_BACNET_SHELL bacnet_shell)
+add_subdirectory(bacnet_settings)
+add_subdirectory(bacnet_shell)
 add_subdirectory_ifdef(CONFIG_BACNETSTACK_BACNET_SERVER server)
 add_subdirectory_ifdef(CONFIG_BACNETSTACK_BACNET_OBJECT object)

zephyr/subsys/bacnet_shell/CMakeLists.txt

@@ -7,11 +7,11 @@ zephyr_library(bacnet_shell)
 
 zephyr_library_include_directories(include)
 
-zephyr_library_sources_ifdef(BACNETSTACK_BACNET_SHELL
+zephyr_library_sources_ifdef(CONFIG_BACNETSTACK_BACNET_SHELL
   bacnet_shell.c
 )
 
-zephyr_library_sources_ifdef(BACNETSTACK_BACNET_BASIC_SHELL
+zephyr_library_sources_ifdef(CONFIG_BACNETSTACK_BACNET_BASIC_SHELL
   bacnet_shell_objects.c
   bacnet_shell_packets.c
   bacnet_shell_uptime.c

zephyr/subsys/bacnet_shell/Kconfig

@@ -4,22 +4,22 @@
 # @date May 2024
 # @copyright SPDX-License-Identifier: Apache-2.0
 
-config BACNETSTACK_BACNET_SHELL
-    bool "BACnet Shell"
-    default n
-    select SHELL
-    select CONSOLE
-    select KERNEL_SHELL
-    select THREAD_MONITOR
-    select THREAD_NAME
-    select DEVICE_SHELL
-    select LOG
+menuconfig BACNETSTACK_BACNET_SHELL
+    bool "BACNETSTACK_BACNET_SHELL"
+    default y if BACNETSTACK && SHELL
     help
-      Enable BACnet Shell support
+      This option enables BACnet Shell services
 
-config BACNETSTACK_BACNET_BASIC_SHELL
-    bool "BACnet Basic subsystem shell"
-    default n
-    depends on BACNETSTACK_BACNET_SHELL
-    help
-      Enable BACnet Basic subsystem shell support
+if BACNETSTACK_BACNET_SHELL
+
+    module = BACNETSTACK_BACNET_SHELL
+    module-str = bacnet_shell
+
+    config BACNETSTACK_BACNET_BASIC_SHELL
+        bool "BACnet Basic subsystem shell"
+        default n
+        depends on BACNETSTACK_BACNET_SHELL
+        help
+          Enable BACnet Basic subsystem shell support
+
+endif # BACNETSTACK_BACNET_SHELL