]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
HID: logitech-hidpp: change low battery level threshold from 31 to 30 percent
authorHans de Goede <hdegoede@redhat.com>
Fri, 22 Mar 2019 07:41:40 +0000 (08:41 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 13 Aug 2019 12:11:36 +0000 (14:11 +0200)
BugLink: https://bugs.launchpad.net/bugs/1837517
[ Upstream commit 1f87b0cd32b3456d7efdfb017fcf74d0bfe3ec29 ]

According to hidpp20_batterylevel_get_battery_info my Logitech K270
keyboard reports only 2 battery levels. This matches with what I've seen
after testing with batteries at varying level of fullness, it always
reports either 5% or 30%.

Windows reports "battery good" for the 30% level. I've captured an USB
trace of Windows reading the battery and it is getting the same info
as the Linux hidpp code gets.

Now that Linux handles these devices as hidpp devices, it reports the
battery as being low as it treats anything under 31% as low, this leads
to the user constantly getting a "Keyboard battery is low" warning from
GNOME3, which is very annoying.

This commit fixes this by changing the low threshold to anything under
30%, which I assume is what Windows does.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/hid/hid-logitech-hidpp.c

index ffd30c7492df8adcf909c900b1d1c85b44ca5aed..e74fa990ba13377542b8f51e46e27d82be690b33 100644 (file)
@@ -1021,7 +1021,11 @@ static int hidpp_map_battery_level(int capacity)
 {
        if (capacity < 11)
                return POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
-       else if (capacity < 31)
+       /*
+        * The spec says this should be < 31 but some devices report 30
+        * with brand new batteries and Windows reports 30 as "Good".
+        */
+       else if (capacity < 30)
                return POWER_SUPPLY_CAPACITY_LEVEL_LOW;
        else if (capacity < 81)
                return POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;