Changeset 91 in pacpussensors for trunk/CanGateway/CanGateway.cpp

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.

File:

• trunk/CanGateway/CanGateway.cpp (modified) (4 diffs)

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()) 
         {