Changeset 236 in flair-src for trunk


Ignore:
Timestamp:
Apr 12, 2018, 4:52:46 PM (7 years ago)
Author:
Sanahuja Guillaume
Message:

change build directories for new architecture

Location:
trunk/demos
Files:
109 added
20 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/demos/PidStandalone/simulator/src/main.cpp

    r105 r236  
    1818#include <SimuImu.h>
    1919#ifdef GL
    20 #include <SimuCameraGL.h>
    2120#include <Parser.h>
    2221#include <SimuUsGL.h>
    … …  
    9796#ifdef GL
    9897    SimuUsGL* us_gl;
    99 
    100     SimuCameraGL *cam_bas;
    10198    Parser *gui;
    10299#endif
    … …  
    108105
    109106#ifdef GL
    110     gui=new Parser(simu,960,480,640,480,media_path,scene_file);
     107    gui=new Parser(1024, 768, 1024, 768,media_path,scene_file);
    111108#endif
    112109
    113110    if(type=="x4")
    114111    {
    115         drone=new X4(simu,name,0);
     112        drone=new X4(name,0);
    116113    }
    117114    else
    118115    {
    119         drone=new X8(simu,name,0);
     116        drone=new X8(name,0);
    120117    }
    121     imu=new SimuImu(drone,"imu",0);
     118    imu=new SimuImu(drone,"imu",0,0);
    122119
    123120#ifdef GL
    124     us_gl=new SimuUsGL(drone,"us",0);
    125     cam_bas=new SimuCameraGL(drone,"bottom camera",320,240,640,0,0);
     121    us_gl=new SimuUsGL(drone,"us",0,0);
    126122#endif
    127123

  • trunk/demos/PidStandalone/uav/CMakeLists.txt

    r105 r236  
    55SET(FLAIR_USE_FILTER TRUE)
    66SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     7SET(FLAIR_USE_VISION_FILTER TRUE)
    78SET(FLAIR_USE_META TRUE)
    8 SET(FLAIR_USE_VRPN TRUE)
    99
    1010include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)

  • 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.