From 1b804a785fb505ed783a5e52402d78d30efb7bfb Mon Sep 17 00:00:00 2001 From: Michel Breyer Date: Tue, 27 Apr 2021 16:28:39 +0200 Subject: [PATCH] Reflect changes of the robot_tools package --- bt_sim_node.py | 4 ++-- policies.py | 5 +++-- run.py | 3 ++- simulation.py | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bt_sim_node.py b/bt_sim_node.py index 079c642..a64803c 100755 --- a/bt_sim_node.py +++ b/bt_sim_node.py @@ -12,8 +12,8 @@ from geometry_msgs.msg import Pose from sensor_msgs.msg import JointState, Image import std_srvs.srv -from robot_tools.controllers import CartesianPoseController -from robot_tools.ros import * +from robot_utils.controllers import CartesianPoseController +from robot_utils.ros.conversions import * from simulation import BtPandaEnv diff --git a/policies.py b/policies.py index ca674c7..ee2582d 100644 --- a/policies.py +++ b/policies.py @@ -3,8 +3,9 @@ import numpy as np import rospy import scipy.interpolate -from robot_tools.spatial import Rotation, Transform -from robot_tools.ros import * +from robot_utils.spatial import Rotation, Transform +from robot_utils.ros.conversions import * +from robot_utils.ros.tf import TransformTree def get_policy(name): diff --git a/run.py b/run.py index af1fa46..a0482c1 100644 --- a/run.py +++ b/run.py @@ -7,7 +7,8 @@ from geometry_msgs.msg import Pose import std_srvs.srv from policies import get_policy -from robot_tools.ros import * +from robot_utils.ros.conversions import * +from robot_utils.ros.panda import PandaGripperRosInterface class GraspController: diff --git a/simulation.py b/simulation.py index 71a4bbe..25e598f 100644 --- a/simulation.py +++ b/simulation.py @@ -1,7 +1,7 @@ import pybullet as p -from robot_tools.btsim import * -from robot_tools.spatial import Rotation, Transform +from robot_utils.btsim import * +from robot_utils.spatial import Rotation, Transform class BtPandaEnv(BtBaseEnv):