diff --git a/bricks_etc.py b/bricks_etc.py index 608ff18..80d626f 100644 --- a/bricks_etc.py +++ b/bricks_etc.py @@ -197,7 +197,7 @@ target_positions = [{ 'yaw':0 }] -bricks_start =[{ +bricks_start_v1 =[{ 'id':'a1', 'rframe':'t1', 'x':-0.419, @@ -288,11 +288,22 @@ bricks_start =[{ # 'yaw':0 # }] +bricks_start_v2 =[{ + 'id':'a1', + 'rframe':'t1', + 'x':-0.219, + 'y':0.134, + 'z':0.770, + 'roll':0, + 'pitch':0, + 'yaw':radians(90) + }] + def getBuildable(): - return bricks_start + return bricks_start_v2 def getAll(): - return bricks_start+bricks_end+[table] + return bricks_start_v2+bricks_end+[table] def getTable(): return table @@ -302,7 +313,7 @@ def getTargets(): def getNodes(): nodes = ['baxter::base', 't1::Table'] - for obj in bricks_start + bricks_end: + for obj in bricks_start_v2 + bricks_end: name = obj['id'] node_name = name+'::Brick' nodes.append(node_name) diff --git a/main.py b/main.py index 67905d5..f3c2dc3 100755 --- a/main.py +++ b/main.py @@ -263,8 +263,8 @@ if __name__ == "__main__": - left_pick = otc.tf_lookup('a3') - left_pick.position.x -= 0.0 + left_pick = otc.tf_lookup('a1') + left_pick.position.x -= 0.05 left_pnp.pick(left_pick) left_place_pos = otc.tf_lookup('h2')