Skip to content

Commit 5a66d5f

Browse files
dmanlfcdmanlfc
committed
move to hid-nintendo for 6.7 kernels & higher
1 parent d4d48bd commit 5a66d5f

File tree

3 files changed

+52
-51
lines changed

3 files changed

+52
-51
lines changed

‎batocera-Changelog.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
- WINE: Compressed applications (wsquashfs, wtgz) use the same storage paths to store the PREFIX as uncompressed ones.
1212
`~/wine-bottles/windows/<gamename>` turns to `~/wine-bottles/windows/<winerunner>/<gamename>.wine`
1313
We recommend following the procedure described in our wiki to back up Windows savegames.
14+
- We have moved to the mainline Nintendo controller driver. You may need to reconfigure your Nintendo controller accordingly for wired & bluetooth.
1415
### Hardware
1516
- AIC8800 USB driver support for Raxda Boards
1617
- Anbernic RG28XX, RG34XX, RG35XX, RG40XX, RGCUBEXX device variant support

‎package/batocera/core/batocera-system/Config.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,10 +322,10 @@ config BR2_PACKAGE_BATOCERA_SYSTEM
322322
select BR2_PACKAGE_NEW_LG4FF if !BR2_PACKAGE_BATOCERA_TARGET_RK3326 && !BR2_PACKAGE_BATOCERA_TARGET_XU4 && !BR2_PACKAGE_BATOCERA_TARGET_BCM2835 && !BR2_PACKAGE_BATOCERA_TARGET_RK3326 && !BR2_PACKAGE_BATOCERA_TARGET_RK3128 && !BR2_PACKAGE_BATOCERA_TARGET_QCS6490 && !BR2_PACKAGE_BATOCERA_TARGET_SM8250 && !BR2_PACKAGE_BATOCERA_TARGET_SM8550 && !BR2_PACKAGE_BATOCERA_TARGET_T527 && !BR2_PACKAGE_BATOCERA_TARGET_ODIN && !BR2_PACKAGE_BATOCERA_TARGET_H700 # Improved Linux module driver for Logitech driving wheels (the lg4ff is disabled in kernels)
323323
select BR2_PACKAGE_HID_T150 if !BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4 # Thrustmaster T150 and TMX Force Feedback Wheel Linux drivers
324324
select BR2_PACKAGE_HID_TMFF2 if !BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4 # Thrustmaster T300RS, T248 and (experimental) TX, T128, T-GT II and TS-XW Wheel Linux drivers
325-
select BR2_PACKAGE_HID_NX if !BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4 && !BR2_PACKAGE_BATOCERA_TARGET_BCM2835 && !BR2_PACKAGE_BATOCERA_TARGET_RK3326 # updated nintendo switch controller driver, requires kernel > 4.4
326-
select BR2_PACKAGE_JOYCOND if BR2_PACKAGE_HID_NX # nintendo switch joycon daemon (requires hid-nx)
325+
select BR2_PACKAGE_HID_NX if !BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 && !BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4 && !BR2_PACKAGE_BATOCERA_TARGET_BCM2835 && !BR2_PACKAGE_BATOCERA_TARGET_RK3326 # updated nintendo switch controller driver, requires kernel > 4.4
326+
select BR2_PACKAGE_JOYCOND if BR2_PACKAGE_HID_NX || BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 # nintendo switch joycon daemon (requires hid-nx or hid-nintendo in kernel 6.7 or later)
327327
select BR2_PACKAGE_KEYBOARDTOPADS
328-
select BR2_PACKAGE_NSO_N64
328+
select BR2_PACKAGE_NSO_N64 if BR2_PACKAGE_HID_NX
329329

330330
select BR2_PACKAGE_ROCKNIX_JOYPAD if BR2_PACKAGE_BATOCERA_TARGET_RK3326
331331

