Skip to content

Commit

Permalink
Updated Docker to use Humble and resolved mismatched function signature
Browse files Browse the repository at this point in the history
  • Loading branch information
evan-palmer committed Jun 25, 2024
1 parent b0dcf4c commit 35b7fa3
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/nouveau/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/robotic-decision-making-lab/auv_controllers:iron-desktop
FROM ghcr.io/robotic-decision-making-lab/auv_controllers:humble-desktop

# Install ROS dependencies
# This is done in a previous stage, but we include it again here in case anyone wants to
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/nvidia/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/robotic-decision-making-lab/auv_controllers:iron-desktop-nvidia
FROM ghcr.io/robotic-decision-making-lab/auv_controllers:humble-desktop-nvidia

# Install ROS dependencies
# This is done in a previous stage, but we include it again here in case anyone wants to
Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ROS_DISTRO=iron
ARG ROS_DISTRO=humble
FROM ros:$ROS_DISTRO-ros-base as ci

ENV DEBIAN_FRONTEND=noninteractive
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
fail-fast: false
matrix:
env:
- IMAGE: iron-ci
ROS_DISTRO: iron
- IMAGE: humble-ci
ROS_DISTRO: humble
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [iron]
ROS_DISTRO: [humble]
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [iron]
ROS_DISTRO: [humble]
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [iron]
ROS_DISTRO: [humble]
runs-on: ubuntu-latest
permissions:
packages: write
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/iron/include/**",
"/opt/ros/humble/include/**",
"/usr/include/eigen3/**",
"/home/ros/ws_ros/**"
],
Expand Down
8 changes: 4 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"autoDocstring.startOnNewLine": false,
"autoDocstring.docstringFormat": "google-notypes",
"python.autoComplete.extraPaths": [
"/opt/ros/iron/lib/python3.10/site-packages/",
"/opt/ros/iron/local/lib/python3.10/dist-packages/",
"/opt/ros/humble/lib/python3.10/site-packages/",
"/opt/ros/humble/local/lib/python3.10/dist-packages/",
"${workspaceFolder}/install/"
],
"python.analysis.extraPaths": [
"/opt/ros/iron/lib/python3.10/site-packages/",
"/opt/ros/iron/local/lib/python3.10/dist-packages/",
"/opt/ros/humble/lib/python3.10/site-packages/",
"/opt/ros/humble/local/lib/python3.10/dist-packages/",
"${workspaceFolder}/install/"
],
"C_Cpp.default.intelliSenseMode": "linux-gcc-x86",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ class PolynomialThrustCurveController : public controller_interface::ChainableCo
protected:
std::vector<hardware_interface::CommandInterface> on_export_reference_interfaces() override;

controller_interface::return_type update_reference_from_subscribers(
const rclcpp::Time & time, const rclcpp::Duration & period) override;
controller_interface::return_type update_reference_from_subscribers() override;

void update_parameters();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,7 @@ std::vector<hardware_interface::CommandInterface> PolynomialThrustCurveControlle
return reference_interfaces;
}

controller_interface::return_type PolynomialThrustCurveController::update_reference_from_subscribers(
const rclcpp::Time & /*time*/, const rclcpp::Duration & /*period*/)
controller_interface::return_type PolynomialThrustCurveController::update_reference_from_subscribers()
{
auto * current_reference = reference_.readFromNonRT();
reference_interfaces_[0] = (*current_reference)->data;
Expand Down

0 comments on commit 35b7fa3

Please sign in to comment.