Merge pull request 'Working on Xbox mapping. /JL' (#19) from 0.1.10 into main

Reviewed-on: #19

pygameControls/controller.py

@@ -9,7 +9,7 @@ from .xbox_series_x_controller import XboxSeriesXController
 from .generic_controller import GenericController
 from .logitech_dual_action_controller import LogitechDualActionController
 
-__version__ = "0.1.6"
+__version__ = "0.1.10"
 
 CONTROLLERS = {
     "DualSense Wireless Controller": DualSenseController,
@@ -18,7 +18,7 @@ CONTROLLERS = {
     "Logitech Gamepad F510": LogitechF510Controller,
     "Logitech Gamepad F710": LogitechF710Controller,
     "Logitech Dual Action": LogitechDualActionController,
-    "X box Series X Controller": XboxSeriesXController
+    "Xbox Series X Controller": XboxSeriesXController
     }
 
 class Controllers:

pygameControls/controlsbase.py

@@ -34,4 +34,8 @@ class ControlsBase(ABC):
     
     @abstractmethod
     def stop_rumble(self):
+        pass
+    
+    @abstractmethod
+    def close(self):
         pass

pygameControls/generic_controller.py

@@ -36,6 +36,9 @@ class GenericController(ControlsBase):
             }
         print(f"{self.name} connected.")
     
+    def close(self):
+        pass
+    
     def handle_input(self, event):
         pass
     

pygameControls/logitech_dual_action_controller.py

@@ -56,7 +56,10 @@ class LogitechDualActionController(ControlsBase):
             "logo button": None
             }
         print(f"{self.name} connected.")
-        
+    
+    def close(self):
+        pass
+    
     def handle_input(self, event):
         pass
     

pygameControls/logitech_f310_controller.py

@@ -57,6 +57,9 @@ class LogitechF310Controller(ControlsBase):
             }
         print(f"{self.name} connected.")
     
+    def close(self):
+        pass
+    
     def handle_input(self, event):
         pass
     

pygameControls/logitech_f510_controller.py

@@ -59,6 +59,9 @@ class LogitechF510Controller(ControlsBase):
             }
         print(f"{self.name} connected.")
     
+    def close(self):
+        pass
+    
     def handle_input(self, event):
         pass
     

pygameControls/logitech_f710_controller.py

@@ -59,6 +59,9 @@ class LogitechF710Controller(ControlsBase):
             }
         print(f"{self.name} connected.")
     
+    def close(self):
+        pass
+    
     def handle_input(self, event):
         pass
     

pygameControls/xbox_series_x_controller.py

@@ -24,8 +24,8 @@ class XboxSeriesXController(ControlsBase):
             "left button": self.buttons[6],
             "right button": self.buttons[7],
             "X button": self.buttons[3],
-            "Y button": self.buttons[4],
-            "A button": self.buttons[0],
+            "Y button": 4,
+            "A button": 0,
             "B button": self.buttons[1],
             "left stick button": self.buttons[13],
             "right stick button": self.buttons[14],
@@ -36,6 +36,9 @@ class XboxSeriesXController(ControlsBase):
             }
         print(f"{self.name} connected.")
     
+    def close(self):
+        self.device.quit()
+    
     def handle_input(self, event):
         pass
     
@@ -54,13 +57,13 @@ class XboxSeriesXController(ControlsBase):
     def pause(self):
         pass
     
-    def rumble(self, left, right):
+    def rumble(self, left, right, duration=0):
         if not left in range(256) or not right in range(256):
             raise ValueError("left and right values must be in the range 0 - 255")
-        self.joy.rumble(left, right)
+        self.device.rumble(left / 255, right / 255, duration)
     
     def stop_rumble(self):
-        self.joy.rumble(0, 0)
+        self.device.stop_rumble()
         
     @property
     def name(self) -> str:

setup.py

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