Merge pull request 'Added rumble functionality to Xbox controller. /JL' (#13) from 0.1.4 into main

Reviewed-on: #13

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.0.7"
+__version__ = "0.1.4"
 
 CONTROLLERS = {
     "DualSense Wireless Controller": DualSenseController,

pygameControls/dualsense_controller.py

@@ -49,6 +49,9 @@ class DualSenseController(ControlsBase):
         print(f"Power level: {self.powerlevel}")
         print(f"Battery state: {self.batterystate}")
     
+    def close(self):
+        self.device.close()
+        
     def handle_input(self, event):
         pass
     
@@ -73,9 +76,16 @@ class DualSenseController(ControlsBase):
     def pause(self):
         pass
     
-    def rumble(self):
-        pass
+    def rumble(self, left, right):
+        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.device.setLeftMotor(left)
+        self.device.setRightMotor(right)
     
+    def stop_rumble(self):
+        self.device.setLeftMotor(0)
+        self.device.setRightMotor(0)
+        
     @property
     def name(self) -> str:
         return self._name

pygameControls/dualsense_edge_controller.py

@@ -41,6 +41,9 @@ class DualSenseEdgeController(ControlsBase):
         print(f"Power level: {self.powerlevel}")
         print(f"Battery state: {self.batterystate}")
     
+    def close(self):
+        self.device.close()
+        
     def handle_input(self, event):
         pass
     
@@ -65,9 +68,16 @@ class DualSenseEdgeController(ControlsBase):
     def pause(self):
         pass
     
-    def rumble(self):
-        pass
+    def rumble(self, left, right):
+        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.device.setLeftMotor(left)
+        self.device.setRightMotor(right)
     
+    def stop_rumble(self):
+        self.device.setLeftMotor(0)
+        self.device.setRightMotor(0)
+        
     @property
     def name(self) -> str:
         return self._name

pygameControls/xbox_series_x_controller.py

@@ -55,9 +55,14 @@ class XboxSeriesXController:
     def pause(self):
         pass
     
-    def rumble(self):
-        pass
+    def rumble(self, left, right):
+        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)
     
+    def stop_rumble(self):
+        self.joy.rumble(0, 0)
+        
     @property
     def name(self) -> str:
         return self._name

setup.py

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