Merge pull request #8 from uv-software/development

Release candidate 3 for version 0.4.4

Author: uv-software

README.md

@@ -1,6 +1,6 @@
 ### CAN API V3 Wrapper Library for Peak-System PCAN® Interfaces (Windows®)
 
-_Copyright © 2005-2022  Uwe Vogt, UV Software, Berlin ([email protected])_
+_Copyright © 2005-2022   Uwe Vogt, UV Software, Berlin ([email protected])_
 
 # CAN API V3 for PCAN Interfaces
 
@@ -9,7 +9,7 @@ CAN API V3 is a wrapper specification to have a uniform CAN Interface API for va
 ## PCANBasic-Wrapper
 
 This repo contains the source code for a CAN API V3 compatible wrapper library under Windows for PCAN Interfaces from Peak-System Technik GmbH.
-The wrapper library is build upon PEAK´s PCANBasic DLL.
+The wrapper library is build upon Peak´s PCANBasic DLL.
 
 ### CAN Interface API, Version 3
 
@@ -156,7 +156,7 @@ You can choose between one of them if you use this work in whole or in part.
 ### Trademarks
 
 Windows is a registered trademark of Microsoft Corporation in the United States and/or other countries. \
-PCAN is a registered trademark of PEAK-System Technik GmbH, Darmstadt, Germany. \
+PCAN is a registered trademark of Peak-System Technik GmbH, Darmstadt, Germany. \
 Mac and macOS are trademarks of Apple Inc., registered in the U.S. and other countries. \
 Linux is a registered trademark of Linus Torvalds. \
 All other company, product and service names mentioned herein may be trademarks, registered trademarks or service marks of their respective owners.

Sources/Wrapper/can_api.c

@@ -730,6 +730,7 @@ int can_read(int handle, can_msg_t *msg, uint16_t timeout)
     msg->id = 0xFFFFFFFFU;
     msg->sts = 1;
 
+repeat:
     if (!can[handle].mode.fdoe)
         rc = CAN_Read(can[handle].board, &can_msg, &timestamp);
     else
@@ -786,6 +787,10 @@ int can_read(int handle, can_msg_t *msg, uint16_t timeout)
             can[handle].counters.err++;
             return CANERR_ERR_FRAME;    //   error frame received
         }
+        if ((can_msg.MSGTYPE & PCAN_MESSAGE_EXTENDED) && can[handle].mode.nxtd)
+            goto repeat;                //   refuse extended frames
+        if ((can_msg.MSGTYPE & PCAN_MESSAGE_RTR) && can[handle].mode.nrtr)
+            goto repeat;                //   refuse remote frames
         msg->id = (int32_t)can_msg.ID;
         msg->xtd = (can_msg.MSGTYPE & PCAN_MESSAGE_EXTENDED) ? 1 : 0;
         msg->rtr = (can_msg.MSGTYPE & PCAN_MESSAGE_RTR) ? 1 : 0;
@@ -809,10 +814,15 @@ int can_read(int handle, can_msg_t *msg, uint16_t timeout)
             return CANERR_RX_EMPTY;     //   receiver empty
         }
         if ((can_msg_fd.MSGTYPE & PCAN_MESSAGE_ERRFRAME)) {
+            // TODO: encode status message (error frame)
             can[handle].status.receiver_empty = 1;
             can[handle].counters.err++;
             return CANERR_ERR_FRAME;    //   error frame received
         }
+        if ((can_msg.MSGTYPE & PCAN_MESSAGE_EXTENDED) && can[handle].mode.nxtd)
+            goto repeat;                //   refuse extended frames
+        if ((can_msg.MSGTYPE & PCAN_MESSAGE_RTR) && can[handle].mode.nrtr)
+            goto repeat;                //   refuse remote frames
         msg->id = (int32_t)can_msg_fd.ID;
         msg->xtd = (can_msg_fd.MSGTYPE & PCAN_MESSAGE_EXTENDED) ? 1 : 0;
         msg->rtr = (can_msg_fd.MSGTYPE & PCAN_MESSAGE_RTR) ? 1 : 0;
@@ -1075,8 +1085,8 @@ static TPCANStatus pcan_capability(TPCANHandle board, can_mode_t *capability)
     capability->nxtd = 1; // PCAN_ACCEPTANCE_FILTER_29BIT available since version 4.2.0
     capability->nrtr = 1; // PCAN_ALLOW_RTR_FRAMES available since version 4.2.0
 #else
-    capability->nxtd = 0; // This feature is not supported (TODO: acceptance filtering)
-    capability->nrtr = 0; // This feature is not supported (TODO: suppress RTR frames)
+    capability->nxtd = 1; // Suppress XTD frames (software solution)
+    capability->nrtr = 1; // Suppress RTR frames (software solution)
 #endif
     capability->err = 1;  // PCAN_ALLOW_ERROR_FRAMES available since version 4.2.0
     capability->mon = 1;  // PCAN_LISTEN_ONLY available since version 1.0.0

Utilities/can_moni/README.md

@@ -1,4 +1,4 @@
-__CAN Monitor for PEAK PCAN Interfaces, Version 0.4.3__ \
+__CAN Monitor for PEAK PCAN Interfaces, Version 0.4.4__ \
 Copyright © 2007,2017-2022 by Uwe Vogt, UV Software, Berlin
 
 ```

Utilities/can_moni/Sources/main.cpp

@@ -20,7 +20,7 @@
 #include "build_no.h"
 #define VERSION_MAJOR    0
 #define VERSION_MINOR    4
-#define VERSION_PATCH    3
+#define VERSION_PATCH    4
 #define VERSION_BUILD    BUILD_NO
 #define VERSION_STRING   TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
 #if defined(_WIN64)

Utilities/can_test/README.md

@@ -1,4 +1,4 @@
-__CAN Tester for PEAK PCAN Interfaces, Version 0.4.3__ \
+__CAN Tester for PEAK PCAN Interfaces, Version 0.4.4__ \
 Copyright © 2008-2010,2014-2022 by Uwe Vogt, UV Software, Berlin
 
 ```

Utilities/can_test/Sources/main.cpp

@@ -20,7 +20,7 @@
 #include "build_no.h"
 #define VERSION_MAJOR    0
 #define VERSION_MINOR    4
-#define VERSION_PATCH    3
+#define VERSION_PATCH    4
 #define VERSION_BUILD    BUILD_NO
 #define VERSION_STRING   TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
 #if defined(_WIN64)