From b2a62c2dd79d01e115e87bbaf4579fea9e60bcac Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 27 May 2013 11:44:20 +0200 Subject: [PATCH 1/3] special_keys: update controls list My previous observation was right, controls and tasks are really different entities. The following "controls" appears to be invalid and have been removed: Home=0x001A, Music=0x001D, Search=0x0029, Sleep=0x002F, --- .../unifying_receiver/special_keys.py | 159 +++++++++++++++++- 1 file changed, 155 insertions(+), 4 deletions(-) diff --git a/lib/logitech/unifying_receiver/special_keys.py b/lib/logitech/unifying_receiver/special_keys.py index 0cc6b1e7..b3b03959 100644 --- a/lib/logitech/unifying_receiver/special_keys.py +++ b/lib/logitech/unifying_receiver/special_keys.py @@ -6,6 +6,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera from .common import NamedInts as _NamedInts +# Date: Mon, 27 May 2013 14:07:38 +0200 Subject: [PATCH 2/3] cli: improve alignment for special keys The following lines have an insane length and are therefore not included in the longest line: WIN7_MONITOR_SWITCH_AS_WIN_SHIFT_LEFTARROW=0x0093, WIN7_MONITOR_SWITCH_AS_WIN_SHIFT_RIGHTARROW=0x0094, While doing this, also fix an obvious typo in the "Lock PC" control. --- lib/logitech/unifying_receiver/special_keys.py | 2 +- lib/solaar/cli.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/logitech/unifying_receiver/special_keys.py b/lib/logitech/unifying_receiver/special_keys.py index b3b03959..7be118b5 100644 --- a/lib/logitech/unifying_receiver/special_keys.py +++ b/lib/logitech/unifying_receiver/special_keys.py @@ -117,7 +117,7 @@ CONTROL = _NamedInts( BUTTON_23=0x006C, BUTTON_24=0x006D, SHOW_DESKTOP=0x006E, - LOKC_PC=0x006F, + Lock_PC=0x006F, FN_F1=0x0070, FN_F2=0x0071, FN_F3=0x0072, diff --git a/lib/solaar/cli.py b/lib/solaar/cli.py index f30a4868..4f3d87ed 100644 --- a/lib/solaar/cli.py +++ b/lib/solaar/cli.py @@ -147,7 +147,7 @@ def _print_device(dev, verbose=False): print (" Has %d reprogrammable keys:" % len(dev.keys)) for k in dev.keys: flags = special_keys.KEY_FLAG.flag_names(k.flags) - print (" %2d: %-20s => %-20s %s" % (k.index, k.key, k.task, ', '.join(flags))) + print (" %2d: %-26s => %-27s %s" % (k.index, k.key, k.task, ', '.join(flags))) if p > 0: battery = hidpp20.get_battery(dev) From 3ef3c23a291ad212b09b936350870a3b4deef530 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 27 May 2013 14:12:44 +0200 Subject: [PATCH 3/3] devices/k360: update solaar output (keys, features) --- docs/devices/k360.txt | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/devices/k360.txt b/docs/devices/k360.txt index abf8ce48..bc0ec049 100644 --- a/docs/devices/k360.txt +++ b/docs/devices/k360.txt @@ -53,36 +53,36 @@ Total number of HID++ 2.0 features: 12 Firmware : RQK 36.00.B0007 The power switch is located on the top case Supports 13 HID++ 2.0 features: - 0: ROOT {0000} - 1: FEATURE SET {0001} - 2: FIRMWARE {0003} - 3: NAME {0005} - 4: BATTERY {1000} - 5: unknown:1820 {1820} hidden - 6: REPROGRAMMABLE KEYS {1B00} - 7: WIRELESS {1D4B} - 8: unknown:1DF0 {1DF0} hidden - 9: unknown:1DF3 {1DF3} hidden - 10: FN STATUS {40A0} - 11: unknown:4100 {4100} - 12: unknown:4520 {4520} + 0: ROOT {0000} + 1: FEATURE SET {0001} + 2: DEVICE FW VERSION {0003} + 3: DEVICE NAME {0005} + 4: BATTERY STATUS {1000} + 5: unknown:1820 {1820} hidden + 6: REPROG CONTROLS {1B00} + 7: WIRELESS DEVICE STATUS {1D4B} + 8: unknown:1DF0 {1DF0} hidden + 9: unknown:1DF3 {1DF3} hidden + 10: FN INVERSION {40A0} + 11: ENCRYPTION {4100} + 12: KEYBOARD LAYOUT {4520} Has 18 reprogrammable keys: - 0: unknown: 22 34 => Home FN sensitive, is FN, reprogrammable (F1) - 1: Mail E 14 => Mail FN sensitive, is FN, reprogrammable (...) - 2: unknown: 3E 62 => Search FN sensitive, is FN, reprogrammable - 3: unknown: 28 40 => Music FN sensitive, is FN, reprogrammable - 4: Applica 8 8 => Application Switcher FN sensitive, is FN, reprogrammable Alt+Tab - 5: unknown: 6E 110 => unknown:0043 FN sensitive, is FN, reprogrammable Win+D ("Show desktop") - 6: unknown: 27 39 => unknown:001C FN sensitive, is FN, reprogrammable Win+M ("Minimize") - 7: unknown: 25 37 => unknown:001B FN sensitive, is FN, reprogrammable Win+Shift+M ("Restore windows") - 8: unknown: 33 51 => unknown:0027 FN sensitive, is FN, reprogrammable Win+E ("My Computer") - 9: unknown: 6F 111 => unknown:0044 FN sensitive, is FN, reprogrammable Win+L ("Lock") - 10: unknown: 40 64 => Sleep FN sensitive, is FN, reprogrammable - 11: Calcul A 10 => Calculator FN sensitive, is FN, reprogrammable (F12) - 12: Previou 6 6 => Previous nonstandard - 13: Play/P 4 4 => Play/Pause nonstandard - 14: Next 5 5 => Next nonstandard - 15: Mute 3 3 => Mute nonstandard - 16: Volume D 2 2 => Volume Down nonstandard - 17: Volume Up 1 1 => Volume Up nonstandard - Battery is 90% charged, dischargin + 0: MY HOME => HomePage FN sensitive, is FN, reprogrammable + 1: Mail => Mail FN sensitive, is FN, reprogrammable + 2: SEARCH => Search FN sensitive, is FN, reprogrammable + 3: MEDIA PLAYER => Music FN sensitive, is FN, reprogrammable + 4: Application Switcher => Application Switcher FN sensitive, is FN, reprogrammable + 5: SHOW DESKTOP => ShowDesktop FN sensitive, is FN, reprogrammable + 6: MINIMIZE AS WIN M => WindowsMinimize FN sensitive, is FN, reprogrammable + 7: MAXIMIZE AS WIN SHIFT M => WindowsRestore FN sensitive, is FN, reprogrammable + 8: MY COMPUTER AS WIN E => My Computer FN sensitive, is FN, reprogrammable + 9: Lock PC => WindowsLock FN sensitive, is FN, reprogrammable + 10: SLEEP => Sleep FN sensitive, is FN, reprogrammable + 11: Calculator => Calculator FN sensitive, is FN, reprogrammable + 12: Previous => Previous nonstandard + 13: Play/Pause => Play/Pause nonstandard + 14: Next => Next nonstandard + 15: Mute => Mute nonstandard + 16: Volume Down => Volume Down nonstandard + 17: Volume Up => Volume Up nonstandard + Battery is 90% charged, discharging