Fix the PS4/5 axis ordering; the left stick shows up as axis 3/4, wit…

…h the l/r analogue triggers being 2 & 5. Update omni control configurations accordingly
clearpathrobotics · Dec 19, 2024 · 39dab6a · 39dab6a
1 parent f4e2942
commit 39dab6a
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 39 deletions.
diff --git a/clearpath_control/config/a200/teleop_ps4.yaml b/clearpath_control/config/a200/teleop_ps4.yaml
@@ -44,10 +44,10 @@
 #    AXIS        Value
 # Left Horiz.      0
 # Left Vert.       1
-# Right Horiz.     2
-# Right Vert.      5
-#    L2            3
-#    R2            4
+# Right Horiz.     3
+# Right Vert.      4
+#    L2            2
+#    R2            5
 # D-pad Horiz.     9
 # D-pad Vert.      10
 # Accel x          7

diff --git a/clearpath_control/config/a300/teleop_ps4.yaml b/clearpath_control/config/a300/teleop_ps4.yaml
@@ -44,10 +44,10 @@
 #    AXIS        Value
 # Left Horiz.      0
 # Left Vert.       1
-# Right Horiz.     2
-# Right Vert.      5
-#    L2            3
-#    R2            4
+# Right Horiz.     3
+# Right Vert.      4
+#    L2            2
+#    R2            5
 # D-pad Horiz.     9
 # D-pad Vert.      10
 # Accel x          7

diff --git a/clearpath_control/config/dd100/teleop_ps4.yaml b/clearpath_control/config/dd100/teleop_ps4.yaml
@@ -44,10 +44,10 @@
 #    AXIS        Value
 # Left Horiz.      0
 # Left Vert.       1
-# Right Horiz.     2
-# Right Vert.      5
-#    L2            3
-#    R2            4
+# Right Horiz.     3
+# Right Vert.      4
+#    L2            2
+#    R2            5
 # D-pad Horiz.     9
 # D-pad Vert.      10
 # Accel x          7

diff --git a/clearpath_control/config/dd150/teleop_ps4.yaml b/clearpath_control/config/dd150/teleop_ps4.yaml
@@ -44,10 +44,10 @@
 #    AXIS        Value
 # Left Horiz.      0
 # Left Vert.       1
-# Right Horiz.     2
-# Right Vert.      5
-#    L2            3
-#    R2            4
+# Right Horiz.     3
+# Right Vert.      4
+#    L2            2
+#    R2            5
 # D-pad Horiz.     9
 # D-pad Vert.      10
 # Accel x          7

diff --git a/clearpath_control/config/do100/teleop_ps4.yaml b/clearpath_control/config/do100/teleop_ps4.yaml
@@ -44,10 +44,10 @@
 #    AXIS        Value
 # Left Horiz.      0
 # Left Vert.       1
-# Right Horiz.     2
-# Right Vert.      5
-#    L2            3
-#    R2            4
+# Right Horiz.     3
+# Right Vert.      4
+#    L2            2
+#    R2            5
 # D-pad Horiz.     9
 # D-pad Vert.      10
 # Accel x          7
@@ -64,7 +64,7 @@ teleop_twist_joy_node:
     scale_linear.y: 0.4
     scale_linear_turbo.x: 1.0
     scale_linear_turbo.y: 1.0
-    axis_angular.yaw: 3
+    axis_angular.yaw: 4
     scale_angular.yaw: 0.5
     scale_angular_turbo.yaw: 1.4
     enable_button: 4

diff --git a/clearpath_control/config/do150/teleop_ps4.yaml b/clearpath_control/config/do150/teleop_ps4.yaml
@@ -44,10 +44,10 @@
 #    AXIS        Value
 # Left Horiz.      0
 # Left Vert.       1
-# Right Horiz.     2
-# Right Vert.      5
-#    L2            3
-#    R2            4
+# Right Horiz.     3
+# Right Vert.      4
+#    L2            2
+#    R2            5
 # D-pad Horiz.     9
 # D-pad Vert.      10
 # Accel x          7
@@ -64,7 +64,7 @@ teleop_twist_joy_node:
     scale_linear.y: 0.4
     scale_linear_turbo.x: 1.0
     scale_linear_turbo.y: 1.0
-    axis_angular.yaw: 3
+    axis_angular.yaw: 4
     scale_angular.yaw: 0.5
     scale_angular_turbo.yaw: 1.0
     enable_button: 4

diff --git a/clearpath_control/config/generic/teleop_ps4.yaml b/clearpath_control/config/generic/teleop_ps4.yaml
@@ -44,10 +44,10 @@
 #    AXIS        Value
 # Left Horiz.      0
 # Left Vert.       1
-# Right Horiz.     2
-# Right Vert.      5
-#    L2            3
-#    R2            4
+# Right Horiz.     3
+# Right Vert.      4
+#    L2            2
+#    R2            5
 # D-pad Horiz.     9
 # D-pad Vert.      10
 # Accel x          7

diff --git a/clearpath_control/config/r100/teleop_ps4.yaml b/clearpath_control/config/r100/teleop_ps4.yaml
@@ -44,10 +44,10 @@
 #    AXIS        Value
 # Left Horiz.      0
 # Left Vert.       1
-# Right Horiz.     2
-# Right Vert.      5
-#    L2            3
-#    R2            4
+# Right Horiz.     3
+# Right Vert.      4
+#    L2            2
+#    R2            5
 # D-pad Horiz.     9
 # D-pad Vert.      10
 # Accel x          7
@@ -64,7 +64,7 @@ teleop_twist_joy_node:
     scale_linear.y: 0.4
     scale_linear_turbo.x: 0.4
     scale_linear_turbo.y: 0.4
-    axis_angular.yaw: 3
+    axis_angular.yaw: 4
     scale_angular.yaw: 0.5
     scale_angular_turbo.yaw: 0.5
     enable_button: 4

diff --git a/clearpath_control/config/w200/teleop_ps4.yaml b/clearpath_control/config/w200/teleop_ps4.yaml
@@ -44,10 +44,10 @@
 #    AXIS        Value
 # Left Horiz.      0
 # Left Vert.       1
-# Right Horiz.     2
-# Right Vert.      5
-#    L2            3
-#    R2            4
+# Right Horiz.     3
+# Right Vert.      4
+#    L2            2
+#    R2            5
 # D-pad Horiz.     9
 # D-pad Vert.      10
 # Accel x          7