Add misc cleanup and some refactoring

Signed-off-by: Jens Rehhoff Thomsen <[email protected]>

Author: jthm-ot

app/src/broadcast_assistant.c

@@ -36,17 +36,19 @@ enum {
 	BROADCAST_ASSISTANT_SCAN_CSIS = BIT(2),
 };
 
-int start_scan(uint8_t mode, uint8_t set_size, uint8_t sirk[BT_CSIP_SIRK_SIZE]);
-int stop_scanning(void);
-int disconnect_unpair_all(void);
-int connect_to_sink(bt_addr_le_t *bt_addr_le);
-int disconnect_from_sink(bt_addr_le_t *bt_addr_le);
-int add_source(uint8_t sid, uint16_t pa_interval, uint32_t broadcast_id, bt_addr_le_t *addr,
-	       uint8_t num_subgroups, uint32_t *bis_sync);
-int remove_source(uint8_t source_id, uint8_t num_subgroups);
-int add_broadcast_code(uint8_t src_id, const uint8_t broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE]);
-int set_volume(bt_addr_le_t *bt_addr_le, uint8_t volume);
-int set_mute(bt_addr_le_t *bt_addr_le, uint8_t state);
+int broadcast_assistant_start_scan(uint8_t mode, uint8_t set_size, uint8_t sirk[BT_CSIP_SIRK_SIZE]);
+int broadcast_assistant_stop_scanning(void);
+int broadcast_assistant_disconnect_unpair_all(void);
+int broadcast_assistant_connect_to_sink(bt_addr_le_t *bt_addr_le);
+int broadcast_assistant_disconnect_from_sink(bt_addr_le_t *bt_addr_le);
+int broadcast_assistant_add_source(uint8_t sid, uint16_t pa_interval, uint32_t broadcast_id,
+				   bt_addr_le_t *addr, uint8_t num_subgroups, uint32_t *bis_sync);
+int broadcast_assistant_remove_source(uint8_t source_id, uint8_t num_subgroups);
+int broadcast_assistant_add_broadcast_code(
+	uint8_t src_id, const uint8_t broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE]);
+int broadcast_assistant_set_volume(bt_addr_le_t *bt_addr_le, uint8_t volume);
+int broadcast_assistant_set_mute(bt_addr_le_t *bt_addr_le, uint8_t state);
+int broadcast_assistant_reset(void);
 int broadcast_assistant_init(void);
 
 #endif /* __BROADCAST_ASSISTANT_H__ */

app/src/broadcast_assistant.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2024 Demant A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/types.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net/buf.h>
+
+#include "message.h"
+
+static bool heartbeat_on;
+static uint8_t heartbeat_cnt;
+
+static void heartbeat_timeout_handler(struct k_timer *dummy_p);
+K_TIMER_DEFINE(heartbeat_timer, heartbeat_timeout_handler, NULL);
+
+static void heartbeat_timeout_handler(struct k_timer *timer)
+{
+	message_send_no_paylod(MESSAGE_TYPE_EVT, MESSAGE_SUBTYPE_HEARTBEAT, heartbeat_cnt++);
+}
+
+void heartbeat_start(void)
+{
+	if (!heartbeat_on) {
+		// Start generating heartbeats every second
+		heartbeat_on = true;
+		k_timer_start(&heartbeat_timer, K_SECONDS(1), K_SECONDS(1));
+	}
+}
+
+void heartbeat_stop(void)
+{
+	if (heartbeat_on) {
+		heartbeat_on = false;
+		k_timer_stop(&heartbeat_timer);
+	}
+}
+
+void heartbeat_toggle(void)
+{
+	if (!heartbeat_on) {
+		heartbeat_start();
+	} else {
+		heartbeat_stop();
+	}
+}
+
+void heartbeat_init(void)
+{
+	heartbeat_on = false;
+	k_timer_init(&heartbeat_timer, heartbeat_timeout_handler, NULL);
+}

app/src/heartbeat.c

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2024 Demant A/S
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __HEARTBEAT_H__
+#define __HEARTBEAT_H__
+
+#include <zephyr/types.h>
+
+void heartbeat_start(void);
+void heartbeat_stop(void);
+void heartbeat_toggle(void);
+void heartbeat_init(void);
+
+#endif /* __HEARTBEAT_H__ */

app/src/heartbeat.h

@@ -14,7 +14,8 @@
 #include "webusb.h"
 #include "msosv2.h"
 #include "broadcast_assistant.h"
-#include "message_handler.h"
+#include "heartbeat.h"
+#include "message.h"
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
 
@@ -30,7 +31,8 @@ int main(void)
 
 	/* Set the message handler */
 	webusb_register_message_handler(&message_handler);
-	message_handler_init();
+
+	heartbeat_init();
 
 	ret = usb_enable(NULL);
 	if (ret != 0) {