Skip to content

Commit 4d2839a

Browse files
authored
Merge pull request #64 from waterlinked/build-on-all-branches
Build on all branches, only deploy on master
2 parents 95cffd7 + 2ae52e4 commit 4d2839a

14 files changed

Lines changed: 22 additions & 169 deletions

File tree

.github/workflows/build.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,33 @@ name: Deploy Water Linked Docs
33
on:
44
push:
55
branches:
6-
- master
6+
- '**' # run on all branches
7+
78
jobs:
89
build:
9-
1010
runs-on: ubuntu-latest
1111

1212
steps:
1313
- uses: actions/checkout@v3
14+
1415
- name: Set up Python 3.8
1516
uses: actions/setup-python@v4
1617
with:
1718
python-version: '3.8'
19+
1820
- name: Install dependencies
1921
run: |
2022
python3 -m pip install --upgrade pip
2123
python3 -m pip install -r requirements.txt
2224
25+
# Always build docs, e.g. for testing
26+
- name: Build docs
27+
run: |
28+
mkdocs build --strict
29+
30+
# Only deploy on master
2331
- name: Deploy docs
32+
if: github.ref == 'refs/heads/master'
2433
uses: mhausenblas/mkdocs-deploy-gh-pages@master
2534
env:
2635
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

docs/dvl/bluerov-integration-dvl-ugps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Before successful sensor fusion of Underwater GPS and DVL the following conditio
3939
* Make sure that the compass calibration was successful by comparing the ROV orientation shown in the map in QGroundControl to the actual ROV orientation. Land-marks like a coast-line or an analogue compass can help.
4040

4141
!!! Note
42-
When you want to use the position estimate for *control* of the ROV and the UGPS Topside is on land, it is highly recommended setting up the Underwater GPS to use static position and static heading mode. Alternatively when the UGPS Topside position is not static (on a boat or similar) you need to input heading and position data from an external GPS compass. [Details can be found here](../underwater-gps/gui/settings.md#topside-setup).
42+
When you want to use the position estimate for *control* of the ROV and the UGPS Topside is on land, it is highly recommended setting up the Underwater GPS to use static position and static heading mode. Alternatively when the UGPS Topside position is not static (on a boat or similar) you need to input heading and position data from an external GPS compass. [Details can be found here](../underwater-gps/ugps-sysconfig.md#topside-settings).
4343

4444
If you don't follow this advice, the position provided by the Underwater GPS will have more noise ("jump" too much) and also drift over time. This might cause the position hold mode to not work properly.
4545

@@ -67,7 +67,7 @@ Now both sensors should be considered for the position estimate of the ROV. You
6767

6868
This mode can be useful when you experience issues with sensor fusion (Mode "DVL+UGPS" above) or not all the described conditions in above section are met. Otherwise, we recommend using Mode "DVL+UGPS".
6969

70-
In this configuration the BlueROV will base its position estimate *updates* on velocity input from the DVL as well as accelerometer, gyroscope, compass and pressure sensor but not the Underwater GPS. Although the Underwater GPS is connected and running it will only be used to *initialize* the global ROV position at the beginning. QGroundControl (or the new Cockpit) will show the ROV position estimate based on the DVL only while the [Underwater GPS GUI](../underwater-gps/gui/position.md) will show the position based on the Underwater GPS.
70+
In this configuration the BlueROV will base its position estimate *updates* on velocity input from the DVL as well as accelerometer, gyroscope, compass and pressure sensor but not the Underwater GPS. Although the Underwater GPS is connected and running it will only be used to *initialize* the global ROV position at the beginning. QGroundControl (or the new Cockpit) will show the ROV position estimate based on the DVL only while the [Underwater GPS GUI](../underwater-gps/interface/ugps-gui.md#position) will show the position based on the Underwater GPS.
7171

7272
!!! Note
7373
The setup procedure below is very similar to when you only use the DVL without a running Underwater GPS. That case is described [here](bluerov-integration.md#software).

docs/modem-m16/modem-m16-gui.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ Follow the installation guide provided in README at [github for examples with Mo
2222

2323

2424
## GUI layout example:
25-
![](../../img/m16-gui.png)
25+
![](../img/m16-gui.png)
2626

2727
---

docs/underwater-gps/interface/gui/demo-gui.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

docs/underwater-gps/interface/gui/diagnostic-report.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/underwater-gps/interface/gui/diagnostic.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

docs/underwater-gps/interface/gui/position.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

docs/underwater-gps/interface/gui/receivers.md

Lines changed: 0 additions & 55 deletions
This file was deleted.

docs/underwater-gps/interface/gui/settings.md

Lines changed: 0 additions & 53 deletions
This file was deleted.

docs/underwater-gps/interface/ugps-gui.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,18 @@ In the diagnostic plot you should see the signal from all 4 Receivers. The signa
7676

7777
Acoustic interference can be observed in the diagnostic plot. Echo sounders from your boat or nearby boats typically appears like burst noise.
7878

79-
![diagnostics2](../../../img/diagnostics_2.png)
79+
![diagnostics2](../../img/diagnostics_2.png)
8080

8181
If it is coming from your boat, try to turn off the echo sounder to improve position accuracy.
8282
In case of interference from other acoustic sources, use the GUI to try other channels to avoid the interference.
8383

8484
!!! Tip
85-
Typically, NSD (_Noise spectral density_, displayed in the [Diagnostic](../underwater-gps/interface/ugps-gui.md#diagnostics) pane of the GUI) is around -100 dBm (in the units of version 3.3.0 or later of the software; 15 nV/sqrt(Hz) in the units of earlier software versions), or a little higher or lower. If it is much higher than this, it is likely that there is acoustic interference in the chosen channel, and a different channel should be tried.
85+
Typically, NSD (_Noise spectral density_) is around -100 dBm (in the units of version 3.3.0 or later of the software; 15 nV/sqrt(Hz) in the units of earlier software versions), or a little higher or lower. If it is much higher than this, it is likely that there is acoustic interference in the chosen channel, and a different channel should be tried.
8686

8787
Note in particular that acoustic devices quite commonly operate at frequencies lying in Channel 1.
8888

8989
!!! Tip
90-
If the NSD values are normal, signal quality is mainly indicated by the RSSI values (_Received signal strength indicator_, displayed in the [Diagnostic](../underwater-gps/interface/ugps-gui.md#diagnostics) pane of the GUI). As long as the RSSI values are not too far below the NSD values, the signal strength should be at usable levels.
90+
If the NSD values are normal, signal quality is mainly indicated by the RSSI values (_Received signal strength indicator). As long as the RSSI values are not too far below the NSD values, the signal strength should be at usable levels.
9191

9292
The UGPS system uses advanced signal processing techniques and can work even with rather weak signals, but an RSSI of -125 dBm or so (in the units of version 3.3.0 or later of the software; -45 dBnW in the units of earlier software versions) is around the lowest possible for an NSD of roughly -100 dBm.
9393

0 commit comments

Comments
 (0)