Changeset 31 in pacpussensors for trunk/CanGateway

Timestamp:

Jan 17, 2014, 6:18:04 PM (11 years ago)

Author:

phudelai

Message:

ok

Location:

trunk/CanGateway

Files:

• CMakeLists.txt (modified) (4 diffs)
• CanFrameBase.h (modified) (1 diff)
• structureCan.h (modified) (1 diff)

trunk/CanGateway/CMakeLists.txt

@@ -34 +34 @@
 # Link directories
 # ========================================
-link_directories( ${PACPUS_LIB_DIR}
+link_directories( 
+        ${PACPUS_LIB_DIR}
         ${CanGateway_SOURCE_DIR}/driver/libs
 )
+
 
 pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
@@ -121 +123 @@
     set(LIBS
         # add your specific libraries to link here
-        vcandm32.lib
-        vxlapi.lib
+        
+                optimized vcandm32.lib debug vcandm32.lib
+        optimized vxlapi.lib debug vxlapi.lib
     )
 endif(WIN32)
@@ -129 +132 @@
     set(LIBS
         # add your specific libraries to link here
-       # pcan
+        # pcan
     )
 endif(UNIX)
@@ -140 +143 @@
         ${PACPUS_DEPENDENCIES_LIB}
         ${LIBS}
-#       PacpusTools
+#       optimized PacpusTools debug PacpusTools_d
 )
 pacpus_folder(${PROJECT_NAME} "components")

trunk/CanGateway/CanFrameBase.h

@@ -16 +16 @@
 #define CANFRAMEBASE_H
 
-#include "driver/CanDriverBase.h"
+#include "../driver/CanDriverBase.h"
 
 namespace pacpus {

trunk/CanGateway/structureCan.h

@@ -1 +1 @@
 // *********************************************************************
 //  created:    2008/2/28 - 16:24
-//  filename:   structureCan.h
+//  filename:   structureCanCarmen.h
 //
 //  author:     Gerald Dherbomez
-//              Copyright Heudiasyc UMR UTC/CNRS 7253
+//              Copyright Heudiasyc UMR UTC/CNRS 6599
 //
 //  version:    $Id: $
 //
-//  purpose:    Description of the CAN structures
+//  purpose:    Description of the CAN structures for Carmen
 //
+// to add:
+// 094 - comodos
+// 612 - eclairage
+// 208 - couple
+// 349 - couple boite vitesse
+// 552 - heure
+//
+// to verify:
+//  350 and 319 not present in real time acquisition
 // *********************************************************************
 
-#ifndef __STRUCTURECAN_H__
-#define __STRUCTURECAN_H__
+#ifndef STRUCTURECANCARMEN_H
+#define STRUCTURECANCARMEN_H
 
 #include <cstddef>