Merge pull request #121 from dpattison3/master

build dependencies - cleared unused waypoints - removed old debug couts
RoboJackets · Oct 17, 2016 · d479433 · d479433
2 parents e9b0207 + df02ff5
commit d479433
Show file tree

Hide file tree

Showing 20 changed files with 16 additions and 16 deletions.
diff --git a/igvc/src/ardupilot/CMakeLists.txt b/igvc/src/ardupilot/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(ardupilot ardupilot.cpp)
+add_dependencies(ardupilot igvc_msgs_gencpp)
 target_link_libraries(ardupilot ${catkin_LIBRARIES} SerialPort)
diff --git a/igvc/src/joystick_driver/CMakeLists.txt b/igvc/src/joystick_driver/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(joystick_driver joystick_driver.cpp)
+add_dependencies(joystick_driver igvc_msgs_gencpp)
 target_link_libraries(joystick_driver ${catkin_LIBRARIES})
diff --git a/igvc/src/light_controller/CMakeLists.txt b/igvc/src/light_controller/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(light_controller main.cpp)
+add_dependencies(light_controller igvc_msgs_gencpp)
 target_link_libraries(light_controller ${catkin_LIBRARIES} SerialPort)
diff --git a/igvc/src/line_detector/CMakeLists.txt b/igvc/src/line_detector/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(linedetector main.cpp linedetector.cpp)
+add_dependencies(linedetector igvc_msgs_gencpp)
 target_link_libraries(linedetector ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
diff --git a/igvc/src/local_mapper/CMakeLists.txt b/igvc/src/local_mapper/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(local_mapper main.cpp)
+add_dependencies(local_mapper igvc_msgs_gencpp)
 target_link_libraries(local_mapper ${catkin_LIBRARIES} ${PCL_LIBRARIES})
diff --git a/igvc/src/mapper/CMakeLists.txt b/igvc/src/mapper/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(mapper main.cpp)
+add_dependencies(mapper igvc_msgs_gencpp)
 target_link_libraries(mapper ${catkin_LIBRARIES} ${PCL_LIBRARIES})
diff --git a/igvc/src/motor_controller/CMakeLists.txt b/igvc/src/motor_controller/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(motor_controller main.cpp)
+add_dependencies(motor_controller igvc_msgs_gencpp)
 target_link_libraries(motor_controller ${catkin_LIBRARIES} SerialPort)
diff --git a/igvc/src/odometer/CMakeLists.txt b/igvc/src/odometer/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(odometer main.cpp)
+add_dependencies(odometer igvc_msgs_gencpp)
 target_link_libraries(odometer ${catkin_LIBRARIES})
diff --git a/igvc/src/path_follower/CMakeLists.txt b/igvc/src/path_follower/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(path_follower main.cpp)
+add_dependencies(path_follower igvc_msgs_gencpp)
 target_link_libraries(path_follower ${catkin_LIBRARIES})
diff --git a/igvc/src/pathplanner/CMakeLists.txt b/igvc/src/pathplanner/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(pathplanner main.cpp igvcsearchproblem.cpp searchlocation.cpp searchmove.cpp)
+add_dependencies(pathplanner igvc_msgs_gencpp)
 target_link_libraries(pathplanner ${catkin_LIBRARIES} ${PCL_LIBRARIES})
diff --git a/igvc/src/pathplanner/main.cpp b/igvc/src/pathplanner/main.cpp
@@ -31,14 +31,12 @@ bool received_waypoint = false;
 void map_callback(const pcl::PointCloud<pcl::PointXYZ>::ConstPtr &msg)
 {
     lock_guard<mutex> lock(planning_mutex);
-    cout << "Map received." << endl;
     *search_problem.Map = *msg;
 }
 
 void position_callback(const geometry_msgs::PoseStampedConstPtr& msg)
 {
     lock_guard<mutex> lock(planning_mutex);
-    cout << "Position received." << endl;
     search_problem.Start.x = msg->pose.position.x;
     search_problem.Start.y = msg->pose.position.y;
     tf::Quaternion q;
@@ -113,8 +111,6 @@ int main(int argc, char** argv)
          * Long paths take forever to compute, and will freeze up this node.
          */
         auto distance_to_goal = search_problem.Start.distTo(search_problem.Goal);
-        cerr<<"dist: "<<distance_to_goal<<endl<<"waypoint: "<<received_waypoint<<endl;
-        cerr<<"num pub: "<<disp_path_pub.getNumSubscribers()<<endl;
         if(!received_waypoint || distance_to_goal == 0 || distance_to_goal > 60)
             continue;
 

diff --git a/igvc/src/pidtester/CMakeLists.txt b/igvc/src/pidtester/CMakeLists.txt
@@ -1,5 +1,7 @@
 add_executable(pidtester main.cpp)
+add_dependencies(pidtester igvc_msgs_gencpp)
 target_link_libraries(pidtester ${catkin_LIBRARIES})
 
 add_executable(encrecord encrecord.cpp)
+add_dependencies(encrecord igvc_msgs_gencpp)
 target_link_libraries(encrecord ${catkin_LIBRARIES})
diff --git a/igvc/src/pose_tracker/CMakeLists.txt b/igvc/src/pose_tracker/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(pose_tracker main.cpp)
+add_dependencies(pose_tracker igvc_msgs_gencpp)
 target_link_libraries(pose_tracker ${catkin_LIBRARIES})
diff --git a/igvc/src/pothole_detector/CMakeLists.txt b/igvc/src/pothole_detector/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(potholedetector main.cpp potholedetector.cpp)
+add_dependencies(potholedetector igvc_msgs_gencpp)
 target_link_libraries(potholedetector ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
diff --git a/igvc/src/scan_to_pointcloud/CMakeLists.txt b/igvc/src/scan_to_pointcloud/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(scan_to_pointcloud main.cpp)
+add_dependencies(scan_to_pointcloud igvc_msgs_gencpp)
 target_link_libraries(scan_to_pointcloud ${catkin_LIBRARIES} ${PCL_LIBRARIES})
diff --git a/igvc/src/waypoint_source/CMakeLists.txt b/igvc/src/waypoint_source/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_executable(waypoint_source main.cpp)
+add_dependencies(waypoint_source igvc_msgs_gencpp)
 target_link_libraries(waypoint_source ${catkin_LIBRARIES})
diff --git a/sandbox/basic_waypoints.csv b/sandbox/basic_waypoints.csv
diff --git a/sandbox/practice_waypoints.csv b/sandbox/practice_waypoints.csv
diff --git a/sandbox/qualification_waypoints.csv b/sandbox/qualification_waypoints.csv
diff --git a/sandbox/test_waypoints.csv b/sandbox/test_waypoints.csv