Changeset 55 in flair-dev for trunk


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

modifs gps

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/cmake-modules/FlairUseFile.cmake

    r49 r55  
    7474IF (FLAIR_USE_SENSOR_ACTUATOR)
    7575        SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} ${FLAIR_DEV}/include/FlairSensorActuator)
    76         SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSensorActuator.a ${FLAIR_LIBRARIES})
     76        SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSensorActuator.a nmea ${FLAIR_LIBRARIES})
    7777ENDIF (FLAIR_USE_SENSOR_ACTUATOR)
    7878
  • trunk/include/FlairMeta/Uav.h

    r50 r55  
    3030                class Imu;
    3131                class Camera;
     32                class NmeaGps;
    3233        }
    3334}
     
    6263  sensor::Camera *GetVerticalCamera(void) const;
    6364  sensor::Camera *GetHorizontalCamera(void) const;
     65  sensor::NmeaGps *GetGps(void) const;
    6466        virtual std::string GetDefaultVrpnAddress(void) const{return "127.0.0.1:3883";}
    6567  virtual bool isReadyToFly(void) const { return true;}
     
    7476  void SetVerticalCamera(const sensor::Camera *verticalCamera);
    7577  void SetHorizontalCamera(const sensor::Camera *verticalCamera);
     78  void SetGps(const sensor::NmeaGps *gps);
    7679
    7780private:
    7881  sensor::Imu *imu;
     82  sensor::NmeaGps *gps;
    7983  filter::Ahrs *ahrs;
    8084  actuator::Bldc *bldc;
Note: See TracChangeset for help on using the changeset viewer.