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

receiver: add new set of special keys from logitech documentation 

receiver: descriptor and key for MX Vertical mouse
This commit is contained in:
Peter F. Patel-Schneider 2020-06-25 11:31:57 -04:00 committed by Filipe Laíns
parent 0836766bfb
commit 070a2bf837
2 changed files with 155 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/logitech_receiver/descriptors.py
View File

@ -356,6 +356,8 @@ _D('Wireless Mouse MX Master 2S', codename='MX Master 2S', protocol=4.5,wpid='40
],
)
_D('Wireless Mouse MX Vertical', codename='MX Vertical', protocol=4.5, wpid='407B')
_D('G7 Cordless Laser Mouse', codename='G7', protocol=1.0, wpid='1002',
registers=(_R.battery_status, ),
)

183
lib/logitech_receiver/special_keys.py
View File

@ -191,24 +191,86 @@ CONTROL = _NamedInts(
ZOOMOUT=0x00AB,
BACK_HSCROLL=0x00AC,
SHOW_DESKTOP_HPP=0x00AE,
Fn_Left_Click=0x00B7, # from K400 Plus
Yellow_Left_Click_Key=0x00B8, # from K400 Plus
Screen_Capture=0x00BF, # from Craft Keyboard
Thumb_Button=0x00C3, # from MX Master
Top_Button=0x00C4, # from MX Master
Brightness_Down=0x00C7, # from Craft Keyboard
Brightness_Up=0x00C8, # from Craft Keyboard
Switch_Workspaces=0x00E0, # from Craft Keyboard
Application_Launcher=0x00E1, # from Craft Keyboard
Backlight_Down=0x00E2, # from Craft Keyboard
Backlight_Up=0x00E3, # from Craft Keyboard
Previous_Fn=0x00E4, # from Craft Keyboard
Play__Pause_Fn=0x00E5, # from Craft Keyboard
Next_Fn=0x00E6, # from Craft Keyboard
Mute_Fn=0x00E7, # from Craft Keyboard
Volume_Down_Fn=0x00E8, # from Craft Keyboard
Volume_Up_Fn=0x00E9, # from Craft Keyboard
Context_Menu=0x00EA, # from Craft Keyboard
Fn_Left_Click=0x00B7, # from K400 Plus
# https://docs.google.com/document/u/0/d/1YvXICgSe8BcBAuMr4Xu_TutvAxaa-RnGfyPFWBWzhkc/export?format=docx
# Extract to csv. Eliminate extra linefeeds and spaces.
# awk -F, '/0x/{gsub(" \\+ ","_",$2); gsub("/","__",$2); gsub(" -","_Down",$2); gsub(" \\+","_Up",$2); gsub("[()\"-]","",$2); gsub(" ","_",$2); printf("\t%s=0x%04X,\n", $2, $1)}' < controls.cvs
Second_Left_Click=0x00B8, # Second_LClick / on K400 Plus
Fn_Second_Left_Click=0x00B9, # Fn_Second_LClick
MultiPlatform_App_Switch=0x00BA,
MultiPlatform_Home=0x00BB,
MultiPlatform_Menu=0x00BC,
MultiPlatform_Back=0x00BD,
MultiPlatform_Insert=0x00BE,
Screen_Capture__Print_Screen=0x00BF, # on Craft Keyboard
Fn_Down=0x00C0,
Fn_Up=0x00C1,
Multiplatform_Lock=0x00C2,
App_Switch_Gesture=0x00C3, # Thumb_Button on MX Master
Smart_Shift=0x00C4, # Top_Button on MX Master
Microphone=0x00C5,
Wifi=0x00C6,
Brightness_Down=0x00C7,
Brightness_Up=0x00C8,
Display_out__project_screen_=0x00C9,
View_Open_Apps=0x00CA,
View_all_apps=0x00CB,
Switch_App=0x00CC,
Fn_inversion_change=0x00CD,
MultiPlatform_back=0x00CE,
Multiplatform_forward=0x00CF,
Multiplatform_gesture_button=0x00D0,
Host_Switch_channel_1=0x00D1,
Host_Switch_channel_2=0x00D2,
Host_Switch_channel_3=0x00D3,
Multiplatform_search=0x00D4,
Multiplatform_Home__Mission_Control=0x00D5,
Multiplatform_Menu__Show__Hide_Virtual_Keyboard__Launchpad=0x00D6,
Virtual_Gesture_Button=0x00D7,
Cursor_Button_Long_press=0x00D8,
Next_Button_Shortpress=0x00D9, # Next_Button
Next_Button_Longpress=0x00DA,
Back_Button_Shortpress=0x00DB, # Back
Back_Button_Longpress=0x00DC,
Multi_Platform_Language_Switch=0x00DD,
F_Lock=0x00DE,
Switch_Highlight=0x00DF,
Mission_Control__Task_View=0x00E0, # Switch_Workspaces on Craft Keyboard
Dashboard_Launchpad__Action_Center=0x00E1, # Application_Launcher on Craft Keyboard
Backlight_Down=0x00E2,
Backlight_Up=0x00E3,
Previous_Fn=0x00E4, # Reprogrammable_Previous_Track / on Craft Keyboard
Play__Pause_Fn=0x00E5, # Reprogrammable_Play__Pause / on Craft Keyboard
Next_Fn=0x00E6, # Reprogrammable_Next_Track / on Craft Keyboard
Mute_Fn=0x00E7, # Reprogrammable_Mute / on Craft Keyboard
Volume_Down_Fn=0x00E8, # Reprogrammable_Volume_Down / on Craft Keyboard
Volume_Up_Fn=0x00E9, # Reprogrammable_Volume_Up / on Craft Keyboard
App_Contextual_Menu__Right_Click=0x00EA, # Context_Menu on Craft Keyboard
Right_Arrow=0x00EB,
Left_Arrow=0x00EC,
DPI_Change=0x00ED,
New_Tab=0x00EE,
F2=0x00EF,
F3=0x00F0,
F4=0x00F1,
F5=0x00F2,
F6=0x00F3,
F7=0x00F4,
F8=0x00F5,
F1=0x00F6,
Next_Color_Effect=0x00F7,
Increase_Color_Effect_Speed=0x00F8,
Decrease_Color_Effect_Speed=0x00F9,
Load_Lighting_Custom_Profile=0x00FA,
Laser_button_short_press=0x00FB,
Laser_button_long_press=0x00FC,
DPI_switch=0x00FD,
MultiPlatform_Home__Show_Desktop=0x00FE,
MultiPlatform_App_Switch__Show_Dashboard=0x00FF,
MultiPlatform_App_Switch_2=0x0100, # MultiPlatform_App_Switch
Fn_Inversion__Hot_Key=0x0101,
LeftAndRightClick=0x0102,
LED_TOGGLE=0x013B, #
)
CONTROL._fallback = lambda x: 'unknown:%04X' % x
@ -352,18 +414,79 @@ TASK = _NamedInts(
Win8ShowDesktopWin7Back=0x008E, # also known as ShowDesktop
MetroApplicationSwitch=0x0090, # also known as MetroStartScreen
ShowUI=0x0092,
Switch_Screen=0x0093, # from K400 Plus
Maximize_Window=0x0095, # from K400 Plus
Screen_Capture=0x009B, # from Craft Keyboard
Toggle_Free_Spin=0x009D, # from MX Master
Mouse_Thumb_Button=0x00A9, # from MX Master
Brightness_Down=0x00A3, # from Craft Keyboard
Brightness_Up=0x00A4, # from Craft Keyboard
Switch_Workspace=0x00BF, # from Craft Keyboard
Application_Launcher=0x00C0, # from Craft Keyboard
Backlight_Down=0x00C1, # from Craft Keyboard
Backlight_Up=0x00C2, # from Craft Keyboard
Context_Menu=0x00C3, # from Craft Keyboard
# https://docs.google.com/document/d/1Dpx_nWRQAZox_zpZ8SNc9nOkSDE9svjkghOCbzopabc/edit
# Extract to csv. Eliminate extra linefeeds and spaces. Turn / into __ and space into _
# awk -F, '/0x/{gsub(" \\+ ","_",$2); gsub("_-","_Down",$2); gsub("_\\+","_Up",$2); gsub("[()\"-]","",$2); gsub(" ","_",$2); printf("\t%s=0x%04X,\n", $2, $1)}' < tasks.csv > tasks.py
Switch_Presentation__Switch_Screen=0x0093, # on K400 Plus
Minimize_Window=0x0094,
Maximize_Window=0x0095, # on K400 Plus
MultiPlatform_App_Switch=0x0096,
MultiPlatform_Home=0x0097,
MultiPlatform_Menu=0x0098,
MultiPlatform_Back=0x0099,
Switch_Language=0x009A, # Mac_switch_language
Screen_Capture=0x009B, # Mac_screen_Capture, on Craft Keyboard
Gesture_Button=0x009C,
Smart_Shift=0x009D,
AppExpose=0x009E,
Smart_Zoom=0x009F,
Lookup=0x00A0,
Microphone_on__off=0x00A1,
Wifi_on__off=0x00A2,
Brightness_Down=0x00A3,
Brightness_Up=0x00A4,
Display_Out=0x00A5,
View_Open_Apps=0x00A6,
View_All_Open_Apps=0x00A7,
AppSwitch=0x00A8,
Gesture_Button_Navigation=0x00A9, # Mouse_Thumb_Button on MX Master
Fn_inversion=0x00AA,
Multiplatform_Back=0x00AB,
Multiplatform_Forward=0x00AC,
Multiplatform_Gesture_Button=0x00AD,
HostSwitch_Channel_1=0x00AE,
HostSwitch_Channel_2=0x00AF,
HostSwitch_Channel_3=0x00B0,
Multiplatform_Search=0x00B1,
Multiplatform_Home__Mission_Control=0x00B2,
Multiplatform_Menu__Launchpad=0x00B3,
Virtual_Gesture_Button=0x00B4,
Cursor=0x00B5,
Keyboard_Right_Arrow=0x00B6,
SW_Custom_Highlight=0x00B7,
Keyboard_Left_Arrow=0x00B8,
TBD=0x00B9,
Multiplatform_Language_Switch=0x00BA,
SW_Custom_Highlight_2=0x00BB,
Fast_Forward=0x00BC,
Fast_Backward=0x00BD,
Switch_Highlighting=0x00BE,
Mission_Control__Task_View=0x00BF, # Switch_Workspace on Craft Keyboard
Dashboard_Launchpad__Action_Center=0x00C0, # Application_Launcher on Craft Keyboard
Backlight_Down=0x00C1, # Backlight_Down_FW_internal_function
Backlight_Up=0x00C2, # Backlight_Up_FW_internal_function
Right_Click__App_Contextual_Menu=0x00C3, # Context_Menu on Craft Keyboard
DPI_Change=0x00C4,
New_Tab=0x00C5,
F2=0x00C6,
F3=0x00C7,
F4=0x00C8,
F5=0x00C9,
F6=0x00CA,
F7=0x00CB,
F8=0x00CC,
F1=0x00CD,
Laser_Button=0x00CE,
Laser_Button_Long_Press=0x00CF,
Start_Presentation=0x00D0,
Blank_Screen=0x00D1,
DPI_Switch=0x00D2, # AdjustDPI on MX Vertical
Home__Show_Desktop=0x00D3,
App_Switch__Dashboard=0x00D4,
App_Switch=0x00D5,
Fn_Inversion=0x00D6,
LeftAndRightClick=0x00D7,
LedToggle=0x00DD, #
)
TASK._fallback = lambda x: 'unknown:%04X' % x
# hidpp 4.5 info from https://lekensteyn.nl/files/logitech/x1b04_specialkeysmsebuttons.html