Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Readd mode arguments to openni2.launch #102

Open
wants to merge 3 commits into
base: ros1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions openni2_launch/launch/openni2.launch
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
doc="This arg is not used. Preserved only for backward compatibility." />
<arg name="auto_white_balance" default="true"
doc="This arg is not used. Preserved only for backward compatibility." />
<arg name="color_mode" default="5" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<arg name="color_mode" default="5" />
<!-- Resolution and FPS setting for each channel -->
<arg name="color_mode" default="5" />

<arg name="ir_mode" default="5" />
<arg name="depth_mode" default="5" />

<!-- Arguments for remapping all device namespaces -->
<arg name="rgb" default="rgb" />
Expand Down Expand Up @@ -88,6 +91,9 @@
<arg name="rgb" value="$(arg rgb)" />
<arg name="ir" value="$(arg ir)" />
<arg name="depth" value="$(arg depth)" />
<arg name="color_mode" value="$(arg color_mode)" />
<arg name="ir_mode" value="$(arg ir_mode)" />
<arg name="depth_mode" value="$(arg depth_mode)" />
<arg name="respawn" value="$(arg respawn)" />
<arg name="depth_registration" value="$(arg depth_registration)" />
<arg name="color_depth_synchronization" value="$(arg color_depth_synchronization)" />
Expand Down
24 changes: 13 additions & 11 deletions openni2_launch/package.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<package>
<?xml version="1.0"?>
<package format="3">
Comment on lines +1 to +2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<?xml version="1.0"?>
<package format="3">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">

<name>openni2_launch</name>
<version>0.4.2</version>
<description>
Expand All @@ -11,17 +12,18 @@
<author email="developers@unboundedrobotics.com">Michael Ferguson</author>

<buildtool_depend>catkin</buildtool_depend>
<build_depend>python-catkin-pkg</build_depend>
<depend condition="$ROS_PYTHON_VERSION == 2">python-catkin-pkg</depend>
<depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-pkg</depend>
<build_depend>roslaunch</build_depend> <!-- For launch check -->
<run_depend>rgbd_launch</run_depend>
<run_depend>depth_image_proc</run_depend>
<run_depend>image_proc</run_depend>
<run_depend>nodelet</run_depend>
<run_depend>openni2_camera</run_depend>
<run_depend>rospy</run_depend>
<run_depend>roswtf</run_depend>
<run_depend>tf</run_depend>
<run_depend>usbutils</run_depend>
<exec_depend>rgbd_launch</exec_depend>
<exec_depend>depth_image_proc</exec_depend>
<exec_depend>image_proc</exec_depend>
<exec_depend>nodelet</exec_depend>
<exec_depend>openni2_camera</exec_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>roswtf</exec_depend>
<exec_depend>tf</exec_depend>
<exec_depend>usbutils</exec_depend>
<export>
<rosdoc config="rosdoc.yaml"/>
<roswtf plugin="openni2_launch.wtf_plugin" />
Expand Down