Skip to content

Commit 7690da3

Browse files
authored
Merge pull request #134 from hmakelin/update-docs
Update documentation
2 parents 282d30c + 5c0bb0f commit 7690da3

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ Docker container, and then start the mission.
6363

6464
## Simulate GPS failure
6565

66-
Wait until the drone has risen to its final mission altitude. You should see a visualization of the GISNav-estimated
67-
field of view projected on the ground appear. You can then try disabling GPS through your [MAVLink Shell][5]
66+
Wait until the drone has risen to its final mission altitude. You can then try disabling GPS through your [MAVLink Shell][5]
6867
*(accessible e.g. through QGroundControl > Analyze Tools > MAVLink Console)*:
6968

7069
```

docs/vitepress/docs/gisnav-cli.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,14 @@ gnc start px4 gisnav
4444
Start simulation on `localhost`, and `gisnav` on `jetsonnano.local`:
4545

4646
::: info Companion computer hostname
47-
The `GISNAV_COMPANION_HOST` environment variable is set below to tell the `px4` service where to find the middleware. `gnc` does not set these automatically and assumes the defaults from the `docker/.env` file.
47+
The `GISNAV_COMPANION_HOST` environment variable is set below to tell the `px4` service where to find the middleware. `gnc` does not set these automatically and assumes the defaults from the `docker/.env` file. We need to set the environment variable before we create the containers.
4848

4949
:::
5050

5151
```bash
5252
companion_host=jetsonnano.local
5353
export GISNAV_COMPANION_HOST=$companion_host
54+
gnc create px4 gisnav@$companion_host
5455
gnc start px4 gisnav@$companion_host
5556
```
5657

docs/vitepress/docs/glossary.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,15 +284,15 @@ Used to refer to the [vehicle](#vehicle), typically in a [ROS](#ros-ros-2) conte
284284

285285
### Rotation
286286

287-
Most likely rotation of the [reference raster](#reference-reference-image-reference-raster) when aligning it with the [vehicle](#heading). This is done in [pose](#pose) estimation because the neural [networks](#network) are not assumed to be rotation agnostic.
287+
Most likely rotation of the [reference raster](#reference-reference-image-reference-raster) when aligning it with the [FOV](#fov--fov). This is done in [pose](#pose) estimation because the neural [networks](#network) are not assumed to be rotation agnostic.
288288

289289
### Service
290290
- A [Docker Compose](#docker-compose) service
291291
- A [ROS](#ros-ros-2) service
292292
- A [systemd](#systemd) service
293293

294294
### Service orchestration
295-
Deploying and managing [Docker Compose](#docker-compose) [services](#service) that constitute a GISNav [deployment](#deploy-deployment). Currently done using [Make](#make-make) (Makefiles).
295+
Deploying and managing [Docker Compose](#docker-compose) [services](#service), potentially on multiple hosts, that constitute a GISNav [deployment](#deploy-deployment).
296296

297297
### Simulation host
298298
Computer that hosts the (Gazebo) simulation world. Typically a more powerful server, or a desktop or laptop personal computer.
@@ -712,7 +712,7 @@ An open source machine learning software library: [torch.ch](http://torch.ch/)
712712
Python machine learning library based on Torch: [pytorch.org](https://pytorch.org/)
713713

714714
### UBX
715-
Communication protocol (form u-blox) for GPS receivers
715+
Communication protocol (from u-blox) for GPS receivers
716716

717717
### Ubuntu
718718
A Linux distribution, only supported OS for GISNav: [ubuntu.com](https://ubuntu.com/)

docs/vitepress/docs/sitl-remote.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ This page describes how to run the [SITL simulation](/sitl-local) with GISNav ru
2525
Prepare the containers for the SITL simulation environment by running the following command on your simulation host.
2626

2727
```bash
28-
gnc create --build px4 gisnav@jetsonnano.local
28+
GISNAV_COMPANION_HOST=jetsonnano.local gnc create --build px4 gisnav@jetsonnano.local
2929
```
3030

3131
Start your simulation:
3232

3333
<!--@include: ./shared/slow-gazebo-startup-on-first-run.md-->
3434

3535
```bash
36-
GISNAV_COMPANION_HOST=jetsonnano.local gnc start px4 gisnav@jetsonnano.local
36+
gnc start px4 gisnav@jetsonnano.local
3737
```

docs/vitepress/docs/system-architecture.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,14 @@ graph TB
5151
PoseNode -->|"geometry_msgs/PoseWithCovarianceStamped\n(global pose, map frame)"| ekf_global_node
5252
UORBNode -->|"px4_msgs/SensorGps"| micro_ros_agent[" "]
5353
UBXNode -->|"ublox_msgs/NavPVT"| ubx[" "]
54+
NMEANode -->|"nmea_msgs/Sentence"| nmea[" "]
5455
5556
ekf_global_node -->|"nav_msgs/TransformStamped\n(map->odom)"| tf
5657
ekf_local_node -->|"nav_msgs/TransformStamped\n(odom->base_link)"| tf
5758
5859
style micro_ros_agent fill-opacity:0, stroke-opacity:0;
5960
style ubx fill-opacity:0, stroke-opacity:0;
61+
style nmea fill-opacity:0, stroke-opacity:0;
6062
style tf fill-opacity:0, stroke-width:1px,stroke-dasharray:3;
6163
style odometry fill-opacity:0, stroke-width:1px,stroke-dasharray:3;
6264
@@ -166,7 +168,6 @@ graph TB
166168
end
167169
end
168170
end
169-
simulation_px4 ----->|"/dev/ttyS4 (px4 GPS 2)\ntcp:15000 (socat bridge)\n/dev/ttyS1 (gisnav NMEA)"| application_gisnav
170171
171172
browser["Web browser"] -->|"80/http\n(443/https not currently supported)"| nginx
172173

0 commit comments

Comments
 (0)