Merge pull request #123 from chalmers-revere/pre-release

Releasing v0.3.0

CMakeLists.txt

@@ -120,6 +120,8 @@ ExternalProject_Add(system
     CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}"
     CMAKE_ARGS "-DOPENDAVINCI_DIR=${OPENDAVINCI_DIR}"
     CMAKE_ARGS "-DODVDVEHICLE_DIR=${ODVDVEHICLE_DIR}"
+    CMAKE_ARGS "-DODVDTRIMBLE_DIR=${ODVDTRIMBLE_DIR}"
+    CMAKE_ARGS "-DODVDIMU_DIR=${ODVDIMU_DIR}"
     CMAKE_ARGS "-DCXXTEST_INCLUDE_DIR=${CXXTEST_INCLUDE_DIR}"
     CMAKE_ARGS "-DEIGEN3_INCLUDE_DIR=${OPENDAVINCI_DIR}/include/opendavinci"
     CMAKE_ARGS "-DKALMAN_INCLUDE_DIR=${KALMAN_INCLUDE_DIR}"

ChangeLog

@@ -1,3 +1,4 @@
+0.3.0 - Propagating OpenDLV.core v0.7.1 release
 0.2.0 - Updated underlying base image.
 0.1.0 - Update to new OpenDLV.core base image
 0.0.1 - Initial version

VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

code/system/CMakeLists.txt

@@ -57,13 +57,26 @@ find_package(ODVDOpenDLVData REQUIRED)
 SET (CMAKE_MODULE_PATH "${ODVDVEHICLE_DIR}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules" ${CMAKE_MODULE_PATH})
 FIND_PACKAGE (ODVDVehicle REQUIRED)
 
+
+###########################################################################
+# Find ODVDTrimble.
+SET (CMAKE_MODULE_PATH "${ODVDTRIMBLE_DIR}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules" ${CMAKE_MODULE_PATH})
+FIND_PACKAGE (ODVDTrimble REQUIRED)
+
+###########################################################################
+# Find ODVDIMU.
+SET (CMAKE_MODULE_PATH "${ODVDIMU_DIR}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules" ${CMAKE_MODULE_PATH})
+FIND_PACKAGE (ODVDIMU REQUIRED)
+
 ###########################################################################
 # Set common include directories.
 INCLUDE_DIRECTORIES(SYSTEM ${AUTOMOTIVEDATA_INCLUDE_DIRS})
 include_directories(SYSTEM ${OPENDAVINCI_INCLUDE_DIRS})
 include_directories(SYSTEM ${OPENDLV_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(SYSTEM ${ODVDVEHICLE_INCLUDE_DIRS})
 include_directories(SYSTEM ${ODVDOPENDLVDATA_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM ${ODVDTRIMBLE_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM ${ODVDIMU_INCLUDE_DIRS})
 include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
 include_directories(SYSTEM ${KALMAN_INCLUDE_DIR})
 include_directories(SYSTEM ${TINYCNN_INCLUDE_DIR})
@@ -74,7 +87,9 @@ set(LIBRARIES ${OPENDAVINCI_LIBRARIES}
               ${OPENDLV_LIBRARIES}
               ${AUTOMOTIVEDATA_LIBRARIES}
               ${ODVDVEHICLE_LIBRARIES}
-              ${ODVDOPENDLVDATA_LIBRARIES})
+              ${ODVDOPENDLVDATA_LIBRARIES}
+              ${ODVDTRIMBLE_LIBRARIES}
+              ${ODVDIMU_LIBRARIES})
 
 ###########################################################################
 # Add subfolders with sources.

code/system/application/knowledge/include/linguistics/v2vcam/v2vcam.hpp

@@ -82,37 +82,37 @@ class V2vCam
   int32_t GetYawRateConfidence() const;
   int32_t GetVehicleRole() const;
 
-  bool m_initialised;
   std::ofstream m_sendLog;
   std::ofstream m_receiveLog;
   std::time_t m_timeType2004;
   bool m_printInbound;
   bool m_printOutbound;
   bool m_record;
+  bool m_debug;
+  bool m_receivedGeolocation;
 
-
-  unsigned char const m_messageId = 2;
-  int32_t m_stationId = 0;
-  int32_t m_generationDeltaTime = 0; 
-  unsigned char m_containerMask = 0;
-  int32_t m_stationType = 0;
-  double m_latitude = 90.0000001;
-  double m_longitude = 180.0000001;
-  double m_semiMajorConfidence = -1;
-  double m_semiMinorConfidence = -1;
-  double m_semiMajorOrientation = -1;
-  double m_altitude = 8000.01;
-  double m_heading = -1;
-  double m_headingConfidence = -1;
-  double m_speed = -1; //
-  double m_speedConfidence = -1;
-  double m_vehicleLength = -1;
-  double m_vehicleWidth = -1;
-  double m_longitudinalAcc = -1;
-  double m_longitudinalAccConf = -1;
-  double m_yawRateValue = 0;
-  double m_yawRateConfidence = -1;
-  int32_t m_vehicleRole = 0;
+  unsigned char const m_messageId;
+  int32_t m_stationId;
+  int32_t m_generationDeltaTime; 
+  unsigned char m_containerMask;
+  int32_t m_stationType;
+  double m_latitude;
+  double m_longitude;
+  double m_semiMajorConfidence;
+  double m_semiMinorConfidence;
+  double m_semiMajorOrientation;
+  double m_altitude;
+  double m_heading;
+  double m_headingConfidence;
+  double m_speed;
+  double m_speedConfidence;
+  double m_vehicleLength;
+  double m_vehicleWidth;
+  double m_longitudinalAcc;
+  double m_longitudinalAccConf;
+  double m_yawRateValue;
+  double m_yawRateConfidence;
+  int32_t m_vehicleRole;
 };
 
 } // v2vcam