Changeset 118 in pacpussensors

Timestamp:

Jan 13, 2016, 5:30:51 PM (9 years ago)

Author:

DHERBOMEZ Gérald

Message:

add output for HDT, VTG, GGA frames
add timestamped structures for GPS

Location:

trunk/Gps

Files:

• gpsComponent.cpp (modified) (5 diffs)
• gpsComponent.h (modified) (3 diffs)
• structure_gps.h (modified) (1 diff)

trunk/Gps/gpsComponent.cpp

@@ -79 +79 @@
 
 }
+
+
+void GpsComponent::addOutputs()
+{
+  addOutput<TimestampedGgaFrame, GpsComponent>("ggaOut");
+  addOutput<TimestampedVtgFrame, GpsComponent>("vtgOut");
+  addOutput<TimestampedVtgFrame, GpsComponent>("hdtOut");
+}
+
 
 
@@ -221 +230 @@
 {
   ppsIndex_ = 0;
+
+  outGga_ = getTypedOutput<TimestampedGgaFrame, GpsComponent>("ggaOut");
+  outVtg_ = getTypedOutput<TimestampedVtgFrame, GpsComponent>("vtgOut");
+  outHdt_ = getTypedOutput<TimestampedHdtFrame, GpsComponent>("hdtOut");
+
 
   setActive( true );
@@ -387 +401 @@
       ggaFrame.notifyObservers();
 
+      memcpy(&mGga.frame, ggaFrame.getFrameData(), sizeof(trame_gga_dbl));
+      mGga.time = ggaFrame.getRoadTime();
+      mGga.timerange = 0;
+
+      // send GGA data to output
+      checkedSend(outGga_, mGga);
+
       if ( (isRecording()) && (ggaRecording) ) {
                     if (!(ggahdFile.isOpen()))
@@ -510 +531 @@
       sendDataToServerSocket(hdtFrame,type);
       hdtFrame.notifyObservers();
+
+      memcpy(&mHdt.frame, hdtFrame.getFrameData(), sizeof(trame_hdt));
+      mHdt.time = hdtFrame.getRoadTime();
+      mHdt.timerange = 0;
+
+      // send VTG data to output
+      checkedSend(outHdt_, mHdt);
 
       if ( (isRecording()) && (hdtRecording) )
@@ -591 +619 @@
         vtgFrame.notifyObservers();
 
+        memcpy(&mVtg.frame, vtgFrame.getFrameData(), sizeof(trame_vtg));
+        mVtg.time = vtgFrame.getRoadTime();
+        mVtg.timerange = 0;
+
+        // send VTG data to output
+        checkedSend(outVtg_, mVtg);
+
         if (isRecording() && vtgRecording) {
           if (!vtghdFile.isOpen())

trunk/Gps/gpsComponent.h

@@ -16 +16 @@
 #include "Pacpus/kernel/DbiteFile.h"
 #include "../NMEA0183/include/nmea0183.h"
+#include <Pacpus/kernel/InputOutputInterface.h>
 
 #include "GpsFrames.h"
@@ -88 +89 @@
   bool analyzeFrame(); /*!< reconstruct the entire frame starting from the received pieces */
 
+  void addOutputs();
+
 #ifdef WIN32
   Win32SerialPort * serialPort;
@@ -153 +156 @@
   ShMem * shMem_;
 
+  TimestampedGgaFrame mGga;
+  TimestampedVtgFrame mVtg;
+  TimestampedHdtFrame mHdt;
+
+  // Declaration of outputs
+  OutputInterface<TimestampedGgaFrame, GpsComponent>* outGga_;
+  OutputInterface<TimestampedVtgFrame, GpsComponent>* outVtg_;
+  OutputInterface<TimestampedHdtFrame, GpsComponent>* outHdt_;
+
   /// For the socket server
   /* Qt3 version - 17/12/2007

trunk/Gps/structure_gps.h

@@ -469 +469 @@
 };
 
+
+/// trame_hdt structure with timestamping
+struct TimestampedHdtFrame
+{
+    trame_hdt frame;
+    road_time_t time;
+    road_timerange_t timerange;
+};
+
 #endif // STRUCTURE_GPS_H