Changeset 185 in flair-src for trunk/demos


Ignore:
Timestamp:
Jun 14, 2017, 11:46:03 AM (4 years ago)
Author:
Sanahuja Guillaume
Message:

modifs gps

Location:
trunk/demos/Gps
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/Gps/simulator/CMakeLists.txt

    r89 r185  
    55SET(FLAIR_USE_SIMULATOR TRUE)
    66SET(FLAIR_USE_SIMULATOR_GL TRUE)
    7 SET(FLAIR_USE_GPS TRUE)
    87
    98include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     
    2322)
    2423
    25 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
     24TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT} nmea)
    2625
    2726#non real time executable
     
    3029)
    3130
    32 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     31TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT} nmea)
  • trunk/demos/Gps/uav/CMakeLists.txt

    r123 r185  
    77SET(FLAIR_USE_VISION_FILTER TRUE)
    88SET(FLAIR_USE_META TRUE)
    9 SET(FLAIR_USE_GPS TRUE)
    10 
    119
    1210include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
  • trunk/demos/Gps/uav/src/DemoGps.cpp

    r167 r185  
    4646  stopCircle = new PushButton(GetButtonsLayout()->LastRowLastCol(), "stop_circle");
    4747
    48   // RTDM_SerialPort *serialport=new RTDM_SerialPort(getFrameworkManager(),"gps_serial","rtser2");
    49   // gps=new Mb800("gps",serialport,(NmeaGps::NMEAFlags_t)(NmeaGps::GGA|NmeaGps::VTG),40);
    50   gps = new SimuGps("gps", (NmeaGps::NMEAFlags_t)(NmeaGps::GGA | NmeaGps::VTG), 0,0, 40);
    51 
    52   gps->UseDefaultPlot();
    53   getFrameworkManager()->AddDeviceToLog(gps);
    54   gps->Start();
    55 
    56   circle = new TrajectoryGenerator2DCircle(gps->GetLayout()->NewRow(), "circle");
     48  circle = new TrajectoryGenerator2DCircle(uav->GetGps()->GetLayout()->NewRow(), "circle");
    5749  // todo: add graphs in gps plot
    5850  /*
  • trunk/demos/Gps/uav/src/DemoGps.h

    r167 r185  
    2626    namespace sensor {
    2727        class TargetController;
    28         class Mb800;
    29         class SimuGps;
    3028    }
    3129}
     
    6361        flair::filter::TrajectoryGenerator2DCircle *circle;
    6462        flair::core::AhrsData *customReferenceOrientation,*customOrientation;
    65         //flair::sensor::Mb800 *gps;
    66         flair::sensor::SimuGps *gps;
    6763};
    6864
  • trunk/demos/Gps/uav/src/main.cpp

    r137 r185  
    4545    manager->SetupLogger(log_path);
    4646
    47     Uav* drone=CreateUav(name,uav_type);
     47    Uav* drone=CreateUav(name,uav_type,"use_gps=true");
    4848    TargetEthController *controller=new TargetEthController("Dualshock3",ds3port);
    4949    DemoGps* demo=new DemoGps(controller);
Note: See TracChangeset for help on using the changeset viewer.