Skip to content

Commit

Permalink
Docs update for release (#378)
Browse files Browse the repository at this point in the history
* Revamped unified C++ and python documentation
* ROS driver support of new FW 2.3 profiles
  • Loading branch information
kairenw authored May 4, 2022
1 parent f60acf3 commit 43107a1
Show file tree
Hide file tree
Showing 148 changed files with 5,432 additions and 2,253 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
Changelog
=========

[unreleased]
============
[20220504]
===========

* update supported vcpkg tag to 2022.02.23
* update to manylinux2014 for x64 linux ``ouster-sdk`` wheels
* Ouster SDK documentation overhaul with C++/Python APIs in one place
* sample data updated to firmware 2.3

ouster_client
-------------
Expand Down Expand Up @@ -36,6 +38,10 @@ python
* the ``ouster-sdk`` package now includes an example visualizer, ``simple-viz``, which will be
installed on that path for the Python environment

ouster_ros
-----------
* support new fw 2.3 profiles by checking for inclusion of fields when creating point cloud. Missing
fields are filled with zeroes

[20220107]
============
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
include(DefaultBuildType)

# ==== Project Name ====
project(ouster_example VERSION 20220107)
project(ouster_example VERSION 20220429)

# ==== Options ====
option(CMAKE_POSITION_INDEPENDENT_CODE "Build position independent code." ON)
Expand Down
312 changes: 13 additions & 299 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,315 +1,29 @@
.. image:: docs/images/Ouster_Logo_TM_Horiz_Black_RGB_600px.png
:align: center
.. figure:: https://github.com/ouster-lidar/ouster_example/raw/master/docs/images/Ouster_Logo_TM_Horiz_Black_RGB_600px.png

------------------------------------------------------

==========================================================
Ouster SDK - libraries and tools for Ouster Lidar Sensors
==========================================================

**Quick links:** `Python SDK <https://static.ouster.dev/sdk-docs/index.html>`_ | `Python Quick
Start <https://static.ouster.dev/sdk-docs/quickstart.html>`_ | `Changelog
<https://static.ouster.dev/sdk-docs/changelog.html>`_ | `Sensor Docs
<https://static.ouster.dev/sensor-docs>`_ | `Sample Data
<https://static.ouster.dev/sdk-docs/quickstart.html#using-sample-data>`_ | `Issues
<https://github.com/ouster-lidar/ouster_example/issues>`_

------------------------------------------------------

:Description: Sample code provided for working with Ouster sensors

.. contents:: Contents:
:local:

Cross-platform C++/Python Ouster Sensor Development Toolkit

Summary
=======
To get started with our sensors, client, and visualizer, please see our SDK and sensor documentation:

To get started building the client and visualizer libraries, see the `Sample Client and Visualizer`_
section below. For instructions on ROS, start with the `Example ROS Code`_ section. Python SDK users
should proceed straight to our `python SDK homepage <python/>`_.
- `Ouster SDK Documentation <https://static.ouster.dev/sdk-docs/index.html>`_
- `Ouster Sensor Documentaion <https://static.ouster.dev/sensor-docs>`_

This repository contains sample code for connecting to and configuring ouster sensors, reading and
visualizing data, and interfacing with ROS.
This repository contains Ouster SDK source code for connecting to and configuring ouster sensors,
reading and visualizing data, and interfacing with ROS.

* `ouster_client <ouster_client/>`_ contains an example C++ client for ouster sensors
* `ouster_viz <ouster_viz/>`_ contains a basic point cloud visualizer
* `ouster_pcap <ouster_pcap/>`_ contains C++ pcap functions for ouster sensors
* `ouster_viz <ouster_viz/>`_ contains a customizable point cloud visualizer
* `ouster_ros <ouster_ros/>`_ contains example ROS nodes for publishing point cloud messages
* `python <python/>`_ contains the code for the ouster sensor python SDK (``ouster-sdk`` Python package)


Sample Client and Visualizer
============================

Building the example code requires a compiler supporting C++11 and CMake 3.1 or newer and the tclap,
jsoncpp, and Eigen3 libraries with headers installed on the system. The sample visualizer also
requires the GLFW3 and GLEW libraries.

Building on Linux / macOS
-------------------------

To install build dependencies on Ubuntu, run::

sudo apt install build-essential cmake libglfw3-dev libglew-dev libeigen3-dev \
libjsoncpp-dev libtclap-dev

On macOS, install XCode and `homebrew <https://brew.sh>`_ and run::

brew install cmake pkg-config glfw glew eigen jsoncpp tclap

To build run the following commands::

mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release <path to ouster_example>
make

where ``<path to ouster_example>`` is the location of the ``ouster_example`` source directory. The
CMake build script supports several optional flags::

-DBUILD_VIZ=OFF Do not build the sample visualizer
-DBUILD_PCAP=ON Build pcap tools. Requres libpcap and libtins dev packages
-DBUILD_SHARED_LIBS Build shared libraries (.dylib or .so)
-DCMAKE_POSITION_INDEPENDENT_CODE Standard flag for position independent code

Building on Windows
-------------------

The example code can be built on Windows 10 with Visual Studio 2019 using CMake support and vcpkg
for dependencies. Follow the official documentation to set up your build environment:

* `Visual Studio <https://visualstudio.microsoft.com/downloads/>`_
* `Visual Studio CMake Support
<https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=vs-2019>`_
* `Visual Studio CPP Support
<https://docs.microsoft.com/en-us/cpp/build/vscpp-step-0-installation?view=vs-2019>`_
* `Vcpkg, at tag "2022.02.23" installed and integrated with Visual Studio
<https://docs.microsoft.com/en-us/cpp/build/vcpkg?view=msvc-160#installation>`_

**Note** You'll need to run ``git checkout 2022.02.23`` in the vcpkg directory before bootstrapping
to use the correct versions of the dependencies. Building may fail unexpectedly if you skip this
step.

Don't forget to integrate vcpkg with Visual Studio after bootstrapping::

.\vcpkg.exe integrate install

You should be able to install dependencies with::

.\vcpkg.exe install --triplet x64-windows glfw3 glad[gl-api-33] tclap jsoncpp eigen3

After these steps are complete, you should be able to open, build and run the ``ouster_example``
project using Visual Studio:

1. Start Visual Studio.
2. When the prompt opens asking you what type of project to open click **Open a local folder** and
navigate to the ``ouster_example`` source directory.
3. After opening the project for the first time, wait for CMake configuration to complete.
4. Make sure Visual Studio is `building in release mode`_. You may experience performance issues and
missing data in the visualizer otherwise.
5. In the menu bar at the top of the screen, select **Build > Build All**.
6. To use the resulting binaries, go to **View > Terminal** and run, for example::

.\out\build\x64-Release\ouster_client\ouster_client_example.exe

.. _building in release mode: https://docs.microsoft.com/en-us/visualstudio/debugger/how-to-set-debug-and-release-configurations?view=vs-2019

Running the Sample Client
-------------------------

Make sure the sensor is connected to the network. See "Connecting to the Sensor" in the `Software
User Manual <https://www.ouster.com/downloads>`_ for instructions and different options for network
configuration.

Navigate to ``ouster_client`` under the build directory, which should contain an executable named
``ouster_client_example``. This program will attempt to connect to the sensor, capture lidar data,
and write point clouds out to CSV files::

./ouster_client_example <sensor hostname> <udp data destination>

where ``<sensor hostname>`` can be the hostname (os-99xxxxxxxxxx) or IP of the sensor and ``<udp
data destingation>`` is the hostname or IP to which the sensor should send lidar data. You can also
supply ``""``, an empty string, to utilize automatic detection.

On Windows, you may need to allow the client/visualizer through the Windows firewall to receive
sensor data.

Running the Sample Visualizer
-----------------------------

Visualization is written in C++ and viz examples provided through Python bindings:

- ``ouster_viz`` C++ library provides functions to build simple point cloud visualizers and comes
with Python bindings.
- ``simple-viz`` Python application can be used as an entrypoint for a more sophisticated custom
point cloud visualizations.

After you have Python environment sourced and ``ouster-sdk`` package installed you can run::

$ simple-viz --sensor <sensor hostname> [--no-auto-dest] [--lidar-port PORT]

where ``<sensor hostname>`` can be the hostname (os-99xxxxxxxxxx) or IP of the sensor.

.. todo::

Add more info about available arguments in ``simple-viz``. ``-x``, ``--lidar-port``, and pcap
replay.

The sample visualizer does not currently include a GUI, but can be controlled with the mouse and
keyboard:

* Click and drag rotates the view
* Middle click and drag moves the view
* Scroll adjusts how far away the camera is from the vehicle

Keyboard controls:
============== ===============================================
Key What it does
============== ===============================================
``o`` Toggle on-screen display
``p/P`` Increase/decrease point size
``m`` Cycle point cloud coloring mode
``b`` Cycle top 2D image
``n`` Cycle bottom 2D image
``R`` Reset camera
``e/E`` Increase/decrease size of displayed 2D images
``'/"`` Increase/decrease spacing in range markers
``w`` Camera pitch up
``s`` Camera pitch down
``a`` Camera yaw left
``d`` Camera yaw right
``1`` Toggle first return point cloud visibility
``2`` Toggle second return point cloud visibility
``0`` Toggle orthographic camera
``=/-`` Dolly in/out
``(space)`` Toggle pause
``./,`` Step one frame forward/back
``ctrl + ./,`` Step 10 frames forward/back
``>/<`` Increase/decrease playback rate (during replay)
``shift`` Camera Translation with mouse drag
============== ===============================================

For usage and other options, run ``./simple_viz -h``


Example ROS Code
================

The sample code include tools for publishing sensor data as standard ROS topics. Since ROS uses its
own build system, it must be compiled separately from the rest of the sample code.

The provided ROS code has been tested on ROS Kinetic, Melodic, and Noetic on Ubuntu 16.04, 18.04,
and 20.04, respectively. Use the `installation instructions <https://www.ros.org/install/>`_ to get
started with ROS on your platform.

Building
--------

The build dependencies include those of the sample code::

sudo apt install build-essential cmake libeigen3-dev libjsoncpp-dev

Additionally, you should install the ros dependencies::

sudo apt install ros-<ROS-VERSION>-ros-core ros-<ROS-VERSION>-pcl-ros \
ros-<ROS-VERSION>-tf2-geometry-msgs ros-<ROS-VERSION>-rviz

where ``<ROS-VERSION>`` is ``kinetic``, ``melodic``, or ``noetic``.


Alternatively, if you would like to install dependencies with `rosdep`::

rosdep install --from-paths <path to ouster example>

To build::

source /opt/ros/<ROS-VERSION>/setup.bash
mkdir -p ./myworkspace/src
cd myworkspace
ln -s <path to ouster_example> ./src/
catkin_make -DCMAKE_BUILD_TYPE=Release

**Warning:** Do not create your workspace directory inside the cloned ouster_example repository, as
this will confuse the ROS build system.

For each command in the following sections, make sure to first set up the ROS environment in each
new terminal by running::

source myworkspace/devel/setup.bash

Running ROS Nodes with a Sensor
-------------------------------

Make sure the sensor is connected to the network. See "Connecting to the Sensor" in the `Software
User Manual`_ for instructions and different options for network configuration.

To publish ROS topics from a running sensor, run::

roslaunch ouster_ros ouster.launch sensor_hostname:=<sensor hostname> \
metadata:=<path to metadata json>

where:

* ``<sensor hostname>`` can be the hostname (os-99xxxxxxxxxx) or IP of the sensor
* ``<path to metadata json>`` is the path you want to save sensor metadata to.

This comment has been minimized.

Copy link
@shubham-shahh

shubham-shahh May 30, 2022

why is all this info removed? what is the new destination?

This comment has been minimized.

Copy link
@kairenw

kairenw May 31, 2022

Contributor

Hi @shubham-shahh, you can find the same instructions here. We unified our documentation between Python, C++, and ROS to one place.

Click on the sidebar at the appropriate place for the ROS build/use instructions!

You must provide a JSON filename at the end, not just a path to a directory.

Note that by default the working directory of all ROS nodes is set to ``${ROS_HOME}``, generally
``$HOME/.ros``. If you provide a relative path to ``metadata``, i.e., ``metadata:=meta.json``, it
will write to ``${ROS_HOME}/meta.json``. To avoid this, you can provide an absolute path to
``metadata``, i.e. ``metadata:=/home/user/meta.json``.

You can also optionally specify:

* ``udp_dest:=<hostname>`` to specify the hostname or IP to which the sensor should send data
* ``lidar_mode:=<mode>`` where mode is one of ``512x10``, ``512x20``, ``1024x10``, ``1024x20``, or
``2048x10``, and
* ``viz:=true`` to visualize the sensor output, if you have the rviz ROS package installed


Recording Data
--------------

To record raw sensor output use `rosbag record`_. After starting the ``roslaunch`` command above, in
another terminal, run::

rosbag record /os_node/imu_packets /os_node/lidar_packets

This will save a bag file of recorded data in the current working directory.

You should copy and save the metadata file alongside your data. The metadata file will be saved at
the provided path to `roslaunch`. If you run the node and cannot find the metadata file, try looking
inside your ``${ROS_HOME}``, generally ``$HOME/.ros``. Regardless, you must retain the metadata
file, as you will not be able to replay your data later without it.

.. _rosbag record: https://wiki.ros.org/rosbag/Commandline#rosbag_record

Playing Back Recorded Data
--------------------------

To publish ROS topics from recorded data, specify the ``replay`` and ``metadata`` parameters when
running ``roslaunch``::

roslaunch ouster_ros ouster.launch replay:=true metadata:=<path to metadata json>

And in a second terminal run `rosbag play`_::

rosbag play --clock <bag files ...>

A metadata file is mandatory for replay of data. See `Recording Data`_ for how
to obtain the metadata file when recording your data.

.. _rosbag play: https://wiki.ros.org/rosbag/Commandline#rosbag_play


Ouster Python SDK
=================

Python SDK users should proceed straight to the `Ouster python SDK homepage <python/>`_.


Additional Information
======================
License
========

* Sample sensor output usable with the provided ROS code `is available here
<https://ouster.com/resources/lidar-sample-data>`_.
* For network configuration, refer to "Connecting to the Sensor" in the `Software User Manual`_.
BSD 3-Clause License, `details <LICENSE>`_
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class OusterSDKConan(ConanFile):
name = "ouster_sdk"
version = "0.14.0-dev7"
version = "0.4.0"
license = "BSD 3-Clause License"
author = "Ouster, Inc."
url = "https://github.com/ouster-lidar/ouster_example"
Expand Down
4 changes: 2 additions & 2 deletions docs/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -521,15 +521,15 @@ RESOLVE_UNNAMED_PARAMS = YES
# section is generated. This option has no effect if EXTRACT_ALL is enabled.
# The default value is: NO.

HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_MEMBERS = YES

# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
# undocumented classes that are normally visible in the class hierarchy. If set
# to NO, these classes will be included in the various overviews. This option
# has no effect if EXTRACT_ALL is enabled.
# The default value is: NO.

HIDE_UNDOC_CLASSES = NO
HIDE_UNDOC_CLASSES = YES

# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
# declarations. If set to NO, these declarations will be included in the
Expand Down
Loading

0 comments on commit 43107a1

Please sign in to comment.