Changeset 122 in flair-src for trunk/lib/FlairMeta/src/UavStateMachine.cpp

Timestamp:

01/06/17 13:56:26 (7 years ago)

Author:

Sanahuja Guillaume

Message:

modifs uav vrpn i686

File:

• trunk/lib/FlairMeta/src/UavStateMachine.cpp (modified) (2 diffs)

trunk/lib/FlairMeta/src/UavStateMachine.cpp

@@ -52 +52 @@
 using namespace flair::meta;
 
-UavStateMachine::UavStateMachine(Uav* inUav,TargetController *controller):
+UavStateMachine::UavStateMachine(TargetController *controller):
         Thread(getFrameworkManager(),"UavStateMachine",50),
-        uav(inUav),controller(controller),failSafeMode(true),flagConnectionLost(false),flagBatteryLow(false),flagCriticalSensorLost(false),flagZTrajectoryFinished(false),safeToFly(true){
+        uav(GetUav()),controller(controller),failSafeMode(true),flagConnectionLost(false),flagBatteryLow(false),flagCriticalSensorLost(false),flagZTrajectoryFinished(false),safeToFly(true){
     altitudeState=AltitudeState_t::Stopped;
     uav->UseDefaultPlot();
@@ -135 +135 @@
   return currentAngularSpeed;
 }
-
-const Uav *UavStateMachine::GetUav(void) const { return uav; }
 
 void UavStateMachine::AltitudeValues(float &altitude,