Changeset 91 in pacpussensors for trunk

Timestamp:

Jul 28, 2015, 4:28:08 PM (9 years ago)

Author:

DHERBOMEZ Gérald

Message:

Small corrections during tests: CAN reading OK under Windows with Kvaser Leaf Light.

Location:

trunk/CanGateway

Files:

• CanGateway.cpp (modified) (4 diffs)
• CanGateway.h (modified) (1 diff)
• cangateway.xml (modified) (1 diff)
• driver/KVaserCanDriver.cpp (modified) (1 diff)

trunk/CanGateway/CanGateway.cpp

@@ -91 +91 @@
                         qFatal("Failed to open the CAN interface port %s in %s mode",port_, accessMode_);
         }
+        else if (source_ == "kvaser")
+        {
+                canIf_.setSource(Win32CanInterface::KvaserCard);
+                // open interface
+                if (canIf_.openInterface(channel_,speed_)==0)
+                        qFatal("Failed to open the CAN interface num %d at speed %d",channel_,speed_);
+        }
         else 
         {
@@ -112 +119 @@
         canIf_.stop();
 
-        if ((source_ == "vector")||(source_=="peak")||(source_=="vectorXL")||(source_=="igep"))
+        if ((source_ == "vector")||(source_=="peak")||(source_=="vectorXL")||(source_=="igep")||(source_=="kvaser"))
                 canIf_.closeInterface(channel_);
         
@@ -151 +158 @@
         }
         setRecording( config.getProperty("recording") == "true" ? true : false );
+
+        verbose_ = config.getProperty("verbose") == "true" ? true : false;
 
         return ComponentBase::CONFIGURED_OK;
@@ -193 +202 @@
                 }
 
-        //displayData(incomingCanFrames_[counter_].frame.data, incomingCanFrames_[counter_].frame.dlc, incomingCanFrames_[counter_].frame.id);
+        if (verbose_) displayData(incomingCanFrames_[counter_].frame.data, incomingCanFrames_[counter_].frame.dlc, incomingCanFrames_[counter_].frame.id);
         if (isRecording()) 
         {

trunk/CanGateway/CanGateway.h

@@ -82 +82 @@
   bool THREAD_ALIVE;
 
+  bool verbose_;
+
 };
 

trunk/CanGateway/cangateway.xml

@@ -6 +6 @@
                         channel="1" 
                         speed="500" 
-                        recording="true"/>
+                        recording="true"
+                        verbose="true" />
                 </components>
                         <connections>

trunk/CanGateway/driver/KVaserCanDriver.cpp

@@ -248 +248 @@
                         memcpy(frame.data, msg, frame.dlc);
                         return 0;
-                } else if (stat == canERR_NOMSG ) {
+                } 
+        } 
+        else if (stat == canERR_NOMSG ) {
                         // timeout occurs
                         LOG_WARN("Kvaser card - receiveFrame() method - TIMEOUT");
                         return 1;
-                } else {
+        } 
+        else {
                         // An error frame.
                         LOG_WARN("Kvaser card, error frame");
                         return 1;
-                }
-        }
-
-        return 0;
+        }
+
+
+        return 1;
 }