Merge pull request 'Added Logitech Rumblepad 2. /JL' (#30) from 0.2.7 into main

Reviewed-on: #30

README.md

@@ -3,4 +3,4 @@
 Small module to make it easy to add controller support.
 
 ![Tests](https://gitpot-lerking.servehttp.com/api/v1/badges/CodingPirates/PyGame-Controller/workflows/test.yml)
-![Version](https://img.shields.io/badge/version-0.2.2-blue)
+![Version](https://img.shields.io/badge/version-0.2.5-blue)

main.py

@@ -4,7 +4,6 @@ from pygameControls import globals
 
 if __name__ == "__main__":
     pygame.init()
-    globals.init()
     
     done = False
     

pygameControls/controller.py

@@ -1,20 +1,18 @@
 import pygame
 from . import globals
 
-__version__ = "0.2.2"
+__version__ = "0.2.7"
 
 class Controllers:
     def __init__(self, joy):
+        globals.init()
         self.controllers = []
         cont = self.detect_controller(joy.get_guid())
-        print(cont)
         self.controllers.append(cont(joy))
 
     def detect_controller(self, guid):
         for gp in globals.GAMEPADS:
-            print(gp)
             for p in globals.GAMEPADS[gp]:
-                print(p)
                 if p["guid"] != guid:
                     continue
                 return p["class"]

pygameControls/globals.py

@@ -126,10 +126,10 @@ def init():
             },
             {
                 "vidpid": "054c:09cc",
-                "guid": "",
+                "guid": "05009b514c050000cc09000000810000",
                 "connection": ConnectionType.BLUETOOTH,
                 "input": InputType.DirectInput,
-                "name": ["DualShock 4 v2 Controller"],
+                "name": ["Wireless Controller"],
                 "class": CONTROLLERS["Sony PLAYSTATION(R)4 Controller"]
             }
         ],
@@ -183,7 +183,7 @@ def init():
             },
             {
                 "vidpid": "046d:c21d",
-                "guid": "",
+                "guid": "0333443e6d0400001fc2000005030000",
                 "connection": ConnectionType.USB,
                 "input": InputType.XInput,
                 "name": [
@@ -194,14 +194,15 @@ def init():
             },
             {
                 "vidpid": "046d:c216",
-                "guid": "",
+                "guid": "03005d8e6d04000019c2000011010000",
                 "connection": ConnectionType.USB,
                 "input": InputType.DirectInput,
                 "name": [
                     "Logitech, Inc. F710 Gamepad [DirectInput Mode]",
-                    "Logitech Dual Action"
+                    "Logitech Dual Action",
+                    "Logitech Cordless Rumblepad 2"
                 ],
-                "class": CONTROLLERS["Logitech Dual Action"]
+                "class": CONTROLLERS["Logitech Rumblepad 2"]
             }
         ]
     }

pygameControls/sony_playstation4_controller.py

@@ -23,12 +23,8 @@ class SonyPlayStation4Controller(ControlsBase):
             "left stick button": 11,
             "right stick button": 12,
             "logo button": 10,
-            "select button": 8,
-            "start button": 9,
-            "down button": 14,
-            "up button": 13,
-            "left button": 15,
-            "right button": 16
+            "share button": 8,
+            "options button": 9
             }
         print(f"{self.name} connected.")
     

setup.py

@@ -3,7 +3,7 @@ if __name__ == "__main__":
 
     setup(
         name='pygameControls',
-        version='0.2.2',
+        version='0.2.7',
         packages=find_packages(),
         install_requires=[],
         author='Jan Lerking',