Merge pull request #25 from williamledda/fix_event_value

Fix for #20
ArturSpirin · Apr 3, 2021 · 724c87d · 724c87d
2 parents 0e2c87a + 9596894
commit 724c87d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/pyPS4Controller/controller.py b/pyPS4Controller/controller.py
@@ -288,27 +288,27 @@ def __handle_event(self, button_id, button_type, value, overflow, debug):
             elif event.R3_x_at_rest():
                 self.on_R3_x_at_rest()
             elif event.R3_right():
-                self.on_R3_right(value)
+                self.on_R3_right(event.value)
             elif event.R3_left():
-                self.on_R3_left(value)
+                self.on_R3_left(event.value)
             elif event.R3_up():
-                self.on_R3_up(value)
+                self.on_R3_up(event.value)
             elif event.R3_down():
-                self.on_R3_down(value)
+                self.on_R3_down(event.value)
         elif event.L3_event():
             self.event_history.append("left_joystick")
             if event.L3_y_at_rest():
                 self.on_L3_y_at_rest()
             elif event.L3_x_at_rest():
                 self.on_L3_x_at_rest()
             elif event.L3_up():
-                self.on_L3_up(value)
+                self.on_L3_up(event.value)
             elif event.L3_down():
-                self.on_L3_down(value)
+                self.on_L3_down(event.value)
             elif event.L3_left():
-                self.on_L3_left(value)
+                self.on_L3_left(event.value)
             elif event.L3_right():
-                self.on_L3_right(value)
+                self.on_L3_right(event.value)
         elif event.circle_pressed():
             self.event_history.append("circle")
             self.on_circle_press()
@@ -336,7 +336,7 @@ def __handle_event(self, button_id, button_type, value, overflow, debug):
             self.on_L1_release()
         elif event.L2_pressed():
             self.event_history.append("L2")
-            self.on_L2_press(value)
+            self.on_L2_press(event.value)
         elif event.L2_released():
             self.on_L2_release()
         elif event.R1_pressed():
@@ -346,7 +346,7 @@ def __handle_event(self, button_id, button_type, value, overflow, debug):
             self.on_R1_release()
         elif event.R2_pressed():
             self.event_history.append("R2")
-            self.on_R2_press(value)
+            self.on_R2_press(event.value)
         elif event.R2_released():
             self.on_R2_release()
         elif event.options_pressed():

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="pyPS4Controller",
-    version="1.2.4",
+    version="1.2.5",
     author="Artur Spirin",
     author_email="[email protected]",
     description="Simple hooks for PS4 controller",