aaron/rover-ros2
1
0
Fork 0
mirror of https://github.com/SHC-ASTRA/rover-ros2.git synced 2026-02-11 09:20:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: (headless) add new control scheme for arm

Browse Source
This commit is contained in:
David
2026-01-18 18:06:34 -06:00
parent 8f9a2d566d
commit 5f5f6e20ba
1 changed files with 103 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/headless_pkg/src/headless_node.py
View File

@@ -118,6 +118,13 @@ class Headless(Node):
CoreCtrlState, "/core/control/state", qos_profile=control_qos
)
self.declare_parameter('arm_manual_scheme', "old")
self.arm_manual_scheme = self.get_parameter('arm_manual_scheme').value
# Check parameter validity
if self.arm_manual_scheme not in ["old", "new"]:
self.get_logger().warn(f"Invalid value '{self.arm_manual_scheme}' for arm_manual_scheme parameter. Defaulting to 'old' ('24 and '25 controls).")
self.ctrl_mode = "core" # Start in core mode
self.core_brake_mode = False
self.core_max_duty = 0.5 # Default max duty cycle (walking speed)
@@ -257,9 +264,15 @@ class Headless(Node):
right_stick_x = deadzone(self.gamepad.get_axis(3))
right_stick_y = deadzone(self.gamepad.get_axis(4))
right_trigger = deadzone(self.gamepad.get_axis(5))
button_a = self.gamepad.get_button(0)
button_b = self.gamepad.get_button(1)
button_x = self.gamepad.get_button(2)
button_y = self.gamepad.get_button(3)
left_bumper = self.gamepad.get_button(4)
right_bumper = self.gamepad.get_button(5)
dpad_input = self.gamepad.get_hat(0)
if self.arm_manual_scheme == "old":
# EF Grippers
if left_trigger > 0 and right_trigger > 0:
arm_input.gripper = 0
@@ -302,6 +315,62 @@ class Headless(Node):
if abs(right_stick_y) > 0.15:
arm_input.axis3 = -1 * round(right_stick_y)
if self.arm_manual_scheme == "new":
# Right stick: EF yaw and axis 3
# Left stick: axis 1 and 2
# D-pad: axis 0 and _
# Triggers: EF grippers
# Bumpers: EF roll
# A: brake
# B: _
# X: _
# Y: linear actuator
# Right stick: EF yaw and axis 3
arm_input.effector_yaw = 0 if right_stick_x == 0 else int(
copysign(1, right_stick_x)
)
arm_input.axis3 = 0 if right_stick_y == 0 else int(
copysign(-1, right_stick_y)
)
# Left stick: axis 1 and 2
arm_input.axis1 = 0 if left_stick_x == 0 else int(
copysign(1, left_stick_x)
)
arm_input.axis2 = 0 if left_stick_y == 0 else int(
copysign(-1, left_stick_y)
)
# D-pad: axis 0 and _
arm_input.axis0 = 0 if dpad_input[0] == 0 else int(
copysign(1, dpad_input[0])
)
# Triggers: EF Grippers
if left_trigger > 0 and right_trigger > 0:
arm_input.gripper = 0
elif left_trigger > 0:
arm_input.gripper = -1
elif right_trigger > 0:
arm_input.gripper = 1
# Bumpers: EF roll
if left_bumper > 0 and right_bumper > 0:
arm_input.effector_roll = 0
elif left_bumper > 0:
arm_input.effector_roll = -1
elif right_bumper > 0:
arm_input.effector_roll = 1
# A: brake
if button_a:
arm_input.brake = True
# Y: linear actuator
if button_y:
arm_input.linear_actuator = 1
# BIO
bio_input = BioControl(
bio_arm=int(left_stick_y * -100),