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

Timestamp:

07/28/15 16:28:08 (9 years ago)

Author:

DHERBOMEZ Gérald

Message:

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

File:

• trunk/CanGateway/driver/KVaserCanDriver.cpp (modified) (1 diff)

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;
 }