Skip to content
This repository was archived by the owner on Sep 4, 2022. It is now read-only.

Ros melodic upgrade #133

Open
sajidanower23 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Ros melodic upgrade #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38fe5af
Misc melodic changes
BLUEsatWebDev Feb 16, 2019
d00d6de
Remove explicit type signature
BLUEsatWebDev Feb 16, 2019
50e0978
Move from qt4 to qt5
BLUEsatWebDev Feb 16, 2019
c57cbec
Merge branch 'master' of https://github.com/bluesat/owr_software into…
BLUEsatWebDev Feb 16, 2019
6169b9e
s/melodic/kinetic
sajidanower23 Feb 16, 2019
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: 2 additions & 2 deletions rover/src/.idea/src.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rover/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/opt/ros/kinetic/share/catkin/cmake/toplevel.cmake
/opt/ros/melodic/share/catkin/cmake/toplevel.cmake
2 changes: 1 addition & 1 deletion rover/src/owr_drive_controls/src/JointSpeedBasedPositionController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ JointSpeedBasedPositionController::JointSpeedBasedPositionController(double radi
int JointSpeedBasedPositionController::posToPWM(double futurePos, double currentPos, double updateFrequency) {

//check for infinity - we should stop
if(std::isinf<double>(currentPos)) {
if(std::isinf(currentPos)) {
ROS_ERROR("Current Position is infinity!");
return deltaPWM/2 + minPWM;
}
Expand Down