Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CMakeLists.txt
!software_training_assignment/CMakeLists.txt
!software_training_assignment/CMakeLists.txt
/ros_notes
8 changes: 4 additions & 4 deletions software_training_assignment/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ The main client for the node
//Class for determining the distances between the turtles
class turtleDistance{
public:
int xd;
int yd;
int distance;
int xd;
int yd;
int distance;
turtleDistance(int t1_x, int t1_y, int t2_x, int t2_y){
xd = t1_x - t2_x;
yd = t1_y - t2_y;
Expand Down Expand Up @@ -89,7 +89,7 @@ int main(int argc, char **argv) {
turtleDist_pub.publish(turtleDist);

//Creating a Action Client
actionlib::SImpleActionClient<actionlib> ac("moveTurtle", true);
actionlib::SimpleActionClient<actionlib> ac("moveTurtle", true);
ROS_INFO("Waiting for Action Server to start");
ac.waitForServer();
//Define the waypoint for which the turtle should move to
Expand Down
2 changes: 1 addition & 1 deletion software_training_assignment/src/resetTurtle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ int main(int argc, char **argv) {

//Link up the service
ros::ServiceServer resetTurtle = nh.advertiseService(
"resetTurtle", &TurtleReset::resetTurtlePosition, &Turtle);
"resetTurtle", &TurtleReset::resetTurtlePosition, &turtle);

ros::spin(); //Creates a infinite loop for the server

Expand Down