Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added possibility to directly control the arm using an ArmVelocityCommand #104

Merged
merged 3 commits into from
Jun 5, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions spot_wrapper/spot_arm.py
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,50 @@ def hand_pose(self, data) -> typing.Tuple[bool, str]:

return True, "Moved arm successfully"

def handle_arm_velocity(
self, arm_velocity_command: arm_command_pb2.ArmVelocityCommand.Request, cmd_duration: float = 0.15
) -> typing.Tuple[bool, str]:
"""
Set the velocity of the arm TCP

Args:
arm_velocity_command: Protobuf message to set the arm velocity
cmd_duration: (optional) Time-to-live for the command in seconds.

Returns:
Boolean success, string message
"""

try:
success, msg = self.ensure_arm_power_and_stand()
if not success:
self._logger.info(msg)
return False, msg
else:
end_time = self._robot.time_sync.robot_timestamp_from_local_secs(time.time() + cmd_duration)

arm_velocity_command2 = arm_command_pb2.ArmVelocityCommand.Request(
cylindrical_velocity=arm_velocity_command.cylindrical_velocity,
angular_velocity_of_hand_rt_odom_in_hand=arm_velocity_command.angular_velocity_of_hand_rt_odom_in_hand,
cartesian_velocity=arm_velocity_command.cartesian_velocity,
end_time=end_time,
)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you copy the request to arm_velocity_command2 here?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh now I see that you modified the end time.
Could you not do something like this?

new_end_time = . . .
arm_velocity_command.end_time = new_end_time

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well I obviously tried that first but the internal protobuf message prevented me from doing this. Not sure why exactly but if you have a workaround I would be happy to streamline this.

MGBla marked this conversation as resolved.
Show resolved Hide resolved

robot_command = robot_command_pb2.RobotCommand()
robot_command.synchronized_command.arm_command.arm_velocity_command.CopyFrom(arm_velocity_command2)

self._robot_command_client.robot_command(
command=robot_command, end_time_secs=time.time() + cmd_duration
)
khughes-bdai marked this conversation as resolved.
Show resolved Hide resolved

except Exception as e:
print(e)
MGBla marked this conversation as resolved.
Show resolved Hide resolved
return (
False,
f"An error occured while trying to move arm\n Exception: {e}",
)
return True, "Moved arm successfully"

@staticmethod
def block_until_gripper_command_completes(
robot_command_client: RobotCommandClient,
Expand Down
Loading