Special controls for MAME: 6 button arcade layout, 3 over 3

package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroMAMEConfig.py

@@ -528,17 +528,25 @@ def getMameControlScheme(system: Emulator, rom: Path) -> str:
             return "sfsnes"
         if controllerType == "megadrive":
             return "megadrive"
+        if controllerType in ["arcade33", "arcade33top1"]:
+            return "arcade33top1"
     elif romName in mkList:
         if controllerType in [ "auto", "snes", "fightstick" ]:
             return "mksnes"
         if controllerType == "megadrive":
             return "mkmegadrive"
+        if controllerType in ["arcade33", "arcade33top1"]:
+            return "mkarcade33"
     elif romName in kiList:
         if controllerType in [ "auto", "snes", "fightstick" ]:
             return "kisnes"
         if controllerType == "megadrive":
             return "megadrive"
+        if controllerType in ["arcade33", "arcade33top1"]:
+            return "arcade33top1"
     elif romName in  neogeoList:
+        if controllerType in ["arcade33", "arcade33top1"]:
+            return "neoarcade33"
         return "neomini"
     elif romName in  twinstickList:
         return "twinstick"
@@ -547,7 +555,11 @@ def getMameControlScheme(system: Emulator, rom: Path) -> str:
     else:
         if controllerType == "fightstick":
             return "sfsnes"
-
+        if controllerType == "arcade33":
+            return "arcade33"
+        if controllerType == "arcade33top1":
+            return "arcade33top1"
+
     return "default"
 
 def generateMAMEPadConfig(

package/batocera/core/batocera-configgen/configgen/configgen/generators/mame/mameGenerator.py

@@ -851,21 +851,29 @@ def getMameControlScheme(system: Emulator, rom_path: Path) -> MameControlScheme:
             return "megadrive"
         if controllerType == "fightstick":
             return "sfstick"
+        if controllerType in ["arcade33", "arcade33top1"]:
+            return "arcade33top1"
     elif romName in mkList:
         if controllerType in [ "auto", "snes" ]:
             return "mksnes"
         if controllerType == "megadrive":
             return "mkmegadrive"
         if controllerType == "fightstick":
             return "mkstick"
+        if controllerType in ["arcade33", "arcade33top1"]:
+            return "mkarcade33"
     elif romName in kiList:
         if controllerType in [ "auto", "snes" ]:
             return "kisnes"
         if controllerType == "megadrive":
             return "megadrive"
         if controllerType == "fightstick":
             return "sfstick"
+        if controllerType in ["arcade33", "arcade33top1"]:
+            return "arcade33top1"
     elif romName in  neogeoList:
+        if controllerType in ["arcade33", "arcade33top1"]:
+            return "neoarcade33"
         return "neomini"
     elif romName in  twinstickList:
         return "twinstick"
@@ -876,5 +884,9 @@ def getMameControlScheme(system: Emulator, rom_path: Path) -> MameControlScheme:
             return "fightstick"
         if controllerType == "megadrive":
             return "mddefault"
-
+        if controllerType == "arcade33":
+            return "arcade33"
+        if controllerType == "arcade33top1":
+            return "arcade33top1"
+
     return "default"

package/batocera/core/batocera-configgen/configgen/configgen/generators/mame/mameTypes.py

@@ -17,4 +17,8 @@
     'mkstick',
     'kisnes',
     'mddefault',
+    'arcade33',
+    'mkarcade33',
+    'neoarcade33',
+    'arcade33top1',
 ]

package/batocera/core/batocera-configgen/data/mame/mameControls.csv

@@ -120,4 +120,26 @@ fightstick,BUTTON4,l2
 fightstick,BUTTON5,y
 fightstick,BUTTON6,x
 fightstick,BUTTON7,pagedown
-fightstick,BUTTON8,pageup
+fightstick,BUTTON8,pageup
+arcade33,BUTTON1,b
+arcade33,BUTTON2,a
+arcade33,BUTTON3,pagedown
+arcade33,BUTTON4,y
+arcade33,BUTTON5,x
+arcade33,BUTTON6,pageup
+mkarcade33,BUTTON1,y
+mkarcade33,BUTTON2,x
+mkarcade33,BUTTON3,pageup
+mkarcade33,BUTTON4,b
+mkarcade33,BUTTON5,pagedown
+mkarcade33,BUTTON6,a
+neoarcade33,BUTTON1,y
+neoarcade33,BUTTON2,x
+neoarcade33,BUTTON3,b
+neoarcade33,BUTTON4,a
+arcade33top1,BUTTON1,y
+arcade33top1,BUTTON2,x
+arcade33top1,BUTTON3,pageup
+arcade33top1,BUTTON4,b
+arcade33top1,BUTTON5,a
+arcade33top1,BUTTON6,pagedown

package/batocera/emulators/mame/mame.emulator.yml

@@ -1560,6 +1560,8 @@ systems:
           Neo Geo CD Pad: neocd
           Twin Stick with Triggers: twinstick
           Rotated 4-Way Stick (Q*Bert): qbert
+          Arcade 6-Button, 3 Over 3: arcade33
+          Arcade 6-Button, 3 Over 3, Button 1 on Top: arcade33top1
       hiscoreplugin:
         group: ADVANCED OPTIONS
         prompt: HIGH SCORE PLUGIN
@@ -1595,6 +1597,8 @@ systems:
           Neo Geo CD Pad: neocd
           Twin Stick with Triggers: twinstick
           Rotated 4-Way Stick (Q*Bert): qbert
+          Arcade 6-Button, 3 Over 3: arcade33
+          Arcade 6-Button, 3 Over 3, Button 1 on Top: arcade33top1
       hiscoreplugin:
         group: ADVANCED OPTIONS
         prompt: HIGH SCORE PLUGIN

package/batocera/emulators/retroarch/libretro/libretro-mame/mame.libretro.core.yml

@@ -60,6 +60,8 @@ custom_features:
       Neo Geo CD Pad: neocd
       Twin Stick with Triggers: twinstick
       Rotated 4-Way Stick (Q*Bert): qbert
+      Arcade 6-Button, 3 Over 3: arcade33
+      Arcade 6-Button, 3 Over 3, Button 1 on Top: arcade33top1
   hiscoreplugin:
     group: ADVANCED OPTIONS
     prompt: HIGH SCORE PLUGIN