Merge branch 'master' of http://git.wxchen.site/wxchen/maintain into da

2023-05-10 20:26:04 +08:00
parent 825af0226d 68e8ba7901
commit 47083e478d
4 changed files with 86 additions and 172 deletions
--- a/src/yolov5_ros/launch/yolov5.launch
+++ b/src/yolov5_ros/launch/yolov5.launch
@@ -50,7 +50,8 @@
        <param name="publish_image" value="$(arg publish_image)"/>
        <param name="output_image_topic" value="$(arg output_image_topic)"/>
    </node>
-    <!-- <include file="$(find camera_launch)/launch/d435.launch"/> -->
+    <include file="$(find realsense2_camera)/launch/my_camera.launch" >
+    </include>


 </launch>