From 0ceb05191773bbf2b47c0a385ff013344f513037 Mon Sep 17 00:00:00 2001 From: Max Hunt Date: Tue, 11 Feb 2020 00:27:29 +0000 Subject: [PATCH] Update --- bricks_etc.py | 4 ++-- main.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bricks_etc.py b/bricks_etc.py index 4b7d518..d3dfb0e 100644 --- a/bricks_etc.py +++ b/bricks_etc.py @@ -110,11 +110,11 @@ target_positions = [{ # 'y':-0.19, 'y':0.2, 'z':0.9, - 'roll':0, + 'roll':radians(90), # 'pitch':-1.570796, 'pitch':0, # 'yaw':radians(90) - 'yaw':0 + 'yaw':radians(90) }, { 'num':2, diff --git a/main.py b/main.py index 50e7075..71442da 100755 --- a/main.py +++ b/main.py @@ -264,10 +264,10 @@ if __name__ == "__main__": left_place_pos.position.x = left_place_pre.position.x + xpos['z'] left_place_pos.position.y = left_place_pre.position.y + xpos['x'] left_place_pos.position.z = left_place_pre.position.z + xpos['y'] - left_place_pos.orientation.x = left_place_pre.orientation.x + zqtr[0] - left_place_pos.orientation.y = left_place_pre.orientation.y + zqtr[1] - left_place_pos.orientation.z = left_place_pre.orientation.z + zqtr[2] - left_place_pos.orientation.w = left_place_pre.orientation.w + zqtr[3] + left_place_pos.orientation.x = left_place_pre.orientation.x# + zqtr[0] + left_place_pos.orientation.y = left_place_pre.orientation.y# + zqtr[1] + left_place_pos.orientation.z = left_place_pre.orientation.z# + zqtr[2] + left_place_pos.orientation.w = left_place_pre.orientation.w# + zqtr[3] left_pnp.place(left_place_pos)