Jukebox/jukebox-software
10
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 2 Wiki Activity

Compare commits

base: Jukebox:fb31ab0d731c1d8b562dc4d41a5992caa4077ca1
Branches Tags
Jukebox:main Jukebox:dthomas_meilisearch Jukebox:dthomas-db
Jukebox:labelgenv0.2 Jukebox:labelgenv0.1
..
compare: Jukebox:c52fe167bf6ee187fda6001a84d1968996c8feef
Branches Tags
Jukebox:main Jukebox:dthomas_meilisearch Jukebox:dthomas-db
Jukebox:labelgenv0.2 Jukebox:labelgenv0.1

2 Commits
fb31ab0d73 ... c52fe167bf

Author SHA1 Message Date
BlueOceanWave
c52fe167bf Merge branch 'main' of https://git.myitr.org/Jukebox/jukebox-software 2024-04-26 17:49:14 -05:00
BlueOceanWave
f7b4f264c4 Fixed positions for holder 47 and 45 in config.yaml 2024-04-26 17:49:11 -05:00
2 changed files with 19 additions and 9 deletions
Expand all files Collapse all files

4
config.yml
View File

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

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