Changeset 55 in flair-dev for trunk

Timestamp:

Jun 14, 2017, 11:46:16 AM (7 years ago)

Author:

Sanahuja Guillaume

Message:

modifs gps

Location:

trunk

Files:

• cmake-modules/FlairUseFile.cmake (modified) (1 diff)
• include/FlairMeta/Uav.h (modified) (3 diffs)

trunk/cmake-modules/FlairUseFile.cmake

@@ -74 +74 @@
 IF (FLAIR_USE_SENSOR_ACTUATOR)
         SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} ${FLAIR_DEV}/include/FlairSensorActuator)
-        SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSensorActuator.a ${FLAIR_LIBRARIES})
+        SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSensorActuator.a nmea ${FLAIR_LIBRARIES})
 ENDIF (FLAIR_USE_SENSOR_ACTUATOR)
 

trunk/include/FlairMeta/Uav.h

@@ -30 +30 @@
                 class Imu;
                 class Camera;
+                class NmeaGps;
         }
 }
@@ -62 +63 @@
   sensor::Camera *GetVerticalCamera(void) const;
   sensor::Camera *GetHorizontalCamera(void) const;
+  sensor::NmeaGps *GetGps(void) const;
         virtual std::string GetDefaultVrpnAddress(void) const{return "127.0.0.1:3883";}
   virtual bool isReadyToFly(void) const { return true;}
@@ -74 +76 @@
   void SetVerticalCamera(const sensor::Camera *verticalCamera);
   void SetHorizontalCamera(const sensor::Camera *verticalCamera);
+  void SetGps(const sensor::NmeaGps *gps);
 
 private:
   sensor::Imu *imu;
+  sensor::NmeaGps *gps;
   filter::Ahrs *ahrs;
   actuator::Bldc *bldc;