Changeset 176 in flair-src for trunk

Timestamp:

Apr 27, 2017, 5:37:41 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

résolution https://devel.hds.utc.fr/software/flair/ticket/18

Location:

trunk

Files:

• ReleaseNotes (modified) (1 diff)
• lib/FlairMeta/src/UavStateMachine.cpp (modified) (1 diff)

trunk/ReleaseNotes

@@ -1 +1 @@
 * Actual Version:
 
+- resolved https://devel.hds.utc.fr/software/flair/ticket/18
 - Vector2D and Vector3D are now templates. Replace all Vector2D to Vector2Df and Vector3D to Vector3Df to keep compatibility.
 - resolved https://devel.hds.utc.fr/software/flair/ticket/17

trunk/lib/FlairMeta/src/UavStateMachine.cpp

@@ -720 +720 @@
   }
   altitudeMode = newAltitudeMode;
-  GotoAltitude(desiredTakeoffAltitude->Value());
+  //avoid starting trajectory at take off (it will be started when altitudeState==AltitudeState_t::Stabilized)
+  if(altitudeState!=AltitudeState_t::Stopped) GotoAltitude(desiredTakeoffAltitude->Value());
 
   return true;