applications: Ensure button names are printed in a standard manner

Assign the button names dependent on the GPIO pin, so as to
match the button correctly to it's name across multiple boards.

Signed-off-by: Graham Wacey <[email protected]>

Author: gWacey

applications/nrf5340_audio/src/modules/button_assignments.h

@@ -29,14 +29,12 @@
 #define BUTTON_VOLUME_DOWN DT_GPIO_PIN(DT_ALIAS(sw0), gpios)
 #else
 #define BUTTON_VOLUME_DOWN BUTTON_NOT_ASSIGNED
-
 #endif
 
 #if DT_NODE_EXISTS(DT_ALIAS(sw1))
 #define BUTTON_VOLUME_UP DT_GPIO_PIN(DT_ALIAS(sw1), gpios)
 #else
 #define BUTTON_VOLUME_UP BUTTON_NOT_ASSIGNED
-
 #endif
 
 #if DT_NODE_EXISTS(DT_ALIAS(sw2))

applications/nrf5340_audio/src/modules/button_handler.c

@@ -50,11 +50,19 @@ static bool debounce_is_ongoing;
 #pragma error("No buttons node found")
 #endif
 
+#define BUTTON_NAME(b)                                                                             \
+	((b) == BUTTON_VOLUME_DOWN  ? "BUTTON_VOLUME_DOWN"                                         \
+	 : (b) == BUTTON_VOLUME_UP  ? "BUTTON_VOLUME_UP"                                           \
+	 : (b) == BUTTON_PLAY_PAUSE ? "BUTTON_PLAY_PAUSE"                                          \
+	 : (b) == BUTTON_4	    ? "BUTTON_4"                                                   \
+	 : (b) == BUTTON_5	    ? "BUTTON_5"                                                   \
+				    : NULL)
+
 #define BUTTON_GPIO(button_node_id)                                                                \
 	{                                                                                          \
-		.name = STRINGIFY(BUTTON_##button_node_id),                                        \
-				  .gpio = GPIO_DT_SPEC_GET(button_node_id, gpios),                 \
-		},
+		.name = BUTTON_NAME(DT_GPIO_PIN(button_node_id, gpios)),                           \
+		.gpio = GPIO_DT_SPEC_GET(button_node_id, gpios),                                   \
+	},
 
 static struct btn_cfg_data btn_config_data[] = {DT_FOREACH_CHILD(BUTTON, BUTTON_GPIO)};