From 82c3d761991b058bdb21677251053bc923067cbd Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Sat, 11 Nov 2023 23:34:32 +0100 Subject: [PATCH 1/2] remove ROS 1 launch package --- openni2_launch/CATKIN_IGNORE | 0 openni2_launch/CHANGELOG.rst | 76 ----- openni2_launch/CMakeLists.txt | 16 - openni2_launch/doc/Makefile | 216 ------------- openni2_launch/doc/conf.py | 300 ------------------ openni2_launch/doc/index.rst | 125 -------- openni2_launch/launch/includes/color.launch | 22 -- openni2_launch/launch/includes/depth.launch | 24 -- openni2_launch/launch/includes/device.launch | 34 -- .../launch/includes/device.launch.xml | 74 ----- openni2_launch/launch/includes/ir.launch | 21 -- openni2_launch/launch/includes/manager.launch | 19 -- .../launch/includes/pointclouds.launch | 24 -- .../launch/includes/processing.launch | 23 -- openni2_launch/launch/kinect_frames.launch | 20 -- openni2_launch/launch/openni2.launch | 135 -------- .../launch/openni2_tf_prefix.launch | 133 -------- openni2_launch/package.xml | 31 -- openni2_launch/rosdoc.yaml | 2 - openni2_launch/setup.py | 11 - openni2_launch/src/openni2_launch/__init__.py | 0 .../src/openni2_launch/wtf_plugin.py | 121 ------- 22 files changed, 1427 deletions(-) delete mode 100644 openni2_launch/CATKIN_IGNORE delete mode 100644 openni2_launch/CHANGELOG.rst delete mode 100644 openni2_launch/CMakeLists.txt delete mode 100644 openni2_launch/doc/Makefile delete mode 100644 openni2_launch/doc/conf.py delete mode 100644 openni2_launch/doc/index.rst delete mode 100644 openni2_launch/launch/includes/color.launch delete mode 100644 openni2_launch/launch/includes/depth.launch delete mode 100644 openni2_launch/launch/includes/device.launch delete mode 100644 openni2_launch/launch/includes/device.launch.xml delete mode 100644 openni2_launch/launch/includes/ir.launch delete mode 100644 openni2_launch/launch/includes/manager.launch delete mode 100644 openni2_launch/launch/includes/pointclouds.launch delete mode 100644 openni2_launch/launch/includes/processing.launch delete mode 100644 openni2_launch/launch/kinect_frames.launch delete mode 100644 openni2_launch/launch/openni2.launch delete mode 100644 openni2_launch/launch/openni2_tf_prefix.launch delete mode 100644 openni2_launch/package.xml delete mode 100644 openni2_launch/rosdoc.yaml delete mode 100644 openni2_launch/setup.py delete mode 100644 openni2_launch/src/openni2_launch/__init__.py delete mode 100644 openni2_launch/src/openni2_launch/wtf_plugin.py diff --git a/openni2_launch/CATKIN_IGNORE b/openni2_launch/CATKIN_IGNORE deleted file mode 100644 index e69de29..0000000 diff --git a/openni2_launch/CHANGELOG.rst b/openni2_launch/CHANGELOG.rst deleted file mode 100644 index 52517cc..0000000 --- a/openni2_launch/CHANGELOG.rst +++ /dev/null @@ -1,76 +0,0 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package openni2_launch -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -1.6.0 (2022-04-12) ------------------- -* [capability] Add depth_registered and depth_registered_filtered arguments `#111 `_ - -1.5.1 (2021-02-01) ------------------- -* Default branch update for ROS1 development. -* [CI] Add GitHub Actions configs - -1.5.0 (2021-01-12) ------------------- -* [capability] Use serialnumber in camera names `#101 `_ -* Release for Noetic `#98 `_ - -1.4.2 (2020-06-03) ------------------- -* update package.xml for noetic support -* Contributors: Michael Ferguson - -0.4.2 (2018-12-01) ------------------- -* Fix roswtf plugin dependency `#92 `_ -* Contributors: Isaac I.Y. Saito - -0.4.1 (2018-10-20) ------------------- -* [fix] [roswtf plugin] Accept vendor and product IDs (fix `#88 `_). -* [improve] Remove unused ROS Parameters. `#76 `_ -* [improve] Add roslaunch check. -* Contributors: Isaac I.Y. Saito - -0.4.0 (2018-07-17) ------------------- -* Add a simple roswtf plugin. `#80 `_ -* Contributors: Isaac I.Y. Saito, PlusOne Robotics Inc. - -0.3.0 (2017-11-03) ------------------- -* Move openni2_launch package into openni2_camera repository `#55 `_ -* Add rosdoc-based document. -* Contributors: Isaac I.Y. Saito - -0.2.2 (2015-01-23) ------------------- -* add tf_prefix version, as per `#16 `_ -* fix `#19 `_, reverts `#16 `_ -* Contributors: Michael Ferguson - -0.2.1 (2014-05-22) ------------------- -* Force device_id to string type -* Contributors: Dariush Forouher, Michael Ferguson - -0.2.0 (2014-05-20) ------------------- -* Remove machine arg, as it is not necessary. -* Add tf_prefix same as openni -* Defaults for depth processing are set apropriately for both hardware and software registration. -* Contributors: Libor Wagner, Mark Pitchless, Michael Ferguson, Piyush Khandelwal - -0.1.2 (2013-09-30) ------------------- -* Expose driver parameters. Note: depth_registration is now off by default. - -0.1.1 (2013-09-25) ------------------- -* Properly namespace the nodelet manager - -0.1.0 (2013-09-10) ------------------- -* First release -* This package is a thin wrapper around rgbd_launch diff --git a/openni2_launch/CMakeLists.txt b/openni2_launch/CMakeLists.txt deleted file mode 100644 index cf969d3..0000000 --- a/openni2_launch/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 2.8.3) -project(openni2_launch) - -find_package(catkin) -catkin_python_setup() -catkin_package() - -install(DIRECTORY launch - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/ -) - -if (CATKIN_ENABLE_TESTING) - find_package(roslaunch REQUIRED) - roslaunch_add_file_check(launch) -# roslaunch_add_file_check(launch/includes) # 20181003 this fails. -endif() diff --git a/openni2_launch/doc/Makefile b/openni2_launch/doc/Makefile deleted file mode 100644 index 21a222f..0000000 --- a/openni2_launch/doc/Makefile +++ /dev/null @@ -1,216 +0,0 @@ -# Makefile for Sphinx documentation -# - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = .build - -# User-friendly check for sphinx-build -ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) -$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) -endif - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . - -.PHONY: help -help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " applehelp to make an Apple Help Book" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " xml to make Docutils-native XML files" - @echo " pseudoxml to make pseudoxml-XML files for display purposes" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - @echo " coverage to run coverage check of the documentation (if enabled)" - -.PHONY: clean -clean: - rm -rf $(BUILDDIR)/* - -.PHONY: html -html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -.PHONY: dirhtml -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -.PHONY: singlehtml -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -.PHONY: pickle -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -.PHONY: json -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -.PHONY: htmlhelp -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -.PHONY: qthelp -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/openni2_launch.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/openni2_launch.qhc" - -.PHONY: applehelp -applehelp: - $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp - @echo - @echo "Build finished. The help book is in $(BUILDDIR)/applehelp." - @echo "N.B. You won't be able to view it unless you put it in" \ - "~/Library/Documentation/Help or install it in your application" \ - "bundle." - -.PHONY: devhelp -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/openni2_launch" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/openni2_launch" - @echo "# devhelp" - -.PHONY: epub -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -.PHONY: latex -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -.PHONY: latexpdf -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -.PHONY: latexpdfja -latexpdfja: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through platex and dvipdfmx..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -.PHONY: text -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -.PHONY: man -man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - @echo - @echo "Build finished. The manual pages are in $(BUILDDIR)/man." - -.PHONY: texinfo -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -.PHONY: info -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -.PHONY: gettext -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale - @echo - @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." - -.PHONY: changes -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -.PHONY: linkcheck -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -.PHONY: doctest -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." - -.PHONY: coverage -coverage: - $(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage - @echo "Testing of coverage in the sources finished, look at the " \ - "results in $(BUILDDIR)/coverage/python.txt." - -.PHONY: xml -xml: - $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml - @echo - @echo "Build finished. The XML files are in $(BUILDDIR)/xml." - -.PHONY: pseudoxml -pseudoxml: - $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml - @echo - @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." diff --git a/openni2_launch/doc/conf.py b/openni2_launch/doc/conf.py deleted file mode 100644 index bdbdade..0000000 --- a/openni2_launch/doc/conf.py +++ /dev/null @@ -1,300 +0,0 @@ -# -*- coding: utf-8 -*- -# -# openni2_launch documentation build configuration file, created by -# sphinx-quickstart on Fri Nov 3 15:35:05 2017. -# -# This file is execfile()d with the current directory set to its -# containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import sys -import os - -import catkin_pkg.package -catkin_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -catkin_package = catkin_pkg.package.parse_package(os.path.join(catkin_dir, catkin_pkg.package.PACKAGE_MANIFEST_FILENAME)) - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) - -# -- General configuration ------------------------------------------------ - -# If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -# ones. -extensions = [ - 'sphinx.ext.autodoc', - 'sphinx.ext.doctest', - 'sphinx.ext.intersphinx', - 'sphinx.ext.todo', - 'sphinx.ext.coverage', - 'sphinx.ext.pngmath', - 'sphinx.ext.ifconfig', - 'sphinx.ext.viewcode', -] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['.templates'] - -# The suffix(es) of source filenames. -# You can specify multiple suffix as a list of string: -# source_suffix = ['.rst', '.md'] -source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8-sig' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'openni2_launch' -copyright = u'2017, Julius Kammerl, Michael Ferguson' -author = u'Julius Kammerl, Michael Ferguson' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = catkin_package.version -# The full version, including alpha/beta/rc tags. -release = catkin_package.version - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -# -# This is also used if you do content translation via gettext catalogs. -# Usually you set "language" from the command line for these cases. -language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = ['.build'] - -# The reST default role (used for this markup: `text`) to use for all -# documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - -# If true, keep warnings as "system message" paragraphs in the built documents. -#keep_warnings = False - -# If true, `todo` and `todoList` produce output, else they produce nothing. -todo_include_todos = True - - -# -- Options for HTML output ---------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -html_theme = 'alabaster' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (relative to this directory) to use as a favicon of -# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['.static'] - -# Add any extra paths that contain custom files (such as robots.txt or -# .htaccess) here, relative to this directory. These files are copied -# directly to the root of the documentation. -#html_extra_path = [] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_domain_indices = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None - -# Language to be used for generating the HTML full-text search index. -# Sphinx supports the following languages: -# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja' -# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr' -#html_search_language = 'en' - -# A dictionary with options for the search language support, empty by default. -# Now only 'ja' uses this config value -#html_search_options = {'type': 'default'} - -# The name of a javascript file (relative to the configuration directory) that -# implements a search results scorer. If empty, the default will be used. -#html_search_scorer = 'scorer.js' - -# Output file base name for HTML help builder. -htmlhelp_basename = 'openni2_launchdoc' - -# -- Options for LaTeX output --------------------------------------------- - -latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', - -# Latex figure (float) alignment -#'figure_align': 'htbp', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, -# author, documentclass [howto, manual, or own class]). -latex_documents = [ - (master_doc, 'openni2_launch.tex', u'openni2\\_launch Documentation', - u'Julius Kammerl, Michael Ferguson', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# If true, show page references after internal links. -#latex_show_pagerefs = False - -# If true, show URL addresses after external links. -#latex_show_urls = False - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_domain_indices = True - - -# -- Options for manual page output --------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - (master_doc, 'openni2_launch', u'openni2_launch Documentation', - [author], 1) -] - -# If true, show URL addresses after external links. -#man_show_urls = False - - -# -- Options for Texinfo output ------------------------------------------- - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - (master_doc, 'openni2_launch', u'openni2_launch Documentation', - author, 'openni2_launch', 'One line description of project.', - 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -#texinfo_appendices = [] - -# If false, no module index is generated. -#texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' - -# If true, do not generate a @detailmenu in the "Top" node's menu. -#texinfo_no_detailmenu = False - - -# Example configuration for intersphinx: refer to the Python standard library. -intersphinx_mapping = {'https://docs.python.org/': None} diff --git a/openni2_launch/doc/index.rst b/openni2_launch/doc/index.rst deleted file mode 100644 index 12a0f1b..0000000 --- a/openni2_launch/doc/index.rst +++ /dev/null @@ -1,125 +0,0 @@ -.. openni2_launch documentation master file, created by - sphinx-quickstart on Fri Nov 3 15:35:05 2017. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -.. toctree:: - :maxdepth: 2 - -========== -Usage -========== - -Simplest use ------------- - -This package contains several `launch` files, but `openni.launch` serves as a single point of entry. It can be started by:: - - roslaunch openni2_launch openni.launch - -Note that with this command the camera driver only accesses a single device. So run as many launch files as needed with correct arguments if you're running multiple devices. - -Options/arguments ------------------- - -`openni.launch` takes the following options. - -* `device_id`: can have the following formats: - - * `#1` : the first device found - - * `2@X` : the Xth device on USB bus 2. - -E.g. When 2 openni2-based cameras are connected and `lsusb -t` returns the following, where Dev 18 and 19 are the cameras, `device_id` can be `3@18` and `3@19`:: - - $ lsusb -t - /: Bus 03.Port 1: Dev 1, Class=root_hub, Driver=xhci_hcd/14p, 480M - |__ Port 2: Dev 18, If 0, Class=Vendor Specific Class, Driver=usbfs, 480M - |__ Port 2: Dev 18, If 1, Class=Audio, Driver=, 480M - |__ Port 2: Dev 18, If 2, Class=Audio, Driver=, 480M - |__ Port 3: Dev 15, If 0, Class=Human Interface Device, Driver=usbhid, 1.5M - |__ Port 3: Dev 15, If 1, Class=Human Interface Device, Driver=usbhid, 1.5M - |__ Port 6: Dev 19, If 0, Class=Vendor Specific Class, Driver=usbfs, 480M - |__ Port 6: Dev 19, If 1, Class=Audio, Driver=, 480M - |__ Port 6: Dev 19, If 2, Class=Audio, Driver=, 480M - -TBD - -Support tools -========== - -Check the number of devices plugged in by `roswtf plugin `_. -Change the number of devices to expect by setting the number in ROS parameter "``openni2_num_sensors_expected``". - -Example: :: - - $ lsusb - : - Bus 005 Device 002: ID 1d27:0601 ASUS - Bus 003 Device 002: ID 1d27:0601 ASUS - - term-1$ roscore - - term-2$ roswtf - - Loaded plugin tf.tfwtf - Loaded plugin openni2_launch.wtf_plugin - No package or stack in context - ================================================================================ - Static checks summary: - - Found 1 error(s). - - ERROR Different number of openni2 sensors found. - * 2 openni2 sensors found (expected: 1). - - ================================================================================ - Beginning tests of your ROS graph. These may take awhile... - analyzing graph... - ... done analyzing graph - running graph rules... - ... done running graph rules - - Online checks summary: - - Found 1 warning(s). - Warnings are things that may be just fine, but are sometimes at fault - - WARNING The following node subscriptions are unconnected: - * /rosout: - * /rosout - -After setting `openni2_num_sensors_expected` param with 2, no error occurs. :: - - term-2$ rosparam set openni2_num_sensors_expected 2 - - $ roswtf - Loaded plugin tf.tfwtf - Loaded plugin openni2_launch.wtf_plugin - No package or stack in context - ================================================================================ - Static checks summary: - - No errors or warnings - ================================================================================ - Beginning tests of your ROS graph. These may take awhile... - analyzing graph... - ... done analyzing graph - running graph rules... - ... done running graph rules - - Online checks summary: - - Found 1 warning(s). - Warnings are things that may be just fine, but are sometimes at fault - - WARNING The following node subscriptions are unconnected: - * /rosout: - * /rosout - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` diff --git a/openni2_launch/launch/includes/color.launch b/openni2_launch/launch/includes/color.launch deleted file mode 100644 index f2bc3ac..0000000 --- a/openni2_launch/launch/includes/color.launch +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/openni2_launch/launch/includes/depth.launch b/openni2_launch/launch/includes/depth.launch deleted file mode 100644 index 0968ba7..0000000 --- a/openni2_launch/launch/includes/depth.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/openni2_launch/launch/includes/device.launch b/openni2_launch/launch/includes/device.launch deleted file mode 100644 index d08834b..0000000 --- a/openni2_launch/launch/includes/device.launch +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/openni2_launch/launch/includes/device.launch.xml b/openni2_launch/launch/includes/device.launch.xml deleted file mode 100644 index cbc167e..0000000 --- a/openni2_launch/launch/includes/device.launch.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/openni2_launch/launch/includes/ir.launch b/openni2_launch/launch/includes/ir.launch deleted file mode 100644 index 4f5a808..0000000 --- a/openni2_launch/launch/includes/ir.launch +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/openni2_launch/launch/includes/manager.launch b/openni2_launch/launch/includes/manager.launch deleted file mode 100644 index 1dc9fd4..0000000 --- a/openni2_launch/launch/includes/manager.launch +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/openni2_launch/launch/includes/pointclouds.launch b/openni2_launch/launch/includes/pointclouds.launch deleted file mode 100644 index d1a7e69..0000000 --- a/openni2_launch/launch/includes/pointclouds.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/openni2_launch/launch/includes/processing.launch b/openni2_launch/launch/includes/processing.launch deleted file mode 100644 index 894a5b3..0000000 --- a/openni2_launch/launch/includes/processing.launch +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/openni2_launch/launch/kinect_frames.launch b/openni2_launch/launch/kinect_frames.launch deleted file mode 100644 index be3a224..0000000 --- a/openni2_launch/launch/kinect_frames.launch +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/openni2_launch/launch/openni2.launch b/openni2_launch/launch/openni2.launch deleted file mode 100644 index ca28fbb..0000000 --- a/openni2_launch/launch/openni2.launch +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/openni2_launch/launch/openni2_tf_prefix.launch b/openni2_launch/launch/openni2_tf_prefix.launch deleted file mode 100644 index d9d80da..0000000 --- a/openni2_launch/launch/openni2_tf_prefix.launch +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/openni2_launch/package.xml b/openni2_launch/package.xml deleted file mode 100644 index 53c0cf3..0000000 --- a/openni2_launch/package.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - openni2_launch - 1.6.0 - - Launch files to start the openni2_camera drivers using rgbd_launch. - - Isaac I. Y. Saito - BSD - - Julius Kammerl - Michael Ferguson - - catkin - python-catkin-pkg - python3-catkin-pkg - roslaunch - rgbd_launch - depth_image_proc - image_proc - nodelet - openni2_camera - rospy - roswtf - tf - usbutils - - - - - diff --git a/openni2_launch/rosdoc.yaml b/openni2_launch/rosdoc.yaml deleted file mode 100644 index d21d73a..0000000 --- a/openni2_launch/rosdoc.yaml +++ /dev/null @@ -1,2 +0,0 @@ - - builder: sphinx - sphinx_root_dir: doc diff --git a/openni2_launch/setup.py b/openni2_launch/setup.py deleted file mode 100644 index 768593d..0000000 --- a/openni2_launch/setup.py +++ /dev/null @@ -1,11 +0,0 @@ -## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD - -from distutils.core import setup -from catkin_pkg.python_setup import generate_distutils_setup - -# fetch values from package.xml -setup_args = generate_distutils_setup( - packages=["openni2_launch"], - package_dir={'': 'src'}) - -setup(**setup_args) diff --git a/openni2_launch/src/openni2_launch/__init__.py b/openni2_launch/src/openni2_launch/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/openni2_launch/src/openni2_launch/wtf_plugin.py b/openni2_launch/src/openni2_launch/wtf_plugin.py deleted file mode 100644 index 7a7f579..0000000 --- a/openni2_launch/src/openni2_launch/wtf_plugin.py +++ /dev/null @@ -1,121 +0,0 @@ -# Software License Agreement (BSD License) -# -# Copyright (c) 2018, PlusOne Robotics, Inc. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of Plus One Robotics, Inc. nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -from __future__ import print_function -import logging -import re -import subprocess - -import rospy -from roswtf.rules import warning_rule, error_rule - - -def _device_notfound_subproc(id_manufacturer, id_product): - """ - @rtype: [dict] - @return: Example: - - [{'device': '/dev/bus/usb/002/004', 'tag': 'Lenovo ', 'id': '17ef:305a'}, - {'device': '/dev/bus/usb/002/001', 'tag': 'Linux Foundation 3.0 root hub', 'id': '1d6b:0003'}, - {'device': '/dev/bus/usb/001/006', 'tag': 'Validity Sensors, Inc. ', 'id': '138a:0090'},,,] - - @note: This method depends on Linux command (via subprocess), which makes - this command platform-dependent. Ubuntu Xenial onward, a Python module - that encapsulate platform operation becomes available so this method - can be wiped out. See https://github.com/ros-drivers/openni2_camera/pull/80#discussion_r193295442 - """ - device_re = re.compile("Bus\s+(?P\d+)\s+Device\s+(?P\d+).+ID\s(?P\w+:\w+)\s(?P.+)$", re.I) - df = subprocess.check_output("lsusb") - devices = [] - for i in df.split('\n'): - if i: - info = device_re.match(i) - if info: - dinfo = info.groupdict() - logging.debug("dinfo: {}, dinfo.id: {}".format(dinfo, dinfo["id"])) - if dinfo["id"] == "{}:{}".format(id_manufacturer, id_product): - dinfo['device'] = "/dev/bus/usb/{}/{}".format(dinfo.pop('bus'), dinfo.pop('device')) - devices.append(dinfo) - logging.info("#devices: {}\ndevices: {}".format(len(devices), devices)) - return devices - - -def sensor_notfound(ctx): - """ - @summary: Check if expected number of sensors are found. - Expected number of sensors can be set by - ROS Parameter 'openni2_num_sensors_expected'. - @note: Technically this can be static check, but because of the - need for connecting to ROS Param server, this needs - to be online check. - """ - errors = [] - num_sensors_expected = rospy.get_param("openni2_num_sensors_expected", 1) - # The set of manufacture id and prod id. Default: Asus Xtion. - id_manufacturer = rospy.get_param("id_manufacturer", "1d27") - id_product = rospy.get_param("id_product", "0601") - devices = _device_notfound_subproc( - id_manufacturer=id_manufacturer, id_product=id_product) - num_sensors = len(devices) - if num_sensors != num_sensors_expected: - errors.append("{} openni2 sensors found (expected: {}).".format( - num_sensors, num_sensors_expected)) - return errors - - -# app_warnings and app_errors declare the rules that we actually check -app_warnings_online = [ -] - -app_warnings_static = [ -] - -app_errors_online = [ - (sensor_notfound, "Different number of openni2 sensors found."), -] - -app_errors_static = [ -] - - -# roswtf entry point for online checks -def roswtf_plugin_online(ctx): - for r in app_warnings_online: - warning_rule(r, r[0](ctx), ctx) - for r in app_errors_online: - error_rule(r, r[0](ctx), ctx) - - -def roswtf_plugin_static(ctx): - for r in app_warnings_static: - warning_rule(r, r[0](ctx), ctx) - for r in app_errors_static: - error_rule(r, r[0](ctx), ctx) From 2feb1fb9252cebb2f9bc807d0c80ce2e07214092 Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Sat, 11 Nov 2023 23:48:49 +0100 Subject: [PATCH 2/2] move all files into root dir --- openni2_camera/CHANGELOG.rst => CHANGELOG.rst | 0 openni2_camera/CMakeLists.txt => CMakeLists.txt | 0 .../include => include}/openni2_camera/openni2_convert.h | 0 .../include => include}/openni2_camera/openni2_device.h | 0 .../include => include}/openni2_camera/openni2_device_info.h | 0 .../include => include}/openni2_camera/openni2_device_manager.h | 0 .../include => include}/openni2_camera/openni2_driver.h | 0 .../include => include}/openni2_camera/openni2_exception.h | 0 .../include => include}/openni2_camera/openni2_frame_listener.h | 0 .../include => include}/openni2_camera/openni2_timer_filter.h | 0 .../include => include}/openni2_camera/openni2_video_mode.h | 0 {openni2_camera/launch => launch}/camera_only.launch.py | 0 {openni2_camera/launch => launch}/camera_with_cloud.launch.py | 0 .../launch => launch}/camera_with_cloud_norgb.launch.py | 0 openni2_camera/package.xml => package.xml | 0 {openni2_camera/src => src}/list_devices.cpp | 0 {openni2_camera/src => src}/openni2_convert.cpp | 0 {openni2_camera/src => src}/openni2_device.cpp | 0 {openni2_camera/src => src}/openni2_device_info.cpp | 0 {openni2_camera/src => src}/openni2_device_manager.cpp | 0 {openni2_camera/src => src}/openni2_driver.cpp | 0 {openni2_camera/src => src}/openni2_exception.cpp | 0 {openni2_camera/src => src}/openni2_frame_listener.cpp | 0 {openni2_camera/src => src}/openni2_timer_filter.cpp | 0 {openni2_camera/src => src}/openni2_video_mode.cpp | 0 {openni2_camera/src => src}/usb_reset.c | 0 {openni2_camera/srv => srv}/GetSerial.srv | 0 {openni2_camera/test => test}/test_wrapper.cpp | 0 28 files changed, 0 insertions(+), 0 deletions(-) rename openni2_camera/CHANGELOG.rst => CHANGELOG.rst (100%) rename openni2_camera/CMakeLists.txt => CMakeLists.txt (100%) rename {openni2_camera/include => include}/openni2_camera/openni2_convert.h (100%) rename {openni2_camera/include => include}/openni2_camera/openni2_device.h (100%) rename {openni2_camera/include => include}/openni2_camera/openni2_device_info.h (100%) rename {openni2_camera/include => include}/openni2_camera/openni2_device_manager.h (100%) rename {openni2_camera/include => include}/openni2_camera/openni2_driver.h (100%) rename {openni2_camera/include => include}/openni2_camera/openni2_exception.h (100%) rename {openni2_camera/include => include}/openni2_camera/openni2_frame_listener.h (100%) rename {openni2_camera/include => include}/openni2_camera/openni2_timer_filter.h (100%) rename {openni2_camera/include => include}/openni2_camera/openni2_video_mode.h (100%) rename {openni2_camera/launch => launch}/camera_only.launch.py (100%) rename {openni2_camera/launch => launch}/camera_with_cloud.launch.py (100%) rename {openni2_camera/launch => launch}/camera_with_cloud_norgb.launch.py (100%) rename openni2_camera/package.xml => package.xml (100%) rename {openni2_camera/src => src}/list_devices.cpp (100%) rename {openni2_camera/src => src}/openni2_convert.cpp (100%) rename {openni2_camera/src => src}/openni2_device.cpp (100%) rename {openni2_camera/src => src}/openni2_device_info.cpp (100%) rename {openni2_camera/src => src}/openni2_device_manager.cpp (100%) rename {openni2_camera/src => src}/openni2_driver.cpp (100%) rename {openni2_camera/src => src}/openni2_exception.cpp (100%) rename {openni2_camera/src => src}/openni2_frame_listener.cpp (100%) rename {openni2_camera/src => src}/openni2_timer_filter.cpp (100%) rename {openni2_camera/src => src}/openni2_video_mode.cpp (100%) rename {openni2_camera/src => src}/usb_reset.c (100%) rename {openni2_camera/srv => srv}/GetSerial.srv (100%) rename {openni2_camera/test => test}/test_wrapper.cpp (100%) diff --git a/openni2_camera/CHANGELOG.rst b/CHANGELOG.rst similarity index 100% rename from openni2_camera/CHANGELOG.rst rename to CHANGELOG.rst diff --git a/openni2_camera/CMakeLists.txt b/CMakeLists.txt similarity index 100% rename from openni2_camera/CMakeLists.txt rename to CMakeLists.txt diff --git a/openni2_camera/include/openni2_camera/openni2_convert.h b/include/openni2_camera/openni2_convert.h similarity index 100% rename from openni2_camera/include/openni2_camera/openni2_convert.h rename to include/openni2_camera/openni2_convert.h diff --git a/openni2_camera/include/openni2_camera/openni2_device.h b/include/openni2_camera/openni2_device.h similarity index 100% rename from openni2_camera/include/openni2_camera/openni2_device.h rename to include/openni2_camera/openni2_device.h diff --git a/openni2_camera/include/openni2_camera/openni2_device_info.h b/include/openni2_camera/openni2_device_info.h similarity index 100% rename from openni2_camera/include/openni2_camera/openni2_device_info.h rename to include/openni2_camera/openni2_device_info.h diff --git a/openni2_camera/include/openni2_camera/openni2_device_manager.h b/include/openni2_camera/openni2_device_manager.h similarity index 100% rename from openni2_camera/include/openni2_camera/openni2_device_manager.h rename to include/openni2_camera/openni2_device_manager.h diff --git a/openni2_camera/include/openni2_camera/openni2_driver.h b/include/openni2_camera/openni2_driver.h similarity index 100% rename from openni2_camera/include/openni2_camera/openni2_driver.h rename to include/openni2_camera/openni2_driver.h diff --git a/openni2_camera/include/openni2_camera/openni2_exception.h b/include/openni2_camera/openni2_exception.h similarity index 100% rename from openni2_camera/include/openni2_camera/openni2_exception.h rename to include/openni2_camera/openni2_exception.h diff --git a/openni2_camera/include/openni2_camera/openni2_frame_listener.h b/include/openni2_camera/openni2_frame_listener.h similarity index 100% rename from openni2_camera/include/openni2_camera/openni2_frame_listener.h rename to include/openni2_camera/openni2_frame_listener.h diff --git a/openni2_camera/include/openni2_camera/openni2_timer_filter.h b/include/openni2_camera/openni2_timer_filter.h similarity index 100% rename from openni2_camera/include/openni2_camera/openni2_timer_filter.h rename to include/openni2_camera/openni2_timer_filter.h diff --git a/openni2_camera/include/openni2_camera/openni2_video_mode.h b/include/openni2_camera/openni2_video_mode.h similarity index 100% rename from openni2_camera/include/openni2_camera/openni2_video_mode.h rename to include/openni2_camera/openni2_video_mode.h diff --git a/openni2_camera/launch/camera_only.launch.py b/launch/camera_only.launch.py similarity index 100% rename from openni2_camera/launch/camera_only.launch.py rename to launch/camera_only.launch.py diff --git a/openni2_camera/launch/camera_with_cloud.launch.py b/launch/camera_with_cloud.launch.py similarity index 100% rename from openni2_camera/launch/camera_with_cloud.launch.py rename to launch/camera_with_cloud.launch.py diff --git a/openni2_camera/launch/camera_with_cloud_norgb.launch.py b/launch/camera_with_cloud_norgb.launch.py similarity index 100% rename from openni2_camera/launch/camera_with_cloud_norgb.launch.py rename to launch/camera_with_cloud_norgb.launch.py diff --git a/openni2_camera/package.xml b/package.xml similarity index 100% rename from openni2_camera/package.xml rename to package.xml diff --git a/openni2_camera/src/list_devices.cpp b/src/list_devices.cpp similarity index 100% rename from openni2_camera/src/list_devices.cpp rename to src/list_devices.cpp diff --git a/openni2_camera/src/openni2_convert.cpp b/src/openni2_convert.cpp similarity index 100% rename from openni2_camera/src/openni2_convert.cpp rename to src/openni2_convert.cpp diff --git a/openni2_camera/src/openni2_device.cpp b/src/openni2_device.cpp similarity index 100% rename from openni2_camera/src/openni2_device.cpp rename to src/openni2_device.cpp diff --git a/openni2_camera/src/openni2_device_info.cpp b/src/openni2_device_info.cpp similarity index 100% rename from openni2_camera/src/openni2_device_info.cpp rename to src/openni2_device_info.cpp diff --git a/openni2_camera/src/openni2_device_manager.cpp b/src/openni2_device_manager.cpp similarity index 100% rename from openni2_camera/src/openni2_device_manager.cpp rename to src/openni2_device_manager.cpp diff --git a/openni2_camera/src/openni2_driver.cpp b/src/openni2_driver.cpp similarity index 100% rename from openni2_camera/src/openni2_driver.cpp rename to src/openni2_driver.cpp diff --git a/openni2_camera/src/openni2_exception.cpp b/src/openni2_exception.cpp similarity index 100% rename from openni2_camera/src/openni2_exception.cpp rename to src/openni2_exception.cpp diff --git a/openni2_camera/src/openni2_frame_listener.cpp b/src/openni2_frame_listener.cpp similarity index 100% rename from openni2_camera/src/openni2_frame_listener.cpp rename to src/openni2_frame_listener.cpp diff --git a/openni2_camera/src/openni2_timer_filter.cpp b/src/openni2_timer_filter.cpp similarity index 100% rename from openni2_camera/src/openni2_timer_filter.cpp rename to src/openni2_timer_filter.cpp diff --git a/openni2_camera/src/openni2_video_mode.cpp b/src/openni2_video_mode.cpp similarity index 100% rename from openni2_camera/src/openni2_video_mode.cpp rename to src/openni2_video_mode.cpp diff --git a/openni2_camera/src/usb_reset.c b/src/usb_reset.c similarity index 100% rename from openni2_camera/src/usb_reset.c rename to src/usb_reset.c diff --git a/openni2_camera/srv/GetSerial.srv b/srv/GetSerial.srv similarity index 100% rename from openni2_camera/srv/GetSerial.srv rename to srv/GetSerial.srv diff --git a/openni2_camera/test/test_wrapper.cpp b/test/test_wrapper.cpp similarity index 100% rename from openni2_camera/test/test_wrapper.cpp rename to test/test_wrapper.cpp