From a404c6e93083e3eaec256ad8e613a4119bf16c7e Mon Sep 17 00:00:00 2001 From: Jack O'Quin Date: Tue, 9 Apr 2013 22:03:16 -0500 Subject: [PATCH 1/8] initial migration to catkin (#12) --- .gitignore | 6 ----- CMakeLists.txt | 58 ++++++++++++++++++++++------------------ Makefile | 1 - manifest.xml | 15 ----------- nodes/axis.py | 5 +--- nodes/axis_all.py | 2 -- nodes/axis_ptz.py | 2 -- nodes/axis_twist.py | 2 -- nodes/publish_axis_tf.py | 2 +- nodes/teleop.py | 2 -- nodes/teleop_twist.py | 2 -- package.xml | 33 +++++++++++++++++++++++ setup.py | 10 +++++++ stack.xml | 13 --------- 14 files changed, 77 insertions(+), 76 deletions(-) delete mode 100644 Makefile delete mode 100644 manifest.xml create mode 100644 package.xml create mode 100644 setup.py delete mode 100644 stack.xml diff --git a/.gitignore b/.gitignore index 44198ca..d53a461 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,4 @@ -*.a -*.o -*.os *.pyc -*.so *.tar.gz *~ TAGS -bin/ -build/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 530ac6a..d0a509a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,30 +1,36 @@ -cmake_minimum_required(VERSION 2.4.6) -include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake) +cmake_minimum_required(VERSION 2.8.3) +project(axis_camera) -# Set the build type. Options are: -# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage -# Debug : w/ debug symbols, w/o optimization -# Release : w/o debug symbols, w/ optimization -# RelWithDebInfo : w/ debug symbols, w/ optimization -# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries -#set(ROS_BUILD_TYPE RelWithDebInfo) +find_package(catkin REQUIRED + COMPONENTS + camera_info_manager_py + geometry_msgs + message_generation + rospy + sensor_msgs + tf +) +catkin_python_setup() -rosbuild_init() +# ROS message generation +add_message_files(DIRECTORY msg FILES Axis.msg) +generate_messages(DEPENDENCIES geometry_msgs std_msgs) -#set the default path for built executables to the "bin" directory -#set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) -#set the default path for built libraries to the "lib" directory -#set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) +catkin_package( + CATKIN_DEPENDS + camera_info_manager_py + geometry_msgs + message_runtime + sensor_msgs + tf +) -#uncomment if you have defined messages -rosbuild_genmsg() -#uncomment if you have defined services -#rosbuild_gensrv() - -#common commands for building c++ executables and libraries -#rosbuild_add_library(${PROJECT_NAME} src/example.cpp) -#target_link_libraries(${PROJECT_NAME} another_library) -#rosbuild_add_boost_directories() -#rosbuild_link_boost(${PROJECT_NAME} thread) -#rosbuild_add_executable(example examples/example.cpp) -#target_link_libraries(example ${PROJECT_NAME}) +install(PROGRAMS + nodes/axis.py + nodes/axis_all.py + nodes/axis_ptz.py + nodes/axis_twist.py + nodes/publish_axis_tf.py + nodes/teleop.py + nodes/teleop_twist.py + DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) diff --git a/Makefile b/Makefile deleted file mode 100644 index b75b928..0000000 --- a/Makefile +++ /dev/null @@ -1 +0,0 @@ -include $(shell rospack find mk)/cmake.mk \ No newline at end of file diff --git a/manifest.xml b/manifest.xml deleted file mode 100644 index 13a88e8..0000000 --- a/manifest.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - Contains basic Python drivers for accessing an Axis camera's MJPG stream. Also provides control for PTZ cameras. - - Ryan Gariepy - BSD - - http://ros.org/wiki/axis_camera - - - - - - - diff --git a/nodes/axis.py b/nodes/axis.py index bdea595..db2c9c5 100755 --- a/nodes/axis.py +++ b/nodes/axis.py @@ -5,14 +5,11 @@ # import os, sys, string, time +import threading import urllib2 -import roslib; roslib.load_manifest('axis_camera') import rospy - from sensor_msgs.msg import CompressedImage, CameraInfo - -import threading import camera_info_manager class StreamThread(threading.Thread): diff --git a/nodes/axis_all.py b/nodes/axis_all.py index 335c486..bfdd6a5 100755 --- a/nodes/axis_all.py +++ b/nodes/axis_all.py @@ -6,8 +6,6 @@ import os, sys, string, time, getopt, threading import httplib, urllib - -import roslib; roslib.load_manifest('axis_camera') import rospy from axis_camera.msg import Axis diff --git a/nodes/axis_ptz.py b/nodes/axis_ptz.py index 756f44c..740e2ba 100755 --- a/nodes/axis_ptz.py +++ b/nodes/axis_ptz.py @@ -7,9 +7,7 @@ import os, sys, string, time, getopt, threading import httplib, urllib -import roslib; roslib.load_manifest('axis_camera') import rospy - from axis_camera.msg import Axis diff --git a/nodes/axis_twist.py b/nodes/axis_twist.py index ae133ad..e5e3146 100755 --- a/nodes/axis_twist.py +++ b/nodes/axis_twist.py @@ -6,8 +6,6 @@ import os, sys, string, time, getopt, threading import httplib, urllib - -import roslib; roslib.load_manifest('axis_camera') import rospy from axis_camera.msg import Axis diff --git a/nodes/publish_axis_tf.py b/nodes/publish_axis_tf.py index df4eefb..97b1a1e 100755 --- a/nodes/publish_axis_tf.py +++ b/nodes/publish_axis_tf.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -import roslib; roslib.load_manifest('axis_camera') + import rospy import math from axis_camera.msg import Axis diff --git a/nodes/teleop.py b/nodes/teleop.py index 7a740cc..e0dbb41 100755 --- a/nodes/teleop.py +++ b/nodes/teleop.py @@ -1,8 +1,6 @@ #!/usr/bin/python -import roslib; roslib.load_manifest('axis_camera') import rospy - from sensor_msgs.msg import Joy from axis_camera.msg import Axis diff --git a/nodes/teleop_twist.py b/nodes/teleop_twist.py index ec2e452..b6f73dd 100755 --- a/nodes/teleop_twist.py +++ b/nodes/teleop_twist.py @@ -1,6 +1,5 @@ #!/usr/bin/python -import roslib; roslib.load_manifest('axis_camera') import rospy import math @@ -8,7 +7,6 @@ from axis_camera.msg import Axis from geometry_msgs.msg import Twist - class Teleop: def __init__(self): rospy.init_node('axis_twist_teleop') diff --git a/package.xml b/package.xml new file mode 100644 index 0000000..e0ca1ac --- /dev/null +++ b/package.xml @@ -0,0 +1,33 @@ + + + axis_camera + 0.1.0 + + Python ROS drivers for accessing an Axis camera's MJPG + stream. Also provides control for PTZ cameras. + + Mike Purvis + Ryan Gariepy + BSD + + http://ros.org/wiki/axis_camera + https://github.com/clearpathrobotics/axis_camera + https://github.com/clearpathrobotics/axis_camera/issues + + catkin + + camera_info_manager_py + geometry_msgs + message_generation + rospy + sensor_msgs + tf + + camera_info_manager_py + geometry_msgs + message_runtime + rospy + sensor_msgs + tf + + diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..6317e60 --- /dev/null +++ b/setup.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python + +from distutils.core import setup +from catkin_pkg.python_setup import generate_distutils_setup + +d = generate_distutils_setup( + install_requires=['rospy', 'urllib2'], + ) + +setup(**d) diff --git a/stack.xml b/stack.xml deleted file mode 100644 index 05b883c..0000000 --- a/stack.xml +++ /dev/null @@ -1,13 +0,0 @@ - - 0.0.1 - - Contains basic Python drivers for accessing an Axis camera's MJPG stream. Also provides control for PTZ cameras. - - Maintained by Ryan Gariepy - BSD - - http://ros.org/wiki/axis_camera - - - - From 517bdf32f9a1a79e6b34cfa53535ee1d128b9bad Mon Sep 17 00:00:00 2001 From: Jack O'Quin Date: Tue, 9 Apr 2013 22:33:35 -0500 Subject: [PATCH 2/8] add README.rst and CHANGELOG.rst (#14) --- CHANGELOG.rst | 24 ++++++++++++++++++++++++ README.rst | 9 +++++++++ 2 files changed, 33 insertions(+) create mode 100644 CHANGELOG.rst create mode 100644 README.rst diff --git a/CHANGELOG.rst b/CHANGELOG.rst new file mode 100644 index 0000000..fb11dc3 --- /dev/null +++ b/CHANGELOG.rst @@ -0,0 +1,24 @@ +Change history +============== + +0.1.0 (forthcoming) +------------------- + + * Groovy and Hydro release. + * Rename **compressed** topic **image_raw/compressed** (`#5`_). + * Add frame_id parameter (fixes `#8`_) + * Add camera_info_manager support (`#10`_). Adds a new dependency on + **camera_info_manager_py**. Add a new **camera_info_url** + parameter. + * Convert to catkin (`#12`_). + +0.0.1 (2012-12-05) +------------------ + + * Fuerte release + * Initial axis_camera package. + +.. _`#5`: https://github.com/clearpathrobotics/axis_camera/issues/5 +.. _`#8`: https://github.com/clearpathrobotics/axis_camera/issues/8 +.. _`#10`: https://github.com/clearpathrobotics/axis_camera/issues/10 +.. _`#12`: https://github.com/clearpathrobotics/axis_camera/issues/12 diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..5805296 --- /dev/null +++ b/README.rst @@ -0,0 +1,9 @@ +Overview +======== + +This ROS_ package provides an Axis camera driver written in Python. + +ROS wiki documentation: `axis_camera`_. + +.. _ROS: http://ros.org +.. _`axis_camera`: http://ros.org/wiki/axis_camera From b2f915a3b54cc144039a17c087c5c55858f794e9 Mon Sep 17 00:00:00 2001 From: Jack O'Quin Date: Wed, 10 Apr 2013 09:56:03 -0500 Subject: [PATCH 3/8] add Sphinx doc index (#14) Just README and CHANGELOG, no Python documentation yet. --- conf.py | 250 ++++++++++++++++++++++++++++++++++++++++++++++++++++ index.rst | 16 ++++ package.xml | 4 + rosdoc.yaml | 4 + 4 files changed, 274 insertions(+) create mode 100644 conf.py create mode 100644 index.rst create mode 100644 rosdoc.yaml diff --git a/conf.py b/conf.py new file mode 100644 index 0000000..3bf9e21 --- /dev/null +++ b/conf.py @@ -0,0 +1,250 @@ +# -*- coding: utf-8 -*- +# +# axis_camera documentation build configuration file, created by +# sphinx-quickstart on Wed Apr 25 16:01:20 2012. +# +# 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, os + +# 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('./src')) + +# -- 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.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.viewcode'] + +# List automatically-documented module members in source code order. +autodoc_member_order = 'bysource' + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +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'axis_camera' +copyright = u'2012, Jack O\'Quin' + +# 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 = '0.2.0' +# The full version, including alpha/beta/rc tags. +release = '0.2.0' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#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 = [] + +# 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 = [] + + +# -- 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 = 'default' + +# 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 (within the static path) to use as 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'] + +# 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 + +# Output file base name for HTML help builder. +htmlhelp_basename = 'axis_camera_doc' + + +# -- 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': '', +} + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, documentclass [howto/manual]). +latex_documents = [ + ('index', 'axis_camera.tex', u'ROS Axis camera driver.', + u'Jack O\'Quin', '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 = [ + ('index', 'axis_camera', u'ROS Python Axis camera driver.', + [u'Jack O\'Quin'], 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 = [ + ('index', 'axis_camera', u'axis_camera Documentation', + u'Jack O\'Quin', 'axis_camera', 'ROS Axis camera driver.', + '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' + + +# Example configuration for intersphinx: refer to the Python standard library. +intersphinx_mapping = {'http://docs.python.org/': None} diff --git a/index.rst b/index.rst new file mode 100644 index 0000000..de235e0 --- /dev/null +++ b/index.rst @@ -0,0 +1,16 @@ +camera_info_manager: ROS CameraInfo support for Python camera drivers +===================================================================== + +Contents: + +.. toctree:: + :maxdepth: 2 + + README + CHANGELOG + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` diff --git a/package.xml b/package.xml index e0ca1ac..5e0d999 100644 --- a/package.xml +++ b/package.xml @@ -30,4 +30,8 @@ sensor_msgs tf + + + + diff --git a/rosdoc.yaml b/rosdoc.yaml new file mode 100644 index 0000000..1bda6fb --- /dev/null +++ b/rosdoc.yaml @@ -0,0 +1,4 @@ + - builder: sphinx + name: Python API + output_dir: python + From 9afe2ce38e8e627d18f918fa223459ad51ee334d Mon Sep 17 00:00:00 2001 From: Jack O'Quin Date: Wed, 10 Apr 2013 09:59:09 -0500 Subject: [PATCH 4/8] credit Ryan as author (#14) --- conf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf.py b/conf.py index 3bf9e21..1444ac8 100644 --- a/conf.py +++ b/conf.py @@ -45,7 +45,7 @@ # General information about the project. project = u'axis_camera' -copyright = u'2012, Jack O\'Quin' +copyright = u'2012, Ryan Gariepy' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -188,7 +188,7 @@ # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ ('index', 'axis_camera.tex', u'ROS Axis camera driver.', - u'Jack O\'Quin', 'manual'), + u'Ryan Gariepy', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -218,7 +218,7 @@ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'axis_camera', u'ROS Python Axis camera driver.', - [u'Jack O\'Quin'], 1) + [u'Ryan Gariepy'], 1) ] # If true, show URL addresses after external links. @@ -232,7 +232,7 @@ # dir menu entry, description, category) texinfo_documents = [ ('index', 'axis_camera', u'axis_camera Documentation', - u'Jack O\'Quin', 'axis_camera', 'ROS Axis camera driver.', + u'Ryan Gariepy', 'axis_camera', 'ROS Axis camera driver.', 'Miscellaneous'), ] From 71242bb244d722dd5d9200719827b9f92e96e0da Mon Sep 17 00:00:00 2001 From: Jack O'Quin Date: Wed, 10 Apr 2013 10:12:47 -0500 Subject: [PATCH 5/8] warn that interfaces are not completely stable (#14) --- README.rst | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 5805296..6ad3ef7 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,26 @@ Overview ======== -This ROS_ package provides an Axis camera driver written in Python. +This ROS_ package provides an `Axis network camera`_ driver, written +in Python. ROS wiki documentation: `axis_camera`_. -.. _ROS: http://ros.org +*This driver is under active development. Its interfaces are + relatively stable, but may still change.* + +This package has no released code API. + +**Warning**:: + + The master branch normally contains code being tested for the next + ROS release. It does not always work with previous ROS distributions. + Sometimes, it may not work at all. + + Each official release is tagged in the repository. The `change history`_ + describes every version. + +.. _`Axis network camera`: http://www.axis.com/products/video/camera/index.htm +.. _`change history`: https://github.com/clearpathrobotics/axis_camera/blob/master/CHANGELOG.rst .. _`axis_camera`: http://ros.org/wiki/axis_camera +.. _ROS: http://ros.org From 7d87c0517750229c0a1f513ffe38d0a594d0a728 Mon Sep 17 00:00:00 2001 From: Jack O'Quin Date: Wed, 10 Apr 2013 11:01:56 -0500 Subject: [PATCH 6/8] fix github formatting of README.rst (#14) --- README.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 6ad3ef7..a877a84 100644 --- a/README.rst +++ b/README.rst @@ -6,10 +6,10 @@ in Python. ROS wiki documentation: `axis_camera`_. -*This driver is under active development. Its interfaces are - relatively stable, but may still change.* +This driver is under active development. Its ROS interfaces are +relatively stable, but may still change. -This package has no released code API. +There is no released code API. **Warning**:: @@ -17,8 +17,8 @@ This package has no released code API. ROS release. It does not always work with previous ROS distributions. Sometimes, it may not work at all. - Each official release is tagged in the repository. The `change history`_ - describes every version. +Each official release is tagged in the repository. The `change +history`_ describes every version. .. _`Axis network camera`: http://www.axis.com/products/video/camera/index.htm .. _`change history`: https://github.com/clearpathrobotics/axis_camera/blob/master/CHANGELOG.rst From dcf394bf5eba57a83f6f3aef09c64ebfb857b6f5 Mon Sep 17 00:00:00 2001 From: Jack O'Quin Date: Wed, 10 Apr 2013 16:53:46 -0500 Subject: [PATCH 7/8] add release 0.0.2 to change log --- CHANGELOG.rst | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fb11dc3..3af959a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,16 +6,24 @@ Change history * Groovy and Hydro release. * Rename **compressed** topic **image_raw/compressed** (`#5`_). - * Add frame_id parameter (fixes `#8`_) + * Convert to catkin (`#12`_). + +0.0.2 (2013-04-10) +------------------ + + * Fuerte update. + * Add **frame_id** parameter (fixes `#8`_) * Add camera_info_manager support (`#10`_). Adds a new dependency on - **camera_info_manager_py**. Add a new **camera_info_url** + **camera_info_manager_py**, and a new **camera_info_url** parameter. - * Convert to catkin (`#12`_). + * Add some additional PTZ control nodes: teleop.py, teleop_twist.py, + axis_twist.py, axis_all.py. + * Add PTZ transform publisher: publish_axis_tf.py. 0.0.1 (2012-12-05) ------------------ - * Fuerte release + * Fuerte release. * Initial axis_camera package. .. _`#5`: https://github.com/clearpathrobotics/axis_camera/issues/5 From f4283d25555eb54446d3364360e32a9d4c5a2ed1 Mon Sep 17 00:00:00 2001 From: Jack O'Quin Date: Wed, 10 Apr 2013 17:00:11 -0500 Subject: [PATCH 8/8] fix documentation version number --- conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.py b/conf.py index 1444ac8..1713534 100644 --- a/conf.py +++ b/conf.py @@ -52,9 +52,9 @@ # built documents. # # The short X.Y version. -version = '0.2.0' +version = '0.1' # The full version, including alpha/beta/rc tags. -release = '0.2.0' +release = '0.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.