Changeset 180 in flair-src for trunk

Timestamp:

May 31, 2017, 3:53:32 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs gps

Location:

trunk

Files:

• ReleaseNotes (modified) (1 diff)
• lib/FlairCore/src/GpsData.cpp (modified) (9 diffs)
• lib/FlairCore/src/GpsData.h (modified) (4 diffs)
• lib/FlairSensorActuator/src/Mb800.cpp (modified) (1 diff)
• lib/FlairSensorActuator/src/NmeaGps.cpp (modified) (1 diff)
• lib/FlairSensorActuator/src/NmeaGps.h (modified) (1 diff)

trunk/ReleaseNotes

@@ -1 +1 @@
 * Actual Version:
 
+- added GSA nmea sentence
 - resolved https://devel.hds.utc.fr/software/flair/ticket/18
 - Vector2D and Vector3D are now templates. Replace all Vector2D to Vector2Df and Vector3D to Vector3Df to keep compatibility.

trunk/lib/FlairCore/src/GpsData.cpp

@@ -49 +49 @@
     case GpsData::EastVelocity:
     case GpsData::NorthVelocity:
+    case GpsData::Pdop:
+    case GpsData::Hdop:
+    case GpsData::Vdop:
       size=4;
       break;
@@ -62 +65 @@
   void CopyData(char *dst) const {
     double latitude,longitude;
-    float altitude,east,north,up,eastVelocity,northVelocity;
+    float altitude,east,north,up,eastVelocity,northVelocity,pDop,hDop,vDop;
 
     gpsdata->GetLla(latitude,longitude,altitude);
@@ -69 +72 @@
     gpsdata->GetEnu(east,north,up);
     gpsdata->GetVelocity(eastVelocity,northVelocity);
+    gpsdata->GetDop(pDop,hDop,vDop);
 
     switch (plotableData) {
@@ -100 +104 @@
     case GpsData::NorthVelocity:
       memcpy(dst, &northVelocity, sizeof(northVelocity));
+      break;
+    case GpsData::Pdop:
+      memcpy(dst, &pDop, sizeof(pDop));
+      break;
+    case GpsData::Hdop:
+      memcpy(dst, &hDop, sizeof(hDop));
+      break;
+    case GpsData::Vdop:
+      memcpy(dst, &vDop, sizeof(vDop));
       break;
     default:
@@ -119 +132 @@
     case GpsData::EastVelocity:
     case GpsData::NorthVelocity:
+    case GpsData::Pdop:
+    case GpsData::Hdop:
+    case GpsData::Vdop:
       return floatType;
       break;
@@ -150 +166 @@
   AppendLogDescription("east velocity", floatType);
   AppendLogDescription("north velocity", floatType);
+  AppendLogDescription("pdop", floatType);
+  AppendLogDescription("hdop", floatType);
+  AppendLogDescription("vdop", floatType);
 
   numberOfSatellites=0;
@@ -220 +239 @@
 }
 
+void GpsData::GetDop(float &inPdop, float &inHdop,float &inVdop) const {
+  inPdop=pDop;
+  inHdop=hDop;
+  inVdop=vDop;
+}
+
+void GpsData::SetDop(float inPdop, float inHdop,float inVdop) {
+  pDop=inPdop;
+  hDop=inHdop;
+  vDop=inVdop;
+}
+  
 IODataElement *GpsData::Element(PlotableData_t data_type) const {
   string name;
@@ -252 +283 @@
   case GpsData::NorthVelocity:
     name = "NorthVelocity";
+    break;
+  case GpsData::Pdop:
+    name = "Pdop";
+    break;
+  case GpsData::Hdop:
+    name = "Hdop";
+    break;
+  case GpsData::Vdop:
+    name = "Vdop";
     break;
   }
@@ -271 +311 @@
   Queue(&dst, &eastVelocity, sizeof(eastVelocity));
   Queue(&dst, &northVelocity, sizeof(northVelocity));
+  Queue(&dst, &pDop, sizeof(pDop));
+  Queue(&dst, &hDop, sizeof(hDop));
+  Queue(&dst, &vDop, sizeof(vDop));
 
   ReleaseMutex();

trunk/lib/FlairCore/src/GpsData.h

@@ -41 +41 @@
       size += UInt8Type.GetSize(); // FixQuality_t
       size += 5*floatType.GetSize();//e,n,u,ve,vn
+      size += 3*floatType.GetSize();//pdop,hdop,vdop
       return size;
     }
@@ -62 +63 @@
     EastVelocity /*! east velocity*/,
     NorthVelocity /*! north velocity*/,
+    Pdop /* dilution of precision*/,
+    Hdop /* horizontal dilution of precision*/,
+    Vdop /* vertical dilution of precision*/,
   } PlotableData_t;
 
@@ -214 +218 @@
   */
   void SetFixQuality(FixQuality_t fixQuality);
+  
+  /*!
+  * \brief Get dilution of precision
+  *
+  * This method is mutex protected.
+  *
+  * \param pDop dilution of precision
+  * \param hDop horizontal dilution of precision
+  * \param vDop vertical dilution of precision
+  *
+  */
+  void GetDop(float &pDop, float &hDop,float &vDop) const;
+
+  /*!
+  * \brief Set dilution of precision
+  *
+  * This method is mutex protected.
+  *
+  * \param pDop dilution of precision
+  * \param hDop horizontal dilution of precision
+  * \param vDop vertical dilution of precision
+  *
+  */
+  void SetDop(float pDop, float hDop,float vDop);
 
   Type const &GetDataType() const { return dataType; }
@@ -234 +262 @@
   uint8_t numberOfSatellites;
   FixQuality_t fixQuality;
-  float east,north,up,eastVelocity,northVelocity;
+  float east,north,up,eastVelocity,northVelocity,pDop,hDop,vDop;
 };
 

trunk/lib/FlairSensorActuator/src/Mb800.cpp

@@ -92 +92 @@
     }
   }
+  if ((NMEAFlags & GSA) != 0) {
+    char to_send[] = "$PASHS,NME,GSA,A,ON,0.1\r\n";
+    written = serialport->Write(to_send, sizeof(to_send));
+    if (written< 0) {
+      Thread::Err("erreur Write (%s)\n", strerror(-written));
+    }
+  }
 
   Sync();

trunk/lib/FlairSensorActuator/src/NmeaGps.cpp

@@ -233 +233 @@
         gpsData->SetVelocity(info.speed * 1000. / 3600. * sin(Euler::ToRadian(info.direction)),
                                   info.speed * 1000. / 3600. * cos(Euler::ToRadian(info.direction)));
-      }/*
+      }
+      if ((NMEAFlags & GSA) != 0) {
+        gpsData->SetDop(info.PDOP,info.HDOP,info.VDOP);
+      }
+      /*
       if ((NMEAFlags & GST) != 0) {
         // Thread::Printf("dev_lon:%f dev_lat:%f

trunk/lib/FlairSensorActuator/src/NmeaGps.h

@@ -53 +53 @@
     VTG = 0x02, /*!< VTG */
     GST = 0x04, /*!< GST */
+    GSA = 0x08, /*!< GSA */
   };