Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused variables #6

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Remove unused variables #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e201235
Remove unused variables
bradygm Apr 4, 2024
89c8d84
Update docker to use noetic
bradygm Apr 4, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/ci-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ros:melodic
FROM ros:noetic

WORKDIR /ws/src

Expand Down
2 changes: 0 additions & 2 deletions src/trochoids.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Loading