Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nimble/audio: Add Audio Broadcast Sink initial implementation #1677

Merged
merged 3 commits into from
Jul 1, 2024
Merged

nimble/audio: Add Audio Broadcast Sink initial implementation #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04ca186
nimble/audio: Add initial audio broadcast sink implementation
MariuszSkamra Jan 25, 2024
3ae79ef
apps/btshell: Add Audio Broadcast Sink to shell application
MariuszSkamra Jan 25, 2024
218617d
nimble/audio: Add PACS to Broadcast Sink
MariuszSkamra Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/btshell/src/btshell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ int btshell_broadcast_start(uint8_t adv_instance);
int btshell_broadcast_stop(uint8_t adv_instance);
#endif

void btshell_leaudio_init(void);

int btshell_gap_event(struct ble_gap_event *event, void *arg);
void btshell_sync_stats(uint16_t handle);
uint8_t btshell_get_default_own_addr_type(void);
Expand Down
86 changes: 83 additions & 3 deletions apps/btshell/src/cmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,28 @@ static const struct parse_arg_kv_pair cmd_peer_addr_types[] = {
{ NULL }
};

static const struct parse_arg_kv_pair cmd_addr_type[] = {
const struct parse_arg_kv_pair cmd_addr_type[] = {
{ "public", BLE_ADDR_PUBLIC },
{ "random", BLE_ADDR_RANDOM },
{ NULL }
};

const char *
cmd_addr_type_str(uint8_t type)
{
const struct parse_arg_kv_pair *kvs = cmd_addr_type;
int i;

static int
for (i = 0; kvs[i].key != NULL; i++) {
if (type == kvs[i].val) {
return kvs[i].key;
}
}

return "unknown";
}

int
parse_dev_addr(const char *prefix, const struct parse_arg_kv_pair *addr_types,
ble_addr_t *addr)
{
Expand Down Expand Up @@ -152,6 +166,12 @@ parse_dev_addr(const char *prefix, const struct parse_arg_kv_pair *addr_types,
return 0;
}

int
cmd_parse_addr(const char *prefix, ble_addr_t *addr)
{
return parse_dev_addr(prefix, cmd_addr_type, addr);
}

/*****************************************************************************
* $advertise *
*****************************************************************************/
Expand Down Expand Up @@ -4924,7 +4944,67 @@ static const struct shell_cmd btshell_commands[] = {
.help = &leaudio_broadcast_stop_help,
#endif
},
#endif /* BLE_ISO_BROADCAST_SOURCE */
#endif
#if MYNEWT_VAL(BLE_AUDIO_BROADCAST_SINK)
{
.sc_cmd = "broadcast-sink-start",
.sc_cmd_func = cmd_leaudio_broadcast_sink_start,
#if MYNEWT_VAL(SHELL_CMD_HELP)
.help = &cmd_leaudio_broadcast_sink_start_help,
#endif
},
{
.sc_cmd = "broadcast-sink-stop",
.sc_cmd_func = cmd_leaudio_broadcast_sink_stop,
#if MYNEWT_VAL(SHELL_CMD_HELP)
.help = &cmd_leaudio_broadcast_sink_stop_help,
#endif
},
{
.sc_cmd = "broadcast-sink-metadata",
.sc_cmd_func = cmd_leaudio_broadcast_sink_metadata_update,
#if MYNEWT_VAL(SHELL_CMD_HELP)
.help = &cmd_leaudio_broadcast_sink_metadata_update_help,
#endif
},
#endif /* BLE_AUDIO_BROADCAST_SINK */
#if MYNEWT_VAL(BLE_AUDIO_SCAN_DELEGATOR)
{
.sc_cmd = "scan-delegator-add",
.sc_cmd_func = cmd_leaudio_scan_delegator_receive_state_add,
#if MYNEWT_VAL(SHELL_CMD_HELP)
.help = &cmd_leaudio_scan_delegator_receive_state_add_help,
#endif
},
{
.sc_cmd = "scan-delegator-remove",
.sc_cmd_func = cmd_leaudio_scan_delegator_receive_state_remove,
#if MYNEWT_VAL(SHELL_CMD_HELP)
.help = &cmd_leaudio_scan_delegator_receive_state_remove_help,
#endif
},
{
.sc_cmd = "scan-delegator-set",
.sc_cmd_func = cmd_leaudio_scan_delegator_receive_state_set,
#if MYNEWT_VAL(SHELL_CMD_HELP)
.help = &cmd_leaudio_scan_delegator_receive_state_set_help,
#endif
},
{
.sc_cmd = "scan-delegator-get",
.sc_cmd_func = cmd_leaudio_scan_delegator_receive_state_get,
#if MYNEWT_VAL(SHELL_CMD_HELP)
.help = &cmd_leaudio_scan_delegator_receive_state_get_help,
#endif
},
{
.sc_cmd = "scan-delegator-show",
.sc_cmd_func = cmd_leaudio_scan_delegator_receive_state_show,
#if MYNEWT_VAL(SHELL_CMD_HELP)
.help = &cmd_leaudio_scan_delegator_receive_state_show_help,
#endif
},
#endif /* BLE_AUDIO_SCAN_DELEGATOR */
#if MYNEWT_VAL(BLE_ISO)
#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE)
{
Expand Down
7 changes: 7 additions & 0 deletions apps/btshell/src/cmd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ int parse_eddystone_url(char *full_url, uint8_t *out_scheme, char *out_body,
int cmd_parse_conn_start_end(uint16_t *out_conn, uint16_t *out_start,
uint16_t *out_end);

int parse_dev_addr(const char *prefix, const struct parse_arg_kv_pair *addr_types,
ble_addr_t *addr);

int cmd_parse_addr(const char *prefix, ble_addr_t *addr);

const char *cmd_addr_type_str(uint8_t type);

void cmd_init(void);

#endif
Loading