Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/knulli-main' into knulli-main
Browse files Browse the repository at this point in the history
  • Loading branch information
@acmeplus
acmeplus committed Jul 19, 2024
2 parents 5f77e79 + 0e018fe commit d3b520f
Show file tree
Hide file tree
Showing 7 changed files with 5,501 additions and 1 deletion.
2 changes: 1 addition & 1 deletion board/batocera/allwinner/h700/fsoverlay/etc/triggerhappy/triggers.d/multimedia_keys.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ KEY_POWER 0 /usr/bin/power-button-release
KEY_VOLUMEUP+BTN_TL2 1 batocera-brightness + 5
KEY_VOLUMEDOWN+BTN_TL2 1 batocera-brightness - 5
KEY_POWER+BTN_TL2 1 /usr/bin/power-led
BTN_TL+BTN_TL2 1 /usr/bin/dpad-toggle
BTN_TL+BTN_TL2 1 /usr/bin/dpad-toggle
5,076 changes: 5,076 additions & 0 deletions ...rg28xx/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_input.cfg
View file

Large diffs are not rendered by default.

140 changes: 140 additions & 0 deletions board/batocera/allwinner/h700/rg28xx/fsoverlay/usr/share/evmapy/nds.drastic.keys
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
{
"actions_player1": [
{
"trigger": ["up"],
"type": "key",
"target": [ "KEY_UP" ],
"description": "Hat Up"
},
{
"trigger": ["down"],
"type": "key",
"target": [ "KEY_DOWN" ],
"description": "Hat Down"
},
{
"trigger": ["left"],
"type": "key",
"target": [ "KEY_LEFT" ],
"description": "Hat Left"
},
{
"trigger": ["right"],
"type": "key",
"target": [ "KEY_RIGHT" ],
"description": "Hat Right"
},
{
"trigger": ["a"],
"type": "key",
"target": [ "KEY_E" ],
"description": "Button A"
},
{
"trigger": ["b"],
"type": "key",
"target": [ "KEY_R" ],
"description": "Button B"
},
{
"trigger": ["x"],
"type": "key",
"target": [ "KEY_D" ],
"description": "Button X"
},
{
"trigger": ["y"],
"type": "key",
"target": [ "KEY_F" ],
"description": "Button Y"
},
{
"trigger": ["start"],
"type": "key",
"target": [ "KEY_ENTER" ],
"description": "Button Start"
},
{
"trigger": ["select"],
"type": "key",
"target": [ "KEY_SPACE" ],
"description": "Button Select"
},
{
"trigger": ["pageup"],
"type": "key",
"target": [ "KEY_C" ],
"description": "Button L"
},
{
"trigger": ["pagedown"],
"type": "key",
"target": [ "KEY_V" ],
"description": "Button R"
},
{
"trigger": ["l2"],
"type": "key",
"target": [ "KEY_F3" ],
"description": "Disposition A"
},
{
"trigger": ["hotkey", "l2"],
"type": "key",
"target": [ "KEY_F4" ],
"description": "Disposition B"
},
{
"trigger": ["hotkey", "a"],
"type": "key",
"target": [ "KEY_Y" ],
"description": "Microphone"
},
{
"trigger": "joystick1",
"type": "mouse"
},
{
"trigger": ["r2"],
"type": "key",
"target": [ "BTN_LEFT" ],
"description": "TouchScreen"
},
{
"trigger": ["hotkey", "start"],
"type": "key",
"target": [ "KEY_F12" ],
"description": "Exit Drastic"
},
{
"trigger": ["hotkey", "y"],
"type": "key",
"target": [ "KEY_F5" ],
"description": "Save State"
},
{
"trigger": ["hotkey", "x"],
"type": "key",
"target": [ "KEY_F7" ],
"description": "Load State"
},
{
"trigger": ["hotkey", "down"],
"type": "key",
"target": [ "KEY_F2" ],
"description": "Swap Screens"
},
{
"trigger": ["hotkey", "b"],
"type": "key",
"target": [ "KEY_F1" ],
"description": "QuickMenu"
},
{
"trigger": ["hotkey", "right"],
"type": "key",
"target": [ "KEY_TAB" ],
"description": "FastForward"
}
]
}
2 changes: 2 additions & 0 deletions ...x-plus/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_input.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5070,5 +5070,7 @@
<input name="up" type="hat" id="0" value="1" />
<input name="x" type="button" id="6" value="1" code="307" />
<input name="y" type="button" id="5" value="1" code="306" />
<input name="joystick1left" type="axis" id="0" value="-1" code="3" />
<input name="joystick1up" type="axis" id="1" value="-1" code="4" />
</inputConfig>
</inputList>
140 changes: 140 additions & 0 deletions board/batocera/allwinner/h700/rg35xx-plus/fsoverlay/usr/share/evmapy/nds.drastic.keys
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
{
"actions_player1": [
{
"trigger": ["up"],
"type": "key",
"target": [ "KEY_UP" ],
"description": "Hat Up"
},
{
"trigger": ["down"],
"type": "key",
"target": [ "KEY_DOWN" ],
"description": "Hat Down"
},
{
"trigger": ["left"],
"type": "key",
"target": [ "KEY_LEFT" ],
"description": "Hat Left"
},
{
"trigger": ["right"],
"type": "key",
"target": [ "KEY_RIGHT" ],
"description": "Hat Right"
},
{
"trigger": ["a"],
"type": "key",
"target": [ "KEY_E" ],
"description": "Button A"
},
{
"trigger": ["b"],
"type": "key",
"target": [ "KEY_R" ],
"description": "Button B"
},
{
"trigger": ["x"],
"type": "key",
"target": [ "KEY_D" ],
"description": "Button X"
},
{
"trigger": ["y"],
"type": "key",
"target": [ "KEY_F" ],
"description": "Button Y"
},
{
"trigger": ["start"],
"type": "key",
"target": [ "KEY_ENTER" ],
"description": "Button Start"
},
{
"trigger": ["select"],
"type": "key",
"target": [ "KEY_SPACE" ],
"description": "Button Select"
},
{
"trigger": ["pageup"],
"type": "key",
"target": [ "KEY_C" ],
"description": "Button L"
},
{
"trigger": ["pagedown"],
"type": "key",
"target": [ "KEY_V" ],
"description": "Button R"
},
{
"trigger": ["l2"],
"type": "key",
"target": [ "KEY_F3" ],
"description": "Disposition A"
},
{
"trigger": ["hotkey", "l2"],
"type": "key",
"target": [ "KEY_F4" ],
"description": "Disposition B"
},
{
"trigger": ["hotkey", "a"],
"type": "key",
"target": [ "KEY_Y" ],
"description": "Microphone"
},
{
"trigger": "joystick1",
"type": "mouse"
},
{
"trigger": ["r2"],
"type": "key",
"target": [ "BTN_LEFT" ],
"description": "TouchScreen"
},
{
"trigger": ["hotkey", "start"],
"type": "key",
"target": [ "KEY_F12" ],
"description": "Exit Drastic"
},
{
"trigger": ["hotkey", "y"],
"type": "key",
"target": [ "KEY_F5" ],
"description": "Save State"
},
{
"trigger": ["hotkey", "x"],
"type": "key",
"target": [ "KEY_F7" ],
"description": "Load State"
},
{
"trigger": ["hotkey", "down"],
"type": "key",
"target": [ "KEY_F2" ],
"description": "Swap Screens"
},
{
"trigger": ["hotkey", "b"],
"type": "key",
"target": [ "KEY_F1" ],
"description": "QuickMenu"
},
{
"trigger": ["hotkey", "right"],
"type": "key",
"target": [ "KEY_TAB" ],
"description": "FastForward"
}
]
}
2 changes: 2 additions & 0 deletions ...5xx-sp/fsoverlay/usr/share/batocera/datainit/system/configs/emulationstation/es_input.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5070,5 +5070,7 @@
<input name="up" type="hat" id="0" value="1" />
<input name="x" type="button" id="6" value="1" code="307" />
<input name="y" type="button" id="5" value="1" code="306" />
<input name="joystick1left" type="axis" id="0" value="-1" code="3" />
<input name="joystick1up" type="axis" id="1" value="-1" code="4" />
</inputConfig>
</inputList>
Loading

0 comments on commit d3b520f

Please sign in to comment.