From: Sonny Sasaka <sonnysasaka@chromium.org>
To: linux-bluetooth@vger.kernel.org
Cc: Sonny Sasaka <sonnysasaka@chromium.org>
Subject: [PATCH 1/1] client: Add battery command
Date: Tue, 30 Jun 2020 10:47:07 -0700 [thread overview]
Message-ID: <20200630174707.214317-1-sonnysasaka@chromium.org> (raw)
This adds the "battery" command to show battery information of a peer
device based on org.bluez.Battery1 API. Example usage:
[bluetooth]# battery XX:XX:XX:XX:XX:XX
Percentage: 100%
---
client/main.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/client/main.c b/client/main.c
index 422da5593..cc5eb7ce8 100644
--- a/client/main.c
+++ b/client/main.c
@@ -65,6 +65,7 @@ static struct adapter *default_ctrl;
static GDBusProxy *default_dev;
static GDBusProxy *default_attr;
static GList *ctrl_list;
+static GList *battery_proxies;
static const char *agent_arguments[] = {
"on",
@@ -107,7 +108,9 @@ static void disconnect_handler(DBusConnection *connection, void *user_data)
bt_shell_set_prompt(PROMPT_OFF);
g_list_free_full(ctrl_list, proxy_leak);
+ g_list_free_full(battery_proxies, proxy_leak);
ctrl_list = NULL;
+ battery_proxies = NULL;
default_ctrl = NULL;
}
@@ -445,6 +448,16 @@ done:
g_free(desc);
}
+static void battery_added(GDBusProxy *proxy)
+{
+ battery_proxies = g_list_append(battery_proxies, proxy);
+}
+
+static void battery_removed(GDBusProxy *proxy)
+{
+ battery_proxies = g_list_remove(battery_proxies, proxy);
+}
+
static void device_added(GDBusProxy *proxy)
{
DBusMessageIter iter;
@@ -539,6 +552,8 @@ static void proxy_added(GDBusProxy *proxy, void *user_data)
gatt_add_manager(proxy);
} else if (!strcmp(interface, "org.bluez.LEAdvertisingManager1")) {
ad_manager_added(proxy);
+ } else if (!strcmp(interface, "org.bluez.Battery1")) {
+ battery_added(proxy);
}
}
@@ -630,6 +645,8 @@ static void proxy_removed(GDBusProxy *proxy, void *user_data)
gatt_remove_manager(proxy);
} else if (!strcmp(interface, "org.bluez.LEAdvertisingManager1")) {
ad_unregister(dbus_conn, NULL);
+ } else if (!strcmp(interface, "org.bluez.Battery1")) {
+ battery_removed(proxy);
}
}
@@ -763,6 +780,19 @@ static struct adapter *find_ctrl_by_address(GList *source, const char *address)
return NULL;
}
+static GDBusProxy *find_battery_by_path(GList *source, const char *path)
+{
+ GList *list;
+
+ for (list = g_list_first(source); list; list = g_list_next(list)) {
+ GDBusProxy *proxy = list->data;
+ if (strcmp(g_dbus_proxy_get_path(proxy), path) == 0)
+ return proxy;
+ }
+
+ return NULL;
+}
+
static GDBusProxy *find_proxy_by_address(GList *source, const char *address)
{
GList *list;
@@ -1650,6 +1680,35 @@ static void cmd_info(int argc, char *argv[])
return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
+static void cmd_battery(int argc, char *argv[])
+{
+ DBusMessageIter iter;
+ GDBusProxy *device_proxy;
+ GDBusProxy *battery_proxy;
+ unsigned char percentage;
+
+ device_proxy = find_device(argc, argv);
+ if (!device_proxy)
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+
+ battery_proxy = find_battery_by_path(battery_proxies,
+ g_dbus_proxy_get_path(device_proxy));
+ if (!battery_proxy) {
+ bt_shell_printf("Device %s does not have battery information\n",
+ argv[1]);
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+
+ if (g_dbus_proxy_get_property(battery_proxy, "Percentage", &iter) ==
+ FALSE)
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+
+ dbus_message_iter_get_basic(&iter, &percentage);
+ bt_shell_printf("Percentage: %d%%\n", percentage);
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+}
+
static void pair_reply(DBusMessage *message, void *user_data)
{
DBusError error;
@@ -2785,6 +2844,8 @@ static const struct bt_shell_menu main_menu = {
dev_generator },
{ "disconnect", "[dev]", cmd_disconn, "Disconnect device",
dev_generator },
+ { "battery", "[dev]", cmd_battery, "Show device battery",
+ dev_generator },
{ } },
};
--
2.26.2
next reply other threads:[~2020-06-30 17:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 17:47 Sonny Sasaka [this message]
2020-06-30 18:18 ` [1/1] client: Add battery command bluez.test.bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200630174707.214317-1-sonnysasaka@chromium.org \
--to=sonnysasaka@chromium.org \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).