Merge pull request #4 from uv-software/development

Release candidate 2 for version v0.4.2 (service release)

Author: uv-software

Libraries/CANAPI/Resource.rc

@@ -3,7 +3,7 @@
 _Copyright © 2004-2022  Uwe Vogt, UV Software, Berlin ([email protected])_ \
 _All rights reserved._
 
-Version $Rev: 1019 $
+Version $Rev: 1020 $
 
 # A CAN Interface Wrapper Specification
 
@@ -54,7 +54,7 @@ extern int can_bitrate(int handle, can_bitrate_t *bitrate, can_speed_t *speed);
 extern int can_property(int handle, uint16_t param, void *value, uint32_t nbyte);
 
 extern char *can_hardware(int handle);
-extern char *can_software(int handle);
+extern char *can_firmware(int handle);
 
 #if (OPTION_CANAPI_LIBRARY != 0)
 extern char *can_library(int handle);

Libraries/PeakCAN/Resource.rc

@@ -2,7 +2,7 @@
 /*
  *  CAN Interface API, Version 3 (generic)
  *
- *  Copyright (c) 2004-2021 Uwe Vogt, UV Software, Berlin ([email protected])
+ *  Copyright (c) 2004-2022 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
  *  This file is part of CAN API V3.
@@ -51,7 +51,7 @@
  *
  *  @author      $Author: eris $
  *
- *  @version     $Rev: 993 $
+ *  @version     $Rev: 1020 $
  *
  *  @defgroup    can_api CAN Interface API, Version 3
  *  @{
@@ -120,6 +120,7 @@ typedef int                             can_handle_t;
  *  @{ */
 #define can_transmit(hnd, msg)          can_write(hnd, msg, 0U)
 #define can_receive(hnd, msg)           can_read(hnd, msg, 0U)
+#define can_software(hnd)               can_firmware(hnd)
 #define can_msg_t                       can_message_t
 /** @} */
 
@@ -445,7 +446,7 @@ CANAPI char *can_hardware(int handle);
  *
  *  @returns     pointer to a zero-terminated string, or NULL on error.
  */
-CANAPI char *can_software(int handle);
+CANAPI char *can_firmware(int handle);
 
 
 #if (OPTION_CANAPI_LIBRARY != 0)

Sources/CANAPI/README.md

@@ -49,7 +49,7 @@
 #ifdef _MSC_VER
 #define VERSION_MAJOR    0
 #define VERSION_MINOR    4
-#define VERSION_PATCH    9
+#define VERSION_PATCH    2
 #else
 #define VERSION_MAJOR    0
 #define VERSION_MINOR    2
@@ -290,7 +290,7 @@ char *CPeakCAN::GetHardwareVersion() {
 EXPORT
 char *CPeakCAN::GetFirmwareVersion() {
     // retrieve the firmware version of the CAN controller
-    return can_software(m_Handle);
+    return can_firmware(m_Handle);
 }
 
 EXPORT

Sources/CANAPI/can_api.h

@@ -924,7 +924,7 @@ char *can_hardware(int handle)
     if (can[handle].board == PCAN_NONEBUS) // must be an opened handle
         return NULL;
 
-    if (CAN_GetValue(can[handle].board, PCAN_CHANNEL_VERSION, (void*)str, 256) != PCAN_ERROR_OK)
+    if (CAN_GetValue(can[handle].board, PCAN_HARDWARE_NAME, (void*)str, 256) != PCAN_ERROR_OK)
         return NULL;
     if ((ptr = strchr(str, '\n')) != NULL)
        *ptr = '\0';
@@ -933,7 +933,7 @@ char *can_hardware(int handle)
     {
         if (CAN_GetValue(can[handle].board, PCAN_DEVICE_NUMBER, (void*)&dev, 4) != PCAN_ERROR_OK)
             return NULL;
-        snprintf(hardware, 256, "%s (Device %02lXh)", str, dev);
+        snprintf(hardware, 256, "%s, Device-Id. %02lXh", str, dev);
     }
     else
         strcpy(hardware, str);
@@ -942,20 +942,28 @@ char *can_hardware(int handle)
 }
 
 EXPORT
-char *can_software(int handle)
+char *can_firmware(int handle)
 {
-    static char software[256] = "";     // software version
-    char  str[256] = "PCAN-Basic API "; // info string
+    static char firmware[256] = "";     // firmware version
+    char  str[256], *ptr;               // info string
+    char  ver[256];                     // version
 
     if (!init)                          // must be initialized
         return NULL;
-    (void)handle;                       // handle not needed here
+    if (!IS_HANDLE_VALID(handle))       // must be a valid handle
+        return NULL;
+    if (can[handle].board == PCAN_NONEBUS) // must be an opened handle
+        return NULL;
 
-    if (CAN_GetValue(PCAN_NONEBUS, PCAN_API_VERSION, (void*)&str[15], 256-15) != PCAN_ERROR_OK)
+    if (CAN_GetValue(can[handle].board, PCAN_HARDWARE_NAME, (void*)str, 256) != PCAN_ERROR_OK)
+        return NULL;
+    if ((ptr = strchr(str, '\n')) != NULL)
+        *ptr = '\0';
+    if (CAN_GetValue(can[handle].board, PCAN_FIRMWARE_VERSION, (void*)ver, 256) != PCAN_ERROR_OK)
         return NULL;
-    strcpy(software, str);
+    snprintf(firmware, 256, "%s, Firmware %s", str, ver);
 
-    return (char*)software;             // software version
+    return (char*)firmware;             // firmware version
 }
 
 /*  -----------  local functions  ----------------------------------------