Compare commits

..

No commits in common. "c52fe167bf6ee187fda6001a84d1968996c8feef" and "fb31ab0d731c1d8b562dc4d41a5992caa4077ca1" have entirely different histories.

2 changed files with 9 additions and 19 deletions

View File

@ -512,7 +512,7 @@ position_map:
- index: 36
pos: [-228.6, -131.982]
- index: 37
pos: [-151, -133]
pos: [-152.4, -131.982]
- index: 38
pos: [-76.2, -131.982]
- index: 39
@ -528,7 +528,7 @@ position_map:
- index: 44
pos: [-114.3, -197.973]
- index: 45
pos: [-35, -199]
pos: [-38.1, -197.973]
- index: 46
pos: [38.1, -197.973]
- index: 47

View File

@ -486,7 +486,7 @@ def safe_move(robot, x, y, z, use_closest_path=True):
if (r <= flip_radius and is_flipped(robot)) or (r > flip_radius and not is_flipped(robot)):
flip(robot)
rob.movej(offset_gripper_angle(robot, x, y, z, flip=is_flipped(robot), use_closest_path=use_closest_path), vel=2, acc=2)
rob.movej(offset_gripper_angle(robot, x, y, z, flip=is_flipped(robot), use_closest_path=use_closest_path), vel=4, acc=3)
return True
def holder_routine(robot, holder_index, pick_up, verbose=False):
@ -711,25 +711,15 @@ if __name__ == "__main__":
#move_to_packup(robot)
# pick_up_holder(robot, 2)
# drop_off_tray(robot, 0)
# pick_up_tray(robot, 1)
# drop_off_holder(robot, 5)
# for i in range(3):
# pick_up_holder(robot, i)
# pick_up_holder(robot, 26)
# drop_off_tray(robot, 3)
# print('Drop off', i+1)
# drop_off_holder(robot, i+1)
for i in range(44,45):
pick_up_holder(robot, i)
print('Drop off', i+1)
drop_off_holder(robot, i+1)
input()
# holder_to_camera(robot, 0)
# camera_to_holder(robot, 0)
holder_to_camera(robot, 0)
camera_to_holder(robot, 0)
print("Current tool pose is: ", rob.getl())
curr_pos = rob.getl()