Skip to content

Commit dc5c7f2

Browse files
authored
Merge pull request #132 from hmakelin/fix-docs-dead-links
Fix dead links in documentation
2 parents 6d933be + f525051 commit dc5c7f2

File tree

7 files changed

+22
-15
lines changed

7 files changed

+22
-15
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ You will need to have the [Docker Compose plugin][2] and [NVIDIA Container Toolk
2323

2424
## Install GISNav CLI
2525

26-
The GISNav CLI (`gnc`) is a Docker Compose wrapper that significantly simplifies building and deploying GISNav's Docker Compose services.
26+
The GISNav CLI (`gnc`) is a Docker Compose wrapper that significantly simplifies building and deploying GISNav's Docker Compose services. It is packaged as a Debian distributable.
2727

28-
Create the Debian package yourself and install `gnc` from it using the following commands:
28+
Create the Debian distributable and install `gnc` from it using the following commands:
2929

3030
```bash
3131
git clone https://github.com/hmakelin/gisnav.git
@@ -80,7 +80,7 @@ listener sensor_gps
8080
```
8181

8282
> **Note**
83-
> The `gisnav` service will by default will send uORB messages to PX4 via the
83+
> The `gisnav` service will by default send uORB messages to PX4 via the
8484
> micro-ROS agent which bypasses the GPS driver so you will not see the GPS
8585
> status with commands like `gps status`.
8686
@@ -97,7 +97,7 @@ gnc stop
9797
# Documentation
9898

9999
See the [latest developer documentation][6] for information on how to setup a local environment for GISNav development,
100-
for code examples and API documentation, and for contribution guidelines.
100+
for code examples and API documentation, and integration examples.
101101

102102
[6]: https://hmakelin.github.io/gisnav
103103

debian/gisnav/Makefile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,15 @@ $(BUILD_DIR)/etc/systemd:
7878
@mkdir -p $@
7979
@cp -r etc/systemd/ $@
8080

81+
# We need to copy .git to make git describe work for the docs (docs are built
82+
# with git version string). pre-commit might also need the .git folder.
83+
# TODO: only copy over a shallow copy of git repo - we do not need entire history
84+
# nor all branches
8185
$(BUILD_DIR)/etc/gisnav: $(BUILD_DIR)/etc/gisnav/ros $(BUILD_DIR)/etc/gisnav/docker $(BUILD_DIR)/etc/gisnav/docs
8286
@dest=debian/gisnav/$@ && \
8387
mkdir -p $@ && \
8488
touch $(BUILD_DIR)/COLCON_IGNORE && \
85-
cd ${REPO_ROOT_PATH}; rsync -av --exclude-from='.gitignore' Makefile .pre-commit-config.yaml LICENSE.md README.md pyproject.toml $$dest
89+
cd ${REPO_ROOT_PATH}; rsync -av --exclude-from='.gitignore' Makefile .pre-commit-config.yaml LICENSE.md README.md pyproject.toml .git $$dest
8690

8791
$(BUILD_DIR)/etc/gisnav/ros:
8892
@dest=debian/gisnav/$@ && \
@@ -97,8 +101,8 @@ $(BUILD_DIR)/etc/gisnav/docker:
97101
cd ${REPO_ROOT_PATH}; rsync -av --exclude-from='.gitignore' docker/ $$dest
98102
@echo -e "\033[1;33;40mWarning! Check the file list above that no unintended files were copied over to the distributable.\033[0m"
99103

100-
# TODO package.json needed for gisnav image build to go through - try to
101-
# refactor it out (need better defined gisnav image)
102104
$(BUILD_DIR)/etc/gisnav/docs:
103-
@mkdir -p $@/vitepress
104-
@echo "{}" > $@/vitepress/package.json
105+
@dest=debian/gisnav/$@ && \
106+
mkdir -p $@ && \
107+
touch $(BUILD_DIR)/COLCON_IGNORE && \
108+
cd ${REPO_ROOT_PATH}; rsync -av --exclude-from='.gitignore' docs/ $$dest

docker/mavros/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,9 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | b
129129

130130
COPY Makefile .pre-commit-config.yaml LICENSE.md README.md pyproject.toml /opt/colcon_ws/src/gisnav/
131131

132-
# .git needed to make pre-commit work -> initialize a blank repo
133-
RUN git init
132+
# .git needed to make pre-commit and git describe work
133+
# TODO: solve this in a better way - we have an unnecessarily large git
134+
# history in the container
135+
COPY .git /opt/colcon_ws/src/gisnav/.git
134136

135137
ENTRYPOINT ["/entrypoint.sh"]

docs/vitepress/docs/.vitepress/config.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ export default withMermaid({
7171
{ text: 'GISNode', link: '/reference/public/gis_node' },
7272
{ text: 'StereoNode', link: '/reference/public/stereo_node' },
7373
{ text: 'PoseNode', link: '/reference/public/pose_node' },
74+
{ text: 'TwistNode', link: '/reference/public/twist_node' },
7475
]
7576
},
7677
{

docs/vitepress/docs/deploy-with-docker-compose.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The interdependencies between different services are hard-coded into the Docker
3737

3838
### Mock GPS demo
3939

40-
To deploy the [mock GPS demonstration](/README) introduced locally without using the Makefile, follow the below steps to create, start, and shutdown the required containers. These steps simply repeat what the `demo` Makefile recipe would do.
40+
To deploy the [mock GPS demonstration](/sitl-local) introduced locally without using the Makefile, follow the below steps to create, start, and shutdown the required containers. These steps simply repeat what the `demo` Makefile recipe would do.
4141

4242
#### Build images
4343

docs/vitepress/docs/install-locally.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ as the workspace might not play nicely with the virtual environment.
100100

101101
GISNav's Python dependencies are divided into [core](./glossary#core-core-functionality), [extended](./glossary#extension-extended-functionality), and development dependencies. You must at least install the core dependencies.
102102

103-
- If you know you are not going to use a specific extension such as `NMEANode`, you can skip installing the corresponding Python [extra](/glossary#extra). `NMEANode` is required for the [mock GPS demo](/README) and enables downstream integration of GISNav as a secondary GPS device via the NMEA protocol.
103+
- If you know you are not going to use a specific extension such as `NMEANode`, you can skip installing the corresponding Python [extra](/glossary#extra). `NMEANode` is required for the [mock GPS demo](/sitl-local) and enables downstream integration of GISNav as a secondary GPS device via the NMEA protocol.
104104

105105
- The development dependencies are required for various development tasks such as generating documentation and running tests. You do not need to install them if you do not plan to do any development work on GISNav.
106106

docs/vitepress/docs/setup-gis-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Setup GIS Server
22

3-
GISNav uses an onboard GIS server as a source for high-resolution orthoimagery and digital elevation models (DEM) for the approximate global position of the vehicle. This page describes how to setup a self-hosted GIS server. If you are [running the mock GPS demo](/README), you can
3+
GISNav uses an onboard GIS server as a source for high-resolution orthoimagery and digital elevation models (DEM) for the approximate global position of the vehicle. This page describes how to setup a self-hosted GIS server. If you are [running the mock GPS demo](/sitl-local), you can
44
simply use the provided `mapserver` [Docker Compose service](/deploy-with-docker-compose).
55

66
## Overview
@@ -12,7 +12,7 @@ The DEM is optionally used to input ground elevation z-coordinates to the Perspe
1212

1313
You should probably self-host an onboard GIS server with public domain orthoimagery because in a realistic scenario, the GIS should be embedded onboard and not depend on an internet connection. For development, it may sometimes be more convenient to proxy an existing commercial tile-based endpoint.
1414

15-
Because the [mock GPS demo](/README) uses NAIP imagery, in this section we will briefly describe how to obtain NAIP data in case you want to build your own GIS service.
15+
Because the [mock GPS demo](/sitl-local) uses NAIP imagery, in this section we will briefly describe how to obtain NAIP data in case you want to build your own GIS service.
1616

1717
::: info Tile-based endpoints
1818
Commercial web-based map services are often [tile-based](https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames) because it is more efficient to serve pre-rendered tiles than to render unique rasters for each individual requested bounding box. You will need a WMS proxy if you decide to go with a tile-based endpoint.

0 commit comments

Comments
 (0)