From 98ee1267a9e7f3e79dceaa57005e2b31561ca22b Mon Sep 17 00:00:00 2001 From: Max Hunt Date: Tue, 11 Feb 2020 12:52:48 +0000 Subject: [PATCH] Update --- bricks_etc.py | 18 +++++++++--------- main.py | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bricks_etc.py b/bricks_etc.py index 2b1c6cb..cc36ae5 100644 --- a/bricks_etc.py +++ b/bricks_etc.py @@ -12,7 +12,7 @@ table = { } bricks_end =[{ - 'id':'ea1', + 'id':'f1', 'rframe':'t1', 'x':0.46, 'y':-0.19, @@ -22,7 +22,7 @@ bricks_end =[{ 'yaw':radians(90) }, { - 'id':'ea2', + 'id':'f2', 'rframe':'ea1', 'x':0, 'y':0, @@ -32,7 +32,7 @@ bricks_end =[{ 'yaw':0 }, { - 'id':'ea3', + 'id':'f3', 'rframe':'ea1', 'x':0, 'y':0, @@ -42,7 +42,7 @@ bricks_end =[{ 'yaw':0 }, { - 'id':'eb1', + 'id':'g1', 'rframe':'ea1', 'x':-0.127, 'y':0, @@ -52,7 +52,7 @@ bricks_end =[{ 'yaw':0 }, { - 'id':'eb2', + 'id':'g2', 'rframe':'ea1', 'x':-0.127, 'y':0, @@ -62,7 +62,7 @@ bricks_end =[{ 'yaw':0 }, { - 'id':'ec1', + 'id':'h1', 'rframe':'ea1', 'x':-0.254, 'y':0, @@ -72,7 +72,7 @@ bricks_end =[{ 'yaw':0 }, { - 'id':'ec2', + 'id':'h2', 'rframe':'ea1', 'x':-0.254, 'y':0, @@ -82,7 +82,7 @@ bricks_end =[{ 'yaw':0 }, { - 'id':'ed1', + 'id':'i1', 'rframe':'ea1', 'x':-0.381, 'y':0, @@ -92,7 +92,7 @@ bricks_end =[{ 'yaw':0 }, { - 'id':'ee1', + 'id':'j1', 'rframe':'ea1', 'x':-0.508, 'y':0, diff --git a/main.py b/main.py index 8f98c8a..6017f00 100755 --- a/main.py +++ b/main.py @@ -266,7 +266,7 @@ if __name__ == "__main__": left_pick = otc.tf_lookup('a3') left_pnp.pick(left_pick) - left_place_pos = otc.tf_lookup('ea2') + left_place_pos = otc.tf_lookup('f2') # xpos = built_bricks[0] # zqtr = quaternion_from_euler(xpos['roll'], xpos['pitch'], xpos['yaw'])