From dadf6794f66677405271ddceff6ad4756e99b1b7 Mon Sep 17 00:00:00 2001 From: Iki Yo Date: Tue, 16 Apr 2019 18:01:00 +0900 Subject: [PATCH] Fixed a key setting mistake. Add controller_type ipega as a possible input for joy_status --- jsk_teleop_joy/src/jsk_teleop_joy/joy.py | 2 ++ jsk_teleop_joy/src/jsk_teleop_joy/joy_status.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jsk_teleop_joy/src/jsk_teleop_joy/joy.py b/jsk_teleop_joy/src/jsk_teleop_joy/joy.py index 4e127818e..de3da60f1 100755 --- a/jsk_teleop_joy/src/jsk_teleop_joy/joy.py +++ b/jsk_teleop_joy/src/jsk_teleop_joy/joy.py @@ -96,6 +96,8 @@ def __init__(self, plugin_package="jsk_teleop_joy"): self.JoyStatus = PS3Status elif self.controller_type == 'ps3wired': self.JoyStatus = PS3WiredStatus + elif self.controller_type == 'ipega': + self.JoyStatus = IpegaStatus elif self.controller_type == 'auto': s = rospy.Subscriber('/joy', Joy, autoJoyDetect) self.state = self.STATE_WAIT_FOR_JOY diff --git a/jsk_teleop_joy/src/jsk_teleop_joy/joy_status.py b/jsk_teleop_joy/src/jsk_teleop_joy/joy_status.py index 7411cfcad..4c28f9083 100644 --- a/jsk_teleop_joy/src/jsk_teleop_joy/joy_status.py +++ b/jsk_teleop_joy/src/jsk_teleop_joy/joy_status.py @@ -191,8 +191,8 @@ def __init__(self, msg): self.R2 = False self.left_analog_x = msg.axes[0] self.left_analog_y = msg.axes[1] - self.right_analog_x = msg.axes[3] - self.right_analog_y = msg.axes[4] + self.right_analog_x = msg.axes[2] + self.right_analog_y = msg.axes[3] self.checkAnalogStick() self.orig_msg = msg