Skip to content

Commit

Permalink
Merge pull request #3 from ethz-asl/feature/minor-fixes
Browse files Browse the repository at this point in the history
Minor changes to make abb_odn work for abb demo
  • Loading branch information
fjulian authored Jul 13, 2022
2 parents 12ff502 + 04d8369 commit bd4f8a5
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@
[submodule "dependencies/kcf_catkin"]
path = dependencies/kcf_catkin
url = [email protected]:ethz-asl/kcf_catkin.git
[submodule "dependencies/maplab"]
path = dependencies/maplab
url = [email protected]:ethz-asl/maplab.git
[submodule "dependencies/pcl_catkin"]
path = dependencies/pcl_catkin
url = [email protected]:ethz-asl/pcl_catkin.git
30 changes: 30 additions & 0 deletions abb_odn/launch/launch_odn.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" ?>
<launch>
<arg name="visualize" default="false" />
<arg name="sensor" default="realsense"/>

<!-- Object detection -->
<node name="object_detection" pkg="abb_odn" type="abb_odn" args="--sensor_calibration_file $(find abb_odn)/share/camchain.yaml --darknet_cfg_path $(find abb_odn)/share/yolov3.cfg --darknet_weights_path $(find abb_odn)/share/yolov3.weights" />

<!-- Voxblox++ -->
<!-- <node name="mask_rcnn" pkg="mask_rcnn_ros" type="mask_rcnn_node.py" output="log">
<remap from="~input" to="/camera/color/image_raw" />
<param name="~visualization" value="$(arg visualize)" />
</node> -->

<!-- <include file="$(find depth_segmentation)/launch/depth_segmentation.launch">
<arg name="depth_segmentation_params_file" value="$(find depth_segmentation)/cfg/$(arg sensor)_config.yaml"/>
<arg name="sensor_topics_file" value="$(find depth_segmentation)/cfg/$(arg sensor)_topics.yaml"/>
<param name="semantic_instance_segmentation/enable" value="true"/>
<param name="label_display" value="$(arg visualize)"/>
</include> -->

<!-- <arg name="gsm_node_params_name" default="$(find gsm_node)/cfg/yumi.yaml"/> -->

<!-- <node name="gsm_node" pkg="gsm_node" type="gsm_node" output="screen">
<rosparam command="load" file="$(arg gsm_node_params_name)" />
<param name="meshing/visualize" value="$(arg visualize)"/>
<param name="meshing/update_mesh_every_n_sec" value="0.0" unless="$(arg visualize)"/>
</node> -->
</launch>

8 changes: 4 additions & 4 deletions abb_odn/src/object-tracking-pipeline.cc
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ void ObjectTrackingPipeline::imageCallback(
triangulateTracks(observations);
}

cv::Mat debug_image = image;
tracker_.debugDrawTracks(&debug_image);
// cv::Mat debug_image = image;
// tracker_.debugDrawTracks(&debug_image);

cv::imshow("Image", image);
cv::waitKey(1);
// cv::imshow("Image", image);
// cv::waitKey(1);
}

void ObjectTrackingPipeline::poseCallback(
Expand Down
2 changes: 1 addition & 1 deletion dependencies/darknet_catkin
1 change: 1 addition & 0 deletions dependencies/maplab
Submodule maplab added at 41fccc

0 comments on commit bd4f8a5

Please sign in to comment.