treewide: Various cleanups

- 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.

- Remove config and error channels

- Update tests and references in modules to reflect the changes

- Update tests to use new name and shell commands

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

Author: simensrostad

app/CMakeLists.txt

@@ -10,7 +10,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project("Asset Tracker Template")
 
 # Include files that are common for all modules
-add_subdirectory(src/common)
+target_include_directories(app PRIVATE src/common)
 
 # Add main application source
 target_sources(app PRIVATE src/main.c)
@@ -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

@@ -6,13 +6,6 @@
 
 menu "Asset Tracker Template"
 
-config APP_PAYLOAD_CHANNEL_BUFFER_MAX_SIZE
-	int "Payload maximum buffer size"
-	default 128
-	help
-	  Maximum size of the buffer sent over the payload channel.
-	  Contains encoded CBOR data sampled and encoded in the various modules.
-
 rsource "src/Kconfig.main"
 rsource "src/modules/power/Kconfig.power"
 rsource "src/modules/network/Kconfig.network"
@@ -21,7 +14,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/prj.conf

@@ -200,7 +200,6 @@ CONFIG_APP_FOTA_LOG_LEVEL_DBG=y
 CONFIG_APP_LOCATION_LOG_LEVEL_DBG=y
 CONFIG_APP_CLOUD_LOG_LEVEL_DBG=y
 CONFIG_APP_NETWORK_LOG_LEVEL_DBG=y
-CONFIG_APP_SHELL_LOG_LEVEL_DBG=y
 CONFIG_APP_LOG_LEVEL_DBG=y
 
 # Task Watchdog

app/src/common/CMakeLists.txt

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#ifndef _MESSAGE_CHANNEL_H_
-#define _MESSAGE_CHANNEL_H_
+#ifndef _APP_COMMON_H_
+#define _APP_COMMON_H_
 
 #include <zephyr/kernel.h>
 #include <zephyr/sys/reboot.h>
@@ -24,8 +24,6 @@ extern "C" {
  *  @param is_watchdog_timeout Boolean indicating if the macro was called upon a watchdog timeout.
  */
 #define FATAL_ERROR_HANDLE(is_watchdog_timeout) do {				\
-	enum error_type type = ERROR_FATAL;					\
-	(void)zbus_chan_pub(&ERROR_CHAN, &type, K_SECONDS(10));			\
 	LOG_PANIC();								\
 	if (is_watchdog_timeout) {						\
 		IF_ENABLED(CONFIG_MEMFAULT, (MEMFAULT_SOFTWARE_WATCHDOG()));	\
@@ -36,54 +34,12 @@ extern "C" {
 
 /** @brief Macro used to handle fatal errors. */
 #define SEND_FATAL_ERROR() FATAL_ERROR_HANDLE(0)
+
 /** @brief Macro used to handle watchdog timeouts. */
 #define SEND_FATAL_ERROR_WATCHDOG_TIMEOUT() FATAL_ERROR_HANDLE(1)
 
-#define SEND_IRRECOVERABLE_ERROR() do {					\
-	enum error_type type = ERROR_IRRECOVERABLE;				\
-	(void)zbus_chan_pub(&ERROR_CHAN, &type, K_SECONDS(10));			\
-	LOG_PANIC();								\
-	k_sleep(K_SECONDS(10));							\
-} while (0)
-
-enum time_status {
-	TIME_AVAILABLE = 0x1,
-};
-
-#define MSG_TO_TIME_STATUS(_msg)	(*(const enum time_status *)_msg)
-
-enum error_type {
-	ERROR_FATAL = 0x1,
-	ERROR_IRRECOVERABLE,
-};
-
-struct configuration {
-	/* LED */
-	int led_red;
-	int led_green;
-	int led_blue;
-	bool led_present;
-	bool led_red_present;
-	bool led_green_present;
-	bool led_blue_present;
-
-	/* Configuration */
-	bool gnss;
-	uint64_t update_interval;
-	bool config_present;
-	bool gnss_present;
-	bool update_interval_present;
-};
-
-#define MSG_TO_CONFIGURATION(_msg) (*(const struct configuration *)_msg)
-
-ZBUS_CHAN_DECLARE(
-	CONFIG_CHAN,
-	ERROR_CHAN
-);
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _MESSAGE_CHANNEL_H_ */
+#endif /* _APP_COMMON_H_ */

app/src/common/message_channel.h app/src/common/app_common.h

@@ -10,7 +10,7 @@
 #include <zephyr/task_wdt/task_wdt.h>
 #include <zephyr/smf.h>
 
-#include "message_channel.h"
+#include "app_common.h"
 #include "button.h"
 #include "network.h"
 #include "cloud_module.h"
@@ -35,7 +35,7 @@
 /* Register log module */
 LOG_MODULE_REGISTER(main, CONFIG_APP_LOG_LEVEL);
 
-#define MAX_MSG_SIZE	(MAX(sizeof(struct configuration),					\
+#define MAX_MSG_SIZE	(MAX(sizeof(struct cloud_shadow_response),				\
 			 MAX(sizeof(struct cloud_payload),					\
 			 /* Button channel payload size */					\
 			 MAX(sizeof(uint8_t),							\
@@ -57,7 +57,6 @@ ZBUS_CHAN_DEFINE(TIMER_CHAN,
 );
 
 /* Observe channels */
-ZBUS_CHAN_ADD_OBS(CONFIG_CHAN, main_subscriber, 0);
 ZBUS_CHAN_ADD_OBS(CLOUD_CHAN, main_subscriber, 0);
 ZBUS_CHAN_ADD_OBS(BUTTON_CHAN, main_subscriber, 0);
 ZBUS_CHAN_ADD_OBS(FOTA_CHAN, main_subscriber, 0);
@@ -453,26 +452,19 @@ static void triggering_run(void *o)
 			smf_set_state(SMF_CTX(state_object), &states[STATE_IDLE]);
 			return;
 		}
-	}
-
-	if (state_object->chan == &CONFIG_CHAN) {
-		struct configuration config = MSG_TO_CONFIGURATION(state_object->msg_buf);
-
-		if (config.config_present) {
-			int err;
 
-			LOG_DBG("Configuration update, new interval: %lld", config.update_interval);
+		if (msg.type == CLOUD_SHADOW_RESPONSE) {
+			/* Missing: Parse the interval received in the shadow response,
+			 * write to state object and schedule new interval
+			 */
 
-			state_object->interval_sec = config.update_interval;
+			int err = k_work_reschedule(&trigger_work,
+						    K_SECONDS(state_object->interval_sec));
 
-			err = k_work_reschedule(&trigger_work,
-						K_SECONDS(state_object->interval_sec));
 			if (err < 0) {
 				LOG_ERR("k_work_reschedule, error: %d", err);
 				SEND_FATAL_ERROR();
 			}
-
-			return;
 		}
 	}
 }

app/src/common/message_channel.c

@@ -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_shell.c)
 target_include_directories(app PRIVATE .)

app/src/main.c

@@ -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/CMakeLists.txt

@@ -10,7 +10,7 @@
 #include <dk_buttons_and_leds.h>
 #include <date_time.h>
 
-#include "message_channel.h"
+#include "app_common.h"
 #include "button.h"
 
 /* Register log module */

app/src/modules/button/Kconfig.button

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include <stdlib.h>
+#include <zephyr/kernel.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/logging/log.h>
+
+#include "button.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;
+
+	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;
+	}
+
+	button_number = (uint8_t)strtol(argv[1], NULL, 10);
+
+	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_REGISTER(att_button_press, NULL, "Asset Tracker Template Button CMDs", cmd_button_press);

