diff --git a/Dockerfile b/Dockerfile index 9bfa7c6..0ddcba5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,7 @@ RUN mkdir /cyclonedds && \ mv /autoware_scenario_runner/docker/cyclonedds.xml /cyclonedds/ && \ echo "export RMW_IMPLEMENTATION=rmw_cyclonedds_cpp" >> ~/.bashrc && \ echo "export CYCLONEDDS_URI=file:///cyclonedds/cyclonedds.xml" >> ~/.bashrc && \ + echo "alias rossrc='source ${AUTOWARE_MSG_PKG}} && source ${ROS_PKG}} && echo Sourced'" >> ~/.bashrc && \ source ~/.bashrc ENV CARLA_API_ROOT="/autoware_scenario_runner/PythonAPI" diff --git a/srunner/autoagents/autoware_agent.py b/srunner/autoagents/autoware_agent.py index f29aa41..8beb129 100644 --- a/srunner/autoagents/autoware_agent.py +++ b/srunner/autoagents/autoware_agent.py @@ -9,7 +9,7 @@ from srunner.tools.environment_parser import EnvironmentConfig -from autoware_carla_interface.msg import EgoConfig, SensorConfig +from autoware_carla_interface_msgs.msg import EgoConfig, SensorConfig import threading import rclpy @@ -67,7 +67,7 @@ def setup(self, config: EnvironmentConfig | None = None) -> None: # keep publishing ego_sensor config until the bridge is ready while not self.autoware_state.bridge_ready: - time.sleep(1) + time.sleep(5) self.state_node.ego_config_publisher.publish(ego_config_msg) def set_route(self) -> None: diff --git a/srunner/autoagents/autoware_nodes/state_node.py b/srunner/autoagents/autoware_nodes/state_node.py index 2e234f9..e872e68 100644 --- a/srunner/autoagents/autoware_nodes/state_node.py +++ b/srunner/autoagents/autoware_nodes/state_node.py @@ -3,7 +3,7 @@ from autoware_adapi_v1_msgs.msg import MotionState from autoware_adapi_v1_msgs.msg import LocalizationInitializationState from srunner.autoagents.agent_state import autoware_state -from autoware_carla_interface.msg import EgoConfig, BridgeState +from autoware_carla_interface_msgs.msg import EgoConfig, BridgeState class StateNode(Node):