Changeset 215 in flair-src

Timestamp:

Feb 8, 2018, 5:51:13 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

pressure sensor

Location:

trunk/lib

Files:

• FlairMeta/src/Uav.cpp (modified) (6 diffs)
• FlairMeta/src/Uav.h (modified) (4 diffs)
• FlairSensorActuator/src/PressureSensor.cpp (added)
• FlairSensorActuator/src/PressureSensor.h (added)

trunk/lib/FlairMeta/src/Uav.cpp

@@ -27 +27 @@
 #include <UsRangeFinder.h>
 #include <NmeaGps.h>
+#include <PressureSensor.h>
 #include <Bldc.h>
 #include <Matrix.h>
@@ -59 +60 @@
   horizontalCamera = NULL;
   gps = NULL;
+  pressureSensor = NULL;
   this->multiplex = multiplex;
 }
@@ -77 +79 @@
 }
 
-void Uav::SetBldc(const Bldc *inBldc) { bldc = (Bldc *)inBldc; }
+void Uav::SetBldc(const Bldc *inBldc) { 
+  bldc = (Bldc *)inBldc;
+}
 
 void Uav::SetBatteryMonitor(const BatteryMonitor *inBattery) {
@@ -96 +100 @@
 }
 
+void Uav::SetPressureSensor(const PressureSensor *inPressureSensor) {
+  pressureSensor=(PressureSensor *)inPressureSensor;
+  getFrameworkManager()->AddDeviceToLog(pressureSensor);
+}
+
 void Uav::SetGps(const NmeaGps *inGps) {
-  gps=(NmeaGps*)inGps;
+  gps=(NmeaGps *)inGps;
   getFrameworkManager()->AddDeviceToLog(gps);
 }
@@ -157 +166 @@
   ahrs->UseDefaultPlot();
   if(gps!=NULL) gps->UseDefaultPlot();
+  if(pressureSensor!=NULL) pressureSensor->UseDefaultPlot();
 }
 
@@ -179 +189 @@
 NmeaGps *Uav::GetGps(void) const { return gps; }
 
+PressureSensor *Uav::GetPressureSensor(void) const { return pressureSensor; }
+
 } // end namespace meta
 } // end namespace flair

trunk/lib/FlairMeta/src/Uav.h

@@ -31 +31 @@
                 class Camera;
                 class NmeaGps;
+                class PressureSensor;
         }
 }
@@ -64 +65 @@
   sensor::Camera *GetHorizontalCamera(void) const;
   sensor::NmeaGps *GetGps(void) const;
+  sensor::PressureSensor *GetPressureSensor(void) const;
         virtual std::string GetDefaultVrpnAddress(void) const{return "127.0.0.1:3883";}
   virtual bool isReadyToFly(void) const { return true;}
@@ -77 +79 @@
   void SetHorizontalCamera(const sensor::Camera *verticalCamera);
   void SetGps(const sensor::NmeaGps *gps);
+  void SetPressureSensor(const sensor::PressureSensor *pressureSensor);
 
 private:
@@ -88 +91 @@
   sensor::BatteryMonitor *battery;
   sensor::Camera *verticalCamera,*horizontalCamera;
+  sensor::PressureSensor *pressureSensor;
 };