treewide: Add shell commands for modules

Place shell commands for modules in separate files. This makes it
easier to distribute the shell commands to the correct modules.

Also removes the need to have a separate shell module.

Signed-off-by: Simen S. Røstad <simen.rostad@nordicsemi.no>

Author: simensrostad

app/CMakeLists.txt

@@ -26,7 +26,6 @@ add_subdirectory(src/modules/button)
 add_subdirectory_ifdef(CONFIG_APP_POWER src/modules/power)
 add_subdirectory_ifdef(CONFIG_APP_ENVIRONMENTAL src/modules/environmental)
 add_subdirectory_ifdef(CONFIG_APP_LED src/modules/led)
-add_subdirectory_ifdef(CONFIG_APP_SHELL src/modules/shell)
 
 if (CONFIG_NRF_CLOUD_COAP_SEC_TAG GREATER_EQUAL 2147483648 AND CONFIG_NRF_CLOUD_COAP_SEC_TAG LESS_EQUAL 2147483667)
 	message(WARNING "CONFIG_NRF_CLOUD_COAP_SEC_TAG is set to a developer security tag. "

app/Kconfig

@@ -21,7 +21,6 @@ rsource "src/modules/location/Kconfig.location"
 rsource "src/modules/led/Kconfig.led"
 rsource "src/modules/fota/Kconfig.fota"
 rsource "src/modules/environmental/Kconfig.environmental"
-rsource "src/modules/shell/Kconfig.shell"
 rsource "src/modules/button/Kconfig.button"
 
 endmenu

app/src/modules/button/CMakeLists.txt

@@ -5,4 +5,5 @@
 #
 
 target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/button.c)
+target_sources_ifdef(CONFIG_APP_BUTTON_SHELL app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/button.c)
 target_include_directories(app PRIVATE .)

app/src/modules/button/Kconfig.button

@@ -6,6 +6,12 @@
 
 menu "Button"
 
+config APP_BUTTON_SHELL
+    bool "Button module shell"
+    default y if SHELL
+    help
+        Enable shell for the button module.
+
 module = APP_BUTTON
 module-str = Button
 source "subsys/logging/Kconfig.template.log_config"

app/src/modules/button/button_shell.c

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_DECLARE(button, CONFIG_APP_BUTTON_LOG_LEVEL);
+
+static int cmd_button_press(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	uint8_t button_number = strtol(argv[1], NULL, 10);
+
+        if (argc != 2) {
+                (void)shell_print(sh, "Invalid number of arguments (%d)", argc);
+                (void)shell_print(sh, "Usage: att_button_press <button_number>");
+                return 1;
+        }
+
+	if ((button_number != 1) && (button_number != 2)) {
+                (void)shell_print(sh, "Invalid button number: %d", button_number);
+		return 1;
+	}
+
+	LOG_DBG("Button %d pressed", button_number);
+
+	err = zbus_chan_pub(&BUTTON_CHAN, &button_number, K_SECONDS(1));
+	if (err) {
+		(void)shell_print(sh, "zbus_chan_pub, error: %d", err);
+		return 1;
+	}
+
+	return 0;
+}
+
+SHELL_CMD_ARG_REGISTER(att_button_press, NULL, "Asset Tracker Template Button Press", cmd_button_press, 1, 0);

app/src/modules/cloud/CMakeLists.txt

@@ -5,4 +5,5 @@
 #
 
 target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cloud_module.c)
+target_sources_ifdef(CONFIG_APP_CLOUD_SHELL app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cloud_module_shell.c)
 target_include_directories(app PRIVATE .)

app/src/modules/cloud/Kconfig.cloud

@@ -7,6 +7,12 @@
 menu "Cloud module"
 	depends on NRF_CLOUD_COAP
 
+config APP_CLOUD_SHELL
+	bool "Enable cloud shell"
+	default y if SHELL
+	help
+	  Enable cloud shell commands.
+
 config APP_CLOUD_CONFIRMABLE_MESSAGES
 	bool "Use confirmable messages"
 	help

