Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed a key setting mistake. Add controller_type ipega as a possible …
…input for joy_status
  • Loading branch information
weiqiyang committed Apr 16, 2019
1 parent d5c8cb0 commit dadf679
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions jsk_teleop_joy/src/jsk_teleop_joy/joy.py
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions jsk_teleop_joy/src/jsk_teleop_joy/joy_status.py
Expand Up @@ -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

Expand Down

0 comments on commit dadf679

Please sign in to comment.