modules: button: channel definition into module header

Button channel definition into dedicated button header.

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

Author: DematteisGiacomo

app/src/common/message_channel.c

@@ -58,14 +58,6 @@ ZBUS_CHAN_DEFINE(CONFIG_CHAN,
 		 ZBUS_MSG_INIT(0)
 );
 
-ZBUS_CHAN_DEFINE(BUTTON_CHAN,
-		 uint8_t,
-		 NULL,
-		 NULL,
-		 ZBUS_OBSERVERS_EMPTY,
-		 ZBUS_MSG_INIT(0)
-);
-
 ZBUS_CHAN_DEFINE(TIME_CHAN,
 		 enum time_status,
 		 NULL,

app/src/common/message_channel.h

@@ -247,7 +247,6 @@ struct configuration {
 #define MSG_TO_CONFIGURATION(_msg) ((const struct configuration *)_msg)
 
 ZBUS_CHAN_DECLARE(
-	BUTTON_CHAN,
 	CONFIG_CHAN,
 	ERROR_CHAN,
 	FOTA_STATUS_CHAN,

app/src/modules/app/app.c

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

app/src/modules/button/CMakeLists.txt

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

app/src/modules/button/button.c

@@ -12,10 +12,20 @@
 
 #include "message_channel.h"
 #include "battery.h"
+#include "button.h"
 
 /* Register log module */
 LOG_MODULE_REGISTER(button, CONFIG_APP_BUTTON_LOG_LEVEL);
 
+/* Define channels provided by this module */
+ZBUS_CHAN_DEFINE(BUTTON_CHAN,
+		 uint8_t,
+		 NULL,
+		 NULL,
+		 ZBUS_OBSERVERS_EMPTY,
+		 ZBUS_MSG_INIT(0)
+);
+
 /* Button handler called when a user pushes a button */
 static void button_handler(uint32_t button_states, uint32_t has_changed)
 {

app/src/modules/button/button.h

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#ifndef _BUTTON_H_
+#define _BUTTON_H_
+
+#include <zephyr/kernel.h>
+#include <zephyr/zbus/zbus.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Channels provided by this module */
+ZBUS_CHAN_DECLARE(
+	BUTTON_CHAN
+);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _BUTTON_H_ */

app/src/modules/shell/shell.c

@@ -21,6 +21,7 @@
 #include <net/nrf_cloud_defs.h>
 
 #include "message_channel.h"
+#include "button.h"
 
 LOG_MODULE_REGISTER(shell, CONFIG_APP_SHELL_LOG_LEVEL);
 

tests/module/app/CMakeLists.txt

@@ -28,6 +28,7 @@ zephyr_include_directories(../../../app/src/common)
 zephyr_include_directories(../../../app/src/modules/cloud)
 zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/include)
 zephyr_include_directories(../../../app/src/modules/battery)
+zephyr_include_directories(../../../app/src/modules/button)
 zephyr_include_directories(${NRF_DIR}/../modules/lib/cjson)
 
 target_link_options(app PRIVATE --whole-archive)

tests/module/app/src/main.c

@@ -25,6 +25,13 @@ ZBUS_CHAN_DEFINE(BATTERY_CHAN,
 		 ZBUS_OBSERVERS_EMPTY,
 		 ZBUS_MSG_INIT(0)
 );
+ZBUS_CHAN_DEFINE(BUTTON_CHAN,
+		 struct battery_msg,
+		 NULL,
+		 NULL,
+		 ZBUS_OBSERVERS_EMPTY,
+		 ZBUS_MSG_INIT(0)
+);
 
 DEFINE_FFF_GLOBALS;
 

tests/module/button/CMakeLists.txt

@@ -23,6 +23,7 @@ zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include)
 zephyr_include_directories(../../../app/src/common)
 zephyr_include_directories(../../../app/src/modules/cloud)
 zephyr_include_directories(../../../app/src/modules/battery)
+zephyr_include_directories(../../../app/src/modules/button)
 
 target_link_options(app PRIVATE --whole-archive)
 # Options that cannot be passed through Kconfig fragments

tests/module/button/src/main.c

@@ -11,6 +11,7 @@
 
 #include "message_channel.h"
 #include "battery.h"
+#include "button.h"
 
 #include <dk_buttons_and_leds.h>
 #include <date_time.h>