Skip to content

Commit

Permalink
Updated the movement order in move rails neutral
Browse files Browse the repository at this point in the history
  • Loading branch information
Dozgulbas committed Jan 24, 2025
1 parent cf97f2a commit b2cefa4
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions src/pf400_driver/pf400_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,6 @@ def refresh_joint_state(self):
self.joint_state_position[6] = float(joint_array[6]) * 0.001 # J6, rail
return self.joint_state_position

# GET COMMANDS

def get_robot_movement_state(self):
"""Checks the movement state of the robot
States: 0 = Power off
Expand Down Expand Up @@ -460,8 +458,6 @@ def get_gripper_state(self):
self.gripper_state = "closed"
return self.gripper_state

# SET COMMANDS

def set_profile(self, wait: int = 0.1, profile_dict: dict = {"0": 0}):
"""
Description: Sets and saves the motion profiles (defined in robot data) to the robot.
Expand Down Expand Up @@ -553,7 +549,6 @@ def check_incorrect_plate_orientation(self, goal_location, goal_rotation):

return goal_location

# MOVE COMMANDS
def move_joint(
self,
target_joint_angles,
Expand Down Expand Up @@ -808,11 +803,10 @@ def move_rails_neutral(self, v_rail: float = None, h_rail: float = None):
if not h_rail:
h_rail = current_location[5] # Keep the horizontal rail same

self.neutral_joints[0] = v_rail + self.sample_above_height
self.move_joint(self.neutral_joints, self.slow_motion_profile)

self.neutral_joints[5] = h_rail
self.move_joint(self.neutral_joints, self.fast_motion_profile)
self.neutral_joints[0] = v_rail + self.sample_above_height
self.move_joint(self.neutral_joints, self.slow_motion_profile)

def move_all_joints_neutral(self, target_location=None):
"""
Expand Down

0 comments on commit b2cefa4

Please sign in to comment.