Skip to content

Commit 064c426

Browse files
amarburgamarburg
committed
2 parents 5932e10 + 4247e6f commit 064c426

File tree

14 files changed

+67
-54
lines changed

14 files changed

+67
-54
lines changed

‎.devcontainer/nouveau/devcontainer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
},
2323
"customizations": {
2424
"vscode": {
25+
"settings": {
26+
"python.defaultInterpreterPath": "/home/ubuntu/.venv/blue/bin/python",
27+
"python.autoComplete.extraPaths": ["${workspaceFolder}/install/"],
28+
"python.analysis.extraPaths": ["${workspaceFolder}/install/"]
29+
},
2530
"extensions": [
2631
"ms-azuretools.vscode-docker",
2732
"ms-python.python",

‎.devcontainer/nvidia/devcontainer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
},
2727
"customizations": {
2828
"vscode": {
29+
"settings": {
30+
"python.defaultInterpreterPath": "/home/ubuntu/.venv/blue/bin/python",
31+
"python.autoComplete.extraPaths": ["${workspaceFolder}/install/"],
32+
"python.analysis.extraPaths": ["${workspaceFolder}/install/"]
33+
},
2934
"extensions": [
3035
"ms-azuretools.vscode-docker",
3136
"ms-python.python",

‎.devcontainer/robot/devcontainer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
"containerEnv": {},
2424
"customizations": {
2525
"vscode": {
26+
"settings": {
27+
"python.defaultInterpreterPath": "/home/ubuntu/.venv/blue/bin/python",
28+
"python.autoComplete.extraPaths": ["${workspaceFolder}/install/"],
29+
"python.analysis.extraPaths": ["${workspaceFolder}/install/"]
30+
},
2631
"extensions": [
2732
"ms-azuretools.vscode-docker",
2833
"ms-python.python",

‎.docker/Dockerfile

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,27 @@ RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" \
230230
&& colcon build
231231

232232
# Setup the simulation environment variables
233-
RUN echo "source ${USER_WORKSPACE}/src/blue/.docker/entrypoints/sim.sh" >> /home/$USERNAME/.bashrc
233+
RUN <<EOT cat >> /home/$USERNAME/.bashrc
234+
235+
# Add results of ArduSub build
236+
export PATH=\$HOME/ardupilot/build/sitl/bin:\$PATH
237+
238+
# Optional: add autotest to the PATH, helpful for running sim_vehicle.py
239+
export PATH=\$HOME/ardupilot/Tools/autotest:\$PATH
240+
241+
# Add ardupilot_gazebo plugin
242+
export GZ_SIM_SYSTEM_PLUGIN_PATH=\$HOME/ardupilot_gazebo/build:\$GZ_SIM_SYSTEM_PLUGIN_PATH
243+
244+
# Add ardupilot_gazebo models and worlds
245+
export GZ_SIM_RESOURCE_PATH=\$HOME/ardupilot_gazebo/models:\$HOME/ardupilot_gazebo/worlds:\$GZ_SIM_RESOURCE_PATH
246+
247+
# Add blue models and worlds
248+
BLUE_DESCRIPTION=\$USER_WORKSPACE/src/blue/blue_description
249+
export GZ_SIM_RESOURCE_PATH=\$BLUE_DESCRIPTION/gazebo/models:\$BLUE_DESCRIPTION/gazebo/worlds:\$GZ_SIM_RESOURCE_PATH
250+
251+
# Add blue meshes
252+
export GZ_SIM_RESOURCE_PATH=\$BLUE_DESCRIPTION/meshes:\$GZ_SIM_RESOURCE_PATH
253+
EOT
234254

235255
FROM desktop AS desktop-nvidia
236256

@@ -249,6 +269,6 @@ RUN sudo apt-get update \
249269
&& sudo rm -rf /var/lib/apt/lists/*
250270

251271
# Env vars for the nvidia-container-runtime.
252-
ENV NVIDIA_VISIBLE_DEVICES all
253-
ENV NVIDIA_DRIVER_CAPABILITIES graphics,utility,compute
254-
ENV QT_X11_NO_MITSHM 1
272+
ENV NVIDIA_VISIBLE_DEVICES=all
273+
ENV NVIDIA_DRIVER_CAPABILITIES=graphics,utility,compute
274+
ENV QT_X11_NO_MITSHM=1

‎.docker/entrypoints/sim.sh

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

‎.github/ISSUE_TEMPLATE/documentation.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Documentation Improvement
2-
description: Report an issue related to the BlueROV2 driver documentation.
2+
description: Report an issue related to the Blue documentation.
33
title: "[DOC]: <Please write a descriptive title after the '[DOC]: ' prefix>"
44
labels: [documentation, needs triage]
55

@@ -16,9 +16,9 @@ body:
1616
label: Documentation Change Type
1717
description: Please indicate what type of documentation issue you are reporting.
1818
options:
19-
- Adding new documentation to the BlueROV2 driver documentation
20-
- Changing existing BlueROV2 driver documentation
21-
- Removing existing BlueROV2 driver documentation
19+
- Adding new documentation to the Blue documentation
20+
- Changing existing documentation
21+
- Removing existing documentation
2222
validations:
2323
required: true
2424

‎.github/mergify.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pull_request_rules:
2-
- name: backport to iron at reviewers discretion
2+
- name: backport to iron at reviewers' discretion
33
conditions:
44
- base=main
55
- "label=backport-iron"
@@ -8,7 +8,7 @@ pull_request_rules:
88
branches:
99
- iron
1010

11-
- name: backport to humble at reviewers discretion
11+
- name: backport to humble at reviewers' discretion
1212
conditions:
1313
- base=main
1414
- "label=backport-humble"
@@ -17,6 +17,15 @@ pull_request_rules:
1717
branches:
1818
- humble
1919

20+
- name: backport to jazzy at reviewers' discretion
21+
conditions:
22+
- base=main
23+
- "label=backport-jazzy"
24+
actions:
25+
backport:
26+
branches:
27+
- jazzy
28+
2029
- name: ask to resolve conflict
2130
conditions:
2231
- conflict

‎.github/workflows/ci-docs.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
- 33-feature-ros2-control
87
pull_request:
98
paths:
109
- docs/**

‎.github/workflows/docker.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }}
5050
5151
- name: Build and push Docker image
52-
uses: docker/build-push-action@v6.6.1
52+
uses: docker/build-push-action@v6.7.0
5353
with:
5454
context: .
5555
file: .docker/Dockerfile
@@ -96,7 +96,7 @@ jobs:
9696
type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }}
9797
9898
- name: Build and push Docker image
99-
uses: docker/build-push-action@v6.6.1
99+
uses: docker/build-push-action@v6.7.0
100100
with:
101101
context: .
102102
file: .docker/Dockerfile
@@ -139,7 +139,7 @@ jobs:
139139
type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }}
140140
141141
- name: Build and push Docker image
142-
uses: docker/build-push-action@v6.6.1
142+
uses: docker/build-push-action@v6.7.0
143143
with:
144144
context: .
145145
file: .docker/Dockerfile
@@ -180,7 +180,7 @@ jobs:
180180
type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }}
181181
182182
- name: Build and push Docker image
183-
uses: docker/build-push-action@v6.6.1
183+
uses: docker/build-push-action@v6.7.0
184184
with:
185185
context: .
186186
file: .docker/Dockerfile

‎.vscode/c_cpp_properties.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
"configurations": [
33
{
44
"name": "Linux",
5-
"includePath": [
6-
"${workspaceFolder}/**",
7-
"/opt/ros/iron/include/**",
8-
"/usr/include/eigen3/**",
9-
"/home/ros/ws_ros/**"
10-
],
5+
"includePath": ["${workspaceFolder}/**", "/opt/ros/rolling/include/**"],
116
"defines": [],
127
"compilerPath": "/usr/bin/gcc",
138
"cStandard": "c99",

0 commit comments

Comments
 (0)