Merge pull request #141 from BCLab-UNM/hotfix-reset-manual-waypoints

Hotfix reset manual waypoints

Author: gmfricke

src/behaviours/src/LogicController.cpp

@@ -374,6 +374,7 @@ void LogicController::SetModeAuto() {
   if(processState == PROCESS_STATE_MANUAL) {
     // only do something if we are in manual mode
     this->Reset();
+    manualWaypointController.Reset();
   }
 }
 void LogicController::SetModeManual()

src/behaviours/src/ManualWaypointController.cpp

@@ -9,6 +9,8 @@ ManualWaypointController::~ManualWaypointController() {}
 
 void ManualWaypointController::Reset() {
   waypoints.clear();
+  num_waypoints = 0;
+  cleared_waypoints.clear();
 }
 
 bool ManualWaypointController::HasWork() {

src/rqt_rover_gui/src/MapData.cpp

@@ -422,6 +422,7 @@ void MapData::setAutonomousMode(string rover_name)
 {
    update_mutex.lock();
    rover_mode[rover_name] = 1;
+   resetWaypointPathForSelectedRover(rover_name);
    update_mutex.unlock();
 }