modules: battery: channel definition into per-module header

Separating battery channel definition into dedicated per-module header.

Signed-off-by: Giacomo Dematteis <giacomo.dematteis@nordicsemi.no>

Author: DematteisGiacomo

app/src/common/message_channel.c

@@ -42,14 +42,6 @@ ZBUS_CHAN_DEFINE(NETWORK_CHAN,
 		 ZBUS_MSG_INIT(.type = NETWORK_DISCONNECTED)
 );
 
-ZBUS_CHAN_DEFINE(BATTERY_CHAN,
-		 struct battery_msg,
-		 NULL,
-		 NULL,
-		 ZBUS_OBSERVERS_EMPTY,
-		 ZBUS_MSG_INIT(0)
-);
-
 ZBUS_CHAN_DEFINE(ERROR_CHAN,
 		 enum error_type,
 		 NULL,

app/src/common/message_channel.h

@@ -175,32 +175,7 @@ struct network_msg {
 
 #define MSG_TO_NETWORK_MSG(_msg)	(*(const struct network_msg *)_msg)
 
-/** BATTERY MODULE */
 
-enum battery_msg_type {
-	/* Output message types */
-
-	/* Response message to a request for a battery percentage sample. The sample is found in the
-	 * .percentage field of the message.
-	 */
-	BATTERY_PERCENTAGE_SAMPLE_RESPONSE = 0x1,
-
-	/* Input message types */
-
-	/* Request to retrieve the current battery percentage. The response is sent as a
-	 * BATTERY_PERCENTAGE_SAMPLE_RESPONSE message.
-	 */
-	BATTERY_PERCENTAGE_SAMPLE_REQUEST,
-};
-
-struct battery_msg {
-	enum battery_msg_type type;
-
-	/** Contains the current charge of the battery in percentage. */
-	double percentage;
-};
-
-#define MSG_TO_BATTERY_MSG(_msg)	(*(const struct battery_msg *)_msg)
 
 enum trigger_type {
 	TRIGGER_POLL_SHADOW = 0x1,
@@ -278,7 +253,6 @@ ZBUS_CHAN_DECLARE(
 	FOTA_STATUS_CHAN,
 	LED_CHAN,
 	NETWORK_CHAN,
-	BATTERY_CHAN,
 	TIME_CHAN,
 	TRIGGER_CHAN,
 	TRIGGER_MODE_CHAN,

app/src/modules/app/app.c

@@ -13,6 +13,7 @@
 
 #include "modules_common.h"
 #include "message_channel.h"
+#include "battery.h"
 
 /* Register log module */
 LOG_MODULE_REGISTER(app, CONFIG_APP_LOG_LEVEL);

app/src/modules/battery/CMakeLists.txt

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

app/src/modules/battery/battery.c

@@ -18,13 +18,23 @@
 #include "lp803448_model.h"
 #include "message_channel.h"
 #include "modules_common.h"
+#include "battery.h"
 
 /* Register log module */
 LOG_MODULE_REGISTER(battery, CONFIG_APP_BATTERY_LOG_LEVEL);
 
 /* Register subscriber */
 ZBUS_MSG_SUBSCRIBER_DEFINE(battery);
 
+/* Define channels provided by this module */
+ZBUS_CHAN_DEFINE(BATTERY_CHAN,
+		 struct battery_msg,
+		 NULL,
+		 NULL,
+		 ZBUS_OBSERVERS_EMPTY,
+		 ZBUS_MSG_INIT(0)
+);
+
 /* Observe channels */
 ZBUS_CHAN_ADD_OBS(BATTERY_CHAN, battery, 0);
 

app/src/modules/battery/battery.h

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#ifndef _BATTERY_H_
+#define _BATTERY_H_
+
+#include <zephyr/kernel.h>
+#include <zephyr/zbus/zbus.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Channels provided by this module */
+ZBUS_CHAN_DECLARE(
+	BATTERY_CHAN
+);
+
+enum battery_msg_type {
+	/* Output message types */
+
+	/* Response message to a request for a battery percentage sample. The sample is found in the
+	 * .percentage field of the message.
+	 */
+	BATTERY_PERCENTAGE_SAMPLE_RESPONSE = 0x1,
+
+	/* Input message types */
+
+	/* Request to retrieve the current battery percentage. The response is sent as a
+	 * BATTERY_PERCENTAGE_SAMPLE_RESPONSE message.
+	 */
+	BATTERY_PERCENTAGE_SAMPLE_REQUEST,
+};
+
+struct battery_msg {
+	enum battery_msg_type type;
+
+	/** Contains the current charge of the battery in percentage. */
+	double percentage;
+};
+
+#define MSG_TO_BATTERY_MSG(_msg)	(*(const struct battery_msg *)_msg)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _BATTERY_H_ */

app/src/modules/button/button.c

@@ -11,6 +11,7 @@
 #include <date_time.h>
 
 #include "message_channel.h"
+#include "battery.h"
 
 /* Register log module */
 LOG_MODULE_REGISTER(button, CONFIG_APP_BUTTON_LOG_LEVEL);

app/src/modules/cloud/cloud_module.c

@@ -19,6 +19,7 @@
 
 #include "modules_common.h"
 #include "message_channel.h"
+#include "battery.h"
 
 /* Register log module */
 LOG_MODULE_REGISTER(cloud, CONFIG_APP_CLOUD_LOG_LEVEL);