Skip to content

Commit 08e9c09

Browse files
authored
Merge pull request #25 from hmakelin/hmakelin-update-docs
Update docs
2 parents 00e5692 + c643387 commit 08e9c09

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

docs/pages/developer_guide/sitl_environment/autopilot.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ Setup PX4
1414
___________________________________________________
1515
**These instructions are written for PX4 version >=1.13.0, <=1.14.0-beta1**
1616

17-
Follow the PX4 instructions to setup your `Ubuntu Development Environment`_ with `Fast DDS`_ support.
17+
Follow the PX4 instructions to setup your `Ubuntu Development Environment`_ with `Fast DDS`_ and `PX4-ROS 2 Bridge`_
18+
support.
1819

1920
.. _Ubuntu Development Environment: https://docs.px4.io/master/en/simulation/ros_interface.html
2021
.. _Fast DDS: https://docs.px4.io/main/en/dev_setup/fast-dds-installation.html
22+
.. _PX4-ROS 2 Bridge: https://docs.px4.io/main/en/ros/ros2_comm.html
2123

2224
Build Gazebo simulation
2325
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

docs/pages/developer_guide/sitl_environment/gis_server.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ convenient to proxy an existing commercial tile-based endpoint.
100100
docker run \
101101
--name $CONTAINER_NAME \
102102
-p 80:80 \
103-
-v $PWD/mapfiles/:$MASERVER_PATH/:ro \
103+
-v $PWD/mapfiles/:$MAPSERVER_PATH/:ro \
104104
camptocamp/mapserver
105105
106106
Test your MapServer WMS service by opening the capabilities XML in your browser:

docs/pages/developer_guide/sitl_environment/install_gisnav.rst

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ Install GISNav in your ROS 2 Workspace:
3636
cd ~/colcon_ws
3737
mkdir -p src && cd "$_"
3838
git clone https://github.com/hmakelin/gisnav.git
39+
git clone https://github.com/hmakelin/gisnav_msgs.git
40+
rosdep update
41+
rosdep install --from-paths . -y --ignore-src
3942
cd gisnav
4043
pip3 install -r requirements.txt
4144

docs/pages/developer_guide/test/sitl_tests.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SITL tests are under the ``test/sitl`` folder. They are simple Python scripts:
44

55
.. code-block:: bash
66
7-
cd ~/px4_ros_com_ros2/src/gisnav/test/sitl
7+
cd ~/colcon_ws/src/gisnav/test/sitl
88
python sitl_test_mock_gps_node.py
99
1010
Flight Log Analysis

gisnav/data.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
)
1212
return position
1313
except DataValueError as dve:
14-
self.get_logger().warn(f'Error determining vehicle position:\n{dve},\n{traceback.print_exc()}.')
14+
self.get_logger().error('Error determining vehicle position.')
1515
return None
16-
1716
"""
1817
from __future__ import annotations # Python version 3.7+
1918

@@ -174,7 +173,7 @@ def __post_init__(self):
174173
# noinspection PyClassHasNoInit
175174
@dataclass(frozen=True)
176175
class ContextualMapData(_ImageHolder):
177-
"""Contains the rotated and cropped map image pose estimation"""
176+
"""Contains the rotated and cropped map image for pose estimation"""
178177
image: Img = field(init=False) # Cropped and rotated map which is the same size as the camera frames
179178
elevation: Optional[Img] = field(init=None) # Rotated elevation raster (optional) in meters
180179
rotation: float # radians

0 commit comments

Comments
 (0)