salfter/USB4VC
1
0
Fork 0
mirror of https://github.com/dekuNukem/USB4VC.git synced 2025-10-31 11:26:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

fixed playstation 5 dualsense controller default mapping

Browse Source
This commit is contained in:
dekunukem
2022-02-25 00:43:54 +00:00
parent ed3c2b1e0f
commit ee788bdccc
4 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
user_program/login.sh
View File

@@ -1 +1 @@
ssh pi@192.168.1.66
ssh pi@192.168.1.56

4
user_program/sync.sh
View File

@@ -2,5 +2,5 @@
# sh sync.sh; ssh -t pi@192.168.1.67 "pkill python3;cd ~/usb4vc/rpi_app;python3 usb4vc_main.py"
scp ./* pi@192.168.1.66:~/usb4vc/rpi_app
ssh -t pi@192.168.1.66 "pkill python3;cd ~/usb4vc/rpi_app;python3 usb4vc_main.py"
scp ./* pi@192.168.1.56:~/usb4vc/rpi_app
ssh -t pi@192.168.1.56 "pkill python3;cd ~/usb4vc/rpi_app;python3 usb4vc_main.py"

25
user_program/usb4vc_ui.py
View File

@@ -101,17 +101,22 @@ USBGP_ABS_RZ = 0x05 # right analog trigger
USBGP_ABS_HAT0X = 0x10 # D-pad X
USBGP_ABS_HAT0Y = 0x11 # D-pad Y
IBM_GGP_DEAULT_MAPPING = {
IBM_GENERIC_USB_GAMEPAD_TO_15PIN_GAMEPORT_GAMEPAD_DEAULT_MAPPING = {
"IS_DEFAULT": True,
# buttons to buttons
'BTN_X': {'code':'IBM_GGP_BTN_2'},
'BTN_B': {'code':'IBM_GGP_BTN_3'},
'BTN_Y': {'code':'IBM_GGP_BTN_4'},
'BTN_A': {'code':'IBM_GGP_BTN_1'},
'BTN_SOUTH': {'code':'IBM_GGP_BTN_1'},
'BTN_NORTH': {'code':'IBM_GGP_BTN_2'},
'BTN_EAST': {'code':'IBM_GGP_BTN_3'},
'BTN_WEST': {'code':'IBM_GGP_BTN_4'},
'BTN_TL': {'code':'IBM_GGP_BTN_1'},
'BTN_TR': {'code':'IBM_GGP_BTN_2'},
# buttons to keyboard keys
'BTN_SELECT': {'code':'KEY_ESC'},
'BTN_START': {'code':'KEY_ENTER'},
'BTN_Z': {'code':'IBM_GGP_BTN_3'},
'BTN_C': {'code':'IBM_GGP_BTN_4'},
'BTN_TL2': {'code':'IBM_GGP_BTN_1'},
'BTN_TR2': {'code':'IBM_GGP_BTN_2'},
# analog axes to analog axes
'ABS_X': {'code':'IBM_GGP_JS1_X'},
'ABS_Y': {'code':'IBM_GGP_JS1_Y'},
@@ -119,8 +124,6 @@ IBM_GGP_DEAULT_MAPPING = {
'ABS_HAT0Y': {'code':'IBM_GGP_JS1_Y'},
'ABS_RX': {'code':'IBM_GGP_JS2_X'},
'ABS_RY': {'code':'IBM_GGP_JS2_Y'},
'ABS_Z':{'code':'IBM_GGP_JS2_YP'},
'ABS_RZ':{'code':'IBM_GGP_JS2_YN'},
}
PROTOCOL_OFF = {'pid':0, 'display_name':"OFF"}
@@ -130,7 +133,7 @@ PROTOCOL_ADB_KB = {'pid':3, 'display_name':"ADB"}
PROTOCOL_PS2_MOUSE = {'pid':4, 'display_name':"PS/2"}
PROTOCOL_MICROSOFT_SERIAL_MOUSE = {'pid':5, 'display_name':"Microsft Serial"}
PROTOCOL_ADB_MOUSE = {'pid':6, 'display_name':"ADB"}
PROTOCOL_15PIN_GAMEPORT_GAMEPAD = {'pid':7, 'display_name':"Generic 15-Pin", 'mapping':IBM_GGP_DEAULT_MAPPING}
PROTOCOL_15PIN_GAMEPORT_GAMEPAD = {'pid':7, 'display_name':"Generic 15-Pin", 'mapping':IBM_GENERIC_USB_GAMEPAD_TO_15PIN_GAMEPORT_GAMEPAD_DEAULT_MAPPING}
# PROTOCOL_GAMEPORT_GRAVIS_GAMEPAD = {'pid':8, 'display_name':"Gravis Pro"}
# PROTOCOL_GAMEPORT_MICROSOFT_SIDEWINDER = {'pid':9, 'display_name':"MS Sidewinder"}
PROTOCOL_RAW_KEYBOARD = {'pid':125, 'display_name':"Raw data"}

64
user_program/usb4vc_usb_scan.py
View File

@@ -211,16 +211,66 @@ def translate_dict(old_mapping_dict, lookup_dict):
translated_map_dict[lookup_result] = old_mapping_dict[key]
return translated_map_dict
XBOX_DEFAULT_MAPPING = {
# buttons to buttons
'BTN_A': {'code':'IBM_GGP_BTN_1'},
'BTN_X': {'code':'IBM_GGP_BTN_2'},
'BTN_B': {'code':'IBM_GGP_BTN_3'},
'BTN_Y': {'code':'IBM_GGP_BTN_4'},
'BTN_TL': {'code':'IBM_GGP_BTN_1'},
'BTN_TR': {'code':'IBM_GGP_BTN_2'},
# buttons to keyboard keys
'BTN_SELECT': {'code':'KEY_ESC'},
'BTN_START': {'code':'KEY_ENTER'},
# analog axes to analog axes
'ABS_X': {'code':'IBM_GGP_JS1_X'},
'ABS_Y': {'code':'IBM_GGP_JS1_Y'},
'ABS_HAT0X': {'code':'IBM_GGP_JS1_X'},
'ABS_HAT0Y': {'code':'IBM_GGP_JS1_Y'},
'ABS_RX': {'code':'IBM_GGP_JS2_X'},
'ABS_RY': {'code':'IBM_GGP_JS2_Y'},
'ABS_Z':{'code':'IBM_GGP_JS2_YP'},
'ABS_RZ':{'code':'IBM_GGP_JS2_YN'},
}
PLAYSTATION_DEAULT_MAPPING = {
# buttons to buttons
'BTN_EAST': {'code':'IBM_GGP_BTN_1'},
'BTN_SOUTH': {'code':'IBM_GGP_BTN_2'},
'BTN_C': {'code':'IBM_GGP_BTN_3'},
'BTN_NORTH': {'code':'IBM_GGP_BTN_4'},
'BTN_WEST': {'code':'IBM_GGP_BTN_1'},
'BTN_Z': {'code':'IBM_GGP_BTN_2'},
'BTN_TL': {'code':'IBM_GGP_BTN_3'},
'BTN_TR': {'code':'IBM_GGP_BTN_4'},
# analog axes to analog axes
'ABS_X': {'code':'IBM_GGP_JS1_X'},
'ABS_Y': {'code':'IBM_GGP_JS1_Y'},
'ABS_HAT0X': {'code':'IBM_GGP_JS1_X'},
'ABS_HAT0Y': {'code':'IBM_GGP_JS1_Y'},
'ABS_Z': {'code':'IBM_GGP_JS2_X'},
'ABS_RZ': {'code':'IBM_GGP_JS2_Y'},
}
def find_keycode_in_mapping(source_code, mapping_dict, usb_gamepad_type):
map_dict_copy = dict(mapping_dict)
if usb_gamepad_type == 'PlayStation' and map_dict_copy.get("IS_DEFAULT", False):
map_dict_copy = PLAYSTATION_DEAULT_MAPPING
if usb_gamepad_type == 'Xbox' and map_dict_copy.get("IS_DEFAULT", False):
map_dict_copy = XBOX_DEFAULT_MAPPING
source_name = usb4vc_shared.code_value_to_name_lookup.get(source_code)
if source_name is None:
return None, None
if usb_gamepad_type == "Xbox One":
mapping_dict = translate_dict(mapping_dict, xbox_one_to_linux_ev_code_dict)
if usb_gamepad_type == "Xbox":
map_dict_copy = translate_dict(map_dict_copy, xbox_one_to_linux_ev_code_dict)
target_info = None
for item in source_name:
if item in mapping_dict:
target_info = mapping_dict[item]
if item in map_dict_copy:
target_info = map_dict_copy[item]
if target_info is None or 'code' not in target_info:
return None, None
target_info = dict(target_info) # make a copy so the lookup table itself won't get modified
@@ -273,7 +323,7 @@ ABS_RZ = 0x05
xbox_one_analog_trigger_codes = {ABS_Z, ABS_RZ}
def is_analog_trigger(ev_code, gamepad_type):
if gamepad_type == "Xbox One" and ev_code in xbox_one_analog_trigger_codes:
if gamepad_type == "Xbox" and ev_code in xbox_one_analog_trigger_codes:
return True
return False
@@ -288,7 +338,9 @@ def make_generic_gamepad_spi_packet(gp_status_dict, gp_id, this_device_info, map
this_gamepad_name = this_device_info.get('name', '').lower()
usb_gamepad_type = 'Generic USB'
if 'xbox' in this_gamepad_name or 'x-box' in this_gamepad_name:
usb_gamepad_type = 'Xbox One'
usb_gamepad_type = 'Xbox'
elif 'wireless controller' in this_gamepad_name:
usb_gamepad_type = 'PlayStation'
this_gp_dict = gp_status_dict[gp_id]
curr_gp_output = {