diff --git a/NaviGator/mission_control/navigator_launch/launch/simulation.launch b/NaviGator/mission_control/navigator_launch/launch/simulation.launch index 6f0543cf0..4ce41f1ae 100644 --- a/NaviGator/mission_control/navigator_launch/launch/simulation.launch +++ b/NaviGator/mission_control/navigator_launch/launch/simulation.launch @@ -32,6 +32,9 @@ + + + diff --git a/NaviGator/mission_control/navigator_launch/launch/vrx/vrx_classifier.launch b/NaviGator/mission_control/navigator_launch/launch/vrx/vrx_classifier.launch index 9dbf8fb02..62cb1b4ae 100644 --- a/NaviGator/mission_control/navigator_launch/launch/vrx/vrx_classifier.launch +++ b/NaviGator/mission_control/navigator_launch/launch/vrx/vrx_classifier.launch @@ -9,6 +9,9 @@ + + + diff --git a/NaviGator/mission_control/navigator_missions/navigator_missions/navigator.py b/NaviGator/mission_control/navigator_missions/navigator_missions/navigator.py index 36c78fcbc..20a2e4c4c 100644 --- a/NaviGator/mission_control/navigator_missions/navigator_missions/navigator.py +++ b/NaviGator/mission_control/navigator_missions/navigator_missions/navigator.py @@ -317,13 +317,13 @@ async def _shutdown_not_vrx(cls): async def init_front_left_camera(cls): if cls.front_left_camera_sub is None: cls.front_left_camera_sub = cls.nh.subscribe( - "/wamv/sensors/camera/front_left_cam/image_raw", + "/camera/front/left/image_raw", Image, ) if cls.front_left_camera_info_sub is None: cls.front_left_camera_info_sub = cls.nh.subscribe( - "/wamv/sensors/camera/front_left_cam/camera_info", + "/camera/front/left/camera_info", CameraInfo, ) @@ -336,13 +336,13 @@ async def init_front_left_camera(cls): async def init_front_right_camera(cls): if cls.front_right_camera_sub is None: cls.front_right_camera_sub = cls.nh.subscribe( - "/wamv/sensors/camera/front_right_cam/image_raw", + "/camera/front/right/image_raw", Image, ) if cls.front_right_camera_info_sub is None: cls.front_right_camera_info_sub = cls.nh.subscribe( - "/wamv/sensors/camera/front_right_cam/camera_info", + "/camera/front/right/camera_info", CameraInfo, ) diff --git a/NaviGator/mission_control/navigator_missions/vrx_missions/vrx.py b/NaviGator/mission_control/navigator_missions/vrx_missions/vrx.py index 91514c01d..7685266fb 100644 --- a/NaviGator/mission_control/navigator_missions/vrx_missions/vrx.py +++ b/NaviGator/mission_control/navigator_missions/vrx_missions/vrx.py @@ -134,13 +134,13 @@ def cleanup(self): async def init_front_left_camera(cls): if cls.front_left_camera_sub is None: cls.front_left_camera_sub = cls.nh.subscribe( - "/wamv/sensors/cameras/front_left_camera/image_raw", + "/camera/front/left/image_raw", Image, ) if cls.front_left_camera_info_sub is None: cls.front_left_camera_info_sub = cls.nh.subscribe( - "/wamv/sensors/cameras/front_left_camera/camera_info", + "/camera/front/left/camera_info", CameraInfo, ) @@ -153,13 +153,13 @@ async def init_front_left_camera(cls): async def init_front_right_camera(cls): if cls.front_right_camera_sub is None: cls.front_right_camera_sub = cls.nh.subscribe( - "/wamv/sensors/cameras/front_right_camera/image_raw", + "/camera/front/right/image_raw", Image, ) if cls.front_right_camera_info_sub is None: cls.front_right_camera_info_sub = cls.nh.subscribe( - "/wamv/sensors/cameras/front_right_camera/camera_info", + "/camera/front/right/camera_info", CameraInfo, ) diff --git a/NaviGator/navigator.rviz b/NaviGator/navigator.rviz index 401204deb..6eb67173c 100644 --- a/NaviGator/navigator.rviz +++ b/NaviGator/navigator.rviz @@ -344,7 +344,7 @@ Visualization Manager: Value: true - Class: rviz/Image Enabled: true - Image Topic: /wamv/sensors/camera/front_left_cam/image_raw + Image Topic: /camera/front/left/image_raw Max Value: 1 Median window: 5 Min Value: 0 diff --git a/NaviGator/vrx.rviz b/NaviGator/vrx.rviz index 88c68daf1..9ed388254 100644 --- a/NaviGator/vrx.rviz +++ b/NaviGator/vrx.rviz @@ -420,7 +420,7 @@ Visualization Manager: Value: true - Class: rviz/Image Enabled: true - Image Topic: /wamv/sensors/cameras/front_left_camera/image_raw + Image Topic: /camera/front/left/image_raw Max Value: 1 Median window: 5 Min Value: 0