File 0005-notifications-fix-battery-status-notificat... of Package solaar

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-notifications-fix-battery-status-notification-parsin.patch of Package solaar (Revision 1bddeb843fea09f1694ea16654097b1e)

Currently displaying revision 1bddeb843fea09f1694ea16654097b1e , Show latest

From 69815558041b84da9add36d4bd1503415a3ac0c0 Mon Sep 17 00:00:00 2001
From: Alex Cherkayev <doctor64@gmail.com>
Date: Tue, 20 Aug 2019 10:40:39 +0300
Subject: [PATCH 5/5] notifications: fix battery status notification parsing

Fix indicator tooltip (duplicate Solaar line, python list instead of battery status).
---
 lib/logitech_receiver/notifications.py | 7 ++++---
 lib/solaar/ui/tray.py                  | 5 +----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/logitech_receiver/notifications.py b/lib/logitech_receiver/notifications.py
index cd9928f..22d8cb7 100644
--- a/lib/logitech_receiver/notifications.py
+++ b/lib/logitech_receiver/notifications.py
@@ -204,9 +204,10 @@ def _process_hidpp10_notification(device, status, n):
 def _process_feature_notification(device, status, n, feature):
 	if feature == _F.BATTERY_STATUS:
 		if n.address == 0x00:
-			discharge = ord(n.data[:1])
-			battery_status = ord(n.data[1:2])
-			status.set_battery_info(discharge, _hidpp20.BATTERY_STATUS[battery_status])
+			discharge_level = ord(n.data[:1])
+			discharge_next_level = ord(n.data[1:2])
+			battery_status = ord(n.data[2:3])
+			status.set_battery_info(discharge_level, _hidpp20.BATTERY_STATUS[battery_status])
 		else:
 			_log.warn("%s: unknown BATTERY %s", device, n)
 		return True
diff --git a/lib/solaar/ui/tray.py b/lib/solaar/ui/tray.py
index 29bcd91..161775a 100644
--- a/lib/solaar/ui/tray.py
+++ b/lib/solaar/ui/tray.py
@@ -185,7 +185,7 @@ try:
 			battery_charging = device_status.get(_K.BATTERY_CHARGING)
 			tray_icon_name = _icons.battery(battery_level, battery_charging)
 
-			description =  '%s: %s' % (name, device_status)
+			description =  '%s: %s' % (name, device_status.to_string())
 		else:
 			# there may be a receiver, but no peripherals
 			tray_icon_name = _icons.TRAY_OKAY if _devices_info else _icons.TRAY_INIT
@@ -279,9 +279,6 @@ def _generate_tooltip_lines():
 		yield '<b>%s</b>: ' % NAME + _("no receiver")
 		return
 
-	yield '<b>%s</b>' % NAME
-	yield ''
-
 	for _ignore, number, name, status in _devices_info:
 		if number is None:  # receiver
 			continue
-- 
2.23.0

Places

File 0005-notifications-fix-battery-status-notification-parsin.patch of Package solaar (Revision 1bddeb843fea09f1694ea16654097b1e)

Places