RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

very low battery level should trigger an attention event

This commit is contained in:
Daniel Pavel 2013-06-03 21:40:15 +02:00
parent b4fc36701a
commit cbdc0bd99b
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/logitech/unifying_receiver/status.py
View File

@ -28,7 +28,7 @@ from . import hidpp20 as _hidpp20
# #
# #
ALERT = _NamedInts(NONE=0x00, NOTIFICATION=0x01, SHOW_WINDOW=0x02, ALL=0xFF) ALERT = _NamedInts(NONE=0x00, NOTIFICATION=0x01, SHOW_WINDOW=0x02, ATTENTION=0x04, ALL=0xFF)
# device properties that may be reported # device properties that may be reported
ENCRYPTED='encrypted' ENCRYPTED='encrypted'
@ -38,6 +38,10 @@ BATTERY_CHARGING='battery-charging'
LIGHT_LEVEL='light-level' LIGHT_LEVEL='light-level'
ERROR='error' ERROR='error'
# if the battery charge is under this percentage, trigger an attention event
# (blink systray icon)
_BATTERY_ATTENTION_LEVEL = 5
# if not updates have been receiver from the device for a while, assume # if not updates have been receiver from the device for a while, assume
# it has gone offline and clear all its know properties. # it has gone offline and clear all its know properties.
_STATUS_TIMEOUT = 5 * 60 # seconds _STATUS_TIMEOUT = 5 * 60 # seconds
@ -155,9 +159,9 @@ class DeviceStatus(dict):
changed = old_level != level or old_status != status or old_charging != charging changed = old_level != level or old_status != status or old_charging != charging
alert, reason = ALERT.NONE, None alert, reason = ALERT.NONE, None
if not _hidpp20.BATTERY_OK(status) or level <= 5: if not _hidpp20.BATTERY_OK(status) or level <= _BATTERY_ATTENTION_LEVEL:
_log.warn("%s: battery %d%%, ALERT %s", self._device, level, status) _log.warn("%s: battery %d%%, ALERT %s", self._device, level, status)
alert = ALERT.NOTIFICATION alert = ALERT.NOTIFICATION | ALERT.ATTENTION
reason = 'Battery: %d%% (%s)' % (level, status) reason = 'Battery: %d%% (%s)' % (level, status)
if changed or reason: if changed or reason:
@ -170,11 +174,13 @@ class DeviceStatus(dict):
if battery is None and d.protocol >= 2.0: if battery is None and d.protocol >= 2.0:
battery = _hidpp20.get_battery(d) battery = _hidpp20.get_battery(d)
# really unnecessary, if the device has SOLAR_DASHBOARD it should be # really unnecessary, if the device has SOLAR_DASHBOARD it should be
# broadcasting it's battery status anyway, it will just take a little while # broadcasting it's battery status anyway, it will just take a little while
# if battery is None and _hidpp20.FEATURE.SOLAR_DASHBOARD in d.features: # however, when the device has just been detected, it will not show
# d.feature_request(_hidpp20.FEATURE.SOLAR_DASHBOARD, 0x00, 1, 1) # any battery status for a while (broadcasts happen every 90 seconds)
# return if battery is None and _hidpp20.FEATURE.SOLAR_DASHBOARD in d.features:
d.feature_request(_hidpp20.FEATURE.SOLAR_DASHBOARD, 0x00, 1, 1)
return
if battery: if battery:
level, status = battery level, status = battery

6
lib/solaar/gtk.py
View File

@ -93,7 +93,11 @@ def _run(args):
# print ("status changed", device, reason) # print ("status changed", device, reason)
GLib.idle_add(ui.status_icon.update, status_icon, device) GLib.idle_add(ui.status_icon.update, status_icon, device)
GLib.idle_add(ui.main_window.update, device, alert & ALERT.SHOW_WINDOW, status_icon) if alert & ALERT.ATTENTION:
GLib.idle_add(ui.status_icon.attention, status_icon)
popup_window = alert & (ALERT.SHOW_WINDOW | ALERT.ATTENTION)
GLib.idle_add(ui.main_window.update, device, popup_window, status_icon)
if alert & ALERT.NOTIFICATION: if alert & ALERT.NOTIFICATION:
GLib.idle_add(ui.notify.show, device, reason) GLib.idle_add(ui.notify.show, device, reason)