modules: transport: Move channel definitions to module

Move channel definitions to the module folder and some minor
cleanup of leftovers from previous updates to the module.

Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>

Author: jtguggedal

app/src/common/message_channel.c

@@ -34,14 +34,6 @@ ZBUS_CHAN_DEFINE(FOTA_STATUS_CHAN,
 		 ZBUS_MSG_INIT(0)
 );
 
-ZBUS_CHAN_DEFINE(PAYLOAD_CHAN,
-		 struct payload,
-		 NULL,
-		 NULL,
-		 ZBUS_OBSERVERS_EMPTY,
-		 ZBUS_MSG_INIT(0)
-);
-
 ZBUS_CHAN_DEFINE(NETWORK_CHAN,
 		 struct network_msg,
 		 NULL,
@@ -74,14 +66,6 @@ ZBUS_CHAN_DEFINE(CONFIG_CHAN,
 		 ZBUS_MSG_INIT(0)
 );
 
-ZBUS_CHAN_DEFINE(CLOUD_CHAN,
-		 enum cloud_msg_type,
-		 NULL,
-		 NULL,
-		 ZBUS_OBSERVERS_EMPTY,
-		 CLOUD_DISCONNECTED
-);
-
 ZBUS_CHAN_DEFINE(BUTTON_CHAN,
 		 uint8_t,
 		 NULL,

app/src/common/message_channel.h

@@ -16,6 +16,8 @@
 #include <memfault/panics/assert.h>
 #endif
 
+#include "transport_module.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -46,13 +48,6 @@ extern "C" {
 	k_sleep(K_SECONDS(10));							\
 } while (0)
 
-struct payload {
-	uint8_t buffer[CONFIG_APP_PAYLOAD_CHANNEL_BUFFER_MAX_SIZE];
-	size_t buffer_len;
-};
-
-#define MSG_TO_PAYLOAD(_msg) ((struct payload *)_msg)
-
 /** NETWORK_MODULE */
 
 enum network_msg_type {
@@ -207,21 +202,6 @@ struct battery_msg {
 
 #define MSG_TO_BATTERY_MSG(_msg)	(*(const struct battery_msg *)_msg)
 
-enum cloud_msg_type {
-	CLOUD_DISCONNECTED = 0x1,
-	CLOUD_CONNECTED_READY_TO_SEND,
-	CLOUD_CONNECTED_PAUSED,
-	CLOUD_CONNECTION_ATTEMPT_COUNT_REACHED,
-	CLOUD_PAYLOAD_JSON,
-};
-
-struct cloud_msg {
-	enum cloud_msg_type type;
-	struct payload payload;
-};
-
-#define MSG_TO_CLOUD_MSG(_msg)	(*(const struct cloud_msg *)_msg)
-
 enum trigger_type {
 	TRIGGER_POLL_SHADOW = 0x1,
 	TRIGGER_FOTA_POLL,
@@ -293,14 +273,12 @@ struct configuration {
 
 ZBUS_CHAN_DECLARE(
 	BUTTON_CHAN,
-	CLOUD_CHAN,
 	CONFIG_CHAN,
 	ERROR_CHAN,
 	FOTA_STATUS_CHAN,
 	LED_CHAN,
 	NETWORK_CHAN,
 	BATTERY_CHAN,
-	PAYLOAD_CHAN,
 	TIME_CHAN,
 	TRIGGER_CHAN,
 	TRIGGER_MODE_CHAN,

app/src/modules/shell/shell.c

@@ -201,7 +201,7 @@ static int cmd_button_press(const struct shell *sh, size_t argc,
 static int cmd_publish_on_payload_chan(const struct shell *sh, size_t argc, char **argv)
 {
 	int err, ret;
-	struct payload payload = {
+	struct cloud_payload payload = {
 		.buffer_len = strlen(argv[1]),
 	};
 	int64_t current_time;

app/src/modules/transport/CMakeLists.txt

@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/transport.c)
-
+target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/transport_module.c)
+target_include_directories(app PRIVATE .)

app/src/modules/transport/Kconfig.transport

@@ -53,20 +53,14 @@ config APP_TRANSPORT_BACKOFF_MAX_SECONDS
 
 config APP_TRANSPORT_THREAD_STACK_SIZE
 	int "Thread stack size"
-	default 2048
+	default 4096
 
 config APP_TRANSPORT_MESSAGE_QUEUE_SIZE
 	int "Message queue size"
 	default 5
 	help
 	  ZBus subscriber message queue size.
 
-config APP_TRANSPORT_WORKQUEUE_STACK_SIZE
-	int "Workqueue stack size"
-	default 1792
-	help
-	  Stack size of the module's internal workqueue.
-
 config APP_TRANSPORT_POLL_INTERVAL_SECONDS
 	int "Poll interval in seconds"
 	default 10

app/src/modules/transport/transport.c app/src/modules/transport/transport_module.c

@@ -25,6 +25,8 @@ LOG_MODULE_REGISTER(transport, CONFIG_APP_TRANSPORT_LOG_LEVEL);
 
 #define CUSTOM_JSON_APPID_VAL_CONEVAL "CONEVAL"
 #define CUSTOM_JSON_APPID_VAL_BATTERY "BATTERY"
+#define MAX_MSG_SIZE	(MAX(sizeof(struct cloud_payload),						\
+			 MAX(sizeof(struct network_msg), sizeof(struct battery_msg))))
 
 BUILD_ASSERT(CONFIG_APP_TRANSPORT_WATCHDOG_TIMEOUT_SECONDS >
 			 CONFIG_APP_TRANSPORT_EXEC_TIME_SECONDS_MAX,
@@ -39,7 +41,23 @@ ZBUS_CHAN_ADD_OBS(NETWORK_CHAN, transport, 0);
 ZBUS_CHAN_ADD_OBS(BATTERY_CHAN, transport, 0);
 ZBUS_CHAN_ADD_OBS(TRIGGER_CHAN, transport, 0);
 
-#define MAX_MSG_SIZE (MAX(sizeof(struct payload), MAX(sizeof(struct network_msg), sizeof(struct battery_msg))))
+/* Define channels provided by this module */
+
+ZBUS_CHAN_DEFINE(PAYLOAD_CHAN,
+		 struct cloud_payload,
+		 NULL,
+		 NULL,
+		 ZBUS_OBSERVERS_EMPTY,
+		 ZBUS_MSG_INIT(0)
+);
+
+ZBUS_CHAN_DEFINE(CLOUD_CHAN,
+		 enum cloud_msg_type,
+		 NULL,
+		 NULL,
+		 ZBUS_OBSERVERS_EMPTY,
+		 CLOUD_DISCONNECTED
+);
 
 /* Enumerator to be used in privat transport channel */
 enum priv_transport_msg {
@@ -527,7 +545,7 @@ static void state_connected_ready_run(void *o)
 	}
 
 	if (state_object->chan == &PAYLOAD_CHAN) {
-		struct payload *payload = MSG_TO_PAYLOAD(state_object->msg_buf);
+		struct cloud_payload *payload = MSG_TO_PAYLOAD(state_object->msg_buf);
 
 		err = nrf_cloud_coap_json_message_send(payload->buffer, false, false);
 		if (err) {

app/src/modules/transport/transport_module.h

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#ifndef _TRANSPORT_MODULE_H_
+#define _TRANSPORT_MODULE_H_
+
+#include <zephyr/kernel.h>
+#include <zephyr/zbus/zbus.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Channels provided by this module */
+ZBUS_CHAN_DECLARE(
+	CLOUD_CHAN,
+	PAYLOAD_CHAN
+);
+
+struct cloud_payload {
+        uint8_t buffer[CONFIG_APP_PAYLOAD_CHANNEL_BUFFER_MAX_SIZE];
+        size_t buffer_len;
+};
+
+enum cloud_msg_type {
+	CLOUD_DISCONNECTED = 0x1,
+	CLOUD_CONNECTED_READY_TO_SEND,
+	CLOUD_CONNECTED_PAUSED,
+	CLOUD_CONNECTION_ATTEMPT_COUNT_REACHED,
+	CLOUD_PAYLOAD_JSON,
+};
+
+struct cloud_msg {
+	enum cloud_msg_type type;
+        struct cloud_payload payload;
+};
+
+#define MSG_TO_CLOUD_MSG(_msg)	(*(const struct cloud_msg *)_msg)
+#define MSG_TO_PAYLOAD(_msg) ((struct cloud_payload *)_msg)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _TRANSPORT_MODULE_H_ */
+

tests/module/transport/CMakeLists.txt

@@ -31,7 +31,6 @@ target_compile_definitions(app PRIVATE
 	-DCONFIG_APP_PAYLOAD_CHANNEL_BUFFER_MAX_SIZE=100
 	-DCONFIG_APP_TRANSPORT_LOG_LEVEL=0
 	-DCONFIG_APP_TRANSPORT_THREAD_STACK_SIZE=2048
-	-DCONFIG_APP_TRANSPORT_WORKQUEUE_STACK_SIZE=4096
 	-DCONFIG_APP_TRANSPORT_MESSAGE_QUEUE_SIZE=5
 	-DCONFIG_APP_TRANSPORT_EXEC_TIME_SECONDS_MAX=1
 	-DCONFIG_APP_TRANSPORT_WATCHDOG_TIMEOUT_SECONDS=2