Skip to content

Commit fe2bcfd

Browse files
Hancock33Hancock33
committed
Merge remote-tracking branch 'upstream/master'
2 parents f0723d9 + a3eb29d commit fe2bcfd

File tree

3 files changed

+51
-50
lines changed

3 files changed

+51
-50
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,15 +305,15 @@ config BR2_PACKAGE_BATOCERA_SYSTEM
305305
select BR2_PACKAGE_XWIIMOTE if !BR2_PACKAGE_BATOCERA_TARGET_BCM2835 # a tool to analyse wiimote events (mainly to debug, but helps and is funny)
306306
select BR2_PACKAGE_BATOCERA_GUNS if !BR2_PACKAGE_BATOCERA_TARGET_BCM2835
307307
select BR2_PACKAGE_BATOCERA_WHEEL_CALIBRATOR
308-
select BR2_PACKAGE_JOYCOND
308+
select BR2_PACKAGE_JOYCOND if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 # nintendo switch joycon daemon (requires hid-nx or hid-nintendo in kernel 6.7 or later)
309309
select BR2_PACKAGE_NEW_LG4FF if !BR2_PACKAGE_BATOCERA_TARGET_RK3326 && !BR2_PACKAGE_BATOCERA_TARGET_XU4 && \
310310
!BR2_PACKAGE_BATOCERA_TARGET_BCM2835 && !BR2_PACKAGE_BATOCERA_TARGET_RK3326 && \
311311
!BR2_PACKAGE_BATOCERA_TARGET_RK3128 && !BR2_PACKAGE_BATOCERA_TARGET_SM8250 && \
312312
!BR2_PACKAGE_BATOCERA_TARGET_SM8550 && !BR2_PACKAGE_BATOCERA_TARGET_T527 && \
313313
!BR2_PACKAGE_BATOCERA_TARGET_ODIN # Improved Linux module driver for Logitech driving wheels (the lg4ff is disabled in kernels)
314314
select BR2_PACKAGE_HID_T150 if !BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4 # Thrustmaster T150 and TMX Force Feedback Wheel Linux drivers
315315
select BR2_PACKAGE_KEYBOARDTOPADS
316-
select BR2_PACKAGE_NSO_N64
316+
select BR2_PACKAGE_NSO_N64 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 # nintendo switch joycon daemon (requires hid-nx or hid-nintendo in kernel 6.7 or later)
317317
select BR2_PACKAGE_ROCKNIX_JOYPAD if BR2_PACKAGE_BATOCERA_TARGET_RK3326
318318

