Skip to content

fix(mapping): resolve conflicting button assignments for Steam Deck and SDL2 gamepads #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pinklightultra wants to merge 1 commit into from
+167 −173
Closed

fix(mapping): resolve conflicting button assignments for Steam Deck and SDL2 gamepads #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 46 additions & 43 deletions projects/resources/DEB/mapping.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,55 @@
<!--
MAPPING FOR KEYBOARDS
MAPPING FOR KEYBOARDS & SDL2 CONTROLLERS
belongs in location of binary
-=-=These keys might not match your controller!=-=-
enable DUMPEVENT to help with mapping
-=-=These keys match keyboard and standard SDL2 GameController=-=-
enable DUMPEVENT in config.xml to help with mapping if needed
-->
<MAPPINGS>

<!--
EXAMPLE
maps the button "q" to left shoulder
maps the button "w" to right shoulder
-->
<MAP src="key:0:q" dst="/event/lshoulder" />
<MAP src="key:0:w" dst="/event/rshoulder" />

<!-- commented-out due to double-mapping causing issues
<MAP src="key:0:up" dst="/event/up" />
<MAP src="key:0:down" dst="/event/down" />
<MAP src="key:0:left" dst="/event/left" />
<MAP src="key:0:right" dst="/event/right" />
-->

<MAP src="key:0:a" dst="/event/b" />
<MAP src="key:0:s" dst="/event/a" />
<MAP src="key:0:space" dst="/event/start" />
<!--
EXAMPLE
maps the button "8" to left shoulder
maps the button "6" to right shoulder
-->
<MAP src="but:0:8" dst="/event/rshoulder" />
<MAP src="but:0:6" dst="/event/lshoulder" />
<!-- Keyboard Controls -->
<MAP src="key:0:q" dst="/event/lshoulder" />
<MAP src="key:0:w" dst="/event/rshoulder" />

<MAP src="key:0:up" dst="/event/up" />
<MAP src="key:0:down" dst="/event/down" />
<MAP src="key:0:left" dst="/event/left" />
<MAP src="key:0:right" dst="/event/right" />

<MAP src="key:0:a" dst="/event/b" />
<MAP src="key:0:s" dst="/event/a" />
<MAP src="key:0:space" dst="/event/start" />

<MAP src="but:0:0" dst="/event/up" />
<MAP src="but:0:2" dst="/event/down" />
<MAP src="but:0:3" dst="/event/left" />
<MAP src="but:0:1" dst="/event/right" />
<!-- D-Pad (SDL2 GameController Buttons) -->
<MAP src="but:0:11" dst="/event/up" />
<MAP src="but:0:12" dst="/event/down" />
<MAP src="but:0:13" dst="/event/left" />
<MAP src="but:0:14" dst="/event/right" />

<MAP src="but:0:0" dst="/event/a" />
<MAP src="but:0:1" dst="/event/b" />
<MAP src="but:0:4" dst="/event/start" />
<!-- Left Analog Stick (Axes) -->
<MAP src="joy:0:1-" dst="/event/up" />
<MAP src="joy:0:1+" dst="/event/down" />
<MAP src="joy:0:0-" dst="/event/left" />
<MAP src="joy:0:0+" dst="/event/right" />

<!-- Hat D-Pad (Fallback) -->
<MAP src="hat:0:0:1" dst="/event/up" />
<MAP src="hat:0:0:4" dst="/event/down" />
<MAP src="hat:0:0:8" dst="/event/left" />
<MAP src="hat:0:0:2" dst="/event/right" />

<!-- Face Buttons (A / B) -->
<MAP src="but:0:0" dst="/event/a" />
<MAP src="but:0:1" dst="/event/b" />

<!-- Shoulder Buttons (LB / RB, buttons 9/10 on SDL2, 4/5 on DInput) -->
<MAP src="but:0:9" dst="/event/lshoulder" />
<MAP src="but:0:10" dst="/event/rshoulder" />
<MAP src="but:0:4" dst="/event/lshoulder" />
<MAP src="but:0:5" dst="/event/rshoulder" />

<!-- Start Buttons (Menu / Start) -->
<MAP src="but:0:6" dst="/event/start" />
<MAP src="but:0:7" dst="/event/start" />