app/src/modules/button/button.c

@@ -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/button/button_shell.c

@@ -7,6 +7,25 @@
 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_PAYLOAD_BUFFER_MAX_SIZE
+	int "Payload maximum buffer size"
+	default 128
+	help
+	  Maximum size of the buffer sent over the payload channel when sending RAW JSON messages
+	  to the cloud.
+
+config APP_CLOUD_SHADOW_RESPONSE_BUFFER_MAX_SIZE
+	int "Payload maximum buffer size"
+	default 512
+	help
+	  Maximum size of the buffer used to receive shadow responses from the cloud.
+
 config APP_CLOUD_CONFIRMABLE_MESSAGES
 	bool "Use confirmable messages"
 	help

app/src/modules/cloud/CMakeLists.txt

@@ -18,7 +18,7 @@
 #endif /* CONFIG_MEMFAULT */
 
 #include "cloud_module.h"
-#include "message_channel.h"
+#include "app_common.h"
 #include "network.h"
 
 #if defined(CONFIG_APP_POWER)

app/src/modules/cloud/Kconfig.cloud

@@ -21,7 +21,12 @@ ZBUS_CHAN_DECLARE(
 );
 
 struct cloud_payload {
-	uint8_t buffer[CONFIG_APP_PAYLOAD_CHANNEL_BUFFER_MAX_SIZE];
+	uint8_t buffer[CONFIG_APP_CLOUD_PAYLOAD_BUFFER_MAX_SIZE];
+	size_t buffer_len;
+};
+
+struct cloud_shadow_response {
+	uint8_t buffer[CONFIG_APP_CLOUD_SHADOW_RESPONSE_BUFFER_MAX_SIZE];
 	size_t buffer_len;
 };
 
@@ -32,6 +37,7 @@ enum cloud_msg_type {
 	CLOUD_CONNECTION_ATTEMPT_COUNT_REACHED,
 	CLOUD_PAYLOAD_JSON,
 	CLOUD_POLL_SHADOW,
+	CLOUD_SHADOW_RESPONSE,
 };
 
 struct cloud_msg {
@@ -41,6 +47,7 @@ struct cloud_msg {
 
 #define MSG_TO_CLOUD_MSG(_msg)	(*(const struct cloud_msg *)_msg)
 #define MSG_TO_PAYLOAD(_msg)	((struct cloud_payload *)_msg)
+#define MSG_TO_SHADOW_RESPONSE(_msg)	(*(const struct cloud_shadow_response *)_msg)
 
 #ifdef __cplusplus
 }