diff --git a/doc/morse/user/middlewares/ros.rst b/doc/morse/user/middlewares/ros.rst index 30ffae422..7c88c6c08 100644 --- a/doc/morse/user/middlewares/ros.rst +++ b/doc/morse/user/middlewares/ros.rst @@ -35,4 +35,4 @@ Similarly, you can set a custom ``frame_id`` and ``child_frame_id``: .. code-block :: python - foo.add_stream('ros', frame_id = '/world', child_frame_id = '/footprint') + foo.add_stream('ros', frame_id = 'world', child_frame_id = 'footprint') diff --git a/src/morse/middleware/ros/imu.py b/src/morse/middleware/ros/imu.py index aba5bff63..2974f661d 100644 --- a/src/morse/middleware/ros/imu.py +++ b/src/morse/middleware/ros/imu.py @@ -4,7 +4,7 @@ class ImuPublisher(ROSPublisher): """ Publish the data of the IMU sensor (without covariance). """ ros_class = Imu - default_frame_id = '/imu' + default_frame_id = 'imu' def default(self, ci='unused'): imu = Imu() diff --git a/src/morse/middleware/ros/laserscanner.py b/src/morse/middleware/ros/laserscanner.py index 8c73d6ae8..336f17373 100644 --- a/src/morse/middleware/ros/laserscanner.py +++ b/src/morse/middleware/ros/laserscanner.py @@ -8,7 +8,7 @@ class LaserScanPublisher(ROSPublisher): """ Publish the ``range_list`` of the laser scanner. """ ros_class = LaserScan - default_frame_id = '/base_laser_link' + default_frame_id = 'base_laser_link' def default(self, ci='unused'): laserscan = LaserScan() diff --git a/src/morse/middleware/ros/odometry.py b/src/morse/middleware/ros/odometry.py index f435655bf..74876e89e 100644 --- a/src/morse/middleware/ros/odometry.py +++ b/src/morse/middleware/ros/odometry.py @@ -10,12 +10,12 @@ class OdometryPublisher(ROSPublisherTF): '/base_footprint' through TF. """ ros_class = Odometry - default_frame_id = '/odom' + default_frame_id = 'odom' def initialize(self): ROSPublisherTF.initialize(self) # store the frame ids - self.child_frame_id = self.kwargs.get("child_frame_id", "/base_footprint") + self.child_frame_id = self.kwargs.get("child_frame_id", "base_footprint") logger.info("Initialized the ROS odometry sensor with frame_id '%s' " +\ "and child_frame_id '%s'", self.frame_id, self.child_frame_id) diff --git a/src/morse/middleware/ros/pose.py b/src/morse/middleware/ros/pose.py index dbe67cb18..63c22aed0 100644 --- a/src/morse/middleware/ros/pose.py +++ b/src/morse/middleware/ros/pose.py @@ -66,7 +66,7 @@ class PoseStampedPublisher(ROSPublisher): as ROS geometry_msgs.PoseStamped message. """ ros_class = PoseStamped - default_frame_id = '/map' + default_frame_id = 'map' def default(self, ci='unused'): if 'valid' not in self.data or self.data['valid']: @@ -79,7 +79,7 @@ def default(self, ci='unused'): class PoseWithCovarianceStampedPublisher(ROSPublisher): """ Publish the position and orientation of the robot including the covariance. """ ros_class = PoseWithCovarianceStamped - default_frame_id = '/map' + default_frame_id = 'map' def default(self, ci='unused'): if 'valid' not in self.data or self.data['valid']: @@ -96,12 +96,12 @@ class TFPublisher(ROSPublisherTF): ``frame_id`` and ``child_frame_id`` args, default '/map' and '/base_link' through TF. """ - default_frame_id = '/map' + default_frame_id = 'map' def initialize(self): ROSPublisherTF.initialize(self) # store the frame ids - self.child_frame_id = self.kwargs.get("child_frame_id", "/base_link") + self.child_frame_id = self.kwargs.get("child_frame_id", "base_link") logger.info("Initialized the ROS TF publisher with frame_id '%s' " + \ "and child_frame_id '%s'", self.frame_id, self.child_frame_id) diff --git a/src/morse/middleware/ros/semantic_camera.py b/src/morse/middleware/ros/semantic_camera.py index ca351cc2a..bc1e2c3d8 100644 --- a/src/morse/middleware/ros/semantic_camera.py +++ b/src/morse/middleware/ros/semantic_camera.py @@ -13,7 +13,7 @@ class SemanticCameraPublisher(ROSPublisherTF): def initialize(self): if not self.component_instance.relative: - self.default_frame_id = '/map' + self.default_frame_id = 'map' ROSPublisherTF.initialize(self) def default(self, ci='unused'): @@ -36,7 +36,7 @@ class SemanticCameraPublisherLisp(ROSPublisherTF): def initialize(self): if not self.component_instance.relative: - self.default_frame_id = '/map' + self.default_frame_id = 'map' ROSPublisherTF.initialize(self) def default(self, ci='unused'): diff --git a/src/morse/middleware/ros/velocity.py b/src/morse/middleware/ros/velocity.py index 63c83e9fb..40263e006 100644 --- a/src/morse/middleware/ros/velocity.py +++ b/src/morse/middleware/ros/velocity.py @@ -5,7 +5,7 @@ class TwistStampedPublisher(ROSPublisher): """ Publish the twist of the robot. """ ros_class = TwistStamped - default_frame_id = '/base_link' + default_frame_id = 'base_link' def default(self, ci='unused'): twist = TwistStamped() diff --git a/testing/middlewares/ros/tf_static_test.py b/testing/middlewares/ros/tf_static_test.py index 0e2e51e03..dc18652f3 100644 --- a/testing/middlewares/ros/tf_static_test.py +++ b/testing/middlewares/ros/tf_static_test.py @@ -41,7 +41,7 @@ def setUpEnv(self): def _callback(self, m, precision = 0.01): t = m.transforms[0] - if t.child_frame_id != '/morsy_test_1/pose': + if t.child_frame_id != 'morsy_test_1/pose': return p = t.transform.translation