Skip to content

Commit 16c77c7

Browse files
authored
Merge branch 'main' into jamen/track-global-waypoints
2 parents 4389a3f + bf6ff65 commit 16c77c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3567
-1650
lines changed

.devcontainer/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ services:
55
build:
66
context: .
77
dockerfile: Dockerfile
8+
network_mode: host
9+
privileged: true
810
user: ros
911
ports:
1012
# website

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v4
2525

2626
- name: Run linter
27-
uses: nosborn/github-action-markdown-cli@v3.4.0
27+
uses: nosborn/github-action-markdown-cli@v3.5.0
2828
with:
2929
config_file: .markdownlint.json
3030
files: .

src/custom_interfaces/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ set(common_msg
2727
"msg/SailCmd.msg"
2828
"msg/WindSensor.msg"
2929
"msg/WindSensors.msg"
30+
"msg/TempSensor.msg"
31+
"msg/TempSensors.msg"
32+
"msg/PhSensor.msg"
33+
"msg/PhSensors.msg"
34+
"msg/SalinitySensor.msg"
35+
"msg/SalinitySensors.msg"
36+
"msg/PressureSensor.msg"
37+
"msg/PressureSensors.msg"
3038

3139
# internal
3240
"msg/HelperAISShip.msg"
@@ -37,6 +45,10 @@ set(common_msg
3745
"msg/HelperLatLon.msg"
3846
"msg/HelperROT.msg"
3947
"msg/HelperSpeed.msg"
48+
"msg/HelperTemp.msg"
49+
"msg/HelperPh.msg"
50+
"msg/HelperSalinity.msg"
51+
"msg/HelperPressure.msg"
4052
"msg/HelperObstacle.msg"
4153
)
4254

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# unit : pH
2+
float32 ph
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#unit : PSI
2+
float32 pressure
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# unit : conductivity in microSiemens / cm
2+
float32 salinity
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# unit: degrees Celsius
2+
float32 temp
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
HelperPh ph
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
PhSensor[16] ph_sensors
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
HelperPressure pressure

0 commit comments

Comments
 (0)