From 68182187c6c55a2a5cfb9e7679f7ab76ccdc2167 Mon Sep 17 00:00:00 2001 From: Max Hunt Date: Mon, 9 Mar 2020 10:41:52 +0000 Subject: [PATCH] Update --- brick/{model.sdfbk => new-model.sdf} | 0 new_main.py | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename brick/{model.sdfbk => new-model.sdf} (100%) diff --git a/brick/model.sdfbk b/brick/new-model.sdf similarity index 100% rename from brick/model.sdfbk rename to brick/new-model.sdf diff --git a/new_main.py b/new_main.py index a369a62..675f9df 100644 --- a/new_main.py +++ b/new_main.py @@ -27,7 +27,7 @@ brickstuff = tps.brick_directions_notf global sumulation simulation = True -debug = False +debug = True class PickAndPlace(object): def __init__(self, limb, hover_distance = 0.10, verbose=True, speed=0.2, accuracy=baxter_interface.settings.JOINT_ANGLE_TOLERANCE): @@ -111,7 +111,7 @@ class PickAndPlace(object): if simulation: #deals with gazebo objects, not useful in the real world brick_ids = ['b1','b2','b3','b4','b5','b6','b7','b8','b9'] - with open ("brick/model.sdf", "r") as brick_file:brick_sdf=brick_file.read().replace('\n', '') + with open ("brick/new-model.sdf", "r") as brick_file:brick_sdf=brick_file.read().replace('\n', '') with open ("L3-table/model.sdf", "r") as table_file:table_sdf=table_file.read().replace('\n', '') with open ("brick/static-b.sdf", "r") as table_file:static_brick=table_file.read().replace('\n', '')