Skip to content

Commit

Permalink
Fixed ci and updated readme
Browse files Browse the repository at this point in the history
  • Loading branch information
evan-palmer committed Sep 23, 2024
1 parent 847dca8 commit adaa8aa
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ROS_DISTRO=rolling
ARG ROS_DISTRO=jazzy
FROM ros:$ROS_DISTRO-ros-base

ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fail-fast: false
matrix:
env:
- ROS_DISTRO: rolling
- ROS_DISTRO: jazzy
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Linux",
"includePath": [
"${workspaceFolder}/**",
"/opt/ros/rolling/include/**",
"/opt/ros/jazzy/include/**",
"/usr/include/eigen3/**",
"/home/${USER}/ws_ros/install/**"
],
Expand Down
10 changes: 5 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
"autoDocstring.startOnNewLine": false,
"autoDocstring.docstringFormat": "google-notypes",
"python.autoComplete.extraPaths": [
"/opt/ros/rolling/lib/python3.12/site-packages/",
"/opt/ros/rolling/local/lib/python3.12/dist-packages/",
"/opt/ros/jazzy/lib/python3.12/site-packages/",
"/opt/ros/jazzy/local/lib/python3.12/dist-packages/",
"${workspaceFolder}/install/"
],
"python.analysis.extraPaths": [
"/opt/ros/rolling/lib/python3.12/site-packages/",
"/opt/ros/rolling/local/lib/python3.12/dist-packages/",
"/opt/ros/jazzy/lib/python3.12/site-packages/",
"/opt/ros/jazzy/local/lib/python3.12/dist-packages/",
"${workspaceFolder}/install/"
],
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/waterlinked_dvl/bin/python",
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/auv_controllers/bin/python",
"C_Cpp.default.intelliSenseMode": "linux-gcc-x86",
"C_Cpp.clang_format_fallbackStyle": "Google",
"C_Cpp.codeAnalysis.clangTidy.enabled": true,
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ benchmarking against other commonly-used control algorithms.
## Installation

auv_controllers is currently supported on Linux and is available for the ROS 2
Iron distribution. To install auv_controllers, first clone this project to the
`src` directory of your ROS workspace:
Rolling, Jazzy, Iron and Humble distributions. To install auv_controllers,
first clone this project to the `src` directory of your ROS workspace:

```bash
git clone git@github.com:Robotic-Decision-Making-Lab/auv_controllers.git
Expand Down

0 comments on commit adaa8aa

Please sign in to comment.