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

fixed names for NamedInts numerical values

This commit is contained in:
Daniel Pavel 2013-01-09 15:31:19 +02:00
parent 2bfba2e399
commit 79a9048db5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/logitech/unifying_receiver/common.py
View File

@ -66,8 +66,6 @@ class NamedInts(object):
def _readable_name(n): def _readable_name(n):
if not isinstance(n, str) and not isinstance(n, unicode): if not isinstance(n, str) and not isinstance(n, unicode):
raise TypeError("expected string, got " + type(n)) raise TypeError("expected string, got " + type(n))
if n == n.upper():
n = n.lstrip('_')
return n.replace('__', '/').replace('_', ' ') return n.replace('__', '/').replace('_', ' ')
values = {k: NamedInt(v, _readable_name(k)) for (k, v) in kwargs.items()} values = {k: NamedInt(v, _readable_name(k)) for (k, v) in kwargs.items()}
@ -77,7 +75,7 @@ class NamedInts(object):
self._fallback = None self._fallback = None
@classmethod @classmethod
def range(cls, from_value, to_value, name_generator=lambda x: '_' + str(x), step=1): def range(cls, from_value, to_value, name_generator=lambda x: str(x), step=1):
values = {name_generator(x): x for x in range(from_value, to_value + 1, step)} values = {name_generator(x): x for x in range(from_value, to_value + 1, step)}
return NamedInts(**values) return NamedInts(**values)

4
lib/logitech/unifying_receiver/descriptors.py
View File

@ -76,7 +76,7 @@ _D('Touch Mouse M600')
_D('Marathon Mouse M705', _D('Marathon Mouse M705',
settings=[ settings=[
_register_smooth_scroll(0x01, true_value=0x40, mask=0x40), _register_smooth_scroll(0x01, true_value=0x40, mask=0x40),
# _register_dpi(0x63, _NamedInts.range(9, 11, lambda x: '_' + str(x * 100))), # _register_dpi(0x63, _NamedInts.range(9, 11, lambda x: str(x * 100))),
], ],
) )
_D('Wireless Keyboard K230') _D('Wireless Keyboard K230')
@ -96,7 +96,7 @@ _D('Anywhere Mouse MX', codename='Anywhere MX',
) )
_D('Performance Mouse MX', codename='Performance MX', _D('Performance Mouse MX', codename='Performance MX',
settings=[ settings=[
_register_dpi(0x63, _NamedInts.range(0x81, 0x8F, lambda x: '_' + str((x - 0x80) * 100))), _register_dpi(0x63, _NamedInts.range(0x81, 0x8F, lambda x: str((x - 0x80) * 100))),
], ],
) )