Changeset 89 in pacpussensors for trunk/CanGateway/driver

Timestamp:

07/28/15 15:28:21 (9 years ago)

Author:

DHERBOMEZ Gérald

Message:

Add KVASER CAN driver support for CanGateway component. Tested only for Windows.

Location:

trunk/CanGateway/driver

Files:

• CanDriver.h (modified) (2 diffs)
• KVaserCanDriver.cpp (added)
• KVaserCanDriver.h (added)
• XLVectorCanDriver.cpp (modified) (3 diffs)
• kvaser (added)
• kvaser/canevt.h (added)
• kvaser/canlib.h (added)
• kvaser/canstat.h (added)
• kvaser/extras (added)
• kvaser/extras/poppack.h (added)
• kvaser/extras/pshpack1.h (added)
• kvaser/j1587lib.h (added)
• kvaser/kvadblib.h (added)
• kvaser/kvaser_stdint.h (added)
• kvaser/kvmlib.h (added)
• kvaser/kvrlib.h (added)
• kvaser/linlib.h (added)
• kvaser/obsolete.h (added)
• kvaser/predef.h (added)
• kvaser/sing.h (added)
• kvaser/std.h (added)

trunk/CanGateway/driver/CanDriver.h

@@ -26 +26 @@
 #define PEAK_CAN_DRIVER_WIN     6
 #define SOFTING_CAN_DRIVER      7
+#define KVASER_CAN_DRIVER_WIN 8 
 
 
@@ -49 +50 @@
 #include "SoftingCanDriver.h"
 #define CanDriverType SoftingCanDriver
+#elif CAN_DRIVER_TYPE == KVASER_CAN_DRIVER_WIN
+#include "KVaserCanDriver.h"
+#define CanDriverType KVaserCanDriver
 #else
 #define CanDriverType CanDriverUnknown

trunk/CanGateway/driver/XLVectorCanDriver.cpp

@@ -412 +412 @@
                 xlCanTransmit(this->port, this->accessMask, &count, &e));
 
-        /*
-  Vstatus vErr;
-  Vevent event;
-  Vevent * pEvent = NULL;
-
-  // Create frame to send 
-  event.tag                 = V_TRANSMIT_MSG;
-  event.tagData.msg.id      = frame.id;
-  event.tagData.msg.flags   = 0;
-  event.tagData.msg.dlc     = frame.dlc;
-
-  for (int i = 0; i < frame.dlc; i++)
-    event.tagData.msg.data[i] = frame.data[i];
-
-  // Send the frame 
-  vErr = ncdTransmit (gPortHandle, gChannelMask, &event);
-
-  //printf("sendFrame ncdTransmit  --  vErr=%d, event=0x%x\n", vErr, event); 
-
-  if (vErr==VERR_QUEUE_IS_FULL)
-  {
-    printf("!");
-  }
-
-  else if (vErr)
-  {
-    printf ("ERROR:(send frame) %s!\n", ncdGetErrorString (vErr));              
-    //          ncdDeactivateChannel (gPortHandle, gChannelMask);
-    //          cleanUpPort ();
-    return vErr;
-  }
-
-  return VSUCCESS;
-
-  // Wait the acknowledgement frame 
-  waitReceivingFrame(); 
-
-  // Read the acknowledgement frame in the buffer 
-  vErr = ncdReceive1 (gPortHandle,&pEvent);
-  //printf("sendFrame ncdReceive1  --  vErr=%d, pEvent=0x%x\n", vErr, pEvent); 
-
-  if ( (pEvent==NULL) && (vErr==VERR_QUEUE_IS_EMPTY) )
-  {
-    printf ("%s\n",ncdGetErrorString (vErr));
-    printf ("%s!\n",ncdGetErrorString (vErr));
-    //          ncdDeactivateChannel (gPortHandle, gChannelMask);
-    //          cleanUpPort ();
-    return vErr;
-  }
-
-  // If frame is well acknoledged 
-  if (pEvent->tagData.msg.flags & 0x40)  
-    return VSUCCESS;
-  else
-  {
-   //printf("%x ",pEvent->tagData.msg.flags);
-   //printf (" no acknolegement of frame!\n");
-   
-    return VERROR;
-  }*/
+        
 
         return 1;
@@ -497 +438 @@
 
         int queueSize;
-        //bool found = false;
-        //DWORD begin = timeGetTime();
-        //while ( !found ) {
-                /*DWORD now = timeGetTime();
-                /DEBUG("begin: %ld, now: %ld", begin, now);
-                if ( now - begin >= timeout ) {
-                        return NULL;
-                }
-*/
+
                 traceXLCommand("xlGetReceiveQueueLevel",
                         xlGetReceiveQueueLevel(this->port, &queueSize));
@@ -526 +459 @@
                         return 1;
                 }
-        //}
-
-        //return new CanMessage(e);
-
-
-        /*
-  int L ;
-  Vstatus vErr;
-  Vevent * pEvent = NULL;
-
-  do {
-    // Read frame in the buffer 
-    ncdGetReceiveQueueLevel( gPortHandle , &L );
-    if( L <= 0 )
-    {
-      if (WaitForSingleObject (gEventHandle,WAIT_RECEIVING_FRAME_TIMEOUT) == WAIT_TIMEOUT)
-      {
-        //printf("no frame receiving in the %d last seconds\n", WAIT_RECEIVING_FRAME_TIMEOUT/1000); 
-        return VERR_QUEUE_IS_EMPTY;
-      }
-    }
-
-    vErr = ncdReceive1 (gPortHandle,&pEvent);
-    if( vErr == VERROR )
-    {
-      printf ("receiveframe ERROR  - ERROR: %s\n", ncdGetErrorString (vErr));           
-      //                ncdDeactivateChannel (gPortHandle, gChannelMask);
-      //                cleanUpPort ();
-
-      return vErr;
-    }
-
-  } while((( pEvent==NULL ) && ( vErr==VERR_QUEUE_IS_EMPTY )) || ( vErr == VERROR ));
-
-  // Return the flags field, dlc field and data field of the sent frame 
-  //frame.flags = pEvent->tagData.msg.flags;
-  frame.dlc = pEvent->tagData.msg.dlc;
-  frame.id =  pEvent->tagData.msg.id;
-  if( ( frame.dlc > 8 ) || ( frame.dlc < 0 ))     
-    frame.dlc = 8; 
-
-  memcpy(frame.data,pEvent->tagData.msg.data, frame.dlc);
-
-  return VSUCCESS;*/
+        
         
 }