<!--
Macro 1
Expand All @@ -53,11 +63,4 @@ Macro 2
<MAP src="but:0:2" dst="/event/lshoulder" />
<MAP src="but:0:2" dst="/event/start" />
-->
<!--
Macro 3
Solo phrase (hold to solo, release to unsolo)
Warning: will do weirdness if combined with other buttons! Use with caution ;)
<MAP src="but:0:5" dst="/event/a" />
<MAP src="but:0:5" dst="/event/rshoulder" />
-->
</MAPPINGS>
</MAPPINGS>
86 changes: 35 additions & 51 deletions projects/resources/STEAM/mapping.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,46 @@
<!--
MAPPING FOR KEYBOARDS
MAPPING FOR STEAM DECK & STANDARD SDL2 CONTROLLERS
belongs in location of binary
-=-=These keys might not match your controller!=-=-
enable DUMPEVENT to help with mapping
-=-=These keys match standard SDL2 GameController / Steam Deck=-=-
enable DUMPEVENT in config.xml to help with mapping if needed
-->
<MAPPINGS>

<!--
EXAMPLE
maps the button "q" to left shoulder
maps the button "w" to right shoulder
-->
<MAP src="key:0:q" dst="/event/lshoulder" />
<MAP src="key:0:w" dst="/event/rshoulder" />
<!-- Keyboard Controls -->
<MAP src="key:0:q" dst="/event/lshoulder" />
<MAP src="key:0:w" dst="/event/rshoulder" />

<MAP src="key:0:up" dst="/event/up" />
<MAP src="key:0:down" dst="/event/down" />
<MAP src="key:0:left" dst="/event/left" />
<MAP src="key:0:right" dst="/event/right" />
<MAP src="key:0:up" dst="/event/up" />
<MAP src="key:0:down" dst="/event/down" />
<MAP src="key:0:left" dst="/event/left" />
<MAP src="key:0:right" dst="/event/right" />

<MAP src="key:0:a" dst="/event/b" />
<MAP src="key:0:s" dst="/event/a" />
<MAP src="key:0:space" dst="/event/start" />
<!--
EXAMPLE
maps the button "8" to left shoulder
maps the button "6" to right shoulder
-->
<MAP src="but:0:0" dst="/event/lshoulder" />
<MAP src="but:0:2" dst="/event/rshoulder" />
<MAP src="key:0:a" dst="/event/b" />
<MAP src="key:0:s" dst="/event/a" />
<MAP src="key:0:space" dst="/event/start" />

<MAP src="but:0:11" dst="/event/up" />
<MAP src="but:0:12" dst="/event/down" />
<MAP src="but:0:13" dst="/event/left" />
<MAP src="but:0:14" dst="/event/right" />
<!-- D-Pad (SDL2 GameController Buttons) -->
<MAP src="but:0:11" dst="/event/up" />
<MAP src="but:0:12" dst="/event/down" />
<MAP src="but:0:13" dst="/event/left" />
<MAP src="but:0:14" dst="/event/right" />

<MAP src="but:0:0" dst="/event/a" />
<MAP src="but:0:2" dst="/event/b" />
<MAP src="but:0:4" dst="/event/start" />
<MAP src="but:0:6" dst="/event/start" />
<!-- Left Analog Stick (Axes) -->
<MAP src="joy:0:1-" dst="/event/up" />
<MAP src="joy:0:1+" dst="/event/down" />
<MAP src="joy:0:0-" dst="/event/left" />
<MAP src="joy:0:0+" dst="/event/right" />

<!-- Face Buttons (A / B) -->
<MAP src="but:0:0" dst="/event/a" />
<MAP src="but:0:1" dst="/event/b" />

<!-- Shoulder Buttons (LB / RB) -->
<MAP src="but:0:9" dst="/event/lshoulder" />
<MAP src="but:0:10" dst="/event/rshoulder" />

<!-- Start / Select -->
<MAP src="but:0:6" dst="/event/start" />
<MAP src="but:0:4" dst="/event/start" />

<!--
Macro 1
Stop Phrase (Selected phrase cue stop)
<MAP src="but:0:3" dst="/event/rshoulder" />
<MAP src="but:0:3" dst="/event/start" />
-->
<!--
Macro 2
Queue Phrases (Current row Phrases cue play)
<MAP src="but:0:2" dst="/event/lshoulder" />
<MAP src="but:0:2" dst="/event/start" />
-->
<!--
Macro 3
Solo phrase (hold to solo, release to unsolo)
Warning: will do weirdness if combined with other buttons! Use with caution ;)
<MAP src="but:0:5" dst="/event/a" />
<MAP src="but:0:5" dst="/event/rshoulder" />
-->
</MAPPINGS>
81 changes: 43 additions & 38 deletions projects/resources/X64/mapping.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,55 @@
<!--
MAPPING FOR KEYBOARDS
MAPPING FOR KEYBOARDS & SDL2 CONTROLLERS
belongs in location of binary
-=-=These keys might not match your controller!=-=-
enable DUMPEVENT to help with mapping
-=-=These keys match keyboard and standard SDL2 GameController=-=-
enable DUMPEVENT in config.xml to help with mapping if needed
-->
<MAPPINGS>

