Changeset 236 in flair-src for trunk/demos/PidStandalone/uav/src

Timestamp:

04/12/18 16:52:46 (6 years ago)

Author:

Sanahuja Guillaume

Message:

change build directories for new architecture

Location:

trunk/demos/PidStandalone/uav/src

Files:

• PidUav.cpp (modified) (3 diffs)
• main.cpp (modified) (1 diff)

trunk/demos/PidStandalone/uav/src/PidUav.cpp

@@ -43 +43 @@
 PidUav::PidUav(Uav *uav, TargetController *controller)
     : behaviourMode(BehaviourMode_t::Default),
-      UavStateMachine(uav, controller) {
+      UavStateMachine(controller) {
   my_uRoll = new Pid(setupLawTab->At(1, 1), "custom uRoll");
   my_uRoll->UseDefaultPlot(graphLawTab->LastRowLastCol());
@@ -107 +107 @@
   const AhrsData *refOrientation = GetDefaultReferenceOrientation();
   Quaternion refQuaternion;
-  Vector3D refAngularRates;
+  Vector3Df refAngularRates;
   refOrientation->GetQuaternionAndAngularRates(refQuaternion, refAngularRates);
   Euler refAngles = refQuaternion.ToEuler();
@@ -113 +113 @@
   const AhrsData *currentOrientation = GetDefaultOrientation();
   Quaternion currentQuaternion;
-  Vector3D currentAngularRates;
+  Vector3Df currentAngularRates;
   currentOrientation->GetQuaternionAndAngularRates(currentQuaternion,
                                                    currentAngularRates);

trunk/demos/PidStandalone/uav/src/main.cpp

@@ -48 +48 @@
   manager->SetupLogger(log_path);
 
-  Uav *drone = CreateUav(manager, name, uav_type);
+  Uav *drone = CreateUav(name, uav_type);
   TargetEthController *controller =
-      new TargetEthController(manager, "Dualshock3", 20000);
+      new TargetEthController("Dualshock3", 20000);
   // EmulatedController *controller=new EmulatedController(manager,"Emulated
   // Controller");