Changeset 342 in flair-src for trunk/demos/CircleFollower/uav/src

Timestamp:

Nov 28, 2019, 5:42:51 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

up

Location:

trunk/demos/CircleFollower/uav/src

Files:

• CircleFollower.cpp (modified) (2 diffs)
• CircleFollower.h (modified) (1 diff)

trunk/demos/CircleFollower/uav/src/CircleFollower.cpp

@@ -54 +54 @@
     
     getFrameworkManager()->AddDeviceToLog(uavVrpn);
+    getFrameworkManager()->AddDeviceToLog(targetVrpn);
+    vrpnclient->Start();
+    
     uav->GetAhrs()->YawPlot()->AddCurve(uavVrpn->State()->Element(2),DataPlot::Green);
                                                                                                                                  
@@ -59 +62 @@
     stopCircle=new PushButton(GetButtonsLayout()->LastRowLastCol(),"stop_circle");
     positionHold=new PushButton(GetButtonsLayout()->LastRowLastCol(),"position hold");
-    
-    vrpnclient->Start();
-
-    getFrameworkManager()->AddDeviceToLog(targetVrpn);
 
     circle=new TrajectoryGenerator2DCircle(vrpnclient->GetLayout()->NewRow(),"circle");

trunk/demos/CircleFollower/uav/src/CircleFollower.h

@@ -23 +23 @@
     namespace filter {
         class TrajectoryGenerator2DCircle;
-        class CvtColor;
     }
     namespace meta {