<!--
EXAMPLE
maps the button "q" to left shoulder
maps the button "w" to right shoulder
-->
<MAP src="key:0:q" dst="/event/lshoulder" />
<MAP src="key:0:w" dst="/event/rshoulder" />
<!-- Keyboard Controls -->
<MAP src="key:0:q" dst="/event/lshoulder" />
<MAP src="key:0:w" dst="/event/rshoulder" />

<MAP src="key:0:up" dst="/event/up" />
<MAP src="key:0:down" dst="/event/down" />
<MAP src="key:0:left" dst="/event/left" />
<MAP src="key:0:right" dst="/event/right" />
<MAP src="key:0:up" dst="/event/up" />
<MAP src="key:0:down" dst="/event/down" />
<MAP src="key:0:left" dst="/event/left" />
<MAP src="key:0:right" dst="/event/right" />

<MAP src="key:0:a" dst="/event/b" />
<MAP src="key:0:s" dst="/event/a" />
<MAP src="key:0:space" dst="/event/start" />
<!--
EXAMPLE
maps the button "8" to left shoulder
maps the button "6" to right shoulder
-->
<MAP src="but:0:8" dst="/event/rshoulder" />
<MAP src="but:0:6" dst="/event/lshoulder" />
<MAP src="key:0:a" dst="/event/b" />
<MAP src="key:0:s" dst="/event/a" />
<MAP src="key:0:space" dst="/event/start" />

<!-- D-Pad (SDL2 GameController Buttons) -->
<MAP src="but:0:11" dst="/event/up" />
<MAP src="but:0:12" dst="/event/down" />
<MAP src="but:0:13" dst="/event/left" />
<MAP src="but:0:14" dst="/event/right" />

<MAP src="but:0:0" dst="/event/up" />
<MAP src="but:0:2" dst="/event/down" />
<MAP src="but:0:3" dst="/event/left" />
<MAP src="but:0:1" dst="/event/right" />
<!-- Left Analog Stick (Axes) -->
<MAP src="joy:0:1-" dst="/event/up" />
<MAP src="joy:0:1+" dst="/event/down" />
<MAP src="joy:0:0-" dst="/event/left" />
<MAP src="joy:0:0+" dst="/event/right" />

<MAP src="but:0:0" dst="/event/a" />
<MAP src="but:0:1" dst="/event/b" />
<MAP src="but:0:4" dst="/event/start" />
<!-- Hat D-Pad (Fallback) -->
<MAP src="hat:0:0:1" dst="/event/up" />
<MAP src="hat:0:0:4" dst="/event/down" />
<MAP src="hat:0:0:8" dst="/event/left" />
<MAP src="hat:0:0:2" dst="/event/right" />

<!-- Face Buttons (A / B) -->
<MAP src="but:0:0" dst="/event/a" />
<MAP src="but:0:1" dst="/event/b" />

<!-- Shoulder Buttons (LB / RB, buttons 9/10 on SDL2, 4/5 on DInput) -->
<MAP src="but:0:9" dst="/event/lshoulder" />
<MAP src="but:0:10" dst="/event/rshoulder" />
<MAP src="but:0:4" dst="/event/lshoulder" />
<MAP src="but:0:5" dst="/event/rshoulder" />

<!-- Start Buttons (Menu / Start) -->
<MAP src="but:0:6" dst="/event/start" />
<MAP src="but:0:7" dst="/event/start" />

<!--
Macro 1
Expand All @@ -51,11 +63,4 @@ Macro 2
<MAP src="but:0:2" dst="/event/lshoulder" />
<MAP src="but:0:2" dst="/event/start" />
-->
<!--
Macro 3
Solo phrase (hold to solo, release to unsolo)
Warning: will do weirdness if combined with other buttons! Use with caution ;)
<MAP src="but:0:5" dst="/event/a" />
<MAP src="but:0:5" dst="/event/rshoulder" />
-->
</MAPPINGS>
Loading