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


Ignore:
Timestamp:
04/12/18 16:52:46 (4 years ago)
Author:
Sanahuja Guillaume
Message:

change build directories for new architecture

Location:
trunk/demos/PidStandalone/uav/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/PidStandalone/uav/src/PidUav.cpp

    r105 r236  
    4343PidUav::PidUav(Uav *uav, TargetController *controller)
    4444    : behaviourMode(BehaviourMode_t::Default),
    45       UavStateMachine(uav, controller) {
     45      UavStateMachine(controller) {
    4646  my_uRoll = new Pid(setupLawTab->At(1, 1), "custom uRoll");
    4747  my_uRoll->UseDefaultPlot(graphLawTab->LastRowLastCol());
     
    107107  const AhrsData *refOrientation = GetDefaultReferenceOrientation();
    108108  Quaternion refQuaternion;
    109   Vector3D refAngularRates;
     109  Vector3Df refAngularRates;
    110110  refOrientation->GetQuaternionAndAngularRates(refQuaternion, refAngularRates);
    111111  Euler refAngles = refQuaternion.ToEuler();
     
    113113  const AhrsData *currentOrientation = GetDefaultOrientation();
    114114  Quaternion currentQuaternion;
    115   Vector3D currentAngularRates;
     115  Vector3Df currentAngularRates;
    116116  currentOrientation->GetQuaternionAndAngularRates(currentQuaternion,
    117117                                                   currentAngularRates);
  • trunk/demos/PidStandalone/uav/src/main.cpp

    r105 r236  
    4848  manager->SetupLogger(log_path);
    4949
    50   Uav *drone = CreateUav(manager, name, uav_type);
     50  Uav *drone = CreateUav(name, uav_type);
    5151  TargetEthController *controller =
    52       new TargetEthController(manager, "Dualshock3", 20000);
     52      new TargetEthController("Dualshock3", 20000);
    5353  // EmulatedController *controller=new EmulatedController(manager,"Emulated
    5454  // Controller");
Note: See TracChangeset for help on using the changeset viewer.