michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: Shell: CAP change microphone mute command

Browse source 
Adds the change microphone mute command to the CAP commander shell.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2023-12-22 11:15:38 +01:00 • committed by Carles Cufí
commit 490fb20148
2 changed files with 108 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

46
doc/connectivity/bluetooth/api/shell/cap.rst
View file

@ -233,10 +233,14 @@ the optionally included CSIS instance by calling (:code:`cap_commander discover`
cap_commander --help
cap_commander - Bluetooth CAP commander shell commands
Subcommands:
discover :Discover CAS
change_volume :Change volume on all connections <volume>
change_volume_offset :Change volume offset per connection <volume_offset
[volume_offset [...]]>
discover :Discover CAS
change_volume :Change volume on all connections <volume>
change_volume_mute :Change volume mute state on all connections <mute>
change_volume_offset :Change volume offset per connection <volume_offset
[volume_offset [...]]>
change_microphone_mute :Change microphone mute state on all connections <mute>
change_microphone_gain :Change microphone gain per connection <gain
[gain [...]]>
Before being able to perform any stream operation, the device must also perform the
@ -340,6 +344,40 @@ Setting the volume mute on all connected devices
VCP unmute done
Volume mute change completed
Setting the microphone mute on all connected devices
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. code-block:: console
uart:~$ bt connect <device A>
Connected: <device A>
uart:~$ cap_commander discover
discovery completed with CSIS
uart:~$ micp_mic_ctlr discover
MICP discover done with 1 VOCS and 1 AICS
uart:~$
uart:~$ bt connect <device B>
Connected: <device B>
uart:~$ cap_commander discover
discovery completed with CSIS
uart:~$ micp_mic_ctlr discover
MICP discover done with 1 VOCS and 1 AICS
uart:~$
uart:~$ cap_commander change_microphone_mute 1
Setting microphone mute to 1 on 2 connections
MICP microphone 100, mute 1
MICP mute done
MICP microphone 100, mute 1
MICP mute done
Microphone mute change completed
uart:~$ cap_commander change_microphone_mute 0
Setting microphone mute to 0 on 2 connections
MICP microphone 100, mute 0
MICP unmute done
MICP microphone 100, mute 0
MICP unmute done
Microphone mute change completed
Setting the microphone gain on one or more devices
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
The gains are set by connection index, so connection index 0 gets the first offset,

66
subsys/bluetooth/audio/shell/cap_commander.c
View file

@ -63,6 +63,16 @@ static void cap_volume_offset_changed_cb(struct bt_conn *conn, int err)
#endif /* CONFIG_BT_VCP_VOL_CTLR */
#if defined(CONFIG_BT_MICP_MIC_CTLR)
static void cap_microphone_mute_changed_cb(struct bt_conn *conn, int err)
{
if (err != 0) {
shell_error(ctx_shell, "Microphone mute change failed (%d)", err);
return;
}
shell_print(ctx_shell, "Microphone mute change completed");
}
#if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
static void cap_microphone_gain_changed_cb(struct bt_conn *conn, int err)
{
@ -86,6 +96,7 @@ static struct bt_cap_commander_cb cbs = {
#endif /* CONFIG_BT_VCP_VOL_CTLR_VOCS */
#endif /* CONFIG_BT_VCP_VOL_CTLR */
#if defined(CONFIG_BT_MICP_MIC_CTLR)
.microphone_mute_changed = cap_microphone_mute_changed_cb,
#if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
.microphone_gain_changed = cap_microphone_gain_changed_cb,
#endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
@ -319,6 +330,58 @@ static int cmd_cap_commander_change_volume_offset(const struct shell *sh, size_t
#endif /* CONFIG_BT_VCP_VOL_CTLR */
#if defined(CONFIG_BT_MICP_MIC_CTLR)
static int cmd_cap_commander_change_microphone_mute(const struct shell *sh, size_t argc,
char *argv[])
{
struct bt_conn *connected_conns[CONFIG_BT_MAX_CONN] = {0};
union bt_cap_set_member members[CONFIG_BT_MAX_CONN] = {0};
struct bt_cap_commander_change_microphone_mute_state_param param = {
.members = members,
.type = BT_CAP_SET_TYPE_AD_HOC, /* TODO: Add support for coordinated sets */
};
int err = 0;
if (default_conn == NULL) {
shell_error(sh, "Not connected");
return -ENOEXEC;
}
param.mute = shell_strtobool(argv[1], 10, &err);
if (err != 0) {
shell_error(sh, "Failed to parse microphone mute from %s", argv[1]);
return -ENOEXEC;
}
/* Populate the array of connected connections */
bt_conn_foreach(BT_CONN_TYPE_LE, populate_connected_conns, (void *)connected_conns);
param.count = 0U;
param.members = members;
for (size_t i = 0; i < ARRAY_SIZE(connected_conns); i++) {
struct bt_conn *conn = connected_conns[i];
if (conn == NULL) {
break;
}
param.members[i].member = conn;
param.count++;
}
shell_print(sh, "Setting microphone mute to %d on %zu connections", param.mute,
param.count);
err = bt_cap_commander_change_microphone_mute_state(&param);
if (err != 0) {
shell_print(sh, "Failed to change microphone mute: %d", err);
return -ENOEXEC;
}
return 0;
}
#if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
static int cmd_cap_commander_change_microphone_gain(const struct shell *sh, size_t argc,
char *argv[])
@ -422,6 +485,9 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
#endif /* CONFIG_BT_VCP_VOL_CTLR_VOCS */
#endif /* CONFIG_BT_VCP_VOL_CTLR */
#if defined(CONFIG_BT_MICP_MIC_CTLR)
SHELL_CMD_ARG(change_microphone_mute, NULL,
"Change microphone mute state on all connections <mute>",
cmd_cap_commander_change_microphone_mute, 2, 0),
#if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
SHELL_CMD_ARG(change_microphone_gain, NULL,
"Change microphone gain per connection <gain [gain [...]]>",