diff --git a/src/Teleop-Control/joystick_control/config/pxn.yaml b/src/Teleop-Control/joystick_control/config/pxn.yaml index 660cad86..58e80079 100644 --- a/src/Teleop-Control/joystick_control/config/pxn.yaml +++ b/src/Teleop-Control/joystick_control/config/pxn.yaml @@ -1,12 +1,12 @@ drive_teleop_node: ros__parameters: - forward_axis: 3 - strafe_axis: 2 - yaw_axis: 0 + forward_axis: 1 + strafe_axis: 0 + yaw_axis: 3 max_linear: 2.0 max_angular: 1.0 - servo_y_axis: 5 - servo_x_axis: 4 + servo_y_axis: 7 + servo_x_axis: 6 servo_home_button: 0 servo_increment: 0.02 mast_left_button: 2 diff --git a/src/Teleop-Control/joystick_control/launch/controller.launch.py b/src/Teleop-Control/joystick_control/launch/controller.launch.py index f507058a..1d74a987 100644 --- a/src/Teleop-Control/joystick_control/launch/controller.launch.py +++ b/src/Teleop-Control/joystick_control/launch/controller.launch.py @@ -7,7 +7,7 @@ def find_ps5(): try: # check for wired first - wired_path = "/dev/input/by-id/usb-ZhiXu_GuliKit_Controller_D-joystick" + wired_path = "/dev/input/by-id/usb-Logitech_Gamepad_F310_8B6600E2-joystick" if os.path.exists(wired_path): return wired_path # Check wireless after