From 9311dd8b9ddd1ef9392fbd0db405a058cfda0287 Mon Sep 17 00:00:00 2001 From: joel-mb Date: Mon, 2 Nov 2020 17:06:39 +0100 Subject: [PATCH] Update CARLA and ROS Bridge compatibility note (#384) * Updated ros-bridge and carla compatibility note * Merge branch 'master' of https://github.com/carla-simulator/ros-bridge into joel-mb/bridge_carla_compatibility * Merge branch 'master' of https://github.com/carla-simulator/ros-bridge into joel-mb/bridge_carla_compatibility * update to 0.9.10 --- README.md | 2 +- carla_ros_bridge/src/carla_ros_bridge/bridge.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 60aa73fe..06b28e95 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This ROS package aims at providing a simple ROS bridge for CARLA simulator. ![rviz setup](./docs/images/ad_demo.png "AD Demo") -**This version requires CARLA 0.9.9.5** +**This version requires CARLA 0.9.10** ## Features diff --git a/carla_ros_bridge/src/carla_ros_bridge/bridge.py b/carla_ros_bridge/src/carla_ros_bridge/bridge.py index 10e003a4..e3795aec 100755 --- a/carla_ros_bridge/src/carla_ros_bridge/bridge.py +++ b/carla_ros_bridge/src/carla_ros_bridge/bridge.py @@ -57,7 +57,7 @@ class CarlaRosBridge(object): Carla Ros bridge """ - CARLA_VERSION = "0.9.9" + CARLA_VERSION = "0.9.10" def __init__(self, carla_world, params): """ @@ -586,16 +586,17 @@ def main(): # check carla version dist = pkg_resources.get_distribution("carla") - if LooseVersion(dist.version) < LooseVersion(CarlaRosBridge.CARLA_VERSION): + if LooseVersion(dist.version) != LooseVersion(CarlaRosBridge.CARLA_VERSION): rospy.logfatal("CARLA python module version {} required. Found: {}".format( CarlaRosBridge.CARLA_VERSION, dist.version)) sys.exit(1) - if LooseVersion(carla_client.get_server_version()) < \ - LooseVersion(CarlaRosBridge.CARLA_VERSION): - rospy.logfatal("CARLA Server version {} required. Found: {}".format( - CarlaRosBridge.CARLA_VERSION, carla_client.get_server_version())) - sys.exit(1) + if LooseVersion(carla_client.get_server_version()) != \ + LooseVersion(carla_client.get_client_version()): + rospy.logwarn( + "Version mismatch detected: You are trying to connect to a simulator that might be incompatible with this API. Client API version: {}. Simulator API version: {}" + .format(carla_client.get_client_version(), + carla_client.get_server_version())) carla_world = carla_client.get_world()