Changeset 371 in pacpusframework for branches

Timestamp:

Oct 28, 2016, 2:47:04 PM (8 years ago)

Author:

DHERBOMEZ Gérald

Message:

modification of the structure_gps.h file: add structure for spanpvaxa frame (Novatel Span CPT)

Location:

branches/0.2.x

Files:

• include/Pacpus/structures/structure_gps.h (modified) (6 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/dbcDecriptor/CMakeLists.txt (modified) (3 diffs)

branches/0.2.x/include/Pacpus/structures/structure_gps.h

@@ +1 @@
+
+
 // donnees NMEA emises par l'ag132 sur la liaison serie
 // revision le 23/08/2004 PhB et GD : trame_gga_dbl
@@ -6 +8 @@
 #define STRUCTURE_GPS_H
 
+#include <QString>
 #include "Pacpus/kernel/road_time.h"
+
+#define TRAME_CORRIMUDATAA 625 // TODO : Add in kernel enum SpanCptType
+#define TRAME_INSPVAXA 626 // TODO : Add in kernel enum SpanCptType
 
 /// POSITION WGS84
@@ -324 +330 @@
     NARROW_INT = 50,
     RTK_DIRECT_INS = 51,
-    INS = 52,
-    INS_PSRSP =53,
-    INS_PSRDIFF =54,
+    INS_SBAS = 52,
+    INS_PSRSP = 53,
+    INS_PSRDIFF = 54,
     INS_RTKFLOAT = 55,
     INS_RTKFIXED = 56,
@@ -334 +340 @@
     OMNISTAR_HP = 64,
     OMNISTAR_XP = 65,
-    CDGPS = 66
+        CDGPS = 66
+    PPP_CONVERGING = 68,
+    PPP = 69,
+    INS_PPP_Converging = 73,
+    INS_PPP = 74
 };
 
@@ -413 +423 @@
 } trame_inscov;
 
+/// TRAME CORRIMUDATAA
+typedef struct
+{
+    uint32_t Week;
+    double        Seconds;
+    double        PitchRate;
+    double        RollRate;
+    double        YawRate;
+    double        LateralAcc;
+    double        LongitudinalAcc;
+    double        VerticalAcc;
+} trame_corrimudataa;
+
+/// TRAME INSPVAXA
+typedef struct
+{
+    QString     Status;
+    QString     posType;
+    double      Lat;
+    double      Lon;
+    double      Hgt;
+    float       Undulation;
+    double      NorthVel;
+    double      EastVel;
+    double      UpVel;
+    double      Roll;
+    double      Pitch;
+    double      Azimuth;
+    float       LatSd;
+    float       LonSd;
+    float       HgtSd;
+    float       NorthVelSd;
+    float       EastVelSd;
+    float       UpVelSd;
+    float       RollSd;
+    float       PitchSd;
+    float       AzimuthSd;
+} trame_inspvaxa;
+
 /// trame_bestgpsposa structure with timestamping
 struct TimestampedBestgpsposaFrame
@@ -445 +494 @@
 };
 
+/// trame_corrimudataa structure with timestamping
+struct TimestampedCorrimudataaFrame
+{
+    trame_corrimudataa frame;
+    road_time_t time;
+    road_timerange_t timerange;
+};
+
+/// trame_inspvaxa structure with timestamping
+struct TimestampedInspvaxaFrame
+{
+    trame_inspvaxa frame;
+    road_time_t time;
+    road_timerange_t timerange;
+};
+
 /// trame_gga structure with timestamping
 struct TimestampedGgaFrame

branches/0.2.x/src/CMakeLists.txt

@@ -19 +19 @@
 add_subdirectory(DBITEPlayer)
 add_subdirectory(PacpusSensor)
-#add_subdirectory(dbcDecriptor)
+add_subdirectory(dbcDecriptor)

branches/0.2.x/src/dbcDecriptor/CMakeLists.txt

@@ -15 +15 @@
 
 # ========================================
-# Pre-configuration of the compiler
+# Include directories
 # ========================================
-find_package(Pacpus REQUIRED)
-# Includes directories
-if(PACPUS_FOUND)
 include_directories(
-  ${PACPUS_DEPENDENCIES_INC}
-  ${PACPUS_INCLUDE_DIR}
+    ${CMAKE_BINARY_DIR}/DBITEPlayer
+    ${QT_INCLUDE_DIR}
 )
 # Compiler flags coming from PacpusDependencies and PacpusPlatforms
@@ -29 +26 @@
 
 # ========================================
-# Include directories
+# Link directories
 # ========================================
-include_directories(
-    ${CMAKE_BINARY_DIR}/DBITEPlayer
-    ${QT_INCLUDE_DIR}
+link_directories(
+    ${PROJECT_BINARY_DIR}/../PacpusLib
+    ${PROJECT_BINARY_DIR}/../FileLib
+    ${PROJECT_BINARY_DIR}/../DBITEPlayerLib
+        ${PROJECT_BINARY_DIR}/../PacpusTools
+        ${PROJECT_BINARY_DIR}/../RoadTime
 )
 
@@ -58 +58 @@
     src/mainwindow.h
     src/structure.h
-    #../ico/heudiasycIco.rc
+    ../ico/heudiasycIco.rc
 )