Changeset 63 in pacpussensors for trunk


Ignore:
Timestamp:
08/01/14 16:58:31 (10 years ago)
Author:
DHERBOMEZ Gérald
Message:

Small bug corrections in headers of cangateway

Location:
trunk/CanGateway
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/CanGateway/Win32CanInterface.h

    r59 r63  
    1717// we use the Vector driver
    1818#ifdef WIN32
    19 //#   define CAN_DRIVER_TYPE       VECTOR_CAN_DRIVER
    20 #   define CAN_DRIVER_TYPE       VECTOR_CANXL_DRIVER
     19#   define CAN_DRIVER_TYPE       VECTOR_CAN_DRIVER
     20//#   define CAN_DRIVER_TYPE       VECTOR_CANXL_DRIVER
    2121//#   define CAN_DRIVER_TYPE       PEAK_CAN_DRIVER_WIN
    2222#else

  • trunk/CanGateway/structureCan.h

    r31 r63  
    11// *********************************************************************
    22//  created:    2008/2/28 - 16:24
    3 //  filename:   structureCanCarmen.h
     3//  filename:   structureCan.h
    44//
    55//  author:     Gerald Dherbomez
    … …  
    88//  version:    $Id: $
    99//
    10 //  purpose:    Description of the CAN structures for Carmen
     10//  purpose:    Useless file, see to delete it !!!!
     11//              gdherbom : 01-08-2014
    1112//
    12 // to add:
    13 // 094 - comodos
    14 // 612 - eclairage
    15 // 208 - couple
    16 // 349 - couple boite vitesse
    17 // 552 - heure
    18 //
    19 // to verify:
    20 //  350 and 319 not present in real time acquisition
    2113// *********************************************************************
    2214
    23 #ifndef STRUCTURECANCARMEN_H
    24 #define STRUCTURECANCARMEN_H
     15#ifndef __STRUCTURECAN_H__
     16#define __STRUCTURECAN_H__
    2517
    2618#include <cstddef>
    … …  
    3325
    3426/// Basic structure of a CAN frame
    35 //struct CanFrame
     27//typedef struct CanFrame
    3628//{
    37  //   static const std::size_t MAX_CAN_MSG_LENGTH = 8;
    38 
     29//    static const std::size_t MAX_CAN_MSG_LENGTH = 8;
     30//
    3931//    uint32_t id;
    4032//    uint8_t dlc;
    4133//    uint8_t data [MAX_CAN_MSG_LENGTH];
    42 //};
     34//}CanFrame;
    4335
    44 /// CAN structure with timestamping
    45 //struct TimestampedCanFrame
     36// CAN structure with timestamping
     37//typedef struct TimestampedCanFrame
    4638//{
    4739//    CanFrame frame;
    4840//    road_time_t time;
    4941//    road_timerange_t timerange;
    50 //};
     42//}TimestampedCanFrame;
    5143
    5244#endif
Note: See TracChangeset for help on using the changeset viewer.