Compare commits

..

No commits in common. "e155a6cfcc0662c7b860a1b0f6cf4ba955fdced1" and "cf4e856a2b5626b026f259aafbf106579317977e" have entirely different histories.

2 changed files with 2 additions and 4 deletions

View File

@ -139,7 +139,7 @@ def ask_user_for_keymap(dev):
('orange', 'guitar button'), ('orange', 'guitar button'),
] ]
print("Press the corresponding button on your controller. If the button doesn't exist, or doesn't register, press the start button again to ignore it. It might act as an axis, we will register that later.") print("Press the corresponding button on your controller. If the button doesn't exist, press the start button again to ignore it.")
# Dictionary of XBox buttons to xboxdrv key names. # Dictionary of XBox buttons to xboxdrv key names.
mappings = {} mappings = {}
# Values of mappings dictionary to avoid mapping the same button twice. # Values of mappings dictionary to avoid mapping the same button twice.
@ -184,8 +184,6 @@ def ask_user_for_axismap(dev, mappings):
('y2', ('down', 'up'), 'right anlog stick (up/down)'), ('y2', ('down', 'up'), 'right anlog stick (up/down)'),
('lt', ('trigger',), 'left analog trigger (L or L2 button)'), ('lt', ('trigger',), 'left analog trigger (L or L2 button)'),
('rt', ('trigger',), 'right analog trigger (R or R2 button)'), ('rt', ('trigger',), 'right analog trigger (R or R2 button)'),
('dpad_x', ('left', 'right'), 'dpad (left/right)'),
('dpad_y', ('up', 'down'), 'dpad (up/down)'),
] ]
print("Move the corresponding axis on your controller. If the axis doesn't exist, press the start button to ignore it.") print("Move the corresponding axis on your controller. If the axis doesn't exist, press the start button to ignore it.")

View File

@ -29,7 +29,7 @@ def list_active_evdev():
for fd in r: for fd in r:
for event in list(devices[fd].read())[:1]: for event in list(devices[fd].read())[:1]:
if event.type == evdev.ecodes.EV_KEY: if event.type == evdev.ecodes.EV_KEY:
output.append(devices[fd].path) output.append(devices[fd].fn)
anyInput = True anyInput = True
return output return output