proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-07 08:39:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

logitech-hidpp: Use fu_device_set_battery_level()

Browse Source
This commit is contained in:
Richard Hughes 2021-03-05 11:50:10 +00:00
parent a76a0da7aa
commit c8d0afe33d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/logitech-hidpp/fu-logitech-hidpp-peripheral.c
View File

@ -15,7 +15,6 @@
struct _FuLogitechHidPpPeripheral struct _FuLogitechHidPpPeripheral
{ {
FuUdevDevice parent_instance; FuUdevDevice parent_instance;
guint8 battery_level;
guint8 cached_fw_entity; guint8 cached_fw_entity;
guint8 hidpp_id; guint8 hidpp_id;
guint8 hidpp_version; guint8 hidpp_version;
@ -267,7 +266,6 @@ fu_logitech_hidpp_peripheral_to_string (FuDevice *device, guint idt, GString *st
fu_common_string_append_ku (str, idt, "HidppVersion", self->hidpp_version); fu_common_string_append_ku (str, idt, "HidppVersion", self->hidpp_version);
fu_common_string_append_kx (str, idt, "HidppId", self->hidpp_id); fu_common_string_append_kx (str, idt, "HidppId", self->hidpp_id);
fu_common_string_append_ku (str, idt, "BatteryLevel", self->battery_level);
fu_common_string_append_kb (str, idt, "IsUpdatable", self->is_updatable); fu_common_string_append_kb (str, idt, "IsUpdatable", self->is_updatable);
fu_common_string_append_kb (str, idt, "IsActive", self->is_active); fu_common_string_append_kb (str, idt, "IsActive", self->is_active);
for (guint i = 0; i < self->feature_index->len; i++) { for (guint i = 0; i < self->feature_index->len; i++) {
@ -380,7 +378,7 @@ fu_logitech_hidpp_peripheral_fetch_battery_level (FuLogitechHidPpPeripheral *sel
return FALSE; return FALSE;
} }
if (msg->data[0] != 0x00) if (msg->data[0] != 0x00)
self->battery_level = msg->data[0]; fu_device_set_battery_level (FU_DEVICE (self), msg->data[0]);
return TRUE; return TRUE;
} }
} }
@ -395,7 +393,7 @@ fu_logitech_hidpp_peripheral_fetch_battery_level (FuLogitechHidPpPeripheral *sel
msg->hidpp_version = self->hidpp_version; msg->hidpp_version = self->hidpp_version;
if (fu_logitech_hidpp_transfer (self->io_channel, msg, NULL)) { if (fu_logitech_hidpp_transfer (self->io_channel, msg, NULL)) {
if (msg->data[0] != 0x00) if (msg->data[0] != 0x00)
self->battery_level = msg->data[0]; fu_device_set_battery_level (FU_DEVICE (self), msg->data[0]);
return TRUE; return TRUE;
} }
@ -404,16 +402,16 @@ fu_logitech_hidpp_peripheral_fetch_battery_level (FuLogitechHidPpPeripheral *sel
if (fu_logitech_hidpp_transfer (self->io_channel, msg, NULL)) { if (fu_logitech_hidpp_transfer (self->io_channel, msg, NULL)) {
switch (msg->data[0]) { switch (msg->data[0]) {
case 1: /* 0 - 10 */ case 1: /* 0 - 10 */
self->battery_level = 5; fu_device_set_battery_level (FU_DEVICE (self), 5);
break; break;
case 3: /* 11 - 30 */ case 3: /* 11 - 30 */
self->battery_level = 20; fu_device_set_battery_level (FU_DEVICE (self), 20);
break; break;
case 5: /* 31 - 80 */ case 5: /* 31 - 80 */
self->battery_level = 55; fu_device_set_battery_level (FU_DEVICE (self), 55);
break; break;
case 7: /* 81 - 100 */ case 7: /* 81 - 100 */
self->battery_level = 90; fu_device_set_battery_level (FU_DEVICE (self), 90);
break; break;
default: default:
g_warning ("unknown battery percentage: 0x%02x", g_warning ("unknown battery percentage: 0x%02x",