From e201235ec0e17f65f10e34aa94650af8c6c2ddd7 Mon Sep 17 00:00:00 2001 From: Brady Moon Date: Thu, 4 Apr 2024 14:10:39 -0400 Subject: [PATCH 1/2] Remove unused variables --- src/trochoids.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/trochoids.cpp b/src/trochoids.cpp index 9863fc5..29644b6 100755 --- a/src/trochoids.cpp +++ b/src/trochoids.cpp @@ -483,8 +483,6 @@ Path trochoids::Trochoid::getTrochoid(double waypoint_distance) continue; } - double xt1dot = v*cos(del1*w*t1_ + phi1) + vw; - double yt1dot = v*sin(del1*w*t1_ + phi1); double xt2dot = v*cos(del2*w*t2 + phi2) + vw; double yt2dot = v*sin(del2*w*t2 + phi2); From 89c8d84b93f15a8824fac85ac417611f6ca88bf5 Mon Sep 17 00:00:00 2001 From: Brady Moon Date: Thu, 4 Apr 2024 14:21:58 -0400 Subject: [PATCH 2/2] Update docker to use noetic --- .github/workflows/ci-tests.yml | 6 +++--- Docker/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 6daa9b4..6f5dd6f 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -39,7 +39,7 @@ jobs: - name: Run benchmark shell: bash run: | - source /opt/ros/melodic/setup.bash + source /opt/ros/noetic/setup.bash source ws/devel/setup.bash ./ws/devel/lib/trochoids/trochoids-benchmark --benchmark_format=json | tee benchmark_result.json git config --global user.name "Github Action" @@ -76,7 +76,7 @@ jobs: - name: Run unit tests shell: bash run: | - source /opt/ros/melodic/setup.bash + source /opt/ros/noetic/setup.bash source ws/devel/setup.bash ./ws/devel/lib/trochoids/trochoids-test @@ -118,7 +118,7 @@ jobs: # - name: Run benchmark # shell: bash # run: | -# source /opt/ros/melodic/setup.bash +# source /opt/ros/noetic/setup.bash # source ws/devel/setup.bash # roscore & # sleep 3 diff --git a/Docker/Dockerfile b/Docker/Dockerfile index d45b743..dfae256 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ros:melodic +FROM ros:noetic WORKDIR /ws/src