app/src/modules/cloud/cloud_module_shell.c

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zbus/zbus.h>
+#include <net/nrf_cloud_defs.h>
+#include <date_time.h>
+
+LOG_MODULE_DECLARE(cloud, CONFIG_APP_CLOUD_LOG_LEVEL);
+
+#define PAYLOAD_MSG_TEMPLATE \
+	"{\"" NRF_CLOUD_JSON_MSG_TYPE_KEY "\":\"" NRF_CLOUD_JSON_MSG_TYPE_VAL_DATA "\"," \
+	"\"" NRF_CLOUD_JSON_APPID_KEY "\":\"%s\"," \
+	"\"" NRF_CLOUD_JSON_DATA_KEY "\":\"%s\"," \
+	"\"" NRF_CLOUD_MSG_TIMESTAMP_KEY "\":%lld}"
+
+static int cmd_publish(const struct shell *sh, size_t argc, char **argv)
+{
+	int err;
+	int64_t current_time;
+	struct cloud_payload payload = { 0 };
+
+	if (argc != 3) {
+		(void)shell_print(sh, "Invalid number of arguments (%d)", argc);
+		(void)shell_print(sh, "Usage: zbus publish payload_chan <appid> <data>");
+		return 1;
+	}
+
+	err = date_time_now(&current_time);
+	if (err) {
+		(void)shell_print(sh, "Failed to get current time, error: %d", err);
+		return 1;
+	}
+
+	err = snprintk(payload.buffer, sizeof(payload.buffer),
+		       PAYLOAD_MSG_TEMPLATE,
+		       argv[1], argv[2], current_time);
+	if (err < 0 || err >= sizeof(payload.buffer)) {
+		(void)shell_print(sh, "Failed to format payload, error: %d", err);
+		return 1;
+	}
+
+	payload.buffer_len = err;
+
+	(void)shell_print(sh, "Sending on payload channel: %s (%d bytes)",
+			  payload.buffer, payload.buffer_len);
+
+	err = zbus_chan_pub(&PAYLOAD_CHAN, &payload, K_SECONDS(1));
+	if (err) {
+		(void)shell_print(sh, "zbus_chan_pub, error: %d", err);
+		return 1;
+	}
+
+	return 0;
+}
+
+SHELL_CMD_ARG_REGISTER(att_cloud_publish, NULL, "Asset Tracker Template Cloud Shell", cmd_publish, 2, 0);

app/src/modules/network/CMakeLists.txt

@@ -5,4 +5,5 @@
 #
 
 target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/network.c)
+target_sources_ifdef(CONFIG_APP_NETWORK_SHELL app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/network_shell.c)
 target_include_directories(app PRIVATE .)

app/src/modules/network/Kconfig.network

@@ -7,6 +7,12 @@
 menu "Network"
 	depends on NRF_MODEM_LIB_NET_IF || (WIFI_NRF700X && WIFI_MGMT_EXT) || BOARD_NATIVE_POSIX
 
+config APP_NETWORK_SHELL
+	bool "Network module shell commands"
+	default y if SHELL
+	help
+	  Enable shell commands for the network module.
+
 config APP_NETWORK_THREAD_STACK_SIZE
 	int "Thread stack size"
 	default 2048

app/src/modules/network/network_shell.c

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zbus/zbus.h>
+
+LOG_MODULE_DECLARE(network, CONFIG_APP_NETWORK_LOG_LEVEL);
+
+static int cmd_connect(const struct shell *sh, size_t argc, char **argv)
+{
+	ARG_UNUSED(argc);
+	ARG_UNUSED(argv);
+
+	int err;
+	const struct network_msg msg = {
+		.type = NETWORK_CONNECT,
+	};
+
+	err = zbus_chan_pub(&NETWORK_CHAN, &msg, K_SECONDS(1));
+	if (err) {
+		(void)shell_print(sh, "zbus_chan_pub, error: %d", err);
+		return 1;
+	}
+
+	return 0;
+}
+
+static int cmd_disconnect(const struct shell *sh, size_t argc, char **argv)
+{
+	ARG_UNUSED(argc);
+	ARG_UNUSED(argv);
+
+	int err;
+	const struct network_msg msg = {
+		.type = NETWORK_DISCONNECT,
+	};
+
+	err = zbus_chan_pub(&NETWORK_CHAN, &msg, K_SECONDS(1));
+	if (err) {
+		(void)shell_print(sh, "zbus_chan_pub, error: %d", err);
+		return 1;
+	}
+
+	return 0;
+}
+
+SHELL_STATIC_SUBCMD_SET_CREATE(sub_cmds,
+			       SHELL_CMD(connect,
+					 NULL,
+					 "Connect to LTE",
+					 cmd_connect),
+			       SHELL_CMD(disconnect,
+					 NULL,
+					 "Disconnect from LTE",
+					 cmd_disconnect),
+			       SHELL_SUBCMD_SET_END
+);
+
+SHELL_CMD_REGISTER(att_network, &sub_cmds, "Asset Tracker Template Network Shell", NULL);