Skip to content

Commit

Permalink
Applied pre-comiit
Browse files Browse the repository at this point in the history
Signed-off-by: Jakub Delicat <[email protected]>
  • Loading branch information
delihus committed Sep 13, 2024
1 parent 5e2cc46 commit b998dc7
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 39 deletions.
50 changes: 25 additions & 25 deletions config/gz_stereolabs_zed_remappings.yaml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
---
# https://github.com/stereolabs/zed-ros2-wrapper
- ros_topic_name: <robot_namespace><device_namespace>/zed_node/rgb/camera_info
gz_topic_name: <robot_namespace><device_namespace>/zed_node/rgb/camera_info
ros_type_name: sensor_msgs/msg/CameraInfo
gz_type_name: ignition.msgs.CameraInfo
lazy: true
- ros_topic_name: <robot_namespace><device_namespace>/zed_node/rgb/camera_info
gz_topic_name: <robot_namespace><device_namespace>/zed_node/rgb/camera_info
ros_type_name: sensor_msgs/msg/CameraInfo
gz_type_name: ignition.msgs.CameraInfo
lazy: true

- ros_topic_name: <robot_namespace><device_namespace>/zed_node/rgb/image_rect_color
gz_topic_name: <robot_namespace><device_namespace>/zed_node/rgb/image_rect_color
ros_type_name: sensor_msgs/msg/Image
gz_type_name: ignition.msgs.Image
lazy: true
- ros_topic_name: <robot_namespace><device_namespace>/zed_node/rgb/image_rect_color
gz_topic_name: <robot_namespace><device_namespace>/zed_node/rgb/image_rect_color
ros_type_name: sensor_msgs/msg/Image
gz_type_name: ignition.msgs.Image
lazy: true

- ros_topic_name: <robot_namespace><device_namespace>/zed_node/camera_info
gz_topic_name: <robot_namespace><device_namespace>/zed_node/camera_info
ros_type_name: sensor_msgs/msg/CameraInfo
gz_type_name: ignition.msgs.CameraInfo
lazy: true
- ros_topic_name: <robot_namespace><device_namespace>/zed_node/camera_info
gz_topic_name: <robot_namespace><device_namespace>/zed_node/camera_info
ros_type_name: sensor_msgs/msg/CameraInfo
gz_type_name: ignition.msgs.CameraInfo
lazy: true

- ros_topic_name: <robot_namespace><device_namespace>/zed_node/depth
gz_topic_name: <robot_namespace><device_namespace>/zed_node/depth
ros_type_name: sensor_msgs/msg/Image
gz_type_name: ignition.msgs.Image
lazy: true
- ros_topic_name: <robot_namespace><device_namespace>/zed_node/depth
gz_topic_name: <robot_namespace><device_namespace>/zed_node/depth
ros_type_name: sensor_msgs/msg/Image
gz_type_name: ignition.msgs.Image
lazy: true

- ros_topic_name: <robot_namespace><device_namespace>/zed_node/depth/points
gz_ros_topic_name: <robot_namespace><device_namespace>/zed_node/depth/points
ros_type_name: sensor_msgs/msg/PointCloud2
gz_type_name: ignition.msgs.PointCloudPacked
lazy: true
- ros_topic_name: <robot_namespace><device_namespace>/zed_node/depth/points
gz_ros_topic_name: <robot_namespace><device_namespace>/zed_node/depth/points
ros_type_name: sensor_msgs/msg/PointCloud2
gz_type_name: ignition.msgs.PointCloudPacked
lazy: true
4 changes: 2 additions & 2 deletions launch/gz_orbbec_astra.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ def fix_depth_image_tf(context, *args, **kwargs):
robot_namespace = LaunchConfiguration("robot_namespace").perform(context)
device_namespace = LaunchConfiguration("device_namespace").perform(context)

if robot_namespace.startswith('/'):
if robot_namespace.startswith("/"):
robot_namespace = robot_namespace[1:] + "/"

if device_namespace.startswith('/'):
if device_namespace.startswith("/"):
device_namespace = device_namespace[1:]

parent_frame = robot_namespace + device_namespace + "_depth_optical_frame"
Expand Down
16 changes: 10 additions & 6 deletions launch/gz_stereolabs_zed.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@
# limitations under the License.

import os

from ament_index_python import get_package_share_directory
from launch_ros.actions import Node
from nav2_common.launch import ReplaceString

from launch import LaunchDescription
from launch.actions import DeclareLaunchArgument, OpaqueFunction
from launch_ros.actions import Node
from launch.substitutions import EnvironmentVariable, LaunchConfiguration
from nav2_common.launch import ReplaceString
from ament_index_python import get_package_share_directory


# The frame of the point cloud from ignition gazebo 6 isn't provided by <frame_id>.
Expand All @@ -27,14 +29,16 @@ def fix_depth_image_tf(context, *args, **kwargs):
robot_namespace = LaunchConfiguration("robot_namespace").perform(context)
device_namespace = LaunchConfiguration("device_namespace").perform(context)

if robot_namespace.startswith('/'):
if robot_namespace.startswith("/"):
robot_namespace = robot_namespace[1:] + "/"

if device_namespace.startswith('/'):
if device_namespace.startswith("/"):
device_namespace = device_namespace[1:]

parent_frame = robot_namespace + device_namespace + "_center_optical_frame"
child_frame = "panther/base_link/" + robot_namespace + device_namespace + "_stereolabs_zed_depth"
child_frame = (
"panther/base_link/" + robot_namespace + device_namespace + "_stereolabs_zed_depth"
)

static_transform_publisher = Node(
package="tf2_ros",
Expand Down
8 changes: 3 additions & 5 deletions launch/gz_wibotic_station.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@
# limitations under the License.

import os

import yaml
from launch_ros.actions import Node

from launch import LaunchDescription
from launch.actions import DeclareLaunchArgument, OpaqueFunction
from launch.substitutions import (
EnvironmentVariable,
LaunchConfiguration,
)
from launch_ros.actions import Node
from launch.substitutions import EnvironmentVariable, LaunchConfiguration


def launch_setup(context, *args, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion test/test_components_xacro.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
# "GRP01": [], not implemented in robotiq_description
"GRP02": ["robotiq", "robotiq_85_base_link", "", ""],
# "GRP03": ["robotiq", "robotiq_140_base_link", "", ""], not implemented in robotiq_description,
"WCH01": ["wibotic_receiver", "wibotic_receiver_link", "", ""]
"WCH01": ["wibotic_receiver", "wibotic_receiver_link", "", ""],
}


Expand Down

0 comments on commit b998dc7

Please sign in to comment.