Merge pull request 'Fixed a bug to allow rumble values 255. /JL' (#12) from 0.1.3 into main

Reviewed-on: #12

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

pygameControls/dualsense_controller.py

@@ -18,6 +18,12 @@ class DualSenseController(ControlsBase):
         self.powerlevel = self.device.battery.Level
         self.batterystate = BATTERY_STATE[str(self.device.battery.State)]
         self.set_player_id(PlayerID.PLAYER_1)
+        self.numaxis: int = joy.get_numaxes()
+        self.axis: list = [joy.get_axis(a) for a in range(self.numaxis)]
+        self.numhats: int = joy.get_numhats()
+        self.hats: list = [joy.get_hat(h) for h in range(self.numhats)]
+        self.numbuttons: int = joy.get_numbuttons()
+        self.buttons: list = [joy.get_button(b) for b in range(self.numbuttons)]
         self.mapping = {
             "left stick x": self.axis[0],
             "left stick y": self.axis[1],
@@ -43,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
     
@@ -67,8 +76,15 @@ 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:

pygameControls/dualsense_edge_controller.py

@@ -10,6 +10,12 @@ class DualSenseEdgeController(ControlsBase):
         self.powerlevel = self.device.battery.Level
         self.batterystate = BATTERY_STATE[str(self.device.battery.State)]
         self.set_player_id(PlayerID.PLAYER_1)
+        self.numaxis: int = joy.get_numaxes()
+        self.axis: list = [joy.get_axis(a) for a in range(self.numaxis)]
+        self.numhats: int = joy.get_numhats()
+        self.hats: list = [joy.get_hat(h) for h in range(self.numhats)]
+        self.numbuttons: int = joy.get_numbuttons()
+        self.buttons: list = [joy.get_button(b) for b in range(self.numbuttons)]
         self.mapping = {
             "left stick x": self.axis[0],
             "left stick y": self.axis[1],
@@ -35,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
     
@@ -59,8 +68,15 @@ 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:

setup.py

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