‎package/batocera/emulationstation/batocera-emulationstation/controllers/es_input.cfg‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3115,27 +3115,27 @@
31153115
<input name="y" type="button" id="3" value="1" code="307" />
31163116
</inputConfig>
31173117
<inputConfig type="joystick" deviceName="Nintendo Co., Ltd. Pro Controller" deviceGUID="030000007e0500000920000011810000">
3118-
<input name="a" type="button" id="3" value="1" code="305" />
3119-
<input name="b" type="button" id="2" value="1" code="304" />
3118+
<input name="a" type="button" id="1" value="1" code="305" />
3119+
<input name="b" type="button" id="0" value="1" code="304" />
31203120
<input name="down" type="hat" id="0" value="4" />
3121-
<input name="hotkey" type="button" id="0" value="1" code="256" />
3121+
<input name="hotkey" type="button" id="11" value="1" code="316" />
31223122
<input name="joystick1left" type="axis" id="0" value="-1" code="0" />
31233123
<input name="joystick1up" type="axis" id="1" value="-1" code="1" />
31243124
<input name="joystick2left" type="axis" id="2" value="-1" code="3" />
31253125
<input name="joystick2up" type="axis" id="3" value="-1" code="4" />
3126-
<input name="l2" type="button" id="8" value="1" code="312" />
3126+
<input name="l2" type="button" id="7" value="1" code="312" />
31273127
<input name="l3" type="button" id="12" value="1" code="317" />
31283128
<input name="left" type="hat" id="0" value="8" />
3129-
<input name="pagedown" type="button" id="7" value="1" code="311" />
3130-
<input name="pageup" type="button" id="6" value="1" code="310" />
3131-
<input name="r2" type="button" id="9" value="1" code="313" />
3129+
<input name="pagedown" type="button" id="6" value="1" code="311" />
3130+
<input name="pageup" type="button" id="5" value="1" code="310" />
3131+
<input name="r2" type="button" id="8" value="1" code="313" />
31323132
<input name="r3" type="button" id="13" value="1" code="318" />
31333133
<input name="right" type="hat" id="0" value="2" />
3134-
<input name="select" type="button" id="10" value="1" code="314" />
3135-
<input name="start" type="button" id="11" value="1" code="315" />
3134+
<input name="select" type="button" id="9" value="1" code="314" />
3135+
<input name="start" type="button" id="10" value="1" code="315" />
31363136
<input name="up" type="hat" id="0" value="1" />
3137-
<input name="x" type="button" id="4" value="1" code="307" />
3138-
<input name="y" type="button" id="5" value="1" code="308" />
3137+
<input name="x" type="button" id="2" value="1" code="307" />
3138+
<input name="y" type="button" id="3" value="1" code="308" />
31393139
</inputConfig>
31403140
<inputConfig type="joystick" deviceName="8BitDo 8BitDo Pro 2" deviceGUID="03000000c82d00000660000011010000">
31413141
<input name="a" type="button" id="0" value="1" code="304" />
@@ -3519,27 +3519,27 @@
35193519
<input name="y" type="button" id="3" value="1" code="308" />
35203520
</inputConfig>
35213521
<inputConfig type="joystick" deviceName="Pro Controller" deviceGUID="050000007e0500000920000001800000">
3522-
<input name="a" type="button" id="3" value="1" code="305" />
3523-
<input name="b" type="button" id="2" value="1" code="304" />
3522+
<input name="a" type="button" id="1" value="1" code="305" />
3523+
<input name="b" type="button" id="0" value="1" code="304" />
35243524
<input name="down" type="hat" id="0" value="4" />
3525-
<input name="hotkey" type="button" id="0" value="1" code="256" />
3525+
<input name="hotkey" type="button" id="11" value="1" code="316" />
35263526
<input name="joystick1left" type="axis" id="0" value="-1" code="0" />
35273527
<input name="joystick1up" type="axis" id="1" value="-1" code="1" />
35283528
<input name="joystick2left" type="axis" id="2" value="-1" code="3" />
35293529
<input name="joystick2up" type="axis" id="3" value="-1" code="4" />
3530-
<input name="l2" type="button" id="8" value="1" code="312" />
3530+
<input name="l2" type="button" id="7" value="1" code="312" />
35313531
<input name="l3" type="button" id="12" value="1" code="317" />
35323532
<input name="left" type="hat" id="0" value="8" />
3533-
<input name="pagedown" type="button" id="7" value="1" code="311" />
3534-
<input name="pageup" type="button" id="6" value="1" code="310" />
3535-
<input name="r2" type="button" id="9" value="1" code="313" />
3533+
<input name="pagedown" type="button" id="6" value="1" code="311" />
3534+
<input name="pageup" type="button" id="5" value="1" code="310" />
3535+
<input name="r2" type="button" id="8" value="1" code="313" />
35363536
<input name="r3" type="button" id="13" value="1" code="318" />
35373537
<input name="right" type="hat" id="0" value="2" />
3538-
<input name="select" type="button" id="10" value="1" code="314" />
3539-
<input name="start" type="button" id="11" value="1" code="315" />
3538+
<input name="select" type="button" id="9" value="1" code="314" />
3539+
<input name="start" type="button" id="10" value="1" code="315" />
35403540
<input name="up" type="hat" id="0" value="1" />
3541-
<input name="x" type="button" id="4" value="1" code="307" />
3542-
<input name="y" type="button" id="5" value="1" code="308" />
3541+
<input name="x" type="button" id="2" value="1" code="307" />
3542+
<input name="y" type="button" id="3" value="1" code="308" />
35433543
</inputConfig>
35443544
<inputConfig type="joystick" deviceName="SWITCH CO.,LTD. USB Gamepad " deviceGUID="03000000790000001100000011010000">
35453545
<input name="a" type="button" id="4" value="1" code="292" />
@@ -4240,46 +4240,46 @@
42404240
<input name="y" type="button" id="3" value="1" code="308" />
42414241
</inputConfig>
42424242
<inputConfig type="joystick" deviceName="Nintendo Co., Ltd. N64 Controller" deviceGUID="030000007e0500001920000011810000">
4243-
<input name="a" type="button" id="3" value="1" code="305" />
4244-
<input name="b" type="button" id="2" value="1" code="304" />
4243+
<input name="a" type="button" id="1" value="1" code="305" />
4244+
<input name="b" type="button" id="0" value="1" code="304" />
42454245
<input name="down" type="hat" id="0" value="4" />
4246-
<input name="hotkey" type="button" id="0" value="1" code="256" />
4246+
<input name="hotkey" type="button" id="12" value="1" code="316" />
42474247
<input name="joystick1left" type="axis" id="0" value="-1" code="0" />
42484248
<input name="joystick1up" type="axis" id="1" value="-1" code="1" />
4249-
<input name="l2" type="button" id="10" value="1" code="545" />
4250-
<input name="l3" type="button" id="1" value="1" code="257" />
4249+
<input name="l2" type="button" id="3" value="1" code="307" />
4250+
<input name="l3" type="button" id="5" value="1" code="309" />
42514251
<input name="left" type="hat" id="0" value="8" />
4252-
<input name="pagedown" type="button" id="6" value="1" code="311" />
4253-
<input name="pageup" type="button" id="5" value="1" code="310" />
4254-
<input name="r2" type="button" id="12" value="1" code="547" />
4255-
<input name="r3" type="button" id="7" value="1" code="313" />
4252+
<input name="pagedown" type="button" id="7" value="1" code="311" />
4253+
<input name="pageup" type="button" id="6" value="1" code="310" />
4254+
<input name="r2" type="button" id="2" value="1" code="306" />
4255+
<input name="r3" type="button" id="9" value="1" code="313" />
42564256
<input name="right" type="hat" id="0" value="2" />
4257-
<input name="select" type="button" id="4" value="1" code="309" />
4258-
<input name="start" type="button" id="8" value="1" code="315" />
4257+
<input name="select" type="button" id="8" value="1" code="312" />
4258+
<input name="start" type="button" id="11" value="1" code="315" />
42594259
<input name="up" type="hat" id="0" value="1" />
4260-
<input name="x" type="button" id="9" value="1" code="544" />
4261-
<input name="y" type="button" id="11" value="1" code="546" />
4260+
<input name="x" type="button" id="10" value="1" code="314" />
4261+
<input name="y" type="button" id="4" value="1" code="308" />
42624262
</inputConfig>
42634263
<inputConfig type="joystick" deviceName="N64 Controller" deviceGUID="050000007e0500001920000001800000">
4264-
<input name="a" type="button" id="3" value="1" code="305" />
4265-
<input name="b" type="button" id="2" value="1" code="304" />
4264+
<input name="a" type="button" id="1" value="1" code="305" />
4265+
<input name="b" type="button" id="0" value="1" code="304" />
42664266
<input name="down" type="hat" id="0" value="4" />
4267-
<input name="hotkey" type="button" id="0" value="1" code="256" />
4267+
<input name="hotkey" type="button" id="12" value="1" code="316" />
42684268
<input name="joystick1left" type="axis" id="0" value="-1" code="0" />
42694269
<input name="joystick1up" type="axis" id="1" value="-1" code="1" />
4270-
<input name="l2" type="button" id="10" value="1" code="545" />
4271-
<input name="l3" type="button" id="1" value="1" code="257" />
4270+
<input name="l2" type="button" id="3" value="1" code="307" />
4271+
<input name="l3" type="button" id="5" value="1" code="309" />
42724272
<input name="left" type="hat" id="0" value="8" />
4273-
<input name="pagedown" type="button" id="6" value="1" code="311" />
4274-
<input name="pageup" type="button" id="5" value="1" code="310" />
4275-
<input name="r2" type="button" id="12" value="1" code="547" />
4276-
<input name="r3" type="button" id="7" value="1" code="313" />
4273+
<input name="pagedown" type="button" id="7" value="1" code="311" />
4274+
<input name="pageup" type="button" id="6" value="1" code="310" />
4275+
<input name="r2" type="button" id="2" value="1" code="306" />
4276+
<input name="r3" type="button" id="9" value="1" code="313" />
42774277
<input name="right" type="hat" id="0" value="2" />
4278-
<input name="select" type="button" id="4" value="1" code="309" />
4279-
<input name="start" type="button" id="8" value="1" code="315" />
4278+
<input name="select" type="button" id="8" value="1" code="312" />
4279+
<input name="start" type="button" id="11" value="1" code="315" />
42804280
<input name="up" type="hat" id="0" value="1" />
4281-
<input name="x" type="button" id="9" value="1" code="544" />
4282-
<input name="y" type="button" id="11" value="1" code="546" />
4281+
<input name="x" type="button" id="10" value="1" code="314" />
4282+
<input name="y" type="button" id="4" value="1" code="308" />
42834283
</inputConfig>
42844284
<inputConfig type="joystick" deviceName=" Trooper V2 Trooper V2 " deviceGUID="03000000242e00006a38000010010000">
42854285
<input name="a" type="button" id="1" value="1" code="289" />

0 commit comments

Comments
 (0)