319319
select BR2_PACKAGE_UPOWER # required by some cemuhook servers

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

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3319,25 +3319,25 @@
33193319
<input name="y" type="button" id="3" value="1" code="307" />
33203320
</inputConfig>
33213321
<inputConfig type="joystick" deviceName="N64 Controller" deviceGUID="050000007e0500001920000001800000">
3322-
<input name="a" type="button" id="3" value="1" code="305" />
3323-
<input name="b" type="button" id="2" value="1" code="304" />
3322+
<input name="a" type="button" id="1" value="1" code="305" />
3323+
<input name="b" type="button" id="0" value="1" code="304" />
33243324
<input name="down" type="hat" id="0" value="4" />
3325-
<input name="hotkey" type="button" id="0" value="1" code="256" />
3325+
<input name="hotkey" type="button" id="12" value="1" code="316" />
33263326
<input name="joystick1left" type="axis" id="0" value="-1" code="0" />
33273327
<input name="joystick1up" type="axis" id="1" value="-1" code="1" />
3328-
<input name="l2" type="button" id="10" value="1" code="545" />
3329-
<input name="l3" type="button" id="1" value="1" code="257" />
3328+
<input name="l2" type="button" id="3" value="1" code="307" />
3329+
<input name="l3" type="button" id="5" value="1" code="309" />
33303330
<input name="left" type="hat" id="0" value="8" />
3331-
<input name="pagedown" type="button" id="6" value="1" code="311" />
3332-
<input name="pageup" type="button" id="5" value="1" code="310" />
3333-
<input name="r2" type="button" id="12" value="1" code="547" />
3334-
<input name="r3" type="button" id="7" value="1" code="313" />
3331+
<input name="pagedown" type="button" id="7" value="1" code="311" />
3332+
<input name="pageup" type="button" id="6" value="1" code="310" />
3333+
<input name="r2" type="button" id="2" value="1" code="306" />
3334+
<input name="r3" type="button" id="9" value="1" code="313" />
33353335
<input name="right" type="hat" id="0" value="2" />
3336-
<input name="select" type="button" id="4" value="1" code="309" />
3337-
<input name="start" type="button" id="8" value="1" code="315" />
3336+
<input name="select" type="button" id="8" value="1" code="312" />
3337+
<input name="start" type="button" id="11" value="1" code="315" />
33383338
<input name="up" type="hat" id="0" value="1" />
3339-
<input name="x" type="button" id="9" value="1" code="544" />
3340-
<input name="y" type="button" id="11" value="1" code="546" />
3339+
<input name="x" type="button" id="10" value="1" code="314" />
3340+
<input name="y" type="button" id="4" value="1" code="308" />
33413341
</inputConfig>
33423342
<inputConfig type="joystick" deviceName="NES30 NES30 Joystick" deviceGUID="03000000c82d000012ab000010010000">
33433343
<input name="a" type="button" id="0" value="1" code="288" />
@@ -3355,48 +3355,48 @@
33553355
<input name="y" type="button" id="4" value="1" code="292" />
33563356
</inputConfig>
33573357
<inputConfig type="joystick" deviceName="Nintendo Co., Ltd. N64 Controller" deviceGUID="030000007e0500001920000011810000">
3358-
<input name="a" type="button" id="3" value="1" code="305" />
3359-
<input name="b" type="button" id="2" value="1" code="304" />
3358+
<input name="a" type="button" id="1" value="1" code="305" />
3359+
<input name="b" type="button" id="0" value="1" code="304" />
33603360
<input name="down" type="hat" id="0" value="4" />
3361-
<input name="hotkey" type="button" id="0" value="1" code="256" />
3361+
<input name="hotkey" type="button" id="12" value="1" code="316" />
33623362
<input name="joystick1left" type="axis" id="0" value="-1" code="0" />
33633363
<input name="joystick1up" type="axis" id="1" value="-1" code="1" />
3364-
<input name="l2" type="button" id="10" value="1" code="545" />
3365-
<input name="l3" type="button" id="1" value="1" code="257" />
3364+
<input name="l2" type="button" id="3" value="1" code="307" />
3365+
<input name="l3" type="button" id="5" value="1" code="309" />
33663366
<input name="left" type="hat" id="0" value="8" />
3367-
<input name="pagedown" type="button" id="6" value="1" code="311" />
3368-
<input name="pageup" type="button" id="5" value="1" code="310" />
3369-
<input name="r2" type="button" id="12" value="1" code="547" />
3370-
<input name="r3" type="button" id="7" value="1" code="313" />
3367+
<input name="pagedown" type="button" id="7" value="1" code="311" />
3368+
<input name="pageup" type="button" id="6" value="1" code="310" />
3369+
<input name="r2" type="button" id="2" value="1" code="306" />
3370+
<input name="r3" type="button" id="9" value="1" code="313" />
33713371
<input name="right" type="hat" id="0" value="2" />
3372-
<input name="select" type="button" id="4" value="1" code="309" />
3373-
<input name="start" type="button" id="8" value="1" code="315" />
3372+
<input name="select" type="button" id="8" value="1" code="312" />
3373+
<input name="start" type="button" id="11" value="1" code="315" />
33743374
<input name="up" type="hat" id="0" value="1" />
3375-
<input name="x" type="button" id="9" value="1" code="544" />
3376-
<input name="y" type="button" id="11" value="1" code="546" />
3375+
<input name="x" type="button" id="10" value="1" code="314" />
3376+
<input name="y" type="button" id="4" value="1" code="308" />
33773377
</inputConfig>
33783378
<inputConfig type="joystick" deviceName="Nintendo Co., Ltd. Pro Controller" deviceGUID="030000007e0500000920000011810000">
3379-
<input name="a" type="button" id="3" value="1" code="305" />
3380-
<input name="b" type="button" id="2" value="1" code="304" />
3379+
<input name="a" type="button" id="1" value="1" code="305" />
3380+
<input name="b" type="button" id="0" value="1" code="304" />
33813381
<input name="down" type="hat" id="0" value="4" />
3382-
<input name="hotkey" type="button" id="0" value="1" code="256" />
3382+
<input name="hotkey" type="button" id="11" value="1" code="316" />
33833383
<input name="joystick1left" type="axis" id="0" value="-1" code="0" />
33843384
<input name="joystick1up" type="axis" id="1" value="-1" code="1" />
33853385
<input name="joystick2left" type="axis" id="2" value="-1" code="3" />
33863386
<input name="joystick2up" type="axis" id="3" value="-1" code="4" />
3387-
<input name="l2" type="button" id="8" value="1" code="312" />
3387+
<input name="l2" type="button" id="7" value="1" code="312" />
33883388
<input name="l3" type="button" id="12" value="1" code="317" />
33893389
<input name="left" type="hat" id="0" value="8" />
3390-
<input name="pagedown" type="button" id="7" value="1" code="311" />
3391-
<input name="pageup" type="button" id="6" value="1" code="310" />
3392-
<input name="r2" type="button" id="9" value="1" code="313" />
3390+
<input name="pagedown" type="button" id="6" value="1" code="311" />
3391+
<input name="pageup" type="button" id="5" value="1" code="310" />
3392+
<input name="r2" type="button" id="8" value="1" code="313" />
33933393
<input name="r3" type="button" id="13" value="1" code="318" />
33943394
<input name="right" type="hat" id="0" value="2" />
3395-
<input name="select" type="button" id="10" value="1" code="314" />
3396-
<input name="start" type="button" id="11" value="1" code="315" />
3395+
<input name="select" type="button" id="9" value="1" code="314" />
3396+
<input name="start" type="button" id="10" value="1" code="315" />
33973397
<input name="up" type="hat" id="0" value="1" />
3398-
<input name="x" type="button" id="4" value="1" code="307" />
3399-
<input name="y" type="button" id="5" value="1" code="308" />
3398+
<input name="x" type="button" id="2" value="1" code="307" />
3399+
<input name="y" type="button" id="3" value="1" code="308" />
34003400
</inputConfig>
34013401
<inputConfig type="joystick" deviceName="Nintendo Co., Ltd. Pro Controller" deviceGUID="0300bb977e0500000920000011810000">
34023402
<input name="a" type="button" id="3" value="1" code="305" />
@@ -3888,27 +3888,27 @@
38883888
<input name="y" type="button" id="2" value="1" code="306" />
38893889
</inputConfig>
38903890
<inputConfig type="joystick" deviceName="Pro Controller" deviceGUID="050000007e0500000920000001800000">
3891-
<input name="a" type="button" id="3" value="1" code="305" />
3892-
<input name="b" type="button" id="2" value="1" code="304" />
3891+
<input name="a" type="button" id="1" value="1" code="305" />
3892+
<input name="b" type="button" id="0" value="1" code="304" />
38933893
<input name="down" type="hat" id="0" value="4" />
3894-
<input name="hotkey" type="button" id="0" value="1" code="256" />
3894+
<input name="hotkey" type="button" id="11" value="1" code="316" />
38953895
<input name="joystick1left" type="axis" id="0" value="-1" code="0" />
38963896
<input name="joystick1up" type="axis" id="1" value="-1" code="1" />
38973897
<input name="joystick2left" type="axis" id="2" value="-1" code="3" />
38983898
<input name="joystick2up" type="axis" id="3" value="-1" code="4" />
3899-
<input name="l2" type="button" id="8" value="1" code="312" />
3899+
<input name="l2" type="button" id="7" value="1" code="312" />
39003900
<input name="l3" type="button" id="12" value="1" code="317" />
39013901
<input name="left" type="hat" id="0" value="8" />
3902-
<input name="pagedown" type="button" id="7" value="1" code="311" />
3903-
<input name="pageup" type="button" id="6" value="1" code="310" />
3904-
<input name="r2" type="button" id="9" value="1" code="313" />
3902+
<input name="pagedown" type="button" id="6" value="1" code="311" />
3903+
<input name="pageup" type="button" id="5" value="1" code="310" />
3904+
<input name="r2" type="button" id="8" value="1" code="313" />
39053905
<input name="r3" type="button" id="13" value="1" code="318" />
39063906
<input name="right" type="hat" id="0" value="2" />
3907-
<input name="select" type="button" id="10" value="1" code="314" />
3908-
<input name="start" type="button" id="11" value="1" code="315" />
3907+
<input name="select" type="button" id="9" value="1" code="314" />
3908+
<input name="start" type="button" id="10" value="1" code="315" />
39093909
<input name="up" type="hat" id="0" value="1" />
3910-
<input name="x" type="button" id="4" value="1" code="307" />
3911-
<input name="y" type="button" id="5" value="1" code="308" />
3910+
<input name="x" type="button" id="2" value="1" code="307" />
3911+
<input name="y" type="button" id="3" value="1" code="308" />
39123912
</inputConfig>
39133913
<inputConfig type="joystick" deviceName="PS3 Controller" deviceGUID="030000004c0500006802000011810000">
39143914
<input name="a" type="button" id="1" value="1" code="305" />

0 commit comments

Comments
 (0)