From 0198d58dc7c06d7d40a02adf288a40e9f5d7343b Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Sun, 12 Jan 2020 13:03:57 -0500 Subject: [PATCH] hidpp20: fix error when showing battery MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filipe Laíns --- lib/solaar/cli/show.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/solaar/cli/show.py b/lib/solaar/cli/show.py index 643e53c5..c727c24b 100644 --- a/lib/solaar/cli/show.py +++ b/lib/solaar/cli/show.py @@ -166,7 +166,6 @@ def _print_device(dev): print (' %s, pos:%d, group:%1d, gmask:%d' % ( ', '.join(flags), k.pos, k.group, k.group_mask)) if dev.online: battery = _hidpp20.get_battery(dev) - (voltage, charging, charge_sts, charge_lvl, charge_type) = _hidpp20.get_voltage(dev) if battery is None: battery = _hidpp10.get_battery(dev) if battery is not None: @@ -180,10 +179,13 @@ def _print_device(dev): else: text = 'N/A' print (' Battery: %s, %s.' % (text, status)) - elif voltage: - print (' Battery: %smV, %s.' % (voltage, 'Charging' if charging else 'Discharging')) else: - print (' Battery status unavailable.') + battery_voltage = _hidpp20.get_voltage(dev) + if battery_voltage : + (voltage, charging, charge_sts, charge_lvl, charge_type) = battery_voltage + print (' Battery: %smV, %s.' % (voltage, 'Charging' if charging else 'Discharging')) + else: + print (' Battery status unavailable.') else: print (' Battery: unknown (device is offline).')