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 more ps5 controller mapping

Browse Source
This commit is contained in:
dekunukem
2022-05-10 13:05:06 +01:00
parent 4b46ab9ee0
commit a07036edd2
3 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
user_program/old/temp.py
View File

@@ -1,3 +1,20 @@
ABS_Z = 0x02
ABS_RX = 0x03
ABS_RY = 0x04
ABS_RZ = 0x05
xbox_one_analog_trigger_codes = {ABS_Z, ABS_RZ}
ps4_analog_trigger_codes = {ABS_Z, ABS_RZ}
ps5_analog_trigger_codes = {ABS_Z, ABS_RZ}
def is_analog_trigger(ev_code, gamepad_type):
if "Xbox" in gamepad_type and ev_code in xbox_one_analog_trigger_codes:
return True
if 'DualSense' in gamepad_type and ev_code in ps5_analog_trigger_codes:
return True
if 'DualShock' in gamepad_type and ev_code in ps4_analog_trigger_codes:
return True
return False
def get_stick_axes(this_device):
if 'DualSense' in this_device['gamepad_type']:

38
user_program/usb4vc_gamepads.py
View File

@@ -20,12 +20,10 @@ def gamepad_type_lookup(vendor_id, product_id):
return GAMEPAD_TYPE_UNKNOWN
ABS_Z = 0x02
ABS_RX = 0x03
ABS_RY = 0x04
ABS_RZ = 0x05
xbox_one_analog_trigger_codes = {ABS_Z, ABS_RZ}
ps4_analog_trigger_codes = {ABS_Z, ABS_RZ}
ps5_analog_trigger_codes = {ABS_RX, ABS_RY}
ps5_analog_trigger_codes = {ABS_Z, ABS_RZ}
def is_analog_trigger(ev_code, gamepad_type):
if "Xbox" in gamepad_type and ev_code in xbox_one_analog_trigger_codes:
@@ -221,27 +219,26 @@ XBOX_DEFAULT_MAPPING = {
PS5_DEFAULT_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'},
'PS_CROSS': {'code':'IBM_GGP_BTN_1'},
'PS_SQUARE': {'code':'IBM_GGP_BTN_2'},
'PS_CIRCLE': {'code':'IBM_GGP_BTN_3'},
'PS_TRIANGLE': {'code':'IBM_GGP_BTN_4'},
'BTN_WEST': {'code':'IBM_GGP_BTN_3'},
'BTN_Z': {'code':'IBM_GGP_BTN_4'},
'PS_L1': {'code':'IBM_GGP_BTN_3'},
'PS_R1': {'code':'IBM_GGP_BTN_4'},
# 'BTN_TL': {'code':'IBM_GGP_BTN_3'},
# 'BTN_TR': {'code':'IBM_GGP_BTN_4'},
# 'PS_L2_BUTTON': {'code':'IBM_GGP_BTN_3'},
# 'PS_R2_BUTTON': {'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'},
'ABS_RX':{'code':'IBM_GGP_JS2_YP'},
'ABS_RY':{'code':'IBM_GGP_JS2_YN'},
'PS_LSX': {'code':'IBM_GGP_JS1_X'},
'PS_LSY': {'code':'IBM_GGP_JS1_Y'},
'PS_DPX': {'code':'IBM_GGP_JS1_X'},
'PS_DPY': {'code':'IBM_GGP_JS1_Y'},
'PS_RSX': {'code':'IBM_GGP_JS2_X'},
'PS_RSY': {'code':'IBM_GGP_JS2_Y'},
'PS_L2_ANALOG':{'code':'IBM_GGP_JS2_YP'},
'PS_R2_ANALOG':{'code':'IBM_GGP_JS2_YN'},
}
PS4_DEFAULT_MAPPING = {
@@ -268,7 +265,6 @@ PS4_DEFAULT_MAPPING = {
'PS_R2_ANALOG':{'code':'IBM_GGP_JS2_YN'},
}
GENERIC_DEFAULT_MAPPING = {
# buttons to buttons
'BTN_1': {'code': 'IBM_GGP_BTN_2'},

4
user_program/usb4vc_usb_scan.py
View File

@@ -826,11 +826,11 @@ def raw_input_event_worker():
for axis_name in USB_GAMEPAD_STICK_AXES_NAMES:
axis_code = usb4vc_shared.code_name_to_value_lookup.get(axis_name)[0]
this_gp_dict = gamepad_status_dict[this_device['id']]
if axis_code in this_gp_dict and 127 - 12 <= this_gp_dict[axis_code] <= 127 + 12:
if axis_code in this_gp_dict and 127 - 10 <= this_gp_dict[axis_code] <= 127 + 10:
this_gp_dict[axis_code] = 127
gamepad_output = make_gamepad_spi_packet(gamepad_status_dict, this_device)
if gamepad_output != last_gamepad_msg:
# print(gamepad_output)
print(gamepad_output)
gp_to_transfer, kb_to_transfer, mouse_to_transfer = gamepad_output
pcard_spi.xfer(list(gp_to_transfer))
if kb_to_transfer is not None: