Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .devcontainer/nouveau/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
},
"customizations": {
"vscode": {
"settings": {
"python.autoComplete.extraPaths": ["${workspaceFolder}/install/"],
"python.analysis.extraPaths": ["${workspaceFolder}/install/"]
},
"extensions": [
"ms-azuretools.vscode-docker",
"ms-python.python",
Expand Down
4 changes: 4 additions & 0 deletions .devcontainer/nvidia/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
},
"customizations": {
"vscode": {
"settings": {
"python.autoComplete.extraPaths": ["${workspaceFolder}/install/"],
"python.analysis.extraPaths": ["${workspaceFolder}/install/"]
},
"extensions": [
"ms-azuretools.vscode-docker",
"ms-python.python",
Expand Down
4 changes: 4 additions & 0 deletions .devcontainer/robot/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
"containerEnv": {},
"customizations": {
"vscode": {
"settings": {
"python.autoComplete.extraPaths": ["${workspaceFolder}/install/"],
"python.analysis.extraPaths": ["${workspaceFolder}/install/"]
},
"extensions": [
"ms-azuretools.vscode-docker",
"ms-python.python",
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/documentation.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Documentation Improvement
description: Report an issue related to the BlueROV2 driver documentation.
description: Report an issue related to the Blue documentation.
title: "[DOC]: <Please write a descriptive title after the '[DOC]: ' prefix>"
labels: [documentation, needs triage]

Expand All @@ -16,9 +16,9 @@ body:
label: Documentation Change Type
description: Please indicate what type of documentation issue you are reporting.
options:
- Adding new documentation to the BlueROV2 driver documentation
- Changing existing BlueROV2 driver documentation
- Removing existing BlueROV2 driver documentation
- Adding new documentation to the Blue documentation
- Changing existing documentation
- Removing existing documentation
validations:
required: true

Expand Down
13 changes: 11 additions & 2 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pull_request_rules:
- name: backport to iron at reviewers discretion
- name: backport to iron at reviewers' discretion
conditions:
- base=main
- "label=backport-iron"
Expand All @@ -8,7 +8,7 @@ pull_request_rules:
branches:
- iron

- name: backport to humble at reviewers discretion
- name: backport to humble at reviewers' discretion
conditions:
- base=main
- "label=backport-humble"
Expand All @@ -17,6 +17,15 @@ pull_request_rules:
branches:
- humble

- name: backport to jazzy at reviewers' discretion
conditions:
- base=main
- "label=backport-jazzy"
actions:
backport:
branches:
- jazzy

- name: ask to resolve conflict
conditions:
- conflict
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- main
- 33-feature-ros2-control
pull_request:
paths:
- docs/**
Expand Down
7 changes: 1 addition & 6 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
"configurations": [
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/**",
"/opt/ros/iron/include/**",
"/usr/include/eigen3/**",
"/home/ros/ws_ros/**"
],
"includePath": ["${workspaceFolder}/**", "/opt/ros/rolling/include/**"],
"defines": [],
"compilerPath": "/usr/bin/gcc",
"cStandard": "c99",
Expand Down
6 changes: 2 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@
"autoDocstring.docstringFormat": "google-notypes",
"python.autoComplete.extraPaths": [
"/opt/ros/iron/lib/python3.10/site-packages/",
"/opt/ros/iron/local/lib/python3.10/dist-packages/",
"${workspaceFolder}/install/"
"/opt/ros/iron/local/lib/python3.10/dist-packages/"
],
"python.analysis.extraPaths": [
"/opt/ros/iron/lib/python3.10/site-packages/",
"/opt/ros/iron/local/lib/python3.10/dist-packages/",
"${workspaceFolder}/install/"
"/opt/ros/iron/local/lib/python3.10/dist-packages/"
],
"[python]": {
"editor.tabSize": 4,
Expand Down