From 0e60f1502c00c6c99d834259072bc8315cb3a34e Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Thu, 25 Apr 2024 11:36:26 +0200
Subject: [PATCH 01/13] Set version numbers for next release

Relates to [MACCAN-190]
---
 Libraries/CANAPI/Makefile    |  6 +++---
 Libraries/PeakCAN/Makefile   |  8 ++++----
 Sources/PeakCAN.cpp          |  8 ++++----
 Sources/PeakCAN.h            |  4 ++--
 Sources/Wrapper/can_api.c    | 10 +++++-----
 Utilities/can_moni/Driver.h  |  8 ++++----
 Utilities/can_moni/Makefile  |  8 ++++----
 Utilities/can_moni/README.md |  4 ++--
 Utilities/can_test/Driver.h  |  8 ++++----
 Utilities/can_test/Makefile  |  8 ++++----
 Utilities/can_test/README.md |  4 ++--
 11 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/Libraries/CANAPI/Makefile b/Libraries/CANAPI/Makefile
index a5b3ceb..949a7bd 100644
--- a/Libraries/CANAPI/Makefile
+++ b/Libraries/CANAPI/Makefile
@@ -1,7 +1,7 @@
 #
 #	CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
 #
-#	Copyright (c) 2012-2023  Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+#	Copyright (c) 2012-204 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
 #	All rights reserved.
 #
 #	This library is part of PCBUSB-Wrapper.
@@ -65,7 +65,7 @@ LIBRARY = libUVCANPCB
 
 MAJOR = 0
 MINOR = 2
-PATCH = 7
+PATCH = 8
 
 VERSION = $(MAJOR).$(MINOR).$(PATCH)
 TARGET  = $(LIBRARY).$(VERSION).dylib
@@ -126,7 +126,7 @@ LIBRARY = libuvcanpcb
 
 MAJOR = 0
 MINOR = 2
-PATCH = 7
+PATCH = 8
 
 VERSION = $(MAJOR).$(MINOR).$(PATCH)
 SONAME  = $(LIBRARY).so
diff --git a/Libraries/PeakCAN/Makefile b/Libraries/PeakCAN/Makefile
index e9bf4ca..ab0c4c1 100644
--- a/Libraries/PeakCAN/Makefile
+++ b/Libraries/PeakCAN/Makefile
@@ -1,7 +1,7 @@
 #
 #	CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
 #
-#	Copyright (c) 2012-2023  Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+#	Copyright (c) 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
 #	All rights reserved.
 #
 #	This library is part of PCBUSB-Wrapper.
@@ -42,7 +42,7 @@
 #	GNU General Public License for more details.
 #
 #	You should have received a copy of the GNU General Public License
-#	along with PCBUSB-Wrapper.  If not, see <http://www.gnu.org/licenses/>.
+#	along with PCBUSB-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
 #
 current_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown OS')
 current_OS := $(patsubst CYGWIN%,Cygwin,$(current_OS))
@@ -65,7 +65,7 @@ LIBRARY = libPeakCAN
 
 MAJOR = 0
 MINOR = 2
-PATCH = 7
+PATCH = 8
 
 VERSION = $(MAJOR).$(MINOR).$(PATCH)
 TARGET  = $(LIBRARY).$(VERSION).dylib
@@ -126,7 +126,7 @@ LIBRARY = libpeakcan
 
 MAJOR = 0
 MINOR = 2
-PATCH = 7
+PATCH = 8
 
 VERSION = $(MAJOR).$(MINOR).$(PATCH)
 SONAME  = $(LIBRARY).so
diff --git a/Sources/PeakCAN.cpp b/Sources/PeakCAN.cpp
index 75a3273..18aac5b 100644
--- a/Sources/PeakCAN.cpp
+++ b/Sources/PeakCAN.cpp
@@ -2,7 +2,7 @@
 //
 //  CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
 //
-//  Copyright (c) 2012-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//  Copyright (c) 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
 //  All rights reserved.
 //
 //  This file is part of PCBUSB-Wrapper.
@@ -48,12 +48,12 @@
 #include "build_no.h"
 #ifdef _MSC_VER
 #define VERSION_MAJOR    0
-#define VERSION_MINOR    4
-#define VERSION_PATCH    7
+#define VERSION_MINOR    5
+#define VERSION_PATCH    0
 #else
 #define VERSION_MAJOR    0
 #define VERSION_MINOR    2
-#define VERSION_PATCH    7
+#define VERSION_PATCH    99
 #endif
 #define VERSION_BUILD    BUILD_NO
 #define VERSION_STRING   TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
diff --git a/Sources/PeakCAN.h b/Sources/PeakCAN.h
index 0cbcf32..358cb31 100644
--- a/Sources/PeakCAN.h
+++ b/Sources/PeakCAN.h
@@ -2,7 +2,7 @@
 //
 //  CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
 //
-//  Copyright (c) 2012-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//  Copyright (c) 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
 //  All rights reserved.
 //
 //  This file is part of PCBUSB-Wrapper.
@@ -59,7 +59,7 @@
 #define PEAKCAN_LIBRARY_NAME  CANDLL_PCANBASIC
 #define PEAKCAN_LIBRARY_VENDOR  "UV Software, Berlin"
 #define PEAKCAN_LIBRARY_LICENSE  "BSD-2-Clause OR GPL-3.0-or-later"
-#define PEAKCAN_LIBRARY_COPYRIGHT  "Copyright (c) 2012-2023  Uwe Vogt, UV Software, Berlin"
+#define PEAKCAN_LIBRARY_COPYRIGHT  "Copyright (c) 2012-2024 by Uwe Vogt, UV Software, Berlin"
 #define PEAKCAN_LIBRARY_HAZARD_NOTE  "If you connect your CAN device to a real CAN network when using this library,\n" \
                                      "you might damage your application."
 /// \}
diff --git a/Sources/Wrapper/can_api.c b/Sources/Wrapper/can_api.c
index c62a77e..e9cc6e1 100755
--- a/Sources/Wrapper/can_api.c
+++ b/Sources/Wrapper/can_api.c
@@ -2,7 +2,7 @@
 /*
  *  CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
  *
- *  Copyright (c) 2012-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+ *  Copyright (c) 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
  *  All rights reserved.
  *
  *  This file is part of PCBUSB-Wrapper.
@@ -43,7 +43,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with PCBUSB-Wrapper.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with PCBUSB-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @addtogroup  can_api
  *  @{
@@ -51,12 +51,12 @@
 #include "build_no.h"
 #ifdef _MSC_VER
 #define VERSION_MAJOR    0
-#define VERSION_MINOR    4
-#define VERSION_PATCH    7
+#define VERSION_MINOR    5
+#define VERSION_PATCH    0
 #else
 #define VERSION_MAJOR    0
 #define VERSION_MINOR    2
-#define VERSION_PATCH    7
+#define VERSION_PATCH    99
 #endif
 #define VERSION_BUILD    BUILD_NO
 #define VERSION_STRING   TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
diff --git a/Utilities/can_moni/Driver.h b/Utilities/can_moni/Driver.h
index 9c1cf45..16bc5f7 100644
--- a/Utilities/can_moni/Driver.h
+++ b/Utilities/can_moni/Driver.h
@@ -2,7 +2,7 @@
 //
 //  CAN Monitor for generic Interfaces (CAN API V3)
 //
-//  Copyright (c) 2007,2012-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//  Copyright (c) 2007,2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -15,14 +15,14 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef DRIVER_H_INCLUDED
 #define DRIVER_H_INCLUDED
 #include "build_no.h"
 #define VERSION_MAJOR      0
 #define VERSION_MINOR      2
-#define VERSION_PATCH      7
+#define VERSION_PATCH      8
 #define VERSION_BUILD      BUILD_NO
 #define VERSION_STRING     TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
 #if defined(_WIN64)
@@ -44,7 +44,7 @@
 #define CAN_FD_SUPPORTED   1  // don't touch that dial
 #endif
 #define MONITOR_INTEFACE  "PEAK-System PCAN-USB Interfaces"
-#define MONITOR_COPYRIGHT "2007,2012-2023 by Uwe Vogt, UV Software, Berlin"
+#define MONITOR_COPYRIGHT "2007,2012-2024 by Uwe Vogt, UV Software, Berlin"
 
 #include "PeakCAN.h"
 
diff --git a/Utilities/can_moni/Makefile b/Utilities/can_moni/Makefile
index 4f2427c..0a45ee8 100644
--- a/Utilities/can_moni/Makefile
+++ b/Utilities/can_moni/Makefile
@@ -1,7 +1,7 @@
 #
 #	CAN Monitor for PEAK-System PCAN-USB Interfaces (CAN API V3)
 #
-#	Copyright (c) 2007,2012-2023  Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+#	Copyright (c) 2007,2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
 #
 #	This program is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 #	GNU General Public License for more details.
 #
 #	You should have received a copy of the GNU General Public License
-#	along with this program   If not, see <http://www.gnu.org/licenses/>.
+#	along with this program   If not, see <https://www.gnu.org/licenses/>.
 #
 current_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown OS')
 current_OS := $(patsubst CYGWIN%,Cygwin,$(current_OS))
@@ -34,7 +34,7 @@ OBJECTS = $(OUTDIR)/main.o $(OUTDIR)/Timer.o \
 
 ifeq ($(current_OS),Darwin)  # macOS - libPeakCAN.dylib
 
-VERSION = 0.2.7
+VERSION = 0.2.8
 
 TARGET  = can_moni
 
@@ -77,7 +77,7 @@ endif
 
 ifeq ($(current_OS),Linux)  # linux - libuvcanpcb.so
 
-VERSION = 0.2.7
+VERSION = 0.2.8
 
 TARGET  = can_moni
 
diff --git a/Utilities/can_moni/README.md b/Utilities/can_moni/README.md
index 4862bbb..e88d876 100644
--- a/Utilities/can_moni/README.md
+++ b/Utilities/can_moni/README.md
@@ -1,5 +1,5 @@
-__CAN Monitor for PEAK-System PCAN-USB Interfaces, Version 0.2.7__ \
-Copyright &copy; 2007,2012-2023 by Uwe Vogt, UV Software, Berlin
+__CAN Monitor for PEAK-System PCAN-USB Interfaces, Version 0.2.8__ \
+Copyright &copy; 2007,2012-2024 by Uwe Vogt, UV Software, Berlin
 
 ```
 Usage: can_moni <interface> [<option>...]
diff --git a/Utilities/can_test/Driver.h b/Utilities/can_test/Driver.h
index 268d884..4c80654 100644
--- a/Utilities/can_test/Driver.h
+++ b/Utilities/can_test/Driver.h
@@ -2,7 +2,7 @@
 //
 //  CAN Tester for generic Interfaces (CAN API V3)
 //
-//  Copyright (c) 2008-2010,2014-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//  Copyright (c) 2008-2010,2014-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -15,14 +15,14 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef DRIVER_H_INCLUDED
 #define DRIVER_H_INCLUDED
 #include "build_no.h"
 #define VERSION_MAJOR      0
 #define VERSION_MINOR      2
-#define VERSION_PATCH      7
+#define VERSION_PATCH      8
 #define VERSION_BUILD      BUILD_NO
 #define VERSION_STRING     TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
 #if defined(_WIN64)
@@ -44,7 +44,7 @@
 #define CAN_FD_SUPPORTED   1  // don't touch that dial
 #endif
 #define TESTER_INTEFACE   "PEAK-System PCAN-USB Interfaces"
-#define TESTER_COPYRIGHT  "2008-2010,2014-2023 by Uwe Vogt, UV Software, Berlin"
+#define TESTER_COPYRIGHT  "2008-2010,2014-2024 by Uwe Vogt, UV Software, Berlin"
 
 #include "PeakCAN.h"
 
diff --git a/Utilities/can_test/Makefile b/Utilities/can_test/Makefile
index e4db680..a6855c7 100644
--- a/Utilities/can_test/Makefile
+++ b/Utilities/can_test/Makefile
@@ -1,7 +1,7 @@
 #
 #	CAN Tester for PEAK-System PCAN-USB Interfaces (CAN API V3)
 #
-#	Copyright (c) 2008-2010,2014-2023  Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+#	Copyright (c) 2008-2010,2014-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
 #
 #	This program is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 #	GNU General Public License for more details.
 #
 #	You should have received a copy of the GNU General Public License
-#	along with this program   If not, see <http://www.gnu.org/licenses/>.
+#	along with this program   If not, see <https://www.gnu.org/licenses/>.
 #
 current_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown OS')
 current_OS := $(patsubst CYGWIN%,Cygwin,$(current_OS))
@@ -33,7 +33,7 @@ OBJECTS = $(OUTDIR)/main.o $(OUTDIR)/Timer.o
 
 ifeq ($(current_OS),Darwin)  # macOS - libPeakCAN.dylib
 
-VERSION = 0.2.7
+VERSION = 0.2.8
 
 TARGET  = can_test
 
@@ -76,7 +76,7 @@ endif
 
 ifeq ($(current_OS),Linux)  # linux - libuvcanpcb.so
 
-VERSION = 0.2.7
+VERSION = 0.2.8
 
 TARGET  = can_test
 
diff --git a/Utilities/can_test/README.md b/Utilities/can_test/README.md
index b25e36e..6c83c42 100644
--- a/Utilities/can_test/README.md
+++ b/Utilities/can_test/README.md
@@ -1,5 +1,5 @@
-__CAN Tester for PEAK-System PCAN-USB Interfaces, Version 0.2.7__ \
-Copyright &copy; 2008-2010,2014-2023 by Uwe Vogt, UV Software, Berlin
+__CAN Tester for PEAK-System PCAN-USB Interfaces, Version 0.2.8__ \
+Copyright &copy; 2008-2010,2014-2024 by Uwe Vogt, UV Software, Berlin
 
 ```
 Usage: can_test <interface> [<option>...]

From 0a5aaf87cd16208f1b7fe3049509b6c77e003687 Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Thu, 25 Apr 2024 12:18:25 +0200
Subject: [PATCH 02/13] Update CAN API V3 sources to rev. 1270

Relates to [MACCAN-191]
---
 Sources/CANAPI/CANAPI.h                 |   69 +-
 Sources/CANAPI/CANAPI_Defines.h         |   10 +-
 Sources/CANAPI/CANAPI_Types.h           |   37 +-
 Sources/CANAPI/CANBTR_Defaults.h        |  348 +++---
 Sources/CANAPI/LICENSE.BSD-2-Clause     |   50 +-
 Sources/CANAPI/LICENSE.GPL-3.0-or-later | 1348 +++++++++++------------
 Sources/CANAPI/README.md                |    8 +-
 Sources/CANAPI/can_api.h                |   12 +-
 Sources/CANAPI/can_btr.c                |   16 +-
 Sources/CANAPI/can_btr.h                |   12 +-
 Sources/CANAPI/can_msg.c                |   12 +-
 Sources/CANAPI/can_msg.h                |   12 +-
 Sources/PeakCAN.cpp                     |   48 +-
 Sources/PeakCAN.h                       |    8 +-
 Trial/Sources/main.cpp                  |   47 +-
 15 files changed, 1082 insertions(+), 955 deletions(-)

diff --git a/Sources/CANAPI/CANAPI.h b/Sources/CANAPI/CANAPI.h
index b62b8ce..c774abb 100644
--- a/Sources/CANAPI/CANAPI.h
+++ b/Sources/CANAPI/CANAPI.h
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Interface Definition)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 /// \file        CANAPI.h
 //
@@ -73,9 +73,9 @@
 ///              zero to compile your program with the CAN API source files or to
 ///              link your program with the static library at compile-time.
 ///
-/// \author      $Author: haumea $
+/// \author      $Author: eris $
 //
-/// \version     $Rev: 1212 $
+/// \version     $Rev: 1270 $
 //
 /// \defgroup    can_api CAN Interface API, Version 3
 /// \{
@@ -227,21 +227,16 @@ class CANCPP CCanApi {
     static bool GetFirstChannel(SChannelInfo &info, void *param = NULL);
 #endif
 
-    /// \brief       query channel information of the first CAN interface in the
+    /// \brief       query channel information of the next CAN interface in the
     ///              list of CAN interfaces, if any.
     //
-    /// \param[in]   library - library id of the CAN interface list, or -1 for all vendors
     /// \param[out]  info    - the channel information of the next entry in the list
     /// \param[out]  param   - pointer to channel-specific parameters
     //
     /// \returns     true if channel information have been successfully read, or
     ///              false on error.
     //
-#if (OPTION_CANAPI_LIBRARY != 0)
-    static bool GetNextChannel(int32_t library, SChannelInfo &info, void *param = NULL);
-#else
-   static bool GetNextChannel(SChannelInfo &info, void *param = NULL);
-#endif
+    static bool GetNextChannel(SChannelInfo &info, void *param = NULL);
 
     /// \brief       probes if the CAN interface (hardware and driver) given by
     ///              the argument [ 'library' and ] 'channel' is present,
@@ -397,7 +392,7 @@ class CANCPP CCanApi {
     //
     /// \param[in]   param    - property id to be read
     /// \param[out]  value    - pointer to a buffer for the value to be read
-    /// \param[in]   nbyte   -  size of the given buffer in byte
+    /// \param[in]   nbyte    - size of the given buffer in byte
     //
     /// \returns     0 if successful, or a negative value on error.
     //
@@ -407,12 +402,54 @@ class CANCPP CCanApi {
     //
     /// \param[in]   param    - property id to be written
     /// \param[in]   value    - pointer to a buffer with the value to be written
-    /// \param[in]   nbyte   -  size of the given buffer in byte
+    /// \param[in]   nbyte    - size of the given buffer in byte
     //
     /// \returns     0 if successful, or a negative value on error.
     //
     virtual CANAPI_Return_t SetProperty(uint16_t param, const void *value, uint32_t nbyte) = 0;
 
+    /// \brief       sets the filter for 11-bit CAN identifiers.
+    //
+    /// \param[in]   code    - 11-bit code for the filter
+    /// \param[in]   mask    - 11-bit mask for the filter
+    //
+    /// \returns     0 if successful, or a negative value on error.
+    //
+    virtual CANAPI_Return_t SetFilter11Bit(uint32_t code, uint32_t mask) = 0;
+
+    /// \brief       retrieves the filter for 11-bit CAN identifiers.
+    //
+    /// \param[out]  code    - 11-bit code for the filter
+    /// \param[out]  mask    - 11-bit mask for the filter
+    //
+    /// \returns     0 if successful, or a negative value on error.
+    //
+    virtual CANAPI_Return_t GetFilter11Bit(uint32_t &code, uint32_t &mask) = 0;
+
+    /// \brief       sets the filter for 29-bit CAN identifiers.
+    //
+    /// \param[in]   code    - 29-bit code for the filter
+    /// \param[in]   mask    - 29-bit mask for the filter
+    //
+    /// \returns     0 if successful, or a negative value on error.
+    //
+    virtual CANAPI_Return_t SetFilter29Bit(uint32_t code, uint32_t mask) = 0;
+
+    /// \brief       retrieves the filter for 29-bit CAN identifiers.
+    //
+    /// \param[out]  code    - 29-bit code for the filter
+    /// \param[out]  mask    - 29-bit mask for the filter
+    //
+    /// \returns     0 if successful, or a negative value on error.
+    //
+    virtual CANAPI_Return_t GetFilter29Bit(uint32_t &code, uint32_t &mask) = 0;
+
+    /// \brief       resets the filters for CAN identifiers (11-bit and 29-bit).
+    //
+    /// \returns     0 if successful, or a negative value on error.
+    //
+    virtual CANAPI_Return_t ResetFilters() = 0;
+
     /// \brief       retrieves the hardware version of the CAN controller
     ///              board as a zero-terminated string.
     //
@@ -478,4 +515,4 @@ class CANCPP CCanApi {
 /// \}
 #endif // CANAPI_H_INCLUDED
 /// \}
-// $Id: CANAPI.h 1212 2023-10-04 15:41:24Z haumea $  Copyright (c) UV Software //
+// $Id: CANAPI.h 1270 2024-04-15 18:42:43Z eris $  Copyright (c) UV Software //
diff --git a/Sources/CANAPI/CANAPI_Defines.h b/Sources/CANAPI/CANAPI_Defines.h
index f17d8eb..e9b8bef 100644
--- a/Sources/CANAPI/CANAPI_Defines.h
+++ b/Sources/CANAPI/CANAPI_Defines.h
@@ -2,13 +2,13 @@
 /*
  *  CAN Interface API, Version 3 (Definitions and Options)
  *
- *  Copyright (c) 2004-2021 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+ *  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
  *  All rights reserved.
  *
  *  This file is part of CAN API V3.
  *
- *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  and under the GNU General Public License v3.0 (or any later version).
  *  You can choose between one of them if you use this file.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @file        CANAPI_Defines.h
  *
@@ -51,7 +51,7 @@
  *
  *  @author      $Author: eris $
  *
- *  @version     $Rev: 993 $
+ *  @version     $Rev: 1270 $
  *
  *  @addtogroup  can_api
  *  @{
diff --git a/Sources/CANAPI/CANAPI_Types.h b/Sources/CANAPI/CANAPI_Types.h
index 453afb1..c3ab159 100644
--- a/Sources/CANAPI/CANAPI_Types.h
+++ b/Sources/CANAPI/CANAPI_Types.h
@@ -2,13 +2,13 @@
 /*
  *  CAN Interface API, Version 3 (Data Types and Defines)
  *
- *  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+ *  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
  *  All rights reserved.
  *
  *  This file is part of CAN API V3.
  *
- *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  and under the GNU General Public License v3.0 (or any later version).
  *  You can choose between one of them if you use this file.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -43,15 +43,15 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @file        CANAPI_Types.h
  *
  *  @brief       CAN API V3 for generic CAN Interfaces - Data Types and Defines
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: eris $
  *
- *  @version     $Rev: 1212 $
+ *  @version     $Rev: 1270 $
  *
  *  @addtogroup  can_api
  *  @{
@@ -112,6 +112,7 @@ extern "C" {
 
 /** @name  CAN Identifier
  *  @brief CAN Identifier range
+ *  @todo  Make it unsigned!
  *  @{ */
 #define CAN_MAX_STD_ID           0x7FF  /**< highest 11-bit identifier */
 #define CAN_MAX_XTD_ID      0x1FFFFFFF  /**< highest 29-bit identifier */
@@ -119,6 +120,7 @@ extern "C" {
 
 /** @name  CAN Data Length
  *  @brief CAN payload length and DLC definition
+ *  @todo  Make it unsigned?
  *  @{ */
 #define CAN_MAX_DLC                  8  /**< max. data length code (CAN 2.0) */
 #define CAN_MAX_LEN                  8  /**< max. payload length (CAN 2.0) */
@@ -131,6 +133,16 @@ extern "C" {
 #define CANFD_MAX_LEN               64  /**< max. payload length (CAN FD) */
 /** @} */
 
+/** @name  CAN Acceptance Filter
+ *  @brief CAN acceptance filter defaults to let all messages pass
+ *  @note  Acceptance condition: (code ^ id) & mask == 0
+ *  @{ */
+#define CANACC_CODE_11BIT       0x000U  /**< mask for 11-bit acceptance code */
+#define CANACC_MASK_11BIT       0x000U  /**< mask for 11-bit acceptance mask */
+#define CANACC_CODE_29BIT  0x00000000U  /**< mask for 29-bit acceptance code */
+#define CANACC_MASK_29BIT  0x00000000U  /**< mask for 29-bit acceptance mask */
+/** @} */
+
 /** @name  CAN Baud Rate Indexes (for compatibility)
  *  @brief CAN baud rate indexes defined by CiA (for CANopen)
  *  @note  They must be passed with a minus sign to can_start()
@@ -333,14 +345,11 @@ extern "C" {
 #define CANPROP_GET_TRM_QUEUE_SIZE  30U /**< maximum number of message the transmit queue can hold (uint32_t) */
 #define CANPROP_GET_TRM_QUEUE_HIGH  31U /**< maximum number of message the transmit queue has hold (uint32_t) */
 #define CANPROP_GET_TRM_QUEUE_OVFL  32U /**< overflow counter of the transmit queue (uint64_t) */
-#define CANPROP_GET_FLT_11BIT_CODE  40U /**< acceptance filter code of 11-bit identifier (int32_t) */
-#define CANPROP_GET_FLT_11BIT_MASK  41U /**< acceptance filter mask of 11-bit identifier (int32_t) */
-#define CANPROP_GET_FLT_29BIT_CODE  42U /**< acceptance filter code of 29-bit identifier (int32_t) */
-#define CANPROP_GET_FLT_29BIT_MASK  43U /**< acceptance filter mask of 29-bit identifier (int32_t) */
-#define CANPROP_SET_FLT_11BIT_CODE  44U /**< set value for acceptance filter code of 11-bit identifier (int32_t) */
-#define CANPROP_SET_FLT_11BIT_MASK  45U /**< set value for acceptance filter mask of 11-bit identifier (int32_t) */
-#define CANPROP_SET_FLT_29BIT_CODE  46U /**< set value for acceptance filter code of 29-bit identifier (int32_t) */
-#define CANPROP_SET_FLT_29BIT_MASK  47U /**< set value for acceptance filter mask of 29-bit identifier (int32_t) */
+#define CANPROP_GET_FILTER_11BIT    40U /**< acceptance filter code and mask for 11-bit identifier (uint64_t) */
+#define CANPROP_GET_FILTER_29BIT    41U /**< acceptance filter code and mask for 29-bit identifier (uint64_t) */
+#define CANPROP_SET_FILTER_11BIT    42U /**< set value for acceptance filter code and mask for 11-bit identifier (uint64_t) */
+#define CANPROP_SET_FILTER_29BIT    43U /**< set value for acceptance filter code and mask for 29-bit identifier (uint64_t) */
+#define CANPROP_SET_FILTER_RESET    44U /**< reset acceptance filter code and mask to default values (NULL) */
 #if (OPTION_CANAPI_LIBRARY != 0)
 /* - -  build-in bit-rate conversion  - - - - - - - - - - - - - - - - - */
 #define CANPROP_GET_BTR_INDEX       64U /**< bit-rate as CiA index (int32_t) */
diff --git a/Sources/CANAPI/CANBTR_Defaults.h b/Sources/CANAPI/CANBTR_Defaults.h
index 448e575..7229339 100644
--- a/Sources/CANAPI/CANBTR_Defaults.h
+++ b/Sources/CANAPI/CANBTR_Defaults.h
@@ -1,174 +1,174 @@
-/*  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later */
-/*
- *  CAN Interface API, Version 3 (Definitions and Options)
- *
- *  Copyright (c) 2004-2021 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
- *  All rights reserved.
- *
- *  This file is part of CAN API V3.
- *
- *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
- *  You can choose between one of them if you use this file.
- *
- *  BSD 2-Clause "Simplified" License:
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  1. Redistributions of source code must retain the above copyright notice, this
- *     list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *  CAN API V3 IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF CAN API V3, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  GNU General Public License v3.0 or later:
- *  CAN API V3 is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  CAN API V3 is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
- */
-/** @file        CANBTR_Defines.h
- *
- *  @brief       CAN API V3 for generic CAN Interfaces - Definitions and Options
- *
- *  @author      $Author: eris $
- *
- *  @version     $Rev: 1090 $
- *
- *  @addtogroup  can_btr
- *  @{
- */
-#ifndef CANBTR_DEFINES_H_INCLUDED
-#define CANBTR_DEFINES_H_INCLUDED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*  -----------  includes  ------------------------------------------------
- */
-
-
-/*  -----------  options  ------------------------------------------------
- */
-
-
-/*  -----------  defines  ------------------------------------------------
- */
-
-/** @name  SJA1000 CAN Clock
- *  @brief Frequency of the SJA1000 CAN controller.
- *  @{ */
-#define SJA1000_CAN_CLOCK  8000000  /**< 8 MHz */
-/** @} */
-
-/** @name  SJA1000 Bit-timing Values
- *  @brief Predefined BTR0BTR1 register values (complies to CiA CANopen DS-301 spec.).
- *
- *  @note  800 kbps is not supported by all CAN controller  <br>
- *         100 kbps is an obsolete CANopen bit-rate  <br/>
- *         5 kbps is not defined in CANopen
- *  @{ */
-#define SJA1000_1M    0x0014U  /**< 1000 kbps (SP=75.0%, SJW=1) */
-#define SJA1000_800K  0x0016U  /**<  800 kbps (SP=80.0%, SJW=1) */
-#define SJA1000_500K  0x001CU  /**<  500 kbps (SP=87.5%, SJW=1) */
-#define SJA1000_250K  0x011CU  /**<  250 kbps (SP=87.5%, SJW=1) */
-#define SJA1000_125K  0x031CU  /**<  125 kbps (SP=87.5%, SJW=1) */
-#define SJA1000_100K  0x441CU  /**<  100 kbps (SP=87.5%, SJW=2) */
-#define SJA1000_50K   0x491CU  /**<   50 kbps (SP=87.5%, SJW=2) */
-#define SJA1000_20K   0x581CU  /**<   20 kbps (SP=87.5%, SJW=2) */
-#define SJA1000_10K   0x711CU  /**<   10 kbps (SP=87.5%, SJW=2) */
-#define SJA1000_5K    0x7F7FU  /**<    5 kbps (SP=68.0%, SJW=2) */
-/** @} */
-
-/** @name  SJA1000  Bit-rate Settings
- *  @brief Predefined BTR0BTR1 register values as CAN API V3 bit-rate settings.
- *  @{ */
-#define SJA1000_BR_1M(x)    do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=1; x.btr.nominal.tseg1=5; x.btr.nominal.tseg2=2;x.btr.nominal.sjw=1;x.btr.nominal.sam=0;} while(0)
-#define SJA1000_BR_800K(x)  do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=1; x.btr.nominal.tseg1=7; x.btr.nominal.tseg2=2;x.btr.nominal.sjw=1;x.btr.nominal.sam=0;} while(0)
-#define SJA1000_BR_500K(x)  do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=1; x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=1;x.btr.nominal.sam=0;} while(0)
-#define SJA1000_BR_250K(x)  do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=2; x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=1;x.btr.nominal.sam=0;} while(0)
-#define SJA1000_BR_125K(x)  do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=4; x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=1;x.btr.nominal.sam=0;} while(0)
-#define SJA1000_BR_100K(x)  do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=5; x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=2;x.btr.nominal.sam=0;} while(0)
-#define SJA1000_BR_50K(x)   do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=10;x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=2;x.btr.nominal.sam=0;} while(0)
-#define SJA1000_BR_20K(x)   do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=25;x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=2;x.btr.nominal.sam=0;} while(0)
-#define SJA1000_BR_10K(x)   do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=50;x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=2;x.btr.nominal.sam=0;} while(0)
-#define SJA1000_BR_5K(x)    do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=64;x.btr.nominal.tseg1=16;x.btr.nominal.tseg2=8;x.btr.nominal.sjw=2;x.btr.nominal.sam=0;} while(0)
-/** @} */
-
-/** @name  CAN API CAN Clock
- *  @brief Default value for CAN 2.0 and CAN FD operation modes.
- *  @{ */
-#define DEFAULT_CAN_CLOCK  SJA1000_CAN_CLOCK  /**< SJA1000 CAN Clock (8 MHz) */
-#define DEFAULT_CAN_FD_CLOCK        80000000  /**< CAN FD Clock (80 MHz) */
-/** @} */
-
-/** @name  CAN 2.0 Bit-rate Settings
- *  @brief Default values according to CANopen spec. (CAN API requirement).
- *  @{ */
-#define DEFAULT_CAN_BR_1M(x)    SJA1000_BR_1M(x)
-#define DEFAULT_CAN_BR_800K(x)  SJA1000_BR_800K(x)
-#define DEFAULT_CAN_BR_500K(x)  SJA1000_BR_500K(x)
-#define DEFAULT_CAN_BR_250K(x)  SJA1000_BR_250K(x)
-#define DEFAULT_CAN_BR_125K(x)  SJA1000_BR_125K(x)
-#define DEFAULT_CAN_BR_100K(x)  SJA1000_BR_100K(x)
-#define DEFAULT_CAN_BR_50K(x)   SJA1000_BR_50K(x)
-#define DEFAULT_CAN_BR_20K(x)   SJA1000_BR_20K(x)
-#define DEFAULT_CAN_BR_10K(x)   SJA1000_BR_10K(x)
-#define DEFAULT_CAN_BR_5K(x)    SJA1000_BR_5K(x)
-/** @} */
-
-#if (OPTION_CAN_2_0_ONLY == 0)
-/** @name  CAN FD Bit-rate Settings w/o Bit-rate Switching
- *  @brief Default values for long frames only (0 to 64 bytes).
- *
- *  @note  Actual bit-rate settings for specific controllers may vary.
- *         The settings made here are for Peak CAN FD interfaces.
- *  @{ */
-#define DEFAULT_CAN_FD_BR_1M(x)      do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=31; x.btr.nominal.tseg2=8; x.btr.nominal.sjw=8; } while(0)
-#define DEFAULT_CAN_FD_BR_500K(x)    do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=63; x.btr.nominal.tseg2=16;x.btr.nominal.sjw=16;} while(0)
-#define DEFAULT_CAN_FD_BR_250K(x)    do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=127;x.btr.nominal.tseg2=32;x.btr.nominal.sjw=32;} while(0)
-#define DEFAULT_CAN_FD_BR_125K(x)    do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=255;x.btr.nominal.tseg2=64;x.btr.nominal.sjw=64;} while(0)
-/** @} */
-
-/** @name  CAN FD Bit-rate Settings with Bit-rate Switching
- *  @brief Default values for long and fast frames only (up to 8 Mbps).
- *
- *  @note  Actual bit-rate settings for specific controllers may vary.
- *         The settings made here are for Peak CAN FD interfaces.
- *  @{ */
-#define DEFAULT_CAN_FD_BR_1M8M(x)    do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=31; x.btr.nominal.tseg2=8; x.btr.nominal.sjw=8;  x.btr.data.brp=2; x.btr.data.tseg1=3;  x.btr.data.tseg2=1; x.btr.data.sjw=1; } while(0)
-#define DEFAULT_CAN_FD_BR_500K4M(x)  do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=63; x.btr.nominal.tseg2=16;x.btr.nominal.sjw=16; x.btr.data.brp=2; x.btr.data.tseg1=7;  x.btr.data.tseg2=2; x.btr.data.sjw=2; } while(0)
-#define DEFAULT_CAN_FD_BR_250K2M(x)  do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=127;x.btr.nominal.tseg2=32;x.btr.nominal.sjw=32; x.btr.data.brp=2; x.btr.data.tseg1=15; x.btr.data.tseg2=4; x.btr.data.sjw=4; } while(0)
-#define DEFAULT_CAN_FD_BR_125K1M(x)  do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=255;x.btr.nominal.tseg2=64;x.btr.nominal.sjw=64; x.btr.data.brp=2; x.btr.data.tseg1=31; x.btr.data.tseg2=8; x.btr.data.sjw=8; } while(0)
-/** @} */
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif /* CANBTR_DEFINES_H_INCLUDED */
-/** @}
- */
-/*  ----------------------------------------------------------------------
- *  Uwe Vogt,  UV Software,  Chausseestrasse 33 A,  10115 Berlin,  Germany
- *  Tel.: +49-30-46799872,  Fax: +49-30-46799873,  Mobile: +49-170-3801903
- *  E-Mail: uwe.vogt@uv-software.de,  Homepage: http://www.uv-software.de/
- */
+/*  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later */
+/*
+ *  CAN Interface API, Version 3 (Definitions and Options)
+ *
+ *  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+ *  All rights reserved.
+ *
+ *  This file is part of CAN API V3.
+ *
+ *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  and under the GNU General Public License v3.0 (or any later version).
+ *  You can choose between one of them if you use this file.
+ *
+ *  BSD 2-Clause "Simplified" License:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  1. Redistributions of source code must retain the above copyright notice, this
+ *     list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ *
+ *  CAN API V3 IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF CAN API V3, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  GNU General Public License v3.0 or later:
+ *  CAN API V3 is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  CAN API V3 is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
+ */
+/** @file        CANBTR_Defines.h
+ *
+ *  @brief       CAN API V3 for generic CAN Interfaces - Definitions and Options
+ *
+ *  @author      $Author: eris $
+ *
+ *  @version     $Rev: 1270 $
+ *
+ *  @addtogroup  can_btr
+ *  @{
+ */
+#ifndef CANBTR_DEFINES_H_INCLUDED
+#define CANBTR_DEFINES_H_INCLUDED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*  -----------  includes  ------------------------------------------------
+ */
+
+
+/*  -----------  options  ------------------------------------------------
+ */
+
+
+/*  -----------  defines  ------------------------------------------------
+ */
+
+/** @name  SJA1000 CAN Clock
+ *  @brief Frequency of the SJA1000 CAN controller.
+ *  @{ */
+#define SJA1000_CAN_CLOCK  8000000  /**< 8 MHz */
+/** @} */
+
+/** @name  SJA1000 Bit-timing Values
+ *  @brief Predefined BTR0BTR1 register values (complies to CiA CANopen DS-301 spec.).
+ *
+ *  @note  800 kbps is not supported by all CAN controller  <br>
+ *         100 kbps is an obsolete CANopen bit-rate  <br/>
+ *         5 kbps is not defined in CANopen
+ *  @{ */
+#define SJA1000_1M    0x0014U  /**< 1000 kbps (SP=75.0%, SJW=1) */
+#define SJA1000_800K  0x0016U  /**<  800 kbps (SP=80.0%, SJW=1) */
+#define SJA1000_500K  0x001CU  /**<  500 kbps (SP=87.5%, SJW=1) */
+#define SJA1000_250K  0x011CU  /**<  250 kbps (SP=87.5%, SJW=1) */
+#define SJA1000_125K  0x031CU  /**<  125 kbps (SP=87.5%, SJW=1) */
+#define SJA1000_100K  0x441CU  /**<  100 kbps (SP=87.5%, SJW=2) */
+#define SJA1000_50K   0x491CU  /**<   50 kbps (SP=87.5%, SJW=2) */
+#define SJA1000_20K   0x581CU  /**<   20 kbps (SP=87.5%, SJW=2) */
+#define SJA1000_10K   0x711CU  /**<   10 kbps (SP=87.5%, SJW=2) */
+#define SJA1000_5K    0x7F7FU  /**<    5 kbps (SP=68.0%, SJW=2) */
+/** @} */
+
+/** @name  SJA1000  Bit-rate Settings
+ *  @brief Predefined BTR0BTR1 register values as CAN API V3 bit-rate settings.
+ *  @{ */
+#define SJA1000_BR_1M(x)    do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=1; x.btr.nominal.tseg1=5; x.btr.nominal.tseg2=2;x.btr.nominal.sjw=1;x.btr.nominal.sam=0;} while(0)
+#define SJA1000_BR_800K(x)  do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=1; x.btr.nominal.tseg1=7; x.btr.nominal.tseg2=2;x.btr.nominal.sjw=1;x.btr.nominal.sam=0;} while(0)
+#define SJA1000_BR_500K(x)  do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=1; x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=1;x.btr.nominal.sam=0;} while(0)
+#define SJA1000_BR_250K(x)  do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=2; x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=1;x.btr.nominal.sam=0;} while(0)
+#define SJA1000_BR_125K(x)  do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=4; x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=1;x.btr.nominal.sam=0;} while(0)
+#define SJA1000_BR_100K(x)  do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=5; x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=2;x.btr.nominal.sam=0;} while(0)
+#define SJA1000_BR_50K(x)   do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=10;x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=2;x.btr.nominal.sam=0;} while(0)
+#define SJA1000_BR_20K(x)   do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=25;x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=2;x.btr.nominal.sam=0;} while(0)
+#define SJA1000_BR_10K(x)   do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=50;x.btr.nominal.tseg1=13;x.btr.nominal.tseg2=2;x.btr.nominal.sjw=2;x.btr.nominal.sam=0;} while(0)
+#define SJA1000_BR_5K(x)    do {x.btr.frequency=SJA1000_CAN_CLOCK;x.btr.nominal.brp=64;x.btr.nominal.tseg1=16;x.btr.nominal.tseg2=8;x.btr.nominal.sjw=2;x.btr.nominal.sam=0;} while(0)
+/** @} */
+
+/** @name  CAN API CAN Clock
+ *  @brief Default value for CAN 2.0 and CAN FD operation modes.
+ *  @{ */
+#define DEFAULT_CAN_CLOCK  SJA1000_CAN_CLOCK  /**< SJA1000 CAN Clock (8 MHz) */
+#define DEFAULT_CAN_FD_CLOCK        80000000  /**< CAN FD Clock (80 MHz) */
+/** @} */
+
+/** @name  CAN 2.0 Bit-rate Settings
+ *  @brief Default values according to CANopen spec. (CAN API requirement).
+ *  @{ */
+#define DEFAULT_CAN_BR_1M(x)    SJA1000_BR_1M(x)
+#define DEFAULT_CAN_BR_800K(x)  SJA1000_BR_800K(x)
+#define DEFAULT_CAN_BR_500K(x)  SJA1000_BR_500K(x)
+#define DEFAULT_CAN_BR_250K(x)  SJA1000_BR_250K(x)
+#define DEFAULT_CAN_BR_125K(x)  SJA1000_BR_125K(x)
+#define DEFAULT_CAN_BR_100K(x)  SJA1000_BR_100K(x)
+#define DEFAULT_CAN_BR_50K(x)   SJA1000_BR_50K(x)
+#define DEFAULT_CAN_BR_20K(x)   SJA1000_BR_20K(x)
+#define DEFAULT_CAN_BR_10K(x)   SJA1000_BR_10K(x)
+#define DEFAULT_CAN_BR_5K(x)    SJA1000_BR_5K(x)
+/** @} */
+
+#if (OPTION_CAN_2_0_ONLY == 0)
+/** @name  CAN FD Bit-rate Settings w/o Bit-rate Switching
+ *  @brief Default values for long frames only (0 to 64 bytes).
+ *
+ *  @note  Actual bit-rate settings for specific controllers may vary.
+ *         The settings made here are for Peak CAN FD interfaces.
+ *  @{ */
+#define DEFAULT_CAN_FD_BR_1M(x)      do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=31; x.btr.nominal.tseg2=8; x.btr.nominal.sjw=8; } while(0)
+#define DEFAULT_CAN_FD_BR_500K(x)    do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=63; x.btr.nominal.tseg2=16;x.btr.nominal.sjw=16;} while(0)
+#define DEFAULT_CAN_FD_BR_250K(x)    do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=127;x.btr.nominal.tseg2=32;x.btr.nominal.sjw=32;} while(0)
+#define DEFAULT_CAN_FD_BR_125K(x)    do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=255;x.btr.nominal.tseg2=64;x.btr.nominal.sjw=64;} while(0)
+/** @} */
+
+/** @name  CAN FD Bit-rate Settings with Bit-rate Switching
+ *  @brief Default values for long and fast frames only (up to 8 Mbps).
+ *
+ *  @note  Actual bit-rate settings for specific controllers may vary.
+ *         The settings made here are for Peak CAN FD interfaces.
+ *  @{ */
+#define DEFAULT_CAN_FD_BR_1M8M(x)    do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=31; x.btr.nominal.tseg2=8; x.btr.nominal.sjw=8;  x.btr.data.brp=2; x.btr.data.tseg1=3;  x.btr.data.tseg2=1; x.btr.data.sjw=1; } while(0)
+#define DEFAULT_CAN_FD_BR_500K4M(x)  do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=63; x.btr.nominal.tseg2=16;x.btr.nominal.sjw=16; x.btr.data.brp=2; x.btr.data.tseg1=7;  x.btr.data.tseg2=2; x.btr.data.sjw=2; } while(0)
+#define DEFAULT_CAN_FD_BR_250K2M(x)  do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=127;x.btr.nominal.tseg2=32;x.btr.nominal.sjw=32; x.btr.data.brp=2; x.btr.data.tseg1=15; x.btr.data.tseg2=4; x.btr.data.sjw=4; } while(0)
+#define DEFAULT_CAN_FD_BR_125K1M(x)  do {x.btr.frequency=DEFAULT_CAN_FD_CLOCK;x.btr.nominal.brp=2;x.btr.nominal.tseg1=255;x.btr.nominal.tseg2=64;x.btr.nominal.sjw=64; x.btr.data.brp=2; x.btr.data.tseg1=31; x.btr.data.tseg2=8; x.btr.data.sjw=8; } while(0)
+/** @} */
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif /* CANBTR_DEFINES_H_INCLUDED */
+/** @}
+ */
+/*  ----------------------------------------------------------------------
+ *  Uwe Vogt,  UV Software,  Chausseestrasse 33 A,  10115 Berlin,  Germany
+ *  Tel.: +49-30-46799872,  Fax: +49-30-46799873,  Mobile: +49-170-3801903
+ *  E-Mail: uwe.vogt@uv-software.de,  Homepage: http://www.uv-software.de/
+ */
diff --git a/Sources/CANAPI/LICENSE.BSD-2-Clause b/Sources/CANAPI/LICENSE.BSD-2-Clause
index d7d391e..08b6473 100644
--- a/Sources/CANAPI/LICENSE.BSD-2-Clause
+++ b/Sources/CANAPI/LICENSE.BSD-2-Clause
@@ -1,25 +1,25 @@
-BSD 2-Clause License
-
-Copyright (c) 2021, Uwe Vogt, UV Software
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+BSD 2-Clause License
+
+Copyright (c) 2004-2024, Uwe Vogt, UV Software
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Sources/CANAPI/LICENSE.GPL-3.0-or-later b/Sources/CANAPI/LICENSE.GPL-3.0-or-later
index f288702..3877ae0 100644
--- a/Sources/CANAPI/LICENSE.GPL-3.0-or-later
+++ b/Sources/CANAPI/LICENSE.GPL-3.0-or-later
@@ -1,674 +1,674 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/Sources/CANAPI/README.md b/Sources/CANAPI/README.md
index 1c962ac..98691ec 100644
--- a/Sources/CANAPI/README.md
+++ b/Sources/CANAPI/README.md
@@ -1,9 +1,9 @@
 ### CAN Interface API, Version 3
 
-_Copyright &copy; 2004-2023  Uwe Vogt, UV Software, Berlin (info@uv-software.com)_ \
+_Copyright &copy; 2004-2024  Uwe Vogt, UV Software, Berlin (info@uv-software.com)_ \
 _All rights reserved._
 
-Version $Rev: 1212 $
+Version $Rev: 1270 $
 
 # A CAN Interface Wrapper Specification
 
@@ -65,9 +65,9 @@ See header file `can_api.h` for a description of the provided functions.
 
 ## This and That
 
-### SVN Repo
+### CAN API V3 Reference
 
-The CAN API V3 sources are maintained in a SVN repo to synchronized them between the different CAN API V3 wrapper repos.
+A generic documentation of the CAN API V3 application programming interface can be found [here](https://uv-software.github.io/CANAPI-Docs/#/).
 
 ### Dual-License
 
diff --git a/Sources/CANAPI/can_api.h b/Sources/CANAPI/can_api.h
index a490c6f..9291285 100644
--- a/Sources/CANAPI/can_api.h
+++ b/Sources/CANAPI/can_api.h
@@ -2,13 +2,13 @@
 /*
  *  CAN Interface API, Version 3 (generic)
  *
- *  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+ *  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
  *  All rights reserved.
  *
  *  This file is part of CAN API V3.
  *
- *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  and under the GNU General Public License v3.0 (or any later version).
  *  You can choose between one of them if you use this file.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @file        can_api.h
  *
@@ -51,7 +51,7 @@
  *
  *  @author      $Author: eris $
  *
- *  @version     $Rev: 1090 $
+ *  @version     $Rev: 1270 $
  *
  *  @defgroup    can_api CAN Interface API, Version 3
  *  @{
@@ -136,7 +136,7 @@ typedef int                             can_handle_t;
 #elif (OPTION_CANAPI_DRIVER != 0)
 #define CAN_BOARD(lib, brd)             brd
 #else
-#error Remove the unneeded definition(s)!
+#error Remove the unneeded definition(s)
 #endif
 
 /*  -----------  types  --------------------------------------------------
diff --git a/Sources/CANAPI/can_btr.c b/Sources/CANAPI/can_btr.c
index d25cbce..f8fa1d1 100644
--- a/Sources/CANAPI/can_btr.c
+++ b/Sources/CANAPI/can_btr.c
@@ -2,13 +2,13 @@
 /*
  *  CAN Interface API, Version 3 (Bit-rate Conversion)
  *
- *  Copyright (c) 2017-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+ *  Copyright (c) 2017-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
  *  All rights reserved.
  *
  *  This file is part of CAN API V3.
  *
- *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  and under the GNU General Public License v3.0 (or any later version).
  *  You can choose between one of them if you use this file.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @file        can_btr.c
  *
@@ -55,9 +55,9 @@
  *               |  SJW  |          BRP          |SAM|   TSEG2   |     TSEG1     |<br>
  *               +-7-+-6-+-5-+---+---+---+---+-0-+-7-+-6-+---+-4-+-3-+---+---+-0-+<br>
  *
- *  @author      $Author: makemake $
+ *  @author      $Author: eris $
  *
- *  @version     $Rev: 1186 $
+ *  @version     $Rev: 1270 $
  *
  *  @addtogroup  can_btr
  *  @{
@@ -166,6 +166,8 @@ int btr_check_bitrate(const btr_bitrate_t *bitrate, bool fdoe, bool brse) {
         if ((bitrate->btr.nominal.sjw < BTR_NOMINAL_SJW_MIN) || (BTR_NOMINAL_SJW_MAX < bitrate->btr.nominal.sjw))
             return BTRERR_BAUDRATE;
 #if (OPTION_CAN_2_0_ONLY != OPTION_DISABLED)
+        (void)fdoe; (void)brse;  // To avoid compiler warnings
+        
         if ((bitrate->btr.nominal.sam != BTR_NOMINAL_SAM_SINGLE) && (BTR_NOMINAL_SAM_TRIPLE != bitrate->btr.nominal.sam))
             return BTRERR_BAUDRATE;
 #else
@@ -278,6 +280,8 @@ int btr_compare_bitrates(const btr_bitrate_t *bitrate1, const btr_bitrate_t *bit
         if (cmp_sp && (data_sp1 != data_sp2))
             return (data_sp1 < data_sp2) ? -4 : +4;
     }
+#else
+    (void)fdoe; (void)brse;  // To avoid compiler warnings
 #endif
     /* if the bit-rates are equal return 1*/
     return 0;
diff --git a/Sources/CANAPI/can_btr.h b/Sources/CANAPI/can_btr.h
index c318bdd..43c9ea6 100644
--- a/Sources/CANAPI/can_btr.h
+++ b/Sources/CANAPI/can_btr.h
@@ -2,13 +2,13 @@
 /*
  *  CAN Interface API, Version 3 (Bit-rate Conversion)
  *
- *  Copyright (c) 2017-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+ *  Copyright (c) 2017-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
  *  All rights reserved.
  *
  *  This file is part of CAN API V3.
  *
- *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  and under the GNU General Public License v3.0 (or any later version).
  *  You can choose between one of them if you use this file.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -43,15 +43,15 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @file        can_btr.h
  *
  *  @brief       CAN API V3 for generic CAN Interfaces (Bit-rate Conversion)
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: eris $
  *
- *  @version     $Rev: 1096 $
+ *  @version     $Rev: 1270 $
  *
  *  @defgroup    can_btr CAN Bit-rate Conversion
  *  @{
diff --git a/Sources/CANAPI/can_msg.c b/Sources/CANAPI/can_msg.c
index 73d03a6..0a785d7 100644
--- a/Sources/CANAPI/can_msg.c
+++ b/Sources/CANAPI/can_msg.c
@@ -2,13 +2,13 @@
 /*
  *  CAN Interface API, Version 3 (Message Formatter)
  *
- *  Copyright (c) 2019-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+ *  Copyright (c) 2019-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
  *  All rights reserved.
  *
  *  This file is part of CAN API V3.
  *
- *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  and under the GNU General Public License v3.0 (or any later version).
  *  You can choose between one of them if you use this file.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -43,15 +43,15 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @file        can_msg.c
  *
  *  @brief       CAN Message Formatter
  *
- *  @author      $Author: makemake $
+ *  @author      $Author: eris $
  *
- *  @version     $Rev: 1187 $
+ *  @version     $Rev: 1270 $
  *
  *  @addtogroup  can_msg
  *  @{
diff --git a/Sources/CANAPI/can_msg.h b/Sources/CANAPI/can_msg.h
index 23d118c..2f5eae9 100644
--- a/Sources/CANAPI/can_msg.h
+++ b/Sources/CANAPI/can_msg.h
@@ -2,13 +2,13 @@
 /*
  *  CAN Interface API, Version 3 (Message Formatter)
  *
- *  Copyright (c) 2019-2022 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+ *  Copyright (c) 2019-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
  *  All rights reserved.
  *
  *  This file is part of CAN API V3.
  *
- *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  and under the GNU General Public License v3.0 (or any later version).
  *  You can choose between one of them if you use this file.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -43,15 +43,15 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @file        can_msg.h
  *
  *  @brief       CAN Message Formatter
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: eris $
  *
- *  @version     $Rev: 1044 $
+ *  @version     $Rev: 1270 $
  *
  *  @defgroup    can_msg CAN Message Formatter
  *  @{
diff --git a/Sources/PeakCAN.cpp b/Sources/PeakCAN.cpp
index 18aac5b..56fc8fc 100644
--- a/Sources/PeakCAN.cpp
+++ b/Sources/PeakCAN.cpp
@@ -146,7 +146,7 @@ bool CPeakCAN::GetFirstChannel(SChannelInfo &info, void *param) {
     // set index to the first entry in the interface list (if any)
     CANAPI_Return_t rc = can_property((-1), CANPROP_SET_FIRST_CHANNEL, NULL, 0U);
     if (CANERR_NOERROR == rc) {
-        // get channel no, device name and device DLL name at actual index in the interface list
+        // get channel no, device name, etc. at actual index in the interface list
         if (((can_property((-1), CANPROP_GET_CHANNEL_NO, (void*)&info.m_nChannelNo, sizeof(int32_t))) == 0) &&
             ((can_property((-1), CANPROP_GET_CHANNEL_NAME, (void*)&info.m_szDeviceName, CANPROP_MAX_BUFFER_SIZE)) == 0) &&
             ((can_property((-1), CANPROP_GET_CHANNEL_DLLNAME, (void*)&info.m_szDeviceDllName, CANPROP_MAX_BUFFER_SIZE)) == 0)) {
@@ -168,7 +168,7 @@ bool CPeakCAN::GetNextChannel(SChannelInfo &info, void *param) {
     // set index to the next entry in the interface list (if any)
     CANAPI_Return_t rc = can_property((-1), CANPROP_SET_NEXT_CHANNEL, NULL, 0U);
     if (CANERR_NOERROR == rc) {
-        // get channel no, device name and device DLL name at actual index in the interface list
+        // get channel no, device name, etc. at actual index in the interface list
         if (((can_property((-1), CANPROP_GET_CHANNEL_NO, (void*)&info.m_nChannelNo, sizeof(int32_t))) == 0) &&
             ((can_property((-1), CANPROP_GET_CHANNEL_NAME, (void*)&info.m_szDeviceName, CANPROP_MAX_BUFFER_SIZE)) == 0) &&
             ((can_property((-1), CANPROP_GET_CHANNEL_DLLNAME, (void*)&info.m_szDeviceDllName, CANPROP_MAX_BUFFER_SIZE)) == 0)) {
@@ -325,6 +325,50 @@ CANAPI_Return_t CPeakCAN::SetProperty(uint16_t param, const void *value, uint32_
     return can_property(m_Handle, param, (void*)value, nbyte);
 }
 
+EXPORT
+CANAPI_Return_t CPeakCAN::SetFilter11Bit(uint32_t code, uint32_t mask) {
+    uint64_t filter = ((uint64_t)code << 32) | (uint64_t)mask;
+    // set the 11-bit acceptance filter of the CAN interface
+    return can_property(m_Handle, CANPROP_SET_FILTER_11BIT, (void*)&filter, sizeof(uint64_t));
+}
+
+EXPORT
+CANAPI_Return_t CPeakCAN::SetFilter29Bit(uint32_t code, uint32_t mask) {
+    uint64_t filter = ((uint64_t)code << 32) | (uint64_t)mask;
+    // set the 29-bit acceptance filter of the CAN interface
+    return can_property(m_Handle, CANPROP_SET_FILTER_29BIT, (void*)&filter, sizeof(uint64_t));
+}
+
+EXPORT
+CANAPI_Return_t CPeakCAN::GetFilter11Bit(uint32_t &code, uint32_t &mask) {
+    uint64_t filter = 0U;
+    // retrieve the 11-bit acceptance filter of the CAN interface
+    CANAPI_Return_t rc = can_property(m_Handle, CANPROP_GET_FILTER_11BIT, (void*)&filter, sizeof(uint64_t));
+    if (CANERR_NOERROR == rc) {
+        code = (uint32_t)(filter >> 32);
+        mask = (uint32_t)(filter >> 0);
+    }
+    return rc;
+}
+
+EXPORT
+CANAPI_Return_t CPeakCAN::GetFilter29Bit(uint32_t &code, uint32_t &mask) {
+    uint64_t filter = 0U;
+    // retrieve the 29-bit acceptance filter of the CAN interface
+    CANAPI_Return_t rc = can_property(m_Handle, CANPROP_GET_FILTER_29BIT, (void*)&filter, sizeof(uint64_t));
+    if (CANERR_NOERROR == rc) {
+        code = (uint32_t)(filter >> 32);
+        mask = (uint32_t)(filter >> 0);
+    }
+    return rc;
+}
+
+EXPORT
+CANAPI_Return_t CPeakCAN::ResetFilters() {
+    // reset all acceptance filters of the CAN interface
+    return can_property(m_Handle, CANPROP_SET_FILTER_RESET, NULL, 0U);
+}
+
 EXPORT
 char *CPeakCAN::GetHardwareVersion() {
     // retrieve the hardware version of the CAN controller
diff --git a/Sources/PeakCAN.h b/Sources/PeakCAN.h
index 358cb31..a7f8780 100644
--- a/Sources/PeakCAN.h
+++ b/Sources/PeakCAN.h
@@ -116,7 +116,7 @@ class CANCPP CPeakCAN : public CCanApi {
     CANAPI_Return_t ResetController();
 
     CANAPI_Return_t WriteMessage(CANAPI_Message_t message, uint16_t timeout = 0U);
-    CANAPI_Return_t ReadMessage(CANAPI_Message_t &message, uint16_t timeout = CANREAD_INFINITE);
+    CANAPI_Return_t ReadMessage(CANAPI_Message_t &message, uint16_t timeout = CANWAIT_INFINITE);
 
     CANAPI_Return_t GetStatus(CANAPI_Status_t &status);
     CANAPI_Return_t GetBusLoad(uint8_t &load);
@@ -127,6 +127,12 @@ class CANCPP CPeakCAN : public CCanApi {
     CANAPI_Return_t GetProperty(uint16_t param, void *value, uint32_t nbyte);
     CANAPI_Return_t SetProperty(uint16_t param, const void *value, uint32_t nbyte);
 
+    CANAPI_Return_t SetFilter11Bit(uint32_t code, uint32_t mask);
+    CANAPI_Return_t SetFilter29Bit(uint32_t code, uint32_t mask);
+    CANAPI_Return_t GetFilter11Bit(uint32_t &code, uint32_t &mask);
+    CANAPI_Return_t GetFilter29Bit(uint32_t &code, uint32_t &mask);
+    CANAPI_Return_t ResetFilters();
+
     char *GetHardwareVersion();  // (for compatibility reasons)
     char *GetFirmwareVersion();  // (for compatibility reasons)
     static char *GetVersion();  // (for compatibility reasons)
diff --git a/Trial/Sources/main.cpp b/Trial/Sources/main.cpp
index 159fa2e..aadc46f 100644
--- a/Trial/Sources/main.cpp
+++ b/Trial/Sources/main.cpp
@@ -22,7 +22,7 @@
 //#define SECOND_CHANNEL
 #define ISSUE_198   (1)
 
-#if (0)
+#if (OPTION_PCAN_BIT_TIMING == 1)
 #define BITRATE_1M(x)    PEAKCAN_BR_1M(x)
 #define BITRATE_800K(x)  PEAKCAN_BR_800K(x)
 #define BITRATE_500K(x)  PEAKCAN_BR_500K(x)
@@ -45,7 +45,7 @@
 #define BITRATE_10K(x)   DEFAULT_CAN_BR_10K(x) 
 #define BITRATE_5K(x)    DEFAULT_CAN_BR_5K(x)  
 #endif
-#if (0)
+#if (OPTION_PCAN_BIT_TIMING == 1)
 #define BITRATE_FD_1M(x)      PEAKCAN_FD_BR_1M(x)
 #define BITRATE_FD_500K(x)    PEAKCAN_FD_BR_500K(x)
 #define BITRATE_FD_250K(x)    PEAKCAN_FD_BR_250K(x)
@@ -269,7 +269,7 @@ int main(int argc, const char * argv[]) {
             fprintf(stderr, "+++ error: myDriver.GetProperty(CANPROP_GET_PATCH_NO) returned %i\n", retVal);
         retVal = myDriver.GetProperty(CANPROP_GET_BUILD_NO, (void *)&u32Val, sizeof(uint32_t));
         if (retVal == CCanApi::NoError)
-            fprintf(stdout, ">>> myDriver.GetProperty(CANPROP_GET_BUILD_NO): value = 0x%07" PRIx32 "\n", u32Val);
+            fprintf(stdout, ">>> myDriver.GetProperty(CANPROP_GET_BUILD_NO): value = %07" PRIx32 "\n", u32Val);
         else
             fprintf(stderr, "+++ error: myDriver.GetProperty(CANPROP_GET_BUILD_NO) returned %i\n", retVal);
         retVal = myDriver.GetProperty(CANPROP_GET_LIBRARY_ID, (void *)&i32Val, sizeof(int32_t));
@@ -342,7 +342,8 @@ int main(int argc, const char * argv[]) {
         bool result = CCanDriver::GetFirstChannel(info);
         while (result) {
             retVal = CCanDriver::ProbeChannel(info.m_nChannelNo, opMode, state);
-            fprintf(stdout, ">>> CCanAPI::ProbeChannel(%i): state = %s", info.m_nChannelNo,
+            fprintf(stdout, ">>> CCanAPI::ProbeChannel(%i): %s = %s",
+                             info.m_nChannelNo, info.m_szDeviceName,
                             (state == CCanApi::ChannelOccupied) ? "occupied" :
                             (state == CCanApi::ChannelAvailable) ? "available" :
                             (state == CCanApi::ChannelNotAvailable) ? "not available" : "not testable");
@@ -492,14 +493,21 @@ int main(int argc, const char * argv[]) {
     }
 #ifdef SECOND_CHANNEL
     retVal = mySecond.InitializeChannel(channel+1U, opMode);
-    if (retVal != CCanApi::NoError)
+    if (retVal != CCanApi::NoError) {
         fprintf(stderr, "+++ error: mySecond.InitializeChannel(%i) returned %i\n", channel+1U, retVal);
+        goto teardown;
+    }
+    else if (myDriver.GetStatus(status) == CCanApi::NoError) {
+        fprintf(stdout, ">>> mySecond.InitializeChannel(%i): status = 0x%02X\n", channel+1U, status.byte);
+    }
     retVal = mySecond.StartController(bitrate);
-    if (retVal != CCanApi::NoError)
+    if (retVal != CCanApi::NoError) {
         fprintf(stderr, "+++ error: mySecond.StartController returned %i\n", retVal);
-    retVal = mySecond.WriteMessage(message, txTimeout);
-    if (retVal != CCanApi::NoError)
-        fprintf(stderr, "+++ error: mySecond.WriteMessage returned %i\n", retVal);
+        goto teardown;
+    }
+    else if (myDriver.GetStatus(status) == CCanApi::NoError) {
+        fprintf(stdout, ">>> mySecond.StartController: status = 0x%02X\n", status.byte);
+    }
 #endif
     /* transmit messages */
     if (option_transmit) {
@@ -512,6 +520,9 @@ int main(int argc, const char * argv[]) {
         frames = 0;
         now = time(NULL);
         while (running && (option_transmit > frames)) {
+#if (OPTION_CAN_2_0_ONLY != 0)
+            message.dlc = CAN_MAX_DLC;
+#else
             if (!opMode.fdoe) {
                 message.fdf = 0;
                 message.brs = 0;
@@ -521,6 +532,7 @@ int main(int argc, const char * argv[]) {
                 message.brs = opMode.brse;
                 message.dlc = CANFD_MAX_DLC;
             }
+#endif
             message.id = (uint32_t)frames & (message.xtd ? CAN_MAX_XTD_ID : CAN_MAX_STD_ID);
             message.data[0] = (uint8_t)(((uint64_t)frames & 0x00000000000000FF) >> 0);
             message.data[1] = (uint8_t)(((uint64_t)frames & 0x000000000000FF00) >> 8);
@@ -547,6 +559,8 @@ int main(int argc, const char * argv[]) {
             fprintf(stdout, ">>> myDriver.WriteMessage: status = 0x%02X\n", status.byte);
         }
         fprintf(stdout, "    %i message(s) sent (took %.1lfs)\n", frames, difftime(time(NULL), now));
+        if (option_exit)
+            goto teardown;
     }
     /* receiving message */
     fprintf(stdout, "Press Ctrl+C to abort...\n");
@@ -556,11 +570,15 @@ int main(int argc, const char * argv[]) {
             if (option_echo) {
                 fprintf(stdout, ">>> %i\t", frames++);
                 fprintf(stdout, "%7li.%04li\t", (long)message.timestamp.tv_sec, message.timestamp.tv_nsec / 100000);
+#if (OPTION_CAN_2_0_ONLY != 0)
+                fprintf(stdout, "%03x\t%c%c [%i]", message.id, message.xtd ? 'X' : 'S', message.rtr ? 'R' : ' ', message.dlc);
+#else
                 if (!opMode.fdoe)
                     fprintf(stdout, "%03x\t%c%c [%i]", message.id, message.xtd ? 'X' : 'S', message.rtr ? 'R' : ' ', message.dlc);
                 else
                     fprintf(stdout, "%03x\t%c%c%c%c%c [%i]", message.id, message.xtd ? 'X' : 'S', message.rtr ? 'R' : ' ',
                             message.fdf ? 'F' : ' ', message.brs ? 'B' : ' ', message.esi ? 'E' :' ', CCanApi::Dlc2Len(message.dlc));
+#endif
                 for (uint8_t i = 0; i < CCanApi::Dlc2Len(message.dlc); i++)
                     fprintf(stdout, " %02x", message.data[i]);
                 if (message.sts) {
@@ -630,7 +648,7 @@ int main(int argc, const char * argv[]) {
                     fprintf(stdout, " %02x", message.data[i]);
                 if (message.sts)
                     fprintf(stdout, " <<< status frame");
-                else if (option_repeat) {
+                else if (option_reply) {
                     retVal = myDriver.WriteMessage(message, txTimeout);
                     if (retVal != CCanApi::NoError) {
                         fprintf(stderr, "+++ error: mySecond.WriteMessage returned %i\n", retVal);
@@ -707,14 +725,21 @@ int main(int argc, const char * argv[]) {
 
 static void verbose(const can_mode_t &mode, const can_bitrate_t &bitrate, const can_speed_t &speed)
 {
+#if (OPTION_CAN_2_0_ONLY == 0)
     fprintf(stdout, "    Op.-Mode: 0x%02X (fdoe=%u,brse=%u,niso=%u,shrd=%u,nxtd=%u,nrtr=%u,err=%u,mon=%u)\n",
             mode.byte, mode.fdoe, mode.brse, mode.niso, mode.shrd, mode.nxtd, mode.nrtr, mode.err, mode.mon);
+#else
+    fprintf(stdout, "    Op.-Mode: 0x%02X (shrd=%u,nxtd=%u,nrtr=%u,err=%u,mon=%u)\n",
+            mode.byte, mode.shrd, mode.nxtd, mode.nrtr, mode.err, mode.mon);
+#endif
     if (bitrate.btr.frequency > 0) {
         fprintf(stdout, "    Baudrate: %.0fkbps@%.1f%%",
             speed.nominal.speed / 1000., speed.nominal.samplepoint * 100.);
+#if (OPTION_CAN_2_0_ONLY == 0)
         if (/*speed.data.brse*/mode.fdoe && mode.brse)
             fprintf(stdout, ":%.0fkbps@%.1f%%",
                 speed.data.speed / 1000., speed.data.samplepoint * 100.);
+#endif
         fprintf(stdout, " (f_clock=%i,nom_brp=%u,nom_tseg1=%u,nom_tseg2=%u,nom_sjw=%u,nom_sam=%u",
             bitrate.btr.frequency,
             bitrate.btr.nominal.brp,
@@ -722,12 +747,14 @@ static void verbose(const can_mode_t &mode, const can_bitrate_t &bitrate, const
             bitrate.btr.nominal.tseg2,
             bitrate.btr.nominal.sjw,
             bitrate.btr.nominal.sam);
+#if (OPTION_CAN_2_0_ONLY == 0)
         if (mode.fdoe && mode.brse)
             fprintf(stdout, ",data_brp=%u,data_tseg1=%u,data_tseg2=%u,data_sjw=%u",
                 bitrate.btr.data.brp,
                 bitrate.btr.data.tseg1,
                 bitrate.btr.data.tseg2,
                 bitrate.btr.data.sjw);
+#endif
         fprintf(stdout, ")\n");
     }
     else {

From 079c842caa4b4a34b7a7226f3e443493c3f8a456 Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Thu, 25 Apr 2024 12:19:46 +0200
Subject: [PATCH 03/13] Update CAN API V3 testing sources to rev. 1273

Relates to [MACCAN-191]
---
 Tests/CANAPI/Driver.h                         |   9 +-
 Tests/CANAPI/Makefile                         |  12 +-
 Tests/CANAPI/README.md                        |  12 +-
 Tests/CANAPI/Sources/Bitrates.cpp             |  10 +-
 Tests/CANAPI/Sources/Bitrates.h               |  10 +-
 Tests/CANAPI/Sources/Config.h                 |  10 +-
 Tests/CANAPI/Sources/Device.cpp               |  10 +-
 Tests/CANAPI/Sources/Device.h                 |  13 +-
 Tests/CANAPI/Sources/Options.cpp              |  10 +-
 Tests/CANAPI/Sources/Options.h                |  10 +-
 Tests/CANAPI/Sources/Progress.cpp             |  12 +-
 Tests/CANAPI/Sources/Progress.h               |  12 +-
 Tests/CANAPI/Sources/Properties.cpp           | 110 ++-
 Tests/CANAPI/Sources/Properties.h             |  11 +-
 Tests/CANAPI/Sources/Settings.h               |  10 +-
 Tests/CANAPI/Sources/Timer.cpp                |  46 +-
 Tests/CANAPI/Sources/Timer.h                  |  28 +-
 Tests/CANAPI/Sources/Timer64.cpp              | 261 ------
 Tests/CANAPI/Sources/Timer64.h                |  91 --
 Tests/CANAPI/Sources/main.cpp                 |  12 +-
 Tests/CANAPI/Sources/pch.h                    |   2 +-
 Tests/CANAPI/Testcases/TC00_SmokeTest.cc      |  10 +-
 Tests/CANAPI/Testcases/TC01_ProbeChannel.cc   |  10 +-
 .../Testcases/TC02_InitializeChannel.cc       |  10 +-
 .../CANAPI/Testcases/TC03_StartController.cc  |  10 +-
 Tests/CANAPI/Testcases/TC04_ReadMessage.cc    |  10 +-
 Tests/CANAPI/Testcases/TC05_WriteMessage.cc   |  18 +-
 .../CANAPI/Testcases/TC06_ResetController.cc  |  10 +-
 .../CANAPI/Testcases/TC08_TeardownChannel.cc  |  10 +-
 Tests/CANAPI/Testcases/TC09_GetStatus.cc      |  10 +-
 Tests/CANAPI/Testcases/TC11_GetBitrate.cc     |  10 +-
 Tests/CANAPI/Testcases/TC12_GetProperty.cc    |  15 +-
 Tests/CANAPI/Testcases/TC21_GetBusSpeed.cc    |  10 +-
 Tests/CANAPI/Testcases/TC23_SetFilter11Bit.cc | 772 ++++++++++++++++
 Tests/CANAPI/Testcases/TC25_SetFilter29Bit.cc | 841 ++++++++++++++++++
 Tests/CANAPI/Testcases/TC27_ResetFilter.cc    | 601 +++++++++++++
 Tests/CANAPI/Testcases/TCx1_CallSequences.cc  |  10 +-
 .../CANAPI/Testcases/TCx2_BitrateConverter.cc |  10 +-
 Tests/CANAPI/Version.h                        |  14 +-
 39 files changed, 2498 insertions(+), 584 deletions(-)
 delete mode 100644 Tests/CANAPI/Sources/Timer64.cpp
 delete mode 100644 Tests/CANAPI/Sources/Timer64.h
 create mode 100644 Tests/CANAPI/Testcases/TC23_SetFilter11Bit.cc
 create mode 100644 Tests/CANAPI/Testcases/TC25_SetFilter29Bit.cc
 create mode 100644 Tests/CANAPI/Testcases/TC27_ResetFilter.cc

diff --git a/Tests/CANAPI/Driver.h b/Tests/CANAPI/Driver.h
index 03781ed..39bb80b 100644
--- a/Tests/CANAPI/Driver.h
+++ b/Tests/CANAPI/Driver.h
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef DRIVER_H_INCLUDED
 #define DRIVER_H_INCLUDED
@@ -68,6 +68,7 @@ typedef CPeakCAN  CCanDriver;
 #define FEATURE_BITRATE_SAM          FEATURE_SUPPORTED
 #define FEATURE_BITRATE_FD_SAM       FEATURE_UNSUPPORTED
 #define FEATURE_BITRATE_SJA1000      FEATURE_SUPPORTED
+#define FEATURE_FILTERING            FEATURE_UNSUPPORTED
 #define FEATURE_ERROR_FRAMES         FEATURE_UNSUPPORTED
 #define FEATURE_ERROR_CODE_CAPTURE   FEATURE_UNSUPPORTED
 #define FEATURE_BLOCKING_READ        FEATURE_SUPPORTED
diff --git a/Tests/CANAPI/Makefile b/Tests/CANAPI/Makefile
index 1ec9160..ff60798 100644
--- a/Tests/CANAPI/Makefile
+++ b/Tests/CANAPI/Makefile
@@ -1,13 +1,13 @@
 #
 #  CAN Interface API, Version 3 (Testing)
 #
-#  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+#  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 #  All rights reserved.
 #
 #  This file is part of CAN API V3.
 #
-#  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-#  under the GNU General Public License v3.0 (or any later version).
+#  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+#  and under the GNU General Public License v3.0 (or any later version).
 #  You can choose between one of them if you use this file.
 #
 #  BSD 2-Clause "Simplified" License:
@@ -42,7 +42,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+#  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 #
 current_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown OS')
 current_OS := $(patsubst CYGWIN%,Cygwin,$(current_OS))
@@ -72,7 +72,7 @@ OBJECTS = $(OUTDIR)/main.o $(OUTDIR)/Device.o $(OUTDIR)/Options.o \
 	$(OUTDIR)/TC11_GetBitrate.o $(OUTDIR)/Bitrates.o \
 	$(OUTDIR)/TC12_GetProperty.o $(OUTDIR)/Properties.o \
 	$(OUTDIR)/TCx1_CallSequences.o $(OUTDIR)/TCx2_BitrateConverter.o \
-	$(OUTDIR)/Timer64.o $(OUTDIR)/Progress.o
+	$(OUTDIR)/Timer.o $(OUTDIR)/Progress.o
 
 ifeq ($(current_OS),Darwin)  # macOS - libPeakCAN.dylib
 
@@ -226,7 +226,7 @@ $(OUTDIR)/Device.o: $(MAIN_DIR)/Device.cpp
 $(OUTDIR)/Options.o: $(MAIN_DIR)/Options.cpp
 	$(CXX) $(CXXFLAGS) -MMD -MF $*.d -o $@ -c $<
 
-$(OUTDIR)/Timer64.o: $(MAIN_DIR)/Timer64.cpp
+$(OUTDIR)/Timer.o: $(MAIN_DIR)/Timer.cpp
 	$(CXX) $(CXXFLAGS) -MMD -MF $*.d -o $@ -c $<
 
 $(OUTDIR)/Progress.o: $(MAIN_DIR)/Progress.cpp
diff --git a/Tests/CANAPI/README.md b/Tests/CANAPI/README.md
index f8bbf7c..f2f6dfe 100644
--- a/Tests/CANAPI/README.md
+++ b/Tests/CANAPI/README.md
@@ -1,9 +1,9 @@
 ### CAN API V3 Testing with GoogleTest
 
-_Copyright &copy; 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)_ \
+_Copyright &copy; 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)_ \
 _All rights reserved._
 
-Version $Rev: 1219 $
+Version $Rev: 1273 $
 
 # CAN Interface Wrapper Specification
 
@@ -81,17 +81,23 @@ public:
 #else
     virtual CANAPI_Return_t InitializeChannel(int32_t channel, const CANAPI_OpMode_t &opMode, const void *param = NULL) = 0;
 #endif
+    virtual CANAPI_Return_t TeardownChannel() = 0;
     virtual CANAPI_Return_t SignalChannel() = 0;
     virtual CANAPI_Return_t StartController(CANAPI_Bitrate_t bitrate) = 0;
     virtual CANAPI_Return_t ResetController() = 0;
     virtual CANAPI_Return_t WriteMessage(CANAPI_Message_t message, uint16_t timeout = 0U) = 0;
-    virtual CANAPI_Return_t ReadMessage(CANAPI_Message_t &message, uint16_t timeout = CANREAD_INFINITE) = 0;
+    virtual CANAPI_Return_t ReadMessage(CANAPI_Message_t &message, uint16_t timeout = CANWAIT_INFINITE) = 0;
     virtual CANAPI_Return_t GetStatus(CANAPI_Status_t &status) = 0;
     virtual CANAPI_Return_t GetBusLoad(uint8_t &load) = 0;  // deprecated
     virtual CANAPI_Return_t GetBitrate(CANAPI_Bitrate_t &bitrate) = 0;
     virtual CANAPI_Return_t GetBusSpeed(CANAPI_BusSpeed_t &speed) = 0;
     virtual CANAPI_Return_t GetProperty(uint16_t param, void *value, uint32_t nbyte) = 0;
     virtual CANAPI_Return_t SetProperty(uint16_t param, const void *value, uint32_t nbyte) = 0;
+    virtual CANAPI_Return_t SetFilter11Bit(uint32_t code, uint32_t mask) = 0;
+    virtual CANAPI_Return_t GetFilter11Bit(uint32_t &code, uint32_t &mask) = 0;
+    virtual CANAPI_Return_t SetFilter29Bit(uint32_t code, uint32_t mask) = 0;
+    virtual CANAPI_Return_t GetFilter29Bit(uint32_t &code, uint32_t &mask) = 0;
+    virtual CANAPI_Return_t ResetFilters() = 0;
     virtual char *GetHardwareVersion() = 0;  // deprecated
     virtual char *GetFirmwareVersion() = 0;  // deprecated
     static char *GetVersion();
diff --git a/Tests/CANAPI/Sources/Bitrates.cpp b/Tests/CANAPI/Sources/Bitrates.cpp
index ebd4467..d8ff469 100644
--- a/Tests/CANAPI/Sources/Bitrates.cpp
+++ b/Tests/CANAPI/Sources/Bitrates.cpp
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2022 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 #include <string.h>
@@ -308,4 +308,4 @@ bool CBitrates::IsCanFdWithBrse() {
             (aBitrateString[m_nIndex].m_fCanFdWithBrse)) ? true : false;
 }
 
-// $Id: Bitrates.cpp 1170 2023-08-23 14:01:13Z haumea $  Copyright (c) UV Software, Berlin //
+// $Id: Bitrates.cpp 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin //
diff --git a/Tests/CANAPI/Sources/Bitrates.h b/Tests/CANAPI/Sources/Bitrates.h
index 606837f..d5bfae2 100644
--- a/Tests/CANAPI/Sources/Bitrates.h
+++ b/Tests/CANAPI/Sources/Bitrates.h
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef BITRATES_H_INCLUDED
 #define BITRATES_H_INCLUDED
@@ -66,5 +66,5 @@ class CBitrates {
 };
 #endif // BITRATES_H_INCLUDED
 
-// $Id: Bitrates.h 1148 2023-08-15 16:20:55Z haumea $  Copyright (c) UV Software, Berlin //
+// $Id: Bitrates.h 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin //
 
diff --git a/Tests/CANAPI/Sources/Config.h b/Tests/CANAPI/Sources/Config.h
index a9eef35..6125e27 100644
--- a/Tests/CANAPI/Sources/Config.h
+++ b/Tests/CANAPI/Sources/Config.h
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef CONFIG_H_INCLUDED
 #define CONFIG_H_INCLUDED
@@ -67,5 +67,5 @@
 #define GTEST_DISABLED  DISABLE_GTEST
 #endif // CONFIG_H_INCLUDED
 
-//  $Id: Config.h 1171 2023-08-23 15:08:43Z haumea $  Copyright (c) UV Software, Berlin.
+//  $Id: Config.h 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
 
diff --git a/Tests/CANAPI/Sources/Device.cpp b/Tests/CANAPI/Sources/Device.cpp
index a7fc5d4..31d084f 100644
--- a/Tests/CANAPI/Sources/Device.cpp
+++ b/Tests/CANAPI/Sources/Device.cpp
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 #include <string.h>
@@ -590,4 +590,4 @@ void CCanDevice::ShowChannelCapabilities(const char* prefix) {
     std::cout << std::endl;
 }
 
-// $Id: Device.cpp 1217 2023-10-10 19:28:31Z haumea $  Copyright (c) UV Software, Berlin //
+// $Id: Device.cpp 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin //
diff --git a/Tests/CANAPI/Sources/Device.h b/Tests/CANAPI/Sources/Device.h
index 7df3d3e..21aaa1a 100644
--- a/Tests/CANAPI/Sources/Device.h
+++ b/Tests/CANAPI/Sources/Device.h
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef DEVICE_H_INCLUDED
 #define DEVICE_H_INCLUDED
@@ -118,6 +118,9 @@ class CCanDevice : public CCanDriver {
         EChannelState state = CCanApi::ChannelNotTestable;
         return (CCanDriver::ProbeChannel(m_nChannelNo, opCapa, state) == CCanApi::NoError) ? true : false;
     }
+    bool IsCanIdAccepted(uint32_t canId, uint32_t accCode, uint32_t accMask) {
+        return (((canId ^ accCode) & accMask) == 0x00000000U) ? true : false;
+    }
     // properties
     CANAPI_Return_t GetOpCapabilities(CANAPI_OpMode_t &opCapa) {
         return CCanDriver::GetProperty(CANPROP_GET_OP_CAPABILITY, (void*)&opCapa.byte, sizeof(uint8_t));
@@ -170,4 +173,4 @@ class CCanDevice : public CCanDriver {
 
 #endif // DEVICE_H_INCLUDED
 
-// $Id: Device.h 1217 2023-10-10 19:28:31Z haumea $  Copyright (c) UV Software, Berlin.
+// $Id: Device.h 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Sources/Options.cpp b/Tests/CANAPI/Sources/Options.cpp
index d0e2ce1..1ca26f1 100644
--- a/Tests/CANAPI/Sources/Options.cpp
+++ b/Tests/CANAPI/Sources/Options.cpp
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifdef _MSC_VER
 //no Microsoft extensions please!
@@ -716,4 +716,4 @@ int COptions::ShowHelp() {
     return m_fShowHelp;
 }
 
-// $Id: Options.cpp 1193 2023-09-06 10:21:35Z haumea $  Copyright (c) UV Software, Berlin //
+// $Id: Options.cpp 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin //
diff --git a/Tests/CANAPI/Sources/Options.h b/Tests/CANAPI/Sources/Options.h
index 4062a6b..92cbeca 100644
--- a/Tests/CANAPI/Sources/Options.h
+++ b/Tests/CANAPI/Sources/Options.h
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef OPTIONS_H_INCLUDED
 #define OPTIONS_H_INCLUDED
@@ -139,4 +139,4 @@ extern COptions g_Options;          // global access to testing options
 
 #endif // OPTIONS_H_INCLUDED
 
-// $Id: Options.h 1193 2023-09-06 10:21:35Z haumea $  Copyright (c) UV Software, Berlin.
+// $Id: Options.h 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Sources/Progress.cpp b/Tests/CANAPI/Sources/Progress.cpp
index 650e6e5..9e6e809 100644
--- a/Tests/CANAPI/Sources/Progress.cpp
+++ b/Tests/CANAPI/Sources/Progress.cpp
@@ -2,11 +2,13 @@
 //
 //  Software for Industrial Communication, Motion Control and Automation
 //
-//  Copyright (c) 2002-2022 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
-//  This class is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  Class CProgress
+//
+//  This class is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this class.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -41,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this class.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this class.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "Progress.h"
 #include <iostream>
@@ -138,4 +140,4 @@ void CCounter::Increment() {
 #endif
 }
 
-// $Id: Progress.cpp 798 2023-10-07 19:01:13Z makemake $  Copyright (c) UV Software, Berlin //
+// $Id: Progress.cpp 811 2024-04-18 14:03:48Z quaoar $  Copyright (c) UV Software, Berlin //
diff --git a/Tests/CANAPI/Sources/Progress.h b/Tests/CANAPI/Sources/Progress.h
index 1c04a81..0b96d40 100644
--- a/Tests/CANAPI/Sources/Progress.h
+++ b/Tests/CANAPI/Sources/Progress.h
@@ -2,11 +2,13 @@
 //
 //  Software for Industrial Communication, Motion Control and Automation
 //
-//  Copyright (c) 2002-2022 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
-//  This class is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  Class CProgress
+//
+//  This class is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this class.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -41,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this class.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this class.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef PROGRESS_H_INCLUDED
 #define PROGRESS_H_INCLUDED
@@ -80,4 +82,4 @@ class CCounter {
 
 #endif // PROGRESS_H_INCLUDED
 
-// $Id: Progress.h 798 2023-10-07 19:01:13Z makemake $  Copyright (c) UV Software, Berlin //
+// $Id: Progress.h 811 2024-04-18 14:03:48Z quaoar $  Copyright (c) UV Software, Berlin //
diff --git a/Tests/CANAPI/Sources/Properties.cpp b/Tests/CANAPI/Sources/Properties.cpp
index 726d39e..fbde633 100644
--- a/Tests/CANAPI/Sources/Properties.cpp
+++ b/Tests/CANAPI/Sources/Properties.cpp
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2022 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,14 +43,14 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 #include <string.h>
 #include <limits.h>
 #include <iostream>
 
-#define MAX_PROPERTIES  37
+#define MAX_PROPERTIES  42
 
 #define LIB_PARAM  true
 #define DRV_PARAM  false
@@ -61,55 +61,70 @@
 #define PROP_REQUIRED  true
 #define PROP_OPTIONAL  false
 
+#if (FEATURE_FILTERING != FEATURE_SUPPORTED)
+#define PROP_FILTERING  PROP_OPTIONAL
+#else
+#define PROP_FILTERING  PROP_REQUIRED
+#endif
+
+#define MODE_RUNNING  true
+#define MODE_STOPPED  false
+
 static struct SProperty {
     uint16_t m_nId;
     uint32_t m_nSize;
     bool m_fPreInit;
     bool m_fSetter;
     bool m_fRequired;
+    bool m_fModeRunning;
     const char* m_szDescription;
 } aProperties[MAX_PROPERTIES + 1] = {
-    { CANPROP_GET_SPEC            , sizeof(uint16_t),        LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "version of the wrapper specification (uint16_t)" },
-    { CANPROP_GET_VERSION         , sizeof(uint16_t),        LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "version number of the library (uint16_t)" },
-    { CANPROP_GET_PATCH_NO        , sizeof(uint8_t),         LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "patch number of the library (uint8_t)" },
-    { CANPROP_GET_BUILD_NO        , sizeof(uint32_t),        LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "build number of the library (uint32_t)" },
-    { CANPROP_GET_LIBRARY_ID      , sizeof(int32_t),         LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "library id of the library (int32_t)" },
-    { CANPROP_GET_LIBRARY_VENDOR  , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "vendor name of the library (char[256])" },
-    { CANPROP_GET_LIBRARY_DLLNAME , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "file name of the library DLL (char[256])" },
-    { CANPROP_GET_DEVICE_TYPE     , sizeof(int32_t),         DRV_PARAM, PROP_GETTER, PROP_REQUIRED, "device type of the CAN interface (int32_t)" },
-    { CANPROP_GET_DEVICE_NAME     , CANPROP_MAX_BUFFER_SIZE, DRV_PARAM, PROP_GETTER, PROP_REQUIRED, "device name of the CAN interface (char[256])" },
-    { CANPROP_GET_DEVICE_VENDOR   , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "vendor name of the CAN interface (char[256])" },
-    { CANPROP_GET_DEVICE_DLLNAME  , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "file name of the CAN interface DLL (char[256])" },
-    { CANPROP_GET_DEVICE_PARAM    , CANPROP_MAX_BUFFER_SIZE, DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, "device parameter of the CAN interface (char[256])" },
-    { CANPROP_GET_OP_CAPABILITY   , sizeof(uint8_t),         DRV_PARAM, PROP_GETTER, PROP_REQUIRED, "supported operation modes of the CAN controller (uint8_t)" },
-    { CANPROP_GET_OP_MODE         , sizeof(uint8_t),         DRV_PARAM, PROP_GETTER, PROP_REQUIRED, "active operation mode of the CAN controller (uint8_t)" },
-    { CANPROP_GET_BITRATE         , sizeof(can_bitrate_t),   DRV_PARAM, PROP_GETTER, PROP_REQUIRED, "active bit-rate of the CAN controller (can_bitrate_t)" },
-    { CANPROP_GET_SPEED           , sizeof(can_speed_t),     DRV_PARAM, PROP_GETTER, PROP_REQUIRED, "active bus speed of the CAN controller (can_speed_t)" },
-    { CANPROP_GET_STATUS          , sizeof(can_mode_t),      DRV_PARAM, PROP_GETTER, PROP_REQUIRED, "current status register of the CAN controller (uint8_t)" },
-    { CANPROP_GET_BUSLOAD         , sizeof(uint16_t),        DRV_PARAM, PROP_GETTER, PROP_REQUIRED, "current bus load of the CAN controller (uint16_t)" },
-    { CANPROP_GET_NUM_CHANNELS    , sizeof(uint8_t),         DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, "numbers of CAN channels on the CAN interface (uint8_t)" },
-    { CANPROP_GET_CAN_CHANNEL     , sizeof(uint8_t),         DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, "active CAN channel on the CAN interface (uint8_t)" },
-    { CANPROP_GET_CAN_CLOCK       , sizeof(int32_t),         DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, "frequency of the CAN controller clock in [Hz] (int32_t)" },
-    { CANPROP_GET_TX_COUNTER      , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_REQUIRED, "total number of sent messages (uint64_t)" },
-    { CANPROP_GET_RX_COUNTER      , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_REQUIRED, "total number of reveiced messages (uint64_t)" },
-    { CANPROP_GET_ERR_COUNTER     , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_REQUIRED, "total number of reveiced error frames (uint64_t)" },
-    { CANPROP_GET_RCV_QUEUE_SIZE  , sizeof(uint32_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, "maximum number of message the receive queue can hold (uint32_t)" },
-    { CANPROP_GET_RCV_QUEUE_HIGH  , sizeof(uint32_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, "maximum number of message the receive queue has hold (uint32_t)" },
-    { CANPROP_GET_RCV_QUEUE_OVFL  , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, "overflow counter of the receive queue (uint64_t)" },
-    { CANPROP_GET_TRM_QUEUE_SIZE  , sizeof(uint32_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, "maximum number of message the transmit queue can hold (uint32_t)" },
-    { CANPROP_GET_TRM_QUEUE_HIGH  , sizeof(uint32_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, "maximum number of message the transmit queue has hold (uint32_t)" },
-    { CANPROP_GET_TRM_QUEUE_OVFL  , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, "overflow counter of the transmit queue (uint64_t)" },
+    { CANPROP_GET_SPEC            , sizeof(uint16_t),        LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "version of the wrapper specification (uint16_t)" },
+    { CANPROP_GET_VERSION         , sizeof(uint16_t),        LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "version number of the library (uint16_t)" },
+    { CANPROP_GET_PATCH_NO        , sizeof(uint8_t),         LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "patch number of the library (uint8_t)" },
+    { CANPROP_GET_BUILD_NO        , sizeof(uint32_t),        LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "build number of the library (uint32_t)" },
+    { CANPROP_GET_LIBRARY_ID      , sizeof(int32_t),         LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "library id of the library (int32_t)" },
+    { CANPROP_GET_LIBRARY_VENDOR  , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "vendor name of the library (char[256])" },
+    { CANPROP_GET_LIBRARY_DLLNAME , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "file name of the library DLL (char[256])" },
+    { CANPROP_GET_DEVICE_TYPE     , sizeof(int32_t),         DRV_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "device type of the CAN interface (int32_t)" },
+    { CANPROP_GET_DEVICE_NAME     , CANPROP_MAX_BUFFER_SIZE, DRV_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "device name of the CAN interface (char[256])" },
+    { CANPROP_GET_DEVICE_VENDOR   , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "vendor name of the CAN interface (char[256])" },
+    { CANPROP_GET_DEVICE_DLLNAME  , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "file name of the CAN interface DLL (char[256])" },
+    { CANPROP_GET_DEVICE_PARAM    , CANPROP_MAX_BUFFER_SIZE, DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, MODE_RUNNING, "device parameter of the CAN interface (char[256])" },
+    { CANPROP_GET_OP_CAPABILITY   , sizeof(uint8_t),         DRV_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "supported operation modes of the CAN controller (uint8_t)" },
+    { CANPROP_GET_OP_MODE         , sizeof(uint8_t),         DRV_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "active operation mode of the CAN controller (uint8_t)" },
+    { CANPROP_GET_BITRATE         , sizeof(can_bitrate_t),   DRV_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "active bit-rate of the CAN controller (can_bitrate_t)" },
+    { CANPROP_GET_SPEED           , sizeof(can_speed_t),     DRV_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "active bus speed of the CAN controller (can_speed_t)" },
+    { CANPROP_GET_STATUS          , sizeof(can_mode_t),      DRV_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "current status register of the CAN controller (uint8_t)" },
+    { CANPROP_GET_BUSLOAD         , sizeof(uint16_t),        DRV_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "current bus load of the CAN controller (uint16_t)" },
+    { CANPROP_GET_NUM_CHANNELS    , sizeof(uint8_t),         DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, MODE_RUNNING, "numbers of CAN channels on the CAN interface (uint8_t)" },
+    { CANPROP_GET_CAN_CHANNEL     , sizeof(uint8_t),         DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, MODE_RUNNING, "active CAN channel on the CAN interface (uint8_t)" },
+    { CANPROP_GET_CAN_CLOCK       , sizeof(int32_t),         DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, MODE_RUNNING, "frequency of the CAN controller clock in [Hz] (int32_t)" },
+    { CANPROP_GET_TX_COUNTER      , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "total number of sent messages (uint64_t)" },
+    { CANPROP_GET_RX_COUNTER      , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "total number of reveiced messages (uint64_t)" },
+    { CANPROP_GET_ERR_COUNTER     , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "total number of reveiced error frames (uint64_t)" },
+    { CANPROP_GET_RCV_QUEUE_SIZE  , sizeof(uint32_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, MODE_RUNNING, "maximum number of message the receive queue can hold (uint32_t)" },
+    { CANPROP_GET_RCV_QUEUE_HIGH  , sizeof(uint32_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, MODE_RUNNING, "maximum number of message the receive queue has hold (uint32_t)" },
+    { CANPROP_GET_RCV_QUEUE_OVFL  , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, MODE_RUNNING, "overflow counter of the receive queue (uint64_t)" },
+    { CANPROP_GET_TRM_QUEUE_SIZE  , sizeof(uint32_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, MODE_RUNNING, "maximum number of message the transmit queue can hold (uint32_t)" },
+    { CANPROP_GET_TRM_QUEUE_HIGH  , sizeof(uint32_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, MODE_RUNNING, "maximum number of message the transmit queue has hold (uint32_t)" },
+    { CANPROP_GET_TRM_QUEUE_OVFL  , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_OPTIONAL, MODE_RUNNING, "overflow counter of the transmit queue (uint64_t)" },
+    { CANPROP_GET_FILTER_11BIT    , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_FILTERING, MODE_RUNNING, "acceptance filter code and mask for 11-bit identifier (uint64_t)" },
+    { CANPROP_GET_FILTER_29BIT    , sizeof(uint64_t),        DRV_PARAM, PROP_GETTER, PROP_FILTERING, MODE_RUNNING, "acceptance filter code and mask for 29-bit identifier (uint64_t)" },
+    { CANPROP_SET_FILTER_11BIT    , sizeof(uint64_t),        DRV_PARAM, PROP_SETTER, PROP_FILTERING, MODE_STOPPED, "set value for acceptance filter code and mask for 11-bit identifier (uint64_t)" },
+    { CANPROP_SET_FILTER_29BIT    , sizeof(uint64_t),        DRV_PARAM, PROP_SETTER, PROP_FILTERING, MODE_STOPPED, "set value for acceptance filter code and mask for 29-bit identifier (uint64_t)" },
+    { CANPROP_SET_FILTER_RESET    , 0U /* NULL pointer*/,    DRV_PARAM, PROP_SETTER, PROP_FILTERING, MODE_STOPPED, "reset acceptance filter code and mask to default values (NULL)" },
     /* note:  SET_FIRST_CHANNEL must be called before any GET_CHANNEL_xyz, therefore we define it as a PROP_GETTER because it gets a (virtual) index */
-    { CANPROP_SET_FIRST_CHANNEL   , 0U /* NULL pointer*/,    LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "set index to the first entry in the interface list (NULL)" },
-    { CANPROP_GET_CHANNEL_NO      , sizeof(int32_t),         LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "get channel no. at actual index in the interface list (int32_t)" },
-    { CANPROP_GET_CHANNEL_NAME    , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "get channel name at actual index in the interface list (char[256])" },
-    { CANPROP_GET_CHANNEL_DLLNAME , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "get file name of the DLL at actual index in the interface list (char[256])" },
-    { CANPROP_GET_CHANNEL_VENDOR_ID , sizeof(int32_t),       LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "get library id at actual index in the interface list (int32_t)" },
-    { CANPROP_GET_CHANNEL_VENDOR_NAME , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "get vendor name at actual index in the interface list(char[256])" },
+    { CANPROP_SET_FIRST_CHANNEL   , 0U /* NULL pointer*/,    LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "set index to the first entry in the interface list (NULL)" },
+    { CANPROP_GET_CHANNEL_NO      , sizeof(int32_t),         LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "get channel no. at actual index in the interface list (int32_t)" },
+    { CANPROP_GET_CHANNEL_NAME    , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "get channel name at actual index in the interface list (char[256])" },
+    { CANPROP_GET_CHANNEL_DLLNAME , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "get file name of the DLL at actual index in the interface list (char[256])" },
+    { CANPROP_GET_CHANNEL_VENDOR_ID , sizeof(int32_t),       LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "get library id at actual index in the interface list (int32_t)" },
+    { CANPROP_GET_CHANNEL_VENDOR_NAME , CANPROP_MAX_BUFFER_SIZE, LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "get vendor name at actual index in the interface list(char[256])" },
     /* note:  SET_NEXT_CHANNEL is also defined as a setter because it gets the next (virtual) index (see above), but it can be EOF when there is no device entry */
-    { CANPROP_SET_NEXT_CHANNEL    , 0U /* NULL pointer*/,    LIB_PARAM, PROP_GETTER, PROP_REQUIRED, "set index to the next entry in the interface list (NULL)" },
+    { CANPROP_SET_NEXT_CHANNEL    , 0U /* NULL pointer*/,    LIB_PARAM, PROP_GETTER, PROP_REQUIRED, MODE_RUNNING, "set index to the next entry in the interface list (NULL)" },
     /* end marker */
-    { CANPROP_INVALID, 0U, false, false, false, "" }
+    { CANPROP_INVALID, 0U, false, false, false, false, "" }
 };
 
 CProperties::CProperties() {
@@ -151,6 +166,13 @@ bool CProperties::IsRequired() {
         return false;
 }
 
+bool CProperties::IsModeRunning() {
+    if (m_nIndex < MAX_PROPERTIES)
+        return aProperties[m_nIndex].m_fModeRunning;
+    else
+        return false;
+}
+
 uint32_t CProperties::SizeOf()  {
     if (m_nIndex < MAX_PROPERTIES)
         return aProperties[m_nIndex].m_nSize;
@@ -165,4 +187,4 @@ const char* CProperties::Description() {
         return aProperties[MAX_PROPERTIES].m_szDescription;
 }
 
-// $Id: Properties.cpp 1170 2023-08-23 14:01:13Z haumea $  Copyright (c) UV Software, Berlin //
+// $Id: Properties.cpp 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin //
diff --git a/Tests/CANAPI/Sources/Properties.h b/Tests/CANAPI/Sources/Properties.h
index 6cf70fd..7bb43c2 100644
--- a/Tests/CANAPI/Sources/Properties.h
+++ b/Tests/CANAPI/Sources/Properties.h
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef PROPERTIES_H_INCLUDED
 #define PROPERTIES_H_INCLUDED
@@ -68,10 +68,11 @@ class CProperties {
     bool IsSetter();
     bool IsPreInit();
     bool IsRequired();
+    bool IsModeRunning();
 	uint32_t SizeOf();
     const char* Description();
 };
 #endif // PROPERTIES_H_INCLUDED
 
-// $Id: Properties.h 1157 2023-08-18 16:51:09Z haumea $  Copyright (c) UV Software, Berlin //
+// $Id: Properties.h 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin //
 
diff --git a/Tests/CANAPI/Sources/Settings.h b/Tests/CANAPI/Sources/Settings.h
index 869d0a8..dba564c 100644
--- a/Tests/CANAPI/Sources/Settings.h
+++ b/Tests/CANAPI/Sources/Settings.h
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef SETTINGS_H_INCLUDED
 #define SETTINGS_H_INCLUDED
@@ -158,4 +158,4 @@
 #endif
 #endif // SETTINGS_H_INCLUDED
 
-//  $Id: Settings.h 1217 2023-10-10 19:28:31Z haumea $  Copyright (c) UV Software, Berlin.
+//  $Id: Settings.h 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Sources/Timer.cpp b/Tests/CANAPI/Sources/Timer.cpp
index 42858d6..afc35ee 100644
--- a/Tests/CANAPI/Sources/Timer.cpp
+++ b/Tests/CANAPI/Sources/Timer.cpp
@@ -2,11 +2,13 @@
 //
 //  Software for Industrial Communication, Motion Control and Automation
 //
-//  Copyright (c) 2002-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
-//  This class is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  Class CTimer
+//
+//  This class is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this class.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -41,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this class.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this class.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifdef _DEBUG
 #undef THIS_FILE
@@ -58,48 +60,50 @@ static char THIS_FILE[]=__FILE__;
 #endif
 #define POSIX_DEPRECATED  0  /* set to non-zero value to use 'gettimeofday' and 'usleep'*/
 
-CTimer::CTimer(uint32_t u32Microseconds) {
+CTimer::CTimer(uint64_t u64Microseconds) {
 #if !defined(_WIN32) && !defined(_WIN64)
 #if (POSIX_DEPRECATED != 0)
     struct timeval tv;
     gettimeofday(&tv, NULL);
     m_u64UntilStop = ((uint64_t)tv.tv_sec * (uint64_t)1000000) + (uint64_t)tv.tv_usec
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #else
     struct timespec now = { 0, 0 };
     clock_gettime(CLOCK_MONOTONIC, &now);
     m_u64UntilStop = ((uint64_t)now.tv_sec * (uint64_t)1000000)
                    + ((uint64_t)now.tv_nsec / (uint64_t)1000)
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #endif
 #else
     LARGE_INTEGER largeCounter;  // high-resolution performance counter
 
+    m_llUntilStop = (LONGLONG)0; // counter value for the desired time-out
+
     // retrieve the frequency of the high-resolution performance counter
     if(!QueryPerformanceFrequency(&m_largeFrequency))
         return;
     // retrieve the current value of the high-resolution performance counter
-    if(!QueryPerformanceCounter(&largeCounter))
+    if (!QueryPerformanceCounter(&largeCounter))
         return;
     // calculate the counter value for the desired time-out
-    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u32Microseconds)
+    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
                                                                         / (LONGLONG)1000000);
 #endif
 }
 
-bool CTimer::Restart(uint32_t u32Microseconds) {
+bool CTimer::Restart(uint64_t u64Microseconds) {
 #if !defined(_WIN32) && !defined(_WIN64)
 #if (POSIX_DEPRECATED != 0)
     struct timeval tv;
     gettimeofday(&tv, NULL);
     m_u64UntilStop = ((uint64_t)tv.tv_sec * (uint64_t)1000000) + (uint64_t)tv.tv_usec
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #else
     struct timespec now = { 0, 0 };
     clock_gettime(CLOCK_MONOTONIC, &now);
     m_u64UntilStop = ((uint64_t)now.tv_sec * (uint64_t)1000000)
                    + ((uint64_t)now.tv_nsec / (uint64_t)1000)
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #endif
     return true;
 #else
@@ -109,7 +113,7 @@ bool CTimer::Restart(uint32_t u32Microseconds) {
     if(!QueryPerformanceCounter(&largeCounter))
         return false;
     // calculate the counter value for the desired time-out
-    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u32Microseconds)
+    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
                                                                         / (LONGLONG)1000000);
     return true;
 #endif
@@ -146,15 +150,15 @@ bool CTimer::Timeout() {
 #endif
 }
 
-bool CTimer::Delay(uint32_t u32Microseconds) {
+bool CTimer::Delay(uint64_t u64Microseconds) {
 #if !defined(_WIN32) && !defined(_WIN64)
 #if (POSIX_DEPRECATED != 0)
-    return (usleep((useconds_t)u32Microseconds) != 0) ? false : true;
+    return (usleep((useconds_t)u64Microseconds) != 0) ? false : true;
 #else
     int rc;
     struct timespec delay;
-    delay.tv_sec = (time_t)(u32Microseconds / CTimer::SEC);
-    delay.tv_nsec = (long)((u32Microseconds % CTimer::SEC) * (uint32_t)1000);
+    delay.tv_sec = (time_t)(u64Microseconds / CTimer::SEC);
+    delay.tv_nsec = (long)((u64Microseconds % CTimer::SEC) * (uint32_t)1000);
     errno = 0;
     while ((rc = nanosleep(&delay, &delay))) {
         if (errno != EINTR)
@@ -175,7 +179,7 @@ bool CTimer::Delay(uint32_t u32Microseconds) {
     if(!QueryPerformanceFrequency(&largeFrequency))
         return false;
     // calculate the counter value for the desired delay
-    llUntilStop = largeCounter.QuadPart + ((largeFrequency.QuadPart * (LONGLONG)u32Microseconds)
+    llUntilStop = largeCounter.QuadPart + ((largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
                                                                     / (LONGLONG)1000000);
     // wait until the counter overruns the delay time
     for(;;)
@@ -189,9 +193,9 @@ bool CTimer::Delay(uint32_t u32Microseconds) {
     HANDLE timer;
     LARGE_INTEGER ft;
 
-    ft.QuadPart = -(10 * (LONGLONG)u32Microseconds); // Convert to 100 nanosecond interval, negative value indicates relative time
+    ft.QuadPart = -(10 * (LONGLONG)u64Microseconds); // Convert to 100 nanosecond interval, negative value indicates relative time
 
-    if(u32Microseconds >= 100) {  // FIXME: Who made this decision?
+    if(u64Microseconds >= 100) {  // FIXME: Who made this decision?
         if ((timer = CreateWaitableTimer(NULL, TRUE, NULL)) != NULL) {
             SetWaitableTimer(timer, &ft, 0, NULL, NULL, 0);
             WaitForSingleObject(timer, INFINITE);
@@ -256,4 +260,4 @@ double CTimer::DiffTime(struct timespec start, struct timespec stop) {
             ((double)start.tv_sec + ((double)start.tv_nsec / 1000000000.f)));
 }
 
-// $Id: Timer.cpp 1213 2023-10-07 19:43:58Z makemake $  Copyright (c) UV Software, Berlin //
+// $Id: Timer.cpp 1273 2024-04-18 16:59:22Z makemake $  Copyright (c) UV Software, Berlin //
diff --git a/Tests/CANAPI/Sources/Timer.h b/Tests/CANAPI/Sources/Timer.h
index 5f0ebc5..3bb4460 100644
--- a/Tests/CANAPI/Sources/Timer.h
+++ b/Tests/CANAPI/Sources/Timer.h
@@ -2,11 +2,13 @@
 //
 //  Software for Industrial Communication, Motion Control and Automation
 //
-//  Copyright (c) 2002-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
-//  This class is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  Class CTimer
+//
+//  This class is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this class.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -41,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this class.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this class.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef TIMER_H_INCLUDED
 #define TIMER_H_INCLUDED
@@ -62,10 +64,10 @@
 
 class CTimer {
 public:
-    static const uint32_t USEC = 1U;  // 1 microsecond
-    static const uint32_t MSEC = 1000U;  // 1 millisecond
-    static const uint32_t SEC = 1000000U;  // 1 second
-    static const uint32_t MIN = 60000000U;  // 1 minute
+    static const uint64_t USEC = 1U;  // 1 microsecond
+    static const uint64_t MSEC = 1000U;  // 1 millisecond
+    static const uint64_t SEC = 1000000U;  // 1 second
+    static const uint64_t MIN = 60000000U;  // 1 minute
 private:
 #if !defined(_WIN32) && !defined(_WIN64)
     uint64_t m_u64UntilStop;  // counter value for the desired time-out
@@ -74,13 +76,13 @@ class CTimer {
     LONGLONG      m_llUntilStop;     // counter value for the desired time-out
 #endif
 public:
-    CTimer(uint32_t u32Microseconds = 0);
+    CTimer(uint64_t u64Microseconds = 0);
     virtual ~CTimer() {};
 
-    bool Restart(uint32_t u32Timeout);  // restart the timer!
-    bool Timeout();                     // time-out occurred?
+    bool Restart(uint64_t u64Microseconds);  // restart the timer!
+    bool Timeout();                          // time-out occurred?
 
-    static bool Delay(uint32_t u32Delay); // delay timer
+    static bool Delay(uint64_t u64Microseconds);  // delay timer
 
     static struct timespec GetTime();  // time with nanosecond resolution
     static double DiffTime(struct timespec start, struct timespec stop);
@@ -88,4 +90,4 @@ class CTimer {
 
 #endif // TIMER_H_INCLUDED
 
-// $Id: Timer.h 799 2023-10-07 19:15:23Z makemake $  Copyright (c) UV Software, Berlin //
+// $Id: Timer.h 810 2024-04-18 14:01:00Z quaoar $  Copyright (c) UV Software, Berlin //
diff --git a/Tests/CANAPI/Sources/Timer64.cpp b/Tests/CANAPI/Sources/Timer64.cpp
deleted file mode 100644
index be8efec..0000000
--- a/Tests/CANAPI/Sources/Timer64.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-//  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
-//
-//  Software for Industrial Communication, Motion Control and Automation
-//
-//  Copyright (c) 2002-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
-//  All rights reserved.
-//
-//  This class is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
-//  You can choose between one of them if you use this class.
-//
-//  BSD 2-Clause "Simplified" License:
-//  Redistribution and use in source and binary forms, with or without
-//  modification, are permitted provided that the following conditions are met:
-//  1. Redistributions of source code must retain the above copyright notice, this
-//     list of conditions and the following disclaimer.
-//  2. Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//  THIS CLASS IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-//  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-//  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-//  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-//  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-//  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-//  OF THIS CLASS, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//  GNU General Public License v3.0 or later:
-//  This class is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This class is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this class.  If not, see <http://www.gnu.org/licenses/>.
-//
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-#define new DEBUG_NEW
-#endif
-
-#include "Timer64.h"
-
-#if !defined(_WIN32) && !defined(_WIN64)
-#include <errno.h>
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-#define POSIX_DEPRECATED  0  /* set to non-zero value to use 'gettimeofday' and 'usleep'*/
-
-CTimer::CTimer(uint64_t u64Microseconds) {
-#if !defined(_WIN32) && !defined(_WIN64)
-#if (POSIX_DEPRECATED != 0)
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    m_u64UntilStop = ((uint64_t)tv.tv_sec * (uint64_t)1000000) + (uint64_t)tv.tv_usec
-                   + ((uint64_t)u64Microseconds);
-#else
-    struct timespec now = { 0, 0 };
-    clock_gettime(CLOCK_MONOTONIC, &now);
-    m_u64UntilStop = ((uint64_t)now.tv_sec * (uint64_t)1000000)
-                   + ((uint64_t)now.tv_nsec / (uint64_t)1000)
-                   + ((uint64_t)u64Microseconds);
-#endif
-#else
-    LARGE_INTEGER largeCounter;  // high-resolution performance counter
-
-    m_llUntilStop = (LONGLONG)0; // counter value for the desired time-out
-
-    // retrieve the frequency of the high-resolution performance counter
-    if(!QueryPerformanceFrequency(&m_largeFrequency))
-        return;
-    // retrieve the current value of the high-resolution performance counter
-    if(!QueryPerformanceCounter(&largeCounter))
-        return;
-    // calculate the counter value for the desired time-out
-    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
-                                                                        / (LONGLONG)1000000);
-#endif
-}
-
-bool CTimer::Restart(uint64_t u64Microseconds) {
-#if !defined(_WIN32) && !defined(_WIN64)
-#if (POSIX_DEPRECATED != 0)
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    m_u64UntilStop = ((uint64_t)tv.tv_sec * (uint64_t)1000000) + (uint64_t)tv.tv_usec
-                   + ((uint64_t)u64Microseconds);
-#else
-    struct timespec now = { 0, 0 };
-    clock_gettime(CLOCK_MONOTONIC, &now);
-    m_u64UntilStop = ((uint64_t)now.tv_sec * (uint64_t)1000000)
-                   + ((uint64_t)now.tv_nsec / (uint64_t)1000)
-                   + ((uint64_t)u64Microseconds);
-#endif
-    return true;
-#else
-    LARGE_INTEGER largeCounter;  // high-resolution performance counter
-
-    // retrieve the current value of the high-resolution performance counter
-    if(!QueryPerformanceCounter(&largeCounter))
-        return false;
-    // calculate the counter value for the desired time-out
-    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
-                                                                        / (LONGLONG)1000000);
-    return true;
-#endif
-}
-
-bool CTimer::Timeout() {
-#if !defined(_WIN32) && !defined(_WIN64)
-    uint64_t u64Now;
-#if (POSIX_DEPRECATED != 0)
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    u64Now = ((uint64_t)tv.tv_sec * (uint64_t)1000000) + (uint64_t)tv.tv_usec;
-#else
-    struct timespec now = { 0, 0 };
-    clock_gettime(CLOCK_MONOTONIC, &now);
-    u64Now = ((uint64_t)now.tv_sec * (uint64_t)1000000)
-           + ((uint64_t)now.tv_nsec / (uint64_t)1000);
-#endif
-    if(u64Now < this->m_u64UntilStop)
-        return false;
-    else
-        return true;
-#else
-    LARGE_INTEGER largeCounter;  // high-resolution performance counter
-
-    // retrieve the current value of the high-resolution performance counter
-    if(!QueryPerformanceCounter(&largeCounter))
-        return false;
-    // a time-out occurred, if the counter overruns the time-out value
-    if(largeCounter.QuadPart < m_llUntilStop)
-        return false;
-    else
-        return true;
-#endif
-}
-
-bool CTimer::Delay(uint64_t u64Microseconds) {
-#if !defined(_WIN32) && !defined(_WIN64)
-#if (POSIX_DEPRECATED != 0)
-    return (usleep((useconds_t)u64Microseconds) != 0) ? false : true;
-#else
-    int rc;
-    struct timespec delay;
-    delay.tv_sec = (time_t)(u64Microseconds / CTimer::SEC);
-    delay.tv_nsec = (long)((u64Microseconds % CTimer::SEC) * (uint32_t)1000);
-    errno = 0;
-    while ((rc = nanosleep(&delay, &delay))) {
-        if (errno != EINTR)
-            break;
-    }
-    return (rc != 0) ? false : true;
-#endif
-#else
-# ifndef CTIMER_WAITABLE_TIMER
-    LARGE_INTEGER largeFrequency;  // frequency in counts per second
-    LARGE_INTEGER largeCounter;    // high-resolution performance counter
-    LONGLONG      llUntilStop;     // counter value for the desired delay
-
-    // retrieve the current value of the high-resolution performance counter
-    if(!QueryPerformanceCounter(&largeCounter))
-        return false;
-    // retrieve the frequency of the high-resolution performance counter
-    if(!QueryPerformanceFrequency(&largeFrequency))
-        return false;
-    // calculate the counter value for the desired delay
-    llUntilStop = largeCounter.QuadPart + ((largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
-                                                                    / (LONGLONG)1000000);
-    // wait until the counter overruns the delay time
-    for(;;)
-    {
-        if(!QueryPerformanceCounter(&largeCounter))
-            return false;
-        if(largeCounter.QuadPart >= llUntilStop)
-            return true;
-    }
-# else
-    HANDLE timer;
-    LARGE_INTEGER ft;
-
-    ft.QuadPart = -(10 * (LONGLONG)u64Microseconds); // Convert to 100 nanosecond interval, negative value indicates relative time
-
-    if(u64Microseconds >= 100) {  // FIXME: Who made this decision?
-        if ((timer = CreateWaitableTimer(NULL, TRUE, NULL)) != NULL) {
-            SetWaitableTimer(timer, &ft, 0, NULL, NULL, 0);
-            WaitForSingleObject(timer, INFINITE);
-            CloseHandle(timer);
-        }
-    }
-    else {
-        // According to MSDN's documentation for Sleep:
-        // | A value of zero causes the thread to relinquish the remainder of its time slice to any other
-        // | thread that is ready to run.If there are no other threads ready to run, the function returns
-        // | immediately, and the thread continues execution.
-        Sleep(0);
-    }
-    return true;
-# endif
-#endif
-}
-
-struct timespec CTimer::GetTime() {
-    struct timespec now = { 0, 0 };
-#if !defined(_WIN32) && !defined(_WIN64)
-    clock_gettime(CLOCK_REALTIME, &now);
-#else
-    static bool fInitialied = false;         // initialization flag
-    static struct timespec tsStartTime;      // time at first call (UTC)
-    static LARGE_INTEGER largeFrequency;     // frequency in counts per second
-    static LARGE_INTEGER largeStartCounter;  // high-resolution performance counter
-    LARGE_INTEGER largeCurrentCounter;
-
-    if (!fInitialied) {
-        // retrieve the frequency of the high-resolution performance counter
-        if (!QueryPerformanceFrequency(&largeFrequency))
-            return now;
-        // retrieve the value of the high-resolution performance counter
-        if (!QueryPerformanceCounter(&largeStartCounter))
-            return now;
-        // retrieve the time as struct timespec
-        if (!timespec_get(&tsStartTime, TIME_UTC))
-            return now;
-        fInitialied = true;
-    }
-    // retrieve the current value of the high-resolution performance counter
-    if (!QueryPerformanceCounter(&largeCurrentCounter))
-        return now;
-    // calculate the current time with nanosecond resolution
-    largeCurrentCounter.QuadPart -= largeStartCounter.QuadPart;
-    time_t sec = largeCurrentCounter.QuadPart / largeFrequency.QuadPart;
-    long nsec = (long)(((largeCurrentCounter.QuadPart - (sec * largeFrequency.QuadPart))
-              * 1000000000UL) / largeFrequency.QuadPart);
-    now.tv_sec = tsStartTime.tv_sec + sec;
-    now.tv_nsec = tsStartTime.tv_nsec + nsec;
-    if (now.tv_nsec >= 1000000000UL) {
-        now.tv_sec += 1;
-        now.tv_nsec -= 1000000000UL;
-    }
-#endif
-    return now;
-}
-
-double CTimer::DiffTime(struct timespec start, struct timespec stop) {
-    return (((double)stop.tv_sec  + ((double)stop.tv_nsec  / 1000000000.f)) -
-            ((double)start.tv_sec + ((double)start.tv_nsec / 1000000000.f)));
-}
-
-// $Id$  Copyright (c) UV Software, Berlin //
diff --git a/Tests/CANAPI/Sources/Timer64.h b/Tests/CANAPI/Sources/Timer64.h
deleted file mode 100644
index 10bdc4f..0000000
--- a/Tests/CANAPI/Sources/Timer64.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
-//
-//  Software for Industrial Communication, Motion Control and Automation
-//
-//  Copyright (c) 2002-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
-//  All rights reserved.
-//
-//  This class is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
-//  You can choose between one of them if you use this class.
-//
-//  BSD 2-Clause "Simplified" License:
-//  Redistribution and use in source and binary forms, with or without
-//  modification, are permitted provided that the following conditions are met:
-//  1. Redistributions of source code must retain the above copyright notice, this
-//     list of conditions and the following disclaimer.
-//  2. Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//  THIS CLASS IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-//  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-//  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-//  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-//  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-//  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-//  OF THIS CLASS, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//  GNU General Public License v3.0 or later:
-//  This class is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This class is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this class.  If not, see <http://www.gnu.org/licenses/>.
-//
-#ifndef TIMER_H_INCLUDED
-#define TIMER_H_INCLUDED
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <time.h>
-#include <stdint.h>
-#if defined(_WIN32) || defined(_WIN64)
-#include <windows.h>
-#endif
-
-#if defined(_WIN32) || defined(_WIN64)
-#define CTIMER_WAITABLE_TIMER  // a Windows alternative for usleep()
-#endif
-
-class CTimer {
-public:
-    static const uint64_t USEC = 1U;  // 1 microsecond
-    static const uint64_t MSEC = 1000U;  // 1 millisecond
-    static const uint64_t SEC = 1000000U;  // 1 second
-    static const uint64_t MIN = 60000000U;  // 1 minute
-private:
-#if !defined(_WIN32) && !defined(_WIN64)
-    uint64_t m_u64UntilStop;  // counter value for the desired time-out
-#else
-    LARGE_INTEGER m_largeFrequency;  // frequency in counts per second
-    LONGLONG      m_llUntilStop;     // counter value for the desired time-out
-#endif
-public:
-    CTimer(uint64_t u64Microseconds = 0);
-    virtual ~CTimer() {};
-
-    bool Restart(uint64_t u64Microseconds);  // restart the timer!
-    bool Timeout();                          // time-out occurred?
-
-    static bool Delay(uint64_t u64Microseconds);  // delay timer
-
-    static struct timespec GetTime();  // time with nanosecond resolution
-    static double DiffTime(struct timespec start, struct timespec stop);
-};
-
-#endif // TIMER_H_INCLUDED
-
-// $Id$  Copyright (c) UV Software, Berlin //
diff --git a/Tests/CANAPI/Sources/main.cpp b/Tests/CANAPI/Sources/main.cpp
index f5f44be..1dd850c 100644
--- a/Tests/CANAPI/Sources/main.cpp
+++ b/Tests/CANAPI/Sources/main.cpp
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include <cstdio>
 #include <iostream>
@@ -62,7 +62,7 @@ GTEST_API_ int main(int argc, char **argv) {
 #endif
     std::cout << CCanDriver::GetVersion() << std::endl;
     std::cout << "Copyright (c) 2004-2012 by UV Software, Friedrichshafen" << std::endl;
-    std::cout << "Copyright (c) 2013-2023 by UV Software, Berlin" << std::endl;
+    std::cout << "Copyright (c) 2013-2024 by UV Software, Berlin" << std::endl;
     std::cout << "Build: " << __DATE__ << " " << __TIME__ << " (" << REVISION_NO << ")" << std::endl;
     // --- initialize GoogleTest framework --
     printf("Running main() from %s\n", __FILE__);
@@ -80,4 +80,4 @@ GTEST_API_ int main(int argc, char **argv) {
     return RUN_ALL_TESTS();
 }
 
-// $Id: main.cpp 1185 2023-08-29 10:42:03Z haumea $  Copyright (c) UV Software, Berlin //
+// $Id: main.cpp 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin //
diff --git a/Tests/CANAPI/Sources/pch.h b/Tests/CANAPI/Sources/pch.h
index 3216ecc..6614a7d 100644
--- a/Tests/CANAPI/Sources/pch.h
+++ b/Tests/CANAPI/Sources/pch.h
@@ -28,7 +28,7 @@
 #include "Bitrates.h"
 #include "Properties.h"
 #include "Progress.h"
-#include "Timer64.h"
+#include "Timer.h"
 #include "Version.h"
 
 #endif // PRECOMPILED_HEADERS_INCLUDED
diff --git a/Tests/CANAPI/Testcases/TC00_SmokeTest.cc b/Tests/CANAPI/Testcases/TC00_SmokeTest.cc
index e7d13b4..4e0b0a5 100644
--- a/Tests/CANAPI/Testcases/TC00_SmokeTest.cc
+++ b/Tests/CANAPI/Testcases/TC00_SmokeTest.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -300,4 +300,4 @@ TEST_F(SmokeTest, DefaultScenario) {
     // @end.
 }
 
-//  $Id: TC00_SmokeTest.cc 1217 2023-10-10 19:28:31Z haumea $  Copyright (c) UV Software, Berlin.
+//  $Id: TC00_SmokeTest.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC01_ProbeChannel.cc b/Tests/CANAPI/Testcases/TC01_ProbeChannel.cc
index 3002d3f..9e10318 100644
--- a/Tests/CANAPI/Testcases/TC01_ProbeChannel.cc
+++ b/Tests/CANAPI/Testcases/TC01_ProbeChannel.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -1031,4 +1031,4 @@ TEST_F(ProbeChannel, GTEST_TESTCASE(WithInvalidLibraryId, GTEST_DISABLED)) {
 }
 #endif  // (OPTION_CANAPI_LIBRARY != OPTION_DISBALED)
 
-//  $Id: TC01_ProbeChannel.cc 1217 2023-10-10 19:28:31Z haumea $  Copyright (c) UV Software, Berlin.
+//  $Id: TC01_ProbeChannel.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC02_InitializeChannel.cc b/Tests/CANAPI/Testcases/TC02_InitializeChannel.cc
index 28c6507..af62aac 100644
--- a/Tests/CANAPI/Testcases/TC02_InitializeChannel.cc
+++ b/Tests/CANAPI/Testcases/TC02_InitializeChannel.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -913,4 +913,4 @@ TEST_F(InitializeChannel, GTEST_TESTCASE(WithInvalidLibraryId, GTEST_DISABLED))
 }
 #endif  // (OPTION_CANAPI_LIBRARY != OPTION_DISBALED)
 
-//  $Id: TC02_InitializeChannel.cc 1188 2023-09-01 18:21:43Z haumea $  Copyright (c) UV Software, Berlin.
+//  $Id: TC02_InitializeChannel.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC03_StartController.cc b/Tests/CANAPI/Testcases/TC03_StartController.cc
index 5a17f19..9b18950 100644
--- a/Tests/CANAPI/Testcases/TC03_StartController.cc
+++ b/Tests/CANAPI/Testcases/TC03_StartController.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -2313,4 +2313,4 @@ TEST_F(StartController, GTEST_TESTCASE(WithCanFdBitrateSettingsInCan20Mode, GTES
 }
 #endif  // (CAN_FD_SUPPORTED == FEATURE_SUPPORTED)
 
-//  $Id: TC03_StartController.cc 1218 2023-10-14 12:18:19Z makemake $  Copyright (c) UV Software, Berlin.
+//  $Id: TC03_StartController.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC04_ReadMessage.cc b/Tests/CANAPI/Testcases/TC04_ReadMessage.cc
index d695618..eb20a3a 100644
--- a/Tests/CANAPI/Testcases/TC04_ReadMessage.cc
+++ b/Tests/CANAPI/Testcases/TC04_ReadMessage.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -1978,4 +1978,4 @@ TEST_F(ReadMessage, GTEST_TESTCASE(WithDifferentTimeoutValues, GTEST_ENABLED)) {
 // @todo: (1) blocking read
 // @todo: (2) test reentrancy
 
-//  $Id: TC04_ReadMessage.cc 1218 2023-10-14 12:18:19Z makemake $  Copyright (c) UV Software, Berlin.
+//  $Id: TC04_ReadMessage.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC05_WriteMessage.cc b/Tests/CANAPI/Testcases/TC05_WriteMessage.cc
index be0037e..dc45d96 100644
--- a/Tests/CANAPI/Testcases/TC05_WriteMessage.cc
+++ b/Tests/CANAPI/Testcases/TC05_WriteMessage.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -2169,12 +2169,18 @@ TEST_F(WriteMessage, GTEST_TESTCASE(WithFlagEsi, GTEST_ENABLED)) {
     retVal = dut2.ReadMessage(rcvMsg, TEST_READ_TIMEOUT);
     EXPECT_EQ(CCanApi::NoError, retVal);
     // @- compare sent and received message
-    EXPECT_TRUE(dut2.CompareMessages(trmMsg, rcvMsg));
+    EXPECT_TRUE(dut2.CompareMessages(trmMsg, rcvMsg, false));
+#if (1)
+    // @  note: flag ESI is not set in received message in CAN FD mode
+    // @        (KvaserCAN-Wrapper and PCANBasic-Wrapper on Windows)
+    EXPECT_EQ(0, rcvMsg.esi);
+#else
     // @  note: flag ESI should also be set in received message in CAN FD mode
     if (dut2.GetOpMode().fdoe)
         EXPECT_EQ(1, rcvMsg.esi);
     else
         EXPECT_EQ(0, rcvMsg.esi);
+#endif
     // @post:
     counter.Clear();
     // @- send some frames to DUT2 and receive some frames from DUT2
@@ -2205,4 +2211,4 @@ TEST_F(WriteMessage, GTEST_TESTCASE(WithFlagEsi, GTEST_ENABLED)) {
 // @todo: (1) blocking write
 // @todo: (2) test reentrancy
 
-//  $Id: TC05_WriteMessage.cc 1218 2023-10-14 12:18:19Z makemake $  Copyright (c) UV Software, Berlin.
+//  $Id: TC05_WriteMessage.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC06_ResetController.cc b/Tests/CANAPI/Testcases/TC06_ResetController.cc
index 03fee7c..d4c0017 100644
--- a/Tests/CANAPI/Testcases/TC06_ResetController.cc
+++ b/Tests/CANAPI/Testcases/TC06_ResetController.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -481,4 +481,4 @@ TEST_F(ResetController, GTEST_TESTCASE(CheckStatisticalCounters, GTEST_ENABLED))
     // @end.
 }
 
-//  $Id: TC06_ResetController.cc 1165 2023-08-22 06:57:25Z haumea $  Copyright (c) UV Software, Berlin.
+//  $Id: TC06_ResetController.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC08_TeardownChannel.cc b/Tests/CANAPI/Testcases/TC08_TeardownChannel.cc
index a4b7684..91c932f 100644
--- a/Tests/CANAPI/Testcases/TC08_TeardownChannel.cc
+++ b/Tests/CANAPI/Testcases/TC08_TeardownChannel.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -333,4 +333,4 @@ TEST_F(TeardownChannel, GTEST_TESTCASE(IfChannelTornDown, GTEST_ENABLED)) {
 // @note: shuting down all channels is not possible with the C++ API!
 
 
-//  $Id: TC08_TeardownChannel.cc 1165 2023-08-22 06:57:25Z haumea $  Copyright (c) UV Software, Berlin.
+//  $Id: TC08_TeardownChannel.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC09_GetStatus.cc b/Tests/CANAPI/Testcases/TC09_GetStatus.cc
index 84a8f05..634d9d5 100644
--- a/Tests/CANAPI/Testcases/TC09_GetStatus.cc
+++ b/Tests/CANAPI/Testcases/TC09_GetStatus.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -1318,4 +1318,4 @@ TEST_F(GetStatus, GTEST_TESTCASE(IfReceiveQueueFull, GTEST_TC09_14_ENABLED)) {
     // @end.
 }
 
-//  $Id: TC09_GetStatus.cc 1218 2023-10-14 12:18:19Z makemake $  Copyright (c) UV Software, Berlin.
+//  $Id: TC09_GetStatus.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC11_GetBitrate.cc b/Tests/CANAPI/Testcases/TC11_GetBitrate.cc
index c66ddfc..d8f8522 100644
--- a/Tests/CANAPI/Testcases/TC11_GetBitrate.cc
+++ b/Tests/CANAPI/Testcases/TC11_GetBitrate.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -662,4 +662,4 @@ TEST_F(GetBitrate, GTEST_TESTCASE(WithVariousCanFdBitrateSettings, GTEST_ENABLED
 }
 #endif  // (CAN_FD_SUPPORTED == FEATURE_SUPPORTED)
 
-//  $Id: TC11_GetBitrate.cc 1204 2023-09-24 15:26:57Z makemake $  Copyright (c) UV Software, Berlin.
+//  $Id: TC11_GetBitrate.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC12_GetProperty.cc b/Tests/CANAPI/Testcases/TC12_GetProperty.cc
index c9411e2..30afb88 100644
--- a/Tests/CANAPI/Testcases/TC12_GetProperty.cc
+++ b/Tests/CANAPI/Testcases/TC12_GetProperty.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -528,7 +528,10 @@ TEST_F(GetProperty, GTEST_TESTCASE(IfControllerStarted, GTEST_ENABLED)) {
         // @-- get property value (incl. pre-initialization parameter)
         retVal = dut1.GetProperty(param, (void*)buffer, testcase.SizeOf());
         if (testcase.IsRequired()) {
-            EXPECT_EQ(CCanApi::NoError, retVal);
+            if (testcase.IsModeRunning())
+                EXPECT_EQ(CCanApi::NoError, retVal);
+            else
+                EXPECT_EQ(CCanApi::ControllerOnline, retVal);
         } else if (retVal != CCanApi::NoError){
             EXPECT_EQ(CCanApi::NotSupported, retVal);
         }
@@ -708,4 +711,4 @@ TEST_F(GetProperty, GTEST_TESTCASE(IfChannelTornDown, GTEST_ENABLED)) {
 }
 
 
-//  $Id: TC12_GetProperty.cc 1201 2023-09-13 11:09:28Z makemake $  Copyright (c) UV Software, Berlin.
+//  $Id: TC12_GetProperty.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC21_GetBusSpeed.cc b/Tests/CANAPI/Testcases/TC21_GetBusSpeed.cc
index af32326..40b5651 100644
--- a/Tests/CANAPI/Testcases/TC21_GetBusSpeed.cc
+++ b/Tests/CANAPI/Testcases/TC21_GetBusSpeed.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -663,4 +663,4 @@ TEST_F(GetBusSpeed, GTEST_TESTCASE(WithVariousCanFdBitrateSettings, GTEST_DISABL
 }
 #endif  // (CAN_FD_SUPPORTED == FEATURE_SUPPORTED)
 
-//  $Id: TC21_GetBusSpeed.cc 1158 2023-08-18 17:05:41Z haumea $  Copyright (c) UV Software, Berlin.
+//  $Id: TC21_GetBusSpeed.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC23_SetFilter11Bit.cc b/Tests/CANAPI/Testcases/TC23_SetFilter11Bit.cc
new file mode 100644
index 0000000..e559191
--- /dev/null
+++ b/Tests/CANAPI/Testcases/TC23_SetFilter11Bit.cc
@@ -0,0 +1,772 @@
+//  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
+//
+//  CAN Interface API, Version 3 (Testing)
+//
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  All rights reserved.
+//
+//  This file is part of CAN API V3.
+//
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
+//  You can choose between one of them if you use this file.
+//
+//  BSD 2-Clause "Simplified" License:
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted provided that the following conditions are met:
+//  1. Redistributions of source code must retain the above copyright notice, this
+//     list of conditions and the following disclaimer.
+//  2. Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//  CAN API V3 IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+//  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+//  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+//  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+//  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+//  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+//  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+//  OF CAN API V3, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+//  GNU General Public License v3.0 or later:
+//  CAN API V3 is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  CAN API V3 is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
+//
+#include "pch.h"
+
+//  @note: This test suite tests the following methods:
+//  @      - CCanApi::SetFilter11Bit()  [TC23.*]
+//  @      - CCanApi::GetFilter11Bit()  [TC24.*]
+//  @
+#ifndef FEATURE_FILTERING
+#define FEATURE_FILTERING  FEATURE_UNSUPPORTED
+#ifdef _MSC_VER
+#pragma message ( "FEATURE_FILTERING not set, default = FEATURE_UNSUPPORTED" )
+#else
+#warning FEATURE_FILTERING not set, default = FEATURE_UNSUPPORTED
+#endif
+#endif
+#if (FEATURE_FILTERING != FEATURE_UNSUPPORTED)
+
+class SetFilter11Bit : public testing::Test {
+    virtual void SetUp() {}
+    virtual void TearDown() {}
+protected:
+    void CheckFilter11Bit(CCanDevice& dut1, uint32_t accCode, uint32_t accMask) {
+        CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+        CANAPI_Message_t trmMsg = {};
+        CANAPI_Message_t rcvMsg = {};
+        CANAPI_Return_t retVal;
+        // CAN message
+        trmMsg.id = 0U;
+        trmMsg.xtd = 0;
+        trmMsg.rtr = 0;
+        trmMsg.sts = 0;
+#if (OPTION_CAN_2_0_ONLY != 0)
+        trmMsg.dlc = 0U; // CAN_MAX_DLC;
+        memset(trmMsg.data, 0, CAN_MAX_LEN);
+#else
+        trmMsg.fdf = g_Options.GetOpMode(DUT1).fdoe ? 1 : 0;
+        trmMsg.brs = g_Options.GetOpMode(DUT1).brse ? 1 : 0;
+        trmMsg.esi = 0;
+        trmMsg.dlc = 0U; // g_Options.GetOpMode(DUT1).fdoe ? CANFD_MAX_DLC : CAN_MAX_DLC;
+        memset(trmMsg.data, 0, CANFD_MAX_LEN);
+#endif
+        // initialize DUT2 with configured settings
+        retVal = dut2.InitializeChannel();
+        ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut2.InitializeChannel() failed with error code " << retVal;
+        // start DUT2 with configured bit-rate settings
+        retVal = dut2.StartController();
+        EXPECT_EQ(CCanApi::NoError, retVal);
+        // DUT2 send 2048 standard messages
+        int n = 0, frames = 2048;
+        CProgress progress = CProgress(frames);
+        for (int i = 0; i < frames; i++) {
+            trmMsg.id = (uint32_t)i;
+            // send one message (retry if busy)
+            do {
+                retVal = dut2.WriteMessage(trmMsg, DEVICE_SEND_TIMEOUT);
+                if (retVal == CCanApi::TransmitterBusy)
+                    PCBUSB_QXMT_DELAY();
+            } while (retVal == CCanApi::TransmitterBusy);
+            // on error abort
+            if (retVal != CCanApi::NoError) {
+                EXPECT_EQ(retVal, CCanApi::NoError);
+                n = 0;
+                break;
+            }
+            PCBUSB_QXMT_DELAY();  // TODO: why here?
+            // update number of transmitted CAN messages
+            progress.Update((int)(i + 1), (int)0);
+            // update number of accepted CAN messages
+            if (dut1.IsCanIdAccepted(trmMsg.id, accCode, accMask)) {
+                n++;
+            }
+        }
+        // DUT1 process all messages with acceptance filter
+        uint64_t timeout = (((uint64_t)dut1.TransmissionTime(dut1.GetBitrate(), (n + DEVICE_LOOP_EXTRA))
+                         *   (uint64_t)DEVICE_LOOP_FACTOR) / (uint64_t)DEVICE_LOOP_DIVISOR);  // bit-rate dependent timeout
+        CTimer timer = CTimer(timeout);
+        int j = 0;
+        while ((j < n) && !timer.Timeout()) {
+            // read one message from receiver's queue, if any
+            retVal = dut1.ReadMessage(rcvMsg, DEVICE_READ_TIMEOUT);
+            if (retVal == CCanApi::NoError) {
+                // ignore status messages/error frames
+                if (!rcvMsg.sts) {
+                    // update number of received CAN messages
+                    progress.Update((int)frames, (int)(j + 1));
+                    // check if received message is accepted by acceptance filter
+                    if (!dut1.IsCanIdAccepted(rcvMsg.id, accCode, accMask)) {
+                        EXPECT_TRUE(dut1.IsCanIdAccepted(rcvMsg.id, accCode, accMask));
+                        break;
+                    }
+                    j++;
+                }
+            }
+            // on error abort (if receiver is empty, continue)
+            else if (retVal != CCanApi::ReceiverEmpty) {
+                EXPECT_EQ(retVal, CCanApi::ReceiverEmpty);
+                break;
+            }
+        }
+        progress.Clear();
+        // tear down DUT2
+        retVal = dut2.TeardownChannel();
+        EXPECT_EQ(CCanApi::NoError, retVal);
+    }
+};
+
+// @gtest TC23/TC24.0: Set CAN acceptance filter for 11-bit identifier (sunnyday scenario)
+//
+// @expected: CANERR_NOERROR
+//
+TEST_F(SetFilter11Bit, GTEST_TESTCASE(SunnydayScenario, GTEST_SUNNYDAY)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CCanApi::EChannelState state;
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- probe if DUT1 is present and not occupied
+    retVal = dut1.ProbeChannel(state);
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.ProbeChannel() failed with error code " << retVal;
+    ASSERT_EQ(CCanApi::ChannelAvailable, state) << "[  ERROR!  ] " << g_Options.GetDeviceName(DUT1) << " is not available";
+    // @- probe if DUT2 is present and not occupied
+    retVal = dut2.ProbeChannel(state);
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut2.ProbeChannel() failed with error code " << retVal;
+    ASSERT_EQ(CCanApi::ChannelAvailable, state) << "[  ERROR!  ] " << g_Options.GetDeviceName(DUT2) << " is not available";
+    // @- check if different channels have been selected
+    ASSERT_TRUE((g_Options.GetChannelNo(DUT1) != g_Options.GetChannelNo(DUT2)) || \
+        (g_Options.GetLibraryId(DUT1) != g_Options.GetLibraryId(DUT2))) << "[  ERROR!  ] same channel selected twice";
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @test:
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @- set 11-bit filter (code 0x000 and mask 0x500)
+    codeSet = 0x00000000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @post:
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC23/TC24.1: Set CAN acceptance filter for 11-bit identifier with invalid interface handle(s)
+//
+// @note: checking channel handles is not possible with the C++ API!
+
+// @gtest TC24.2: Give a NULL pointer as argument for parameter 'code and 'mask'
+//
+// @note: passing pointers for 'code and 'mask' is not possible with the C++ API!
+
+// @gtest TC23/TC24.3: Set CAN acceptance filter for 11-bit identifier if CAN channel is not initialized
+//
+// @expected: CANERR_NOTINIT
+//
+TEST_F(SetFilter11Bit, GTEST_TESTCASE(IfChannelNotInitialized, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+ 
+    // @test:
+    // @- try to get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NotInitialized, retVal);
+    // @- try to set 11-bit filter (code 0x000 and mask 0x500)
+    codeSet = 0x00000000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NotInitialized, retVal);
+    // @post:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC23/TC24.4: Set CAN acceptance filter for 11-bit identifier if CAN controller is not started
+//
+// @expected: CANERR_NOERROR
+//
+TEST_F(SetFilter11Bit, GTEST_TESTCASE(IfControllerNotStarted, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @test:
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @- set 11-bit filter (code 0x000 and mask 0x500)
+    codeSet = 0x00000000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @post:
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC23/TC24.5: Set CAN acceptance filter for 11-bit identifier if CAN controller is started
+//
+// @expected: CANERR_ONLINE
+//
+TEST_F(SetFilter11Bit, GTEST_TESTCASE(IfControllerStarted, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @test:
+    // @- try to set 11-bit filter (code 0x000 and mask 0x500)
+    codeSet = 0x00000000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::ControllerOnline, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @post:
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC23/TC24.6: Set CAN acceptance filter for 11-bit identifier if CAN controller was previously stopped
+//
+// @expected: CANERR_NOERROR
+//
+TEST_F(SetFilter11Bit, GTEST_TESTCASE(IfControllerStopped, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @test:
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @- set 11-bit filter (code 0x000 and mask 0x500)
+    codeSet = 0x00000000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @post:
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    /*int32_t*/ frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC23/TC24.7: Set CAN acceptance filter for 11-bit identifier if CAN channel was previously torn down
+//
+// @expected: CANERR_NOTINIT
+//
+TEST_F(SetFilter11Bit, GTEST_TESTCASE(IfChannelTornDown, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @test:
+    // @- try to get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NotInitialized, retVal);
+    // @- try to set 11-bit filter (code 0x000 and mask 0x500)
+    codeSet = 0x00000000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NotInitialized, retVal);
+    // @end.
+}
+
+// @gtest TC23.8: Set CAN acceptance filter for 11-bit identifier with valid values
+//
+// @expected: CANERR_NOERROR
+//
+TEST_F(SetFilter11Bit, GTEST_TESTCASE(WithValidValues, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    const uint32_t codeSet[4] = { 0x000U, 0x0F0U, 0x70FU, 0x7FFU };
+    const uint32_t maskSet[4] = { 0x000U, 0x0F0U, 0x70FU, 0x7FFU };
+    CANAPI_Return_t retVal;
+    // @
+    // @note: This test can take a very long time
+    if (g_Options.RunQuick())
+        GTEST_SKIP() << "This test can take a very long time!";
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @test:
+    CCounter counter = CCounter();
+    for (int i = 0; i < 4; i++) {
+        for (int j = 0; j < 4; j++) {
+            counter.Increment();
+            // @-- set 11-bit filter
+            retVal = dut1.SetFilter11Bit(codeSet[i], maskSet[j]);
+            EXPECT_EQ(CCanApi::NoError, retVal);
+            // @-- get 11-bit filter
+            codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+            retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+            EXPECT_EQ(CCanApi::NoError, retVal);
+            EXPECT_EQ(codeSet[i], codeGet);
+            EXPECT_EQ(maskSet[j], maskGet);
+            // @-- start DUT1 with configured bit-rate settings
+            retVal = dut1.StartController();
+            EXPECT_EQ(CCanApi::NoError, retVal);
+            // @-- check acceptance filter on DUT1 (DUT2 sends frames with 11-bit identifier)
+            counter.Clear();
+            CheckFilter11Bit(dut1, codeSet[i], maskSet[j]);
+            // @-- stop/reset DUT1
+            retVal = dut1.ResetController();
+            EXPECT_EQ(CCanApi::NoError, retVal);
+        }
+    }
+    counter.Reset();
+    // @post:
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC23.9: Set CAN acceptance filter for 11-bit identifier with invalid values
+//
+// @expected: CANERR_ILLPARAM
+//
+TEST_F(SetFilter11Bit, GTEST_TESTCASE(WithInvalidValues, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @test:
+    // @- try to set 11-bit filter with invalid value (code 0x800 and mask 0x800)
+    codeSet = 0x00000800U; maskSet = 0x00000800U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::IllegalParameter, retVal);
+    // @- try to set 11-bit filter with invalid value (code 0x000 and mask 0xFFFF)
+    codeSet = 0x00000000U; maskSet = 0x0000FFFFU;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::IllegalParameter, retVal);
+    // @- try to set 11-bit filter with invalid value (code 0x1FFFFFFF and mask 0x000)
+    codeSet = 0x1FFFFFFFU; maskSet = 0x00000000U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::IllegalParameter, retVal);
+    // @- try to set 11-bit filter with invalid value (code 0xFFFFFFFF and mask 0xE0000000)
+    codeSet = 0xFFFFFFFFU; maskSet = 0xE0000000U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::IllegalParameter, retVal);
+    // @post:
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+#endif // FEATURE_FILTERING != FEATURE_UNSUPPORTED
+
+//  $Id: TC23_SetFilter11Bit.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC25_SetFilter29Bit.cc b/Tests/CANAPI/Testcases/TC25_SetFilter29Bit.cc
new file mode 100644
index 0000000..b036890
--- /dev/null
+++ b/Tests/CANAPI/Testcases/TC25_SetFilter29Bit.cc
@@ -0,0 +1,841 @@
+//  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
+//
+//  CAN Interface API, Version 3 (Testing)
+//
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  All rights reserved.
+//
+//  This file is part of CAN API V3.
+//
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
+//  You can choose between one of them if you use this file.
+//
+//  BSD 2-Clause "Simplified" License:
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted provided that the following conditions are met:
+//  1. Redistributions of source code must retain the above copyright notice, this
+//     list of conditions and the following disclaimer.
+//  2. Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//  CAN API V3 IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+//  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+//  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+//  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+//  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+//  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+//  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+//  OF CAN API V3, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+//  GNU General Public License v3.0 or later:
+//  CAN API V3 is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  CAN API V3 is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
+//
+#include "pch.h"
+
+//  @note: This test suite tests the following methods:
+//  @      - CCanApi::SetFilter29Bit()  [TC25.*]
+//  @      - CCanApi::GetFilter29Bit()  [TC26.*]
+//  @
+#ifndef FEATURE_FILTERING
+#define FEATURE_FILTERING  FEATURE_UNSUPPORTED
+#ifdef _MSC_VER
+#pragma message ( "FEATURE_FILTERING not set, default = FEATURE_UNSUPPORTED" )
+#else
+#warning FEATURE_FILTERING not set, default = FEATURE_UNSUPPORTED
+#endif
+#endif
+#if (FEATURE_FILTERING != FEATURE_UNSUPPORTED)
+
+class SetFilter29Bit : public testing::Test {
+    virtual void SetUp() {}
+    virtual void TearDown() {}
+protected:
+    void CheckFilter29Bit(CCanDevice& dut1, uint32_t accCode, uint32_t accMask) {
+        CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+        CANAPI_Message_t trmMsg = {};
+        CANAPI_Message_t rcvMsg = {};
+        CANAPI_Return_t retVal;
+        // CAN message
+        trmMsg.id = 0U;
+        trmMsg.xtd = 1;
+        trmMsg.rtr = 0;
+        trmMsg.sts = 0;
+#if (OPTION_CAN_2_0_ONLY != 0)
+        trmMsg.dlc = 0U; // CAN_MAX_DLC;
+        memset(trmMsg.data, 0, CAN_MAX_LEN);
+#else
+        trmMsg.fdf = g_Options.GetOpMode(DUT1).fdoe ? 1 : 0;
+        trmMsg.brs = g_Options.GetOpMode(DUT1).brse ? 1 : 0;
+        trmMsg.esi = 0;
+        trmMsg.dlc = 0U; // g_Options.GetOpMode(DUT1).fdoe ? CANFD_MAX_DLC : CAN_MAX_DLC;
+        memset(trmMsg.data, 0, CANFD_MAX_LEN);
+#endif
+        // initialize DUT2 with configured settings
+        retVal = dut2.InitializeChannel();
+        ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut2.InitializeChannel() failed with error code " << retVal;
+        // start DUT2 with configured bit-rate settings
+        retVal = dut2.StartController();
+        EXPECT_EQ(CCanApi::NoError, retVal);
+        // DUT2 send 2048 standard messages
+        int n = 0, frames = 2048;
+        CProgress progress = CProgress(frames);
+        for (int i = 0; i < frames; i++) {
+            trmMsg.id = (uint32_t)i;
+            // send one message (retry if busy)
+            do {
+                retVal = dut2.WriteMessage(trmMsg, DEVICE_SEND_TIMEOUT);
+                if (retVal == CCanApi::TransmitterBusy)
+                    PCBUSB_QXMT_DELAY();
+            } while (retVal == CCanApi::TransmitterBusy);
+            // on error abort
+            if (retVal != CCanApi::NoError) {
+                EXPECT_EQ(retVal, CCanApi::NoError);
+                n = 0;
+                break;
+            }
+            PCBUSB_QXMT_DELAY();  // TODO: why here?
+            // update number of transmitted CAN messages
+            progress.Update((int)(i + 1), (int)0);
+            // update number of accepted CAN messages
+            if (dut1.IsCanIdAccepted(trmMsg.id, accCode, accMask)) {
+                n++;
+            }
+        }
+        // DUT1 process all messages with acceptance filter
+        uint64_t timeout = (((uint64_t)dut1.TransmissionTime(dut1.GetBitrate(), (n + DEVICE_LOOP_EXTRA))
+                         *   (uint64_t)DEVICE_LOOP_FACTOR) / (uint64_t)DEVICE_LOOP_DIVISOR);  // bit-rate dependent timeout
+        CTimer timer = CTimer(timeout);
+        int j = 0;
+        while ((j < n) && !timer.Timeout()) {
+            // read one message from receiver's queue, if any
+            retVal = dut1.ReadMessage(rcvMsg, DEVICE_READ_TIMEOUT);
+            if (retVal == CCanApi::NoError) {
+                // ignore status messages/error frames
+                if (!rcvMsg.sts) {
+                    // update number of received CAN messages
+                    progress.Update((int)frames, (int)(j + 1));
+                    // check if received message is accepted by acceptance filter
+                    if (!dut1.IsCanIdAccepted(rcvMsg.id, accCode, accMask)) {
+                        EXPECT_TRUE(dut1.IsCanIdAccepted(rcvMsg.id, accCode, accMask));
+                        break;
+                    }
+                    j++;
+                }
+            }
+            // on error abort (if receiver is empty, continue)
+            else if (retVal != CCanApi::ReceiverEmpty) {
+                EXPECT_EQ(retVal, CCanApi::ReceiverEmpty);
+                break;
+            }
+        }
+        progress.Clear();
+        // tear down DUT2
+        retVal = dut2.TeardownChannel();
+        EXPECT_EQ(CCanApi::NoError, retVal);
+    }
+};
+
+// @gtest TC25/TC26.0: CAN acceptance filter for 29-bit identifier (sunnyday scenario)
+//
+// @expected: CANERR_NOERROR
+//
+TEST_F(SetFilter29Bit, GTEST_TESTCASE(SunnydayScenario, GTEST_SUNNYDAY)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CCanApi::EChannelState state;
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- probe if DUT1 is present and not occupied
+    retVal = dut1.ProbeChannel(state);
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.ProbeChannel() failed with error code " << retVal;
+    ASSERT_EQ(CCanApi::ChannelAvailable, state) << "[  ERROR!  ] " << g_Options.GetDeviceName(DUT1) << " is not available";
+    // @- probe if DUT2 is present and not occupied
+    retVal = dut2.ProbeChannel(state);
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut2.ProbeChannel() failed with error code " << retVal;
+    ASSERT_EQ(CCanApi::ChannelAvailable, state) << "[  ERROR!  ] " << g_Options.GetDeviceName(DUT2) << " is not available";
+    // @- check if different channels have been selected
+    ASSERT_TRUE((g_Options.GetChannelNo(DUT1) != g_Options.GetChannelNo(DUT2)) || \
+        (g_Options.GetLibraryId(DUT1) != g_Options.GetLibraryId(DUT2))) << "[  ERROR!  ] same channel selected twice";
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @test:
+     // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @- set 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeSet = 0x00001000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @post:
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC25/TC26.1: CAN acceptance filter for 29-bit identifier with invalid interface handle(s)
+//
+// @note: checking channel handles is not possible with the C++ API!
+
+// @gtest TC26.2: Give a NULL pointer as argument for parameter 'code and 'mask'
+//
+// @note: passing pointers for 'code and 'mask' is not possible with the C++ API!
+
+// @gtest TC25/TC26.3: CAN acceptance filter for 29-bit identifier if CAN channel is not initialized
+//
+// @expected: CANERR_NOTINIT
+//
+TEST_F(SetFilter29Bit, GTEST_TESTCASE(IfChannelNotInitialized, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+ 
+    // @test:
+	// @sub(1): 11-bit identifier
+    // @- try to get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NotInitialized, retVal);
+    // @- try to set 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeSet = 0x00001000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NotInitialized, retVal);
+    // @post:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC25/TC26.4: CAN acceptance filter for 29-bit identifier if CAN controller is not started
+//
+// @expected: CANERR_NOERROR
+//
+TEST_F(SetFilter29Bit, GTEST_TESTCASE(IfControllerNotStarted, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @test:
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @- set 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeSet = 0x00001000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @post:
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC25/TC26.5: CAN acceptance filter for 29-bit identifier if CAN controller is started
+//
+// @expected: CANERR_ONLINE
+//
+TEST_F(SetFilter29Bit, GTEST_TESTCASE(IfControllerStarted, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @test:
+    // @- try to set 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeSet = 0x00001000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::ControllerOnline, retVal);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @post:
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC25/TC26.6: CAN acceptance filter for 29-bit identifier if CAN controller was previously stopped
+//
+// @expected: CANERR_NOERROR
+//
+TEST_F(SetFilter29Bit, GTEST_TESTCASE(IfControllerStopped, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @test:
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @- set 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeSet = 0x00001000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @post:
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    /*int32_t*/ frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC25/TC26.7: CAN acceptance filter for 29-bit identifier if CAN channel was previously torn down
+//
+// @expected: CANERR_NOTINIT
+//
+TEST_F(SetFilter29Bit, GTEST_TESTCASE(IfChannelTornDown, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @test:
+    // @- try to get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NotInitialized, retVal);
+    // @- try to set 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeSet = 0x00001000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NotInitialized, retVal);
+    // @end.
+}
+
+// @gtest TC25.8: CAN acceptance filter for 29-bit identifier with valid values
+//
+// @expected: CANERR_NOERROR
+//
+TEST_F(SetFilter29Bit, GTEST_TESTCASE(WithValidValues, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    const uint32_t codeSet[4] = { 0x00000000U, 0x000000F0U, 0x0000070FU, 0x000007FFU };
+    const uint32_t maskSet[4] = { 0x00000000U, 0x000000F0U, 0x0000070FU, 0x000007FFU };
+    CANAPI_Return_t retVal;
+    // @
+    // @note: This test can take a very long time
+    if (g_Options.RunQuick())
+        GTEST_SKIP() << "This test can take a very long time!";
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @test:
+    CCounter counter = CCounter();
+    for (int i = 0; i < 4; i++) {
+        for (int j = 0; j < 4; j++) {
+            counter.Increment();
+            // @-- set 29-bit filter
+            retVal = dut1.SetFilter29Bit(codeSet[i], maskSet[j]);
+            EXPECT_EQ(CCanApi::NoError, retVal);
+            // @-- get 29-bit filter
+            codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+            retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+            EXPECT_EQ(CCanApi::NoError, retVal);
+            EXPECT_EQ(codeSet[i], codeGet);
+            EXPECT_EQ(maskSet[j], maskGet);
+            // @-- start DUT1 with configured bit-rate settings
+            retVal = dut1.StartController();
+            EXPECT_EQ(CCanApi::NoError, retVal);
+            // @-- check acceptance filter on DUT1 (DUT2 sends frames with 29-bit identifier)
+            counter.Clear();
+            CheckFilter29Bit(dut1, codeSet[i], maskSet[j]);
+            // @-- stop/reset DUT1
+            retVal = dut1.ResetController();
+            EXPECT_EQ(CCanApi::NoError, retVal);
+        }
+    }
+    counter.Reset();
+    // @post:
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC25.9: CAN acceptance filter for 29-bit identifier with invalid values
+//
+// @expected: CANERR_ILLPARAM
+//
+TEST_F(SetFilter29Bit, GTEST_TESTCASE(WithInvalidValues, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @test:
+    // @- try to set 29-bit filter with invalid value (code 0xE0000000 and mask 0xFFFFFFFF)
+    codeSet = 0xE0000000U; maskSet = 0xFFFFFFFFU;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::IllegalParameter, retVal);
+    // @- try to set 29-bit filter with invalid value (code 0x00000000 and mask 0xFFFFFFFF)
+    codeSet = 0x00000000U; maskSet = 0xFFFFFFFFU;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::IllegalParameter, retVal);
+    // @- try to set 29-bit filter with invalid value (code 0xE0000000 and mask 0x00000000)
+    codeSet = 0xE0000000U; maskSet = 0x00000000U;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::IllegalParameter, retVal);
+    // @post:
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC25.10: CAN acceptance filter for 29-bit identifier if extended identifiers are suppressed
+//
+// @expected: CANERR_ILLPARAM
+//
+TEST_F(SetFilter29Bit, GTEST_TESTCASE(IfXtdFramesSuppressed, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_OpMode_t opMode = { TEST_CANMODE };
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- set operation mode bit NXTD (suppress extended frames)
+    opMode = dut1.GetOpMode();
+    opMode.nxtd = 1;
+    dut1.SetOpMode(opMode);
+    //dut1.ShowOperationMode();
+    // @test:
+    // @- initialize DUT1 with operation mode bit NXTD set
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @test:
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @- try to set 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeSet = 0x00001000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::IllegalParameter, retVal);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @post:
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+#endif // FEATURE_FILTERING != FEATURE_UNSUPPORTED
+
+//  $Id: TC25_SetFilter29Bit.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TC27_ResetFilter.cc b/Tests/CANAPI/Testcases/TC27_ResetFilter.cc
new file mode 100644
index 0000000..9358939
--- /dev/null
+++ b/Tests/CANAPI/Testcases/TC27_ResetFilter.cc
@@ -0,0 +1,601 @@
+//  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
+//
+//  CAN Interface API, Version 3 (Testing)
+//
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  All rights reserved.
+//
+//  This file is part of CAN API V3.
+//
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
+//  You can choose between one of them if you use this file.
+//
+//  BSD 2-Clause "Simplified" License:
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted provided that the following conditions are met:
+//  1. Redistributions of source code must retain the above copyright notice, this
+//     list of conditions and the following disclaimer.
+//  2. Redistributions in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//  CAN API V3 IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+//  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+//  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+//  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+//  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+//  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+//  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+//  OF CAN API V3, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+//  GNU General Public License v3.0 or later:
+//  CAN API V3 is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  CAN API V3 is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
+//
+#include "pch.h"
+
+#ifndef FEATURE_FILTERING
+#define FEATURE_FILTERING  FEATURE_UNSUPPORTED
+#ifdef _MSC_VER
+#pragma message ( "FEATURE_FILTERING not set, default = FEATURE_UNSUPPORTED" )
+#else
+#warning FEATURE_FILTERING not set, default = FEATURE_UNSUPPORTED
+#endif
+#endif
+#if (FEATURE_FILTERING != FEATURE_UNSUPPORTED)
+
+class ResetFilter : public testing::Test {
+    virtual void SetUp() {}
+    virtual void TearDown() {}
+protected:
+    // ...
+};
+
+// @gtest TC27.0: Reset CAN acceptance filter (sunnyday scenario)
+//
+// @expected: CANERR_NOERROR
+//
+TEST_F(ResetFilter, GTEST_TESTCASE(SunnydayScenario, GTEST_SUNNYDAY)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CCanApi::EChannelState state;
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- probe if DUT1 is present and not occupied
+    retVal = dut1.ProbeChannel(state);
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.ProbeChannel() failed with error code " << retVal;
+    ASSERT_EQ(CCanApi::ChannelAvailable, state) << "[  ERROR!  ] " << g_Options.GetDeviceName(DUT1) << " is not available";
+    // @- probe if DUT2 is present and not occupied
+    retVal = dut2.ProbeChannel(state);
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut2.ProbeChannel() failed with error code " << retVal;
+    ASSERT_EQ(CCanApi::ChannelAvailable, state) << "[  ERROR!  ] " << g_Options.GetDeviceName(DUT2) << " is not available";
+    // @- check if different channels have been selected
+    ASSERT_TRUE((g_Options.GetChannelNo(DUT1) != g_Options.GetChannelNo(DUT2)) || \
+        (g_Options.GetLibraryId(DUT1) != g_Options.GetLibraryId(DUT2))) << "[  ERROR!  ] same channel selected twice";
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @test:
+    // @sub(1): 11-bit identifier
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @- set 11-bit filter (code 0x000 and mask 0x500)
+    // @  note: DUT2 is sending test frames with 0x200!
+    codeSet = 0x00000000U; maskSet = 0x0000000500U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @sub(2): 29-bit identifier
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @- set 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeSet = 0x00001000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @post:
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC27.1: Reset CAN acceptance filter with invalid interface handle(s)
+//
+// @note: checking channel handles is not possible with the C++ API!
+
+// @gtest TC27.2: Reset CAN acceptance filter if CAN channel is not initialized
+//
+// @expected: CANERR_NOTINIT
+//
+TEST_F(ResetFilter, GTEST_TESTCASE(IfChannelNotInitialized, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    CANAPI_Return_t retVal;
+ 
+    // @test:
+    // @- try to reset acceptance filter
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NotInitialized, retVal);
+    // @post:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC27.2: Reset CAN acceptance filter if CAN controller is not started
+//
+// @expected: CANERR_NOERROR
+//
+TEST_F(ResetFilter, GTEST_TESTCASE(IfControllerNotStarted, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @test:
+    // @sub(1): 11-bit identifier
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @- set 11-bit filter (code 0x000 and mask 0x500)
+    // @  note: DUT2 is sending test frames with 0x200!
+    codeSet = 0x00000000U; maskSet = 0x0000000500U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @sub(2): 29-bit identifier
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @- set 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeSet = 0x00001000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @post:
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC27.4: Reset CAN acceptance filter if CAN controller is started
+//
+// @expected: CANERR_ONLINE
+//
+TEST_F(ResetFilter, GTEST_TESTCASE(IfControllerStarted, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    CANAPI_Return_t retVal;
+
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @test:
+    // @sub(1): 11-bit identifier
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::ControllerOnline, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @sub(2): 29-bit identifier
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::ControllerOnline, retVal);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- try to reset acceptance filter
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::ControllerOnline, retVal);   
+    // @post:
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC27.5: Reset CAN acceptance filter if CAN controller was previously stopped
+//
+// @expected: CANERR_NOERROR
+//
+TEST_F(ResetFilter, GTEST_TESTCASE(IfControllerStopped, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    uint32_t codeGet, maskGet;
+    uint32_t codeSet, maskSet;
+    CANAPI_Return_t retVal;
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @test:
+    // @sub(1): 11-bit identifier
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @- set 11-bit filter (code 0x000 and mask 0x500)
+    // @  note: DUT2 is sending test frames with 0x200!
+    codeSet = 0x00000000U; maskSet = 0x0000000500U;
+    retVal = dut1.SetFilter11Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 11-bit filter (code 0x000 and mask 0x000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter11Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_11BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_11BIT, maskGet);
+    // @sub(2): 29-bit identifier
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @- set 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeSet = 0x00001000U; maskSet = 0x00000500U;
+    retVal = dut1.SetFilter29Bit(codeSet, maskSet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00001000 and mask 0x00000500)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(codeSet, codeGet);
+    EXPECT_EQ(maskGet, maskGet);
+    // @- reset acceptance filter
+    // @  note: SJA100 has only one filter for 11-bit and 29-bit identifier!
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get 29-bit filter (code 0x00000000 and mask 0x00000000)
+    codeGet = 0xFFFFFFFFU; maskGet = 0xFFFFFFFFU;
+    retVal = dut1.GetFilter29Bit(codeGet, maskGet);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_EQ(CANACC_CODE_29BIT, codeGet);
+    EXPECT_EQ(CANACC_MASK_29BIT, maskGet);
+    // @post:
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    /*int32_t*/ frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @end.
+}
+
+// @gtest TC27.6: Reset CAN acceptance filter if CAN channel was previously torn down
+//
+// @expected: CANERR_NOTINIT
+//
+TEST_F(ResetFilter, GTEST_TESTCASE(IfChannelTornDown, GTEST_ENABLED)) {
+    CCanDevice dut1 = CCanDevice(TEST_DEVICE(DUT1));
+    CCanDevice dut2 = CCanDevice(TEST_DEVICE(DUT2));
+    CANAPI_Status_t status = {};
+    CANAPI_Return_t retVal;
+
+    // @pre:
+    // @- initialize DUT1 with configured settings
+    retVal = dut1.InitializeChannel();
+    ASSERT_EQ(CCanApi::NoError, retVal) << "[  ERROR!  ] dut1.InitializeChannel() failed with error code " << retVal;
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- start DUT1 with configured bit-rate settings
+    retVal = dut1.StartController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- send some frames to DUT2 and receive some frames from DUT2
+    int32_t frames = g_Options.GetNumberOfTestFrames();
+    EXPECT_EQ(frames, dut1.SendSomeFrames(dut2, frames));
+    EXPECT_EQ(frames, dut1.ReceiveSomeFrames(dut2, frames));
+    // @- get status of DUT1 and check to be in RUNNING state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_FALSE(status.can_stopped);
+    // @- stop/reset DUT1
+    retVal = dut1.ResetController();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @- get status of DUT1 and check to be in INIT state
+    retVal = dut1.GetStatus(status);
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    EXPECT_TRUE(status.can_stopped);
+    // @- tear down DUT1
+    retVal = dut1.TeardownChannel();
+    EXPECT_EQ(CCanApi::NoError, retVal);
+    // @test:
+    // @- try to reset acceptance filter
+    retVal = dut1.ResetFilters();
+    EXPECT_EQ(CCanApi::NotInitialized, retVal);
+    // @end.
+}
+
+#endif // FEATURE_FILTERING != FEATURE_UNSUPPORTED
+
+//  $Id: TC27_ResetFilter.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TCx1_CallSequences.cc b/Tests/CANAPI/Testcases/TCx1_CallSequences.cc
index 77d987a..35b189c 100644
--- a/Tests/CANAPI/Testcases/TCx1_CallSequences.cc
+++ b/Tests/CANAPI/Testcases/TCx1_CallSequences.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 
@@ -1504,4 +1504,4 @@ TEST_F(CallSequences, GTEST_TESTCASE(ReadInitializeTeardown, GTEST_DISABLED)) {
     // @end.
 }
 
-//  $Id: TCx1_CallSequences.cc 1134 2023-08-06 17:58:59Z haumea $  Copyright (c) UV Software, Berlin.
+//  $Id: TCx1_CallSequences.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Testcases/TCx2_BitrateConverter.cc b/Tests/CANAPI/Testcases/TCx2_BitrateConverter.cc
index b445d55..222f267 100644
--- a/Tests/CANAPI/Testcases/TCx2_BitrateConverter.cc
+++ b/Tests/CANAPI/Testcases/TCx2_BitrateConverter.cc
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "pch.h"
 #include <math.h>
@@ -1603,4 +1603,4 @@ TEST_F(BitrateConverter, GTEST_TESTCASE(BitrateToStringWithNullPointerForString,
 //
 // @note: passing a pointer for 'btr0btr1' is not possible with the C++ API!
 
-//  $Id: TCx2_BitrateConverter.cc 1218 2023-10-14 12:18:19Z makemake $  Copyright (c) UV Software, Berlin.
+//  $Id: TCx2_BitrateConverter.cc 1272 2024-04-16 19:55:27Z makemake $  Copyright (c) UV Software, Berlin.
diff --git a/Tests/CANAPI/Version.h b/Tests/CANAPI/Version.h
index 6d2a370..d37c8c3 100644
--- a/Tests/CANAPI/Version.h
+++ b/Tests/CANAPI/Version.h
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Testing)
 //
-//  Copyright (c) 2004-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,12 +43,12 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef VERSION_H_INCLUDED
 #define VERSION_H_INCLUDED
-// SVN revision number (update with each commit: VII)
-#define REVISION_NO  "$Rev: 1219 $"
+// SVN revision number (update with each commit: XI)
+#define REVISION_NO  "$Rev: 1273 $"
 #endif // VERSION_H_INCLUDED
 
-// $Id: Version.h 1219 2023-10-14 12:23:07Z makemake $  Copyright (c) UV Software, Berlin //
+// $Id: Version.h 1273 2024-04-18 16:59:22Z makemake $  Copyright (c) UV Software, Berlin //

From b4e1bd87796485a52a5e1c7bee3d69ad7da0804e Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Thu, 25 Apr 2024 17:35:30 +0200
Subject: [PATCH 04/13] Remove unused attributes from class `CPeakCAN`

Relates to [MACCAN-191]
---
 Sources/PeakCAN.cpp        | 114 ++++++++------------
 Sources/PeakCAN.h          |  30 +++---
 Sources/PeakCAN_Defaults.h |  45 +++++---
 Sources/PeakCAN_Defines.h  |  25 ++---
 Sources/Wrapper/can_api.c  | 209 +++++++++++++++++++------------------
 Sources/Wrapper/can_defs.h |  25 ++---
 6 files changed, 218 insertions(+), 230 deletions(-)

diff --git a/Sources/PeakCAN.cpp b/Sources/PeakCAN.cpp
index 56fc8fc..58a2366 100644
--- a/Sources/PeakCAN.cpp
+++ b/Sources/PeakCAN.cpp
@@ -1,15 +1,16 @@
 //  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
 //
-//  CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
+//  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
 //
-//  Copyright (c) 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
+//  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
 //  All rights reserved.
 //
-//  This file is part of PCBUSB-Wrapper.
+//  This file is part of PCANBasic-Wrapper.
 //
-//  PCBUSB-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
+//  PCANBasic-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
 //  and under the GNU General Public License v3.0 (or any later version). You can
-//  choose between one of them if you use PCBUSB-Wrapper in whole or in part.
+//  choose between one of them if you use PCANBasic-Wrapper in whole or in part.
 //
 //  BSD 2-Clause "Simplified" License:
 //  Redistribution and use in source and binary forms, with or without
@@ -20,7 +21,7 @@
 //     this list of conditions and the following disclaimer in the documentation
 //     and/or other materials provided with the distribution.
 //
-//  PCBUSB-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+//  PCANBasic-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 //  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 //  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 //  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
@@ -29,21 +30,21 @@
 //  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 //  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 //  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-//  OF PCBUSB-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//  OF PCANBasic-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 //  GNU General Public License v3.0 or later:
-//  PCBUSB-Wrapper is free software: you can redistribute it and/or modify
+//  PCANBasic-Wrapper is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
 //  the Free Software Foundation, either version 3 of the License, or
 //  (at your option) any later version.
 //
-//  PCBUSB-Wrapper is distributed in the hope that it will be useful,
+//  PCANBasic-Wrapper is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with PCBUSB-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
+//  along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "build_no.h"
 #ifdef _MSC_VER
@@ -57,19 +58,6 @@
 #endif
 #define VERSION_BUILD    BUILD_NO
 #define VERSION_STRING   TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
-#if defined(_WIN64)
-#define PLATFORM        "x64"
-#elif defined(_WIN32)
-#define PLATFORM        "x86"
-#elif defined(__linux__)
-#define PLATFORM        "Linux"
-#elif defined(__APPLE__)
-#define PLATFORM        "macOS"
-#else
-#error Unsupported architecture
-#endif
-static const char version[] = "CAN API V3 for PEAK-System PCAN-USB Interfaces, Version " VERSION_STRING;
-
 #ifdef _MSC_VER
 //no Microsoft extensions please!
 #ifndef _CRT_SECURE_NO_WARNINGS
@@ -87,7 +75,30 @@ static const char version[] = "CAN API V3 for PEAK-System PCAN-USB Interfaces, V
 #include <assert.h>
 #include <limits.h>
 
-#if (OPTION_PCAN_DYLIB != 0)
+#if defined(_WIN64)
+#define PLATFORM        "x64"
+#elif defined(_WIN32)
+#define PLATFORM        "x86"
+#elif defined(__linux__)
+#define PLATFORM        "Linux"
+#elif defined(__APPLE__)
+#define PLATFORM        "macOS"
+#else
+#error Platform not supported
+#endif
+#ifndef _MSC_VER
+#define STRCPY_S(dest,size,src)         strcpy(dest,src)
+#define STRNCPY_S(dest,size,src,len)    strncpy(dest,src,len)
+#define SSCANF_S(buf,format,...)        sscanf(buf,format,__VA_ARGS__)
+#define SPRINTF_S(buf,size,format,...)  snprintf(buf,size,format,__VA_ARGS__)
+#else
+#define STRCPY_S(dest,size,src)         strcpy_s(dest,size,src)
+#define STRNCPY_S(dest,size,src,len)    strncpy_s(dest,size,src,len)
+#define SSCANF_S(buf,format,...)        sscanf_s(buf,format,__VA_ARGS__)
+#define SPRINTF_S(buf,size,format,...)  sprintf_s(buf,size,format,__VA_ARGS__)
+#endif
+
+#if (OPTION_PEAKCAN_DYLIB != 0)
 __attribute__((constructor))
 static void _initializer() {
     // default initializer
@@ -101,35 +112,11 @@ static void _finalizer() {
 #define EXPORT
 #endif
 
-#ifndef _MSC_VER
-#define STRCPY_S(dest,size,src)         strcpy(dest,src)
-#define STRNCPY_S(dest,size,src,len)    strncpy(dest,src,len)
-#define SSCANF_S(buf,format,...)        sscanf(buf,format,__VA_ARGS__)
-#define SPRINTF_S(buf,size,format,...)  sprintf(buf,format,__VA_ARGS__)
-#else
-#define STRCPY_S(dest,size,src)         strcpy_s(dest,size,src)
-#define STRNCPY_S(dest,size,src,len)    strncpy_s(dest,size,src,len)
-#define SSCANF_S(buf,format,...)        sscanf_s(buf,format,__VA_ARGS__)
-#define SPRINTF_S(buf,size,format,...)  sprintf_s(buf,size,format,__VA_ARGS__)
-#endif
+static const char version[] = "CAN API V3 for PEAK-System PCAN-USB Interfaces, Version " VERSION_STRING;
 
 EXPORT
 CPeakCAN::CPeakCAN() {
     m_Handle = -1;
-    m_OpMode.byte = CANMODE_DEFAULT;
-    m_Bitrate.index = CANBTR_INDEX_250K;
-    m_Bitrate.btr.nominal.brp = 0;
-    m_Bitrate.btr.nominal.tseg1 = 0;
-    m_Bitrate.btr.nominal.tseg2 = 0;
-    m_Bitrate.btr.nominal.sjw = 0;
-    m_Bitrate.btr.nominal.sam = 0;
-    m_Bitrate.btr.data.brp = m_Bitrate.btr.nominal.brp;
-    m_Bitrate.btr.data.tseg1 = m_Bitrate.btr.nominal.tseg1;
-    m_Bitrate.btr.data.tseg2 = m_Bitrate.btr.nominal.tseg2;
-    m_Bitrate.btr.data.sjw = m_Bitrate.btr.nominal.sjw;
-    m_Counter.u64TxMessages = 0U;
-    m_Counter.u64RxMessages = 0U;
-    m_Counter.u64ErrorFrames = 0U;
 }
 
 EXPORT
@@ -204,7 +191,6 @@ CANAPI_Return_t CPeakCAN::InitializeChannel(int32_t channel, const CANAPI_OpMode
     CANAPI_Handle_t hnd = can_init(channel, opMode.byte, param);
     if (0 <= hnd) {
         m_Handle = hnd;  // we got a handle
-        m_OpMode = opMode;
         rc = CANERR_NOERROR;
     } else {
         rc = (CANAPI_Return_t)hnd;
@@ -238,12 +224,7 @@ CANAPI_Return_t CPeakCAN::SignalChannel() {
 EXPORT
 CANAPI_Return_t CPeakCAN::StartController(CANAPI_Bitrate_t bitrate) {
     // start the CAN controller with the given bit-rate settings
-    CANAPI_Return_t rc = can_start(m_Handle, &bitrate);
-    if (CANERR_NOERROR == rc) {
-        m_Bitrate = bitrate;
-        memset(&m_Counter, 0, sizeof(m_Counter));
-    }
-    return rc;
+    return can_start(m_Handle, &bitrate);
 }
 
 EXPORT
@@ -255,22 +236,13 @@ CANAPI_Return_t CPeakCAN::ResetController() {
 EXPORT
 CANAPI_Return_t CPeakCAN::WriteMessage(CANAPI_Message_t message, uint16_t timeout) {
     // transmit a message over the CAN bus
-    CANAPI_Return_t rc = can_write(m_Handle, &message, timeout);
-    if (CANERR_NOERROR == rc) {
-        m_Counter.u64TxMessages++;
-    }
-    return rc;
+    return can_write(m_Handle, &message, timeout);
 }
 
 EXPORT
 CANAPI_Return_t CPeakCAN::ReadMessage(CANAPI_Message_t &message, uint16_t timeout) {
     // read one message from the message queue of the CAN interface, if any
-    CANAPI_Return_t rc = can_read(m_Handle, &message, timeout);
-    if (CANERR_NOERROR == rc) {
-        m_Counter.u64RxMessages += !message.sts ? 1U : 0U;
-        m_Counter.u64ErrorFrames += message.sts ? 1U : 0U;
-    }
-    return rc;
+    return can_read(m_Handle, &message, timeout);
 }
 
 EXPORT
@@ -288,17 +260,13 @@ CANAPI_Return_t CPeakCAN::GetBusLoad(uint8_t &load) {
 EXPORT
 CANAPI_Return_t CPeakCAN::GetBitrate(CANAPI_Bitrate_t &bitrate) {
     // retrieve the bit-rate setting of the CAN interface
-    CANAPI_Return_t rc = can_bitrate(m_Handle, &bitrate, NULL);
-    if (CANERR_NOERROR == rc) {
-        m_Bitrate = bitrate;
-    }
-    return rc;
+    return can_bitrate(m_Handle, &bitrate, NULL);
 }
 
 EXPORT
 CANAPI_Return_t CPeakCAN::GetBusSpeed(CANAPI_BusSpeed_t &speed) {
     // retrieve the transmission rate of the CAN interface
-    return can_bitrate(m_Handle, &m_Bitrate, &speed);
+    return can_bitrate(m_Handle, NULL, &speed);
 }
 
 EXPORT
diff --git a/Sources/PeakCAN.h b/Sources/PeakCAN.h
index a7f8780..02f7bc0 100644
--- a/Sources/PeakCAN.h
+++ b/Sources/PeakCAN.h
@@ -1,15 +1,16 @@
 //  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
 //
-//  CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
+//  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
 //
-//  Copyright (c) 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
+//  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
 //  All rights reserved.
 //
-//  This file is part of PCBUSB-Wrapper.
+//  This file is part of PCANBasic-Wrapper.
 //
-//  PCBUSB-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
+//  PCANBasic-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
 //  and under the GNU General Public License v3.0 (or any later version). You can
-//  choose between one of them if you use PCBUSB-Wrapper in whole or in part.
+//  choose between one of them if you use PCANBasic-Wrapper in whole or in part.
 //
 //  BSD 2-Clause "Simplified" License:
 //  Redistribution and use in source and binary forms, with or without
@@ -20,7 +21,7 @@
 //     this list of conditions and the following disclaimer in the documentation
 //     and/or other materials provided with the distribution.
 //
-//  PCBUSB-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+//  PCANBasic-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 //  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 //  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 //  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
@@ -29,21 +30,21 @@
 //  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 //  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 //  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-//  OF PCBUSB-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//  OF PCANBasic-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 //  GNU General Public License v3.0 or later:
-//  PCBUSB-Wrapper is free software: you can redistribute it and/or modify
+//  PCANBasic-Wrapper is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
 //  the Free Software Foundation, either version 3 of the License, or
 //  (at your option) any later version.
 //
-//  PCBUSB-Wrapper is distributed in the hope that it will be useful,
+//  PCANBasic-Wrapper is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with PCBUSB-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
+//  along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef PEAKCAN_H_INCLUDED
 #define PEAKCAN_H_INCLUDED
@@ -59,7 +60,7 @@
 #define PEAKCAN_LIBRARY_NAME  CANDLL_PCANBASIC
 #define PEAKCAN_LIBRARY_VENDOR  "UV Software, Berlin"
 #define PEAKCAN_LIBRARY_LICENSE  "BSD-2-Clause OR GPL-3.0-or-later"
-#define PEAKCAN_LIBRARY_COPYRIGHT  "Copyright (c) 2012-2024 by Uwe Vogt, UV Software, Berlin"
+#define PEAKCAN_LIBRARY_COPYRIGHT  "Copyright (c) 2005-2024 by Uwe Vogt, UV Software, Berlin"
 #define PEAKCAN_LIBRARY_HAZARD_NOTE  "If you connect your CAN device to a real CAN network when using this library,\n" \
                                      "you might damage your application."
 /// \}
@@ -71,13 +72,6 @@
 class CANCPP CPeakCAN : public CCanApi {
 private:
     CANAPI_Handle_t m_Handle;  ///< CAN interface handle
-    CANAPI_OpMode_t m_OpMode;  ///< CAN operation mode
-    CANAPI_Bitrate_t m_Bitrate;  ///< CAN bitrate settings
-    struct {
-        uint64_t u64TxMessages;  ///< number of transmitted CAN messages
-        uint64_t u64RxMessages;  ///< number of received CAN messages
-        uint64_t u64ErrorFrames;  ///< number of received status messages
-    } m_Counter;
 public:
     // constructor / destructor
     CPeakCAN();
diff --git a/Sources/PeakCAN_Defaults.h b/Sources/PeakCAN_Defaults.h
index 36612e7..8e4e18d 100644
--- a/Sources/PeakCAN_Defaults.h
+++ b/Sources/PeakCAN_Defaults.h
@@ -1,17 +1,18 @@
 /*  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later */
 /*
- *  CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
+ *  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
  *
- *  Copyright (c) 2005-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+ *  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
+ *  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
  *  All rights reserved.
  *
- *  This file is part of PCBUSB-Wrapper.
+ *  This file is part of PCANBasic-Wrapper.
  *
- *  PCBUSB-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  PCANBasic-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
  *  and under the GNU General Public License v3.0 (or any later version). You can
- *  choose between one of them if you use PCBUSB-Wrapper in whole or in part.
+ *  choose between one of them if you use PCANBasic-Wrapper in whole or in part.
  *
- *  BSD 2-Clause Simplified License:
+ *  BSD 2-Clause "Simplified" License:
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
  *  1. Redistributions of source code must retain the above copyright notice, this
@@ -20,7 +21,7 @@
  *     this list of conditions and the following disclaimer in the documentation
  *     and/or other materials provided with the distribution.
  *
- *  PCBUSB-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
+ *  PCANBasic-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
@@ -29,21 +30,21 @@
  *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF PCBUSB-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  OF PCANBasic-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *  GNU General Public License v3.0 or later:
- *  PCBUSB-Wrapper is free software: you can redistribute it and/or modify
+ *  PCANBasic-Wrapper is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  PCBUSB-Wrapper is distributed in the hope that it will be useful,
+ *  PCANBasic-Wrapper is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with PCBUSB-Wrapper.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @addtogroup  can_btr
  *  @{
@@ -64,6 +65,26 @@ extern "C" {
 /*  -----------  options  ------------------------------------------------
  */
 
+/** @name  Compiler Switches
+ *  @brief Options for conditional compilation.
+ *  @{ */
+/** @note  Set define OPTION_PCAN_BIT_TIMING to a non-zero value to compile
+ *         with non CiA bit-timing (e.g. in the build environment).
+ */
+#ifndef OPTION_DISABLED
+#define OPTION_DISABLED  0  /**< if a define is not defined, it is automatically set to 0 */
+#endif
+#ifndef OPTION_PCAN_BIT_TIMING
+#define OPTION_PCAN_BIT_TIMING OPTION_DISABLED
+#endif
+#if (OPTION_PCAN_BIT_TIMING != OPTION_DISABLED)
+#ifdef _MSC_VER
+#pragma message ( "Compilation with non CiA bit-timming!" )
+#else
+#warning Compilation with non CiA bit-timming!
+#endif
+#endif
+/** @} */
 
 /*  -----------  defines  ------------------------------------------------
  */
@@ -160,5 +181,5 @@ extern "C" {
 /*  ----------------------------------------------------------------------
  *  Uwe Vogt,  UV Software,  Chausseestrasse 33 A,  10115 Berlin,  Germany
  *  Tel.: +49-30-46799872,  Fax: +49-30-46799873,  Mobile: +49-170-3801903
- *  E-Mail: uwe.vogt@uv-software.de,  Homepage: http://www.uv-software.de/
+ *  E-Mail: uwe.vogt@uv-software.de, Homepage: https://www.uv-software.de/
  */
diff --git a/Sources/PeakCAN_Defines.h b/Sources/PeakCAN_Defines.h
index 132069e..c27aad5 100644
--- a/Sources/PeakCAN_Defines.h
+++ b/Sources/PeakCAN_Defines.h
@@ -1,17 +1,18 @@
 /*  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later */
 /*
- *  CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
+ *  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
  *
- *  Copyright (c) 2005-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+ *  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
+ *  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
  *  All rights reserved.
  *
- *  This file is part of PCBUSB-Wrapper.
+ *  This file is part of PCANBasic-Wrapper.
  *
- *  PCBUSB-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  PCANBasic-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
  *  and under the GNU General Public License v3.0 (or any later version). You can
- *  choose between one of them if you use PCBUSB-Wrapper in whole or in part.
+ *  choose between one of them if you use PCANBasic-Wrapper in whole or in part.
  *
- *  BSD 2-Clause Simplified License:
+ *  BSD 2-Clause "Simplified" License:
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
  *  1. Redistributions of source code must retain the above copyright notice, this
@@ -20,7 +21,7 @@
  *     this list of conditions and the following disclaimer in the documentation
  *     and/or other materials provided with the distribution.
  *
- *  PCBUSB-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
+ *  PCANBasic-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
@@ -29,21 +30,21 @@
  *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF PCBUSB-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  OF PCANBasic-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *  GNU General Public License v3.0 or later:
- *  PCBUSB-Wrapper is free software: you can redistribute it and/or modify
+ *  PCANBasic-Wrapper is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  PCBUSB-Wrapper is distributed in the hope that it will be useful,
+ *  PCANBasic-Wrapper is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with PCBUSB-Wrapper.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @addtogroup  can_api
  *  @{
@@ -211,5 +212,5 @@ typedef struct can_pcan_param_t_ {      /* device parameters: */
 /*  ----------------------------------------------------------------------
  *  Uwe Vogt,  UV Software,  Chausseestrasse 33 A,  10115 Berlin,  Germany
  *  Tel.: +49-30-46799872,  Fax: +49-30-46799873,  Mobile: +49-170-3801903
- *  E-Mail: uwe.vogt@uv-software.de,  Homepage: http://www.uv-software.de/
+ *  E-Mail: uwe.vogt@uv-software.de, Homepage: https://www.uv-software.de/
  */
diff --git a/Sources/Wrapper/can_api.c b/Sources/Wrapper/can_api.c
index e9cc6e1..0514a66 100755
--- a/Sources/Wrapper/can_api.c
+++ b/Sources/Wrapper/can_api.c
@@ -1,17 +1,18 @@
 /*  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later */
 /*
- *  CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
+ *  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
  *
- *  Copyright (c) 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+ *  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
+ *  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
  *  All rights reserved.
  *
- *  This file is part of PCBUSB-Wrapper.
+ *  This file is part of PCANBasic-Wrapper.
  *
- *  PCBUSB-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  PCANBasic-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
  *  and under the GNU General Public License v3.0 (or any later version). You can
- *  choose between one of them if you use PCBUSB-Wrapper in whole or in part.
+ *  choose between one of them if you use PCANBasic-Wrapper in whole or in part.
  *
- *  BSD 2-Clause Simplified License:
+ *  BSD 2-Clause "Simplified" License:
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
  *  1. Redistributions of source code must retain the above copyright notice, this
@@ -20,7 +21,7 @@
  *     this list of conditions and the following disclaimer in the documentation
  *     and/or other materials provided with the distribution.
  *
- *  PCBUSB-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
+ *  PCANBasic-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
@@ -29,21 +30,21 @@
  *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF PCBUSB-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  OF PCANBasic-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *  GNU General Public License v3.0 or later:
- *  PCBUSB-Wrapper is free software: you can redistribute it and/or modify
+ *  PCANBasic-Wrapper is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  PCBUSB-Wrapper is distributed in the hope that it will be useful,
+ *  PCANBasic-Wrapper is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with PCBUSB-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
+ *  along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @addtogroup  can_api
  *  @{
@@ -60,6 +61,12 @@
 #endif
 #define VERSION_BUILD    BUILD_NO
 #define VERSION_STRING   TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
+#ifdef _MSC_VER
+//no Microsoft extensions please!
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS 1
+#endif
+#endif
 #if defined(_WIN64)
 #define PLATFORM        "x64"
 #elif defined(_WIN32)
@@ -69,27 +76,15 @@
 #elif defined(__APPLE__)
 #define PLATFORM        "macOS"
 #else
-#error Unsupported architecture
+#error Platform not supported
 #endif
-static const char version[] = "CAN API V3 for PEAK-System PCAN-USB Interfaces, Version " VERSION_STRING;
-
 
 /*  -----------  includes  -----------------------------------------------
  */
-
-#ifdef _MSC_VER
-//no Microsoft extensions please!
-#ifndef _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_WARNINGS 1
-#endif
-#endif
 #include "can_defs.h"
 #include "can_api.h"
 #include "can_btr.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
 #include "PCANBasic.h"
@@ -103,9 +98,15 @@ static const char version[] = "CAN API V3 for PEAK-System PCAN-USB Interfaces, V
 #endif
 #endif
 
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
 /*  -----------  options  ------------------------------------------------
  */
-
+#if (OPTION_CAN_2_0_ONLY != 0)
+#error Compilation with legacy CAN 2.0 frame format!
+#endif
 #if (OPTION_CANAPI_PCBUSB_DYLIB != 0)
 __attribute__((constructor))
 static void _initializer() {
@@ -122,10 +123,8 @@ static void _finalizer() {
 #define ISSUE_303_WORKAROUND    // PCBUSB issue #303: first transmit message will be swallowed
 #define ISSUE_276_UNSOLVED      // PCBUSB issue #276: parameter PCAN_RECEIVE_STATUS reverted
 
-
 /*  -----------  defines  ------------------------------------------------
  */
-
 #ifndef PCAN_MAX_HANDLES
 #define PCAN_MAX_HANDLES        (16)    // maximum number of open handles
 #endif
@@ -147,9 +146,18 @@ static void _finalizer() {
 #define BTR0BTR1_DEFAULT        PCAN_BAUD_250K
 #define BIT_RATE_DEFAULT        "f_clock_mhz=80,nom_brp=20,nom_tseg1=12,nom_tseg2=3,nom_sjw=1," \
                                               "data_brp=4,data_tseg1=7,data_tseg2=2,data_sjw=1"
+#define FILTER_STD_CODE         (uint32_t)(0x000)
+#define FILTER_STD_MASK         (uint32_t)(0x000)
+#define FILTER_XTD_CODE         (uint32_t)(0x00000000)
+#define FILTER_XTD_MASK         (uint32_t)(0x00000000)
 #ifndef SYSERR_OFFSET
 #define SYSERR_OFFSET           (-10000)
 #endif
+#define LIB_ID                  PCAN_LIB_ID
+#define LIB_DLLNAME             PCAN_LIB_WRAPPER
+#define DEV_VENDOR              PCAN_LIB_VENDOR
+#define DEV_DLLNAME             PCAN_LIB_BASIC
+#define NUM_CHANNELS            PCAN_BOARDS
 
 /*  -----------  types  --------------------------------------------------
  */
@@ -171,9 +179,10 @@ typedef struct {                        // PCAN interface:
     BYTE  brd_type;                     //   board type (none PnP hardware)
     DWORD brd_port;                     //   board parameter: I/O port address
     WORD  brd_irq;                      //   board parameter: interrupt number
-#if !defined(_WIN32) && !defined(_WIN64)
-    int   fdes;                         //   file descriptor (for blocking read)
+#if defined(_WIN32) || defined(_WIN64)
+    HANDLE event;                       //   event handle for blocking read
 #else
+    int   fdes;                         //   file descriptor for blocking read
 #endif
     can_mode_t mode;                    //   operation mode of the CAN channel
     can_status_t status;                //   8-bit status register
@@ -184,16 +193,19 @@ typedef struct {                        // PCAN interface:
 
 /*  -----------  prototypes  ---------------------------------------------
  */
+static void var_init(void);             // initialize variables
 
 static int pcan_error(TPCANStatus);     // PCAN specific errors
 static int pcan_compatibility(void);    // PCAN compatibility check
+
 static TPCANStatus pcan_capability(TPCANHandle board, can_mode_t *capability);
+
 static int lib_parameter(uint16_t param, void *value, size_t nbyte);
 static int drv_parameter(int handle, uint16_t param, void *value, size_t nbyte);
 
-
 /*  -----------  variables  ----------------------------------------------
  */
+static const char version[] = "CAN API V3 for PEAK-System PCAN-USB Interfaces, Version " VERSION_STRING;
 
 EXPORT
 can_board_t can_boards[PCAN_BOARDS+1]=// list of CAN Interface boards:
@@ -222,8 +234,7 @@ static const uint8_t dlc_table[16] = {  // DLC to length
     0,1,2,3,4,5,6,7,8,12,16,20,24,32,48,64
 };
 static can_interface_t can[PCAN_MAX_HANDLES]; // interface handles
-static int init =  0;  // initialization flag
-
+static int init = 0;                    // initialization flag
 
 /*  -----------  functions  ----------------------------------------------
  */
@@ -240,23 +251,7 @@ int can_test(int32_t board, uint8_t mode, const void *param, int *result)
         return pcan_error(PCAN_ERROR_ILLCLIENT);
 
     if (!init) {                        // when not init before:
-        for (i = 0; i < PCAN_MAX_HANDLES; i++) {
-            can[i].board = PCAN_NONEBUS;
-            can[i].brd_type = 0u;
-            can[i].brd_port = 0u;
-            can[i].brd_irq = 0u;
-#if !defined(_WIN32) && !defined(_WIN64)
-            can[i].fdes = -1;
-#endif
-            can[i].mode.byte = CANMODE_DEFAULT;
-            can[i].status.byte = CANSTAT_RESET;
-            can[i].error.lec = 0x00u;
-            can[i].error.rx_err = 0u;
-            can[i].error.tx_err = 0u;
-            can[i].counters.tx = 0ull;
-            can[i].counters.rx = 0ull;
-            can[i].counters.err = 0ull;
-        }
+        var_init();                     //   initialize variables
         init = 1;                       //   set initialization flag
     }
     if ((rc = CAN_GetValue((TPCANHandle)board, PCAN_CHANNEL_CONDITION,
@@ -316,23 +311,7 @@ int can_init(int32_t board, uint8_t mode, const void *param)
         return pcan_error(PCAN_ERROR_ILLCLIENT);
 
     if (!init) {                        // when not init before:
-        for (i = 0; i < PCAN_MAX_HANDLES; i++) {
-            can[i].board = PCAN_NONEBUS;
-            can[i].brd_type = 0u;
-            can[i].brd_port = 0u;
-            can[i].brd_irq = 0u;
-#if !defined(_WIN32) && !defined(_WIN64)
-            can[i].fdes = -1;
-#endif
-            can[i].mode.byte = CANMODE_DEFAULT;
-            can[i].status.byte = CANSTAT_RESET;
-            can[i].error.lec = 0x00u;
-            can[i].error.rx_err = 0u;
-            can[i].error.tx_err = 0u;
-            can[i].counters.tx = 0ull;
-            can[i].counters.rx = 0ull;
-            can[i].counters.err = 0ull;
-        }
+        var_init();                     //   initialize variables
         init = 1;                       //   set initialization flag
     }
     for (i = 0; i < PCAN_MAX_HANDLES; i++) {
@@ -477,7 +456,6 @@ int can_start(int handle, const can_bitrate_t *bitrate)
     uint16_t btr0btr1 = BTR0BTR1_DEFAULT;  // btr0btr1 value
     char string[PCAN_MAX_BUFFER_SIZE];  // bit-rate string
     DWORD value;                        // parameter value
-    //UINT64 filter;                       // for 29-bit filter
     TPCANStatus rc;                     // return value
 
     strcpy(string, "");                 // empty string
@@ -542,7 +520,7 @@ int can_start(int handle, const can_bitrate_t *bitrate)
         return pcan_error(rc);
     }
 #endif
-    /* note: the receiver is automatically switched ON by CAN_Uninitialize() */
+    /* note: the receiver is automatically switched ON by CAN_Initialize[FD]() */
     if (can[handle].mode.fdoe) {        // CAN FD operation mode?
         if ((rc = CAN_InitializeFD(can[handle].board, string)) != PCAN_ERROR_OK)
             return pcan_error(rc);
@@ -563,7 +541,7 @@ int can_start(int handle, const can_bitrate_t *bitrate)
 #ifndef ISSUE_303_WORKAROUND
     value = (can[handle].mode.mon) ? PCAN_PARAMETER_ON : PCAN_PARAMETER_OFF;
     if ((rc = CAN_SetValue(can[handle].board, PCAN_LISTEN_ONLY,
-                   (void*)&value, sizeof(value))) != PCAN_ERROR_OK) {
+                  (void*)&value, sizeof(value))) != PCAN_ERROR_OK) {
         CAN_Uninitialize(can[handle].board);
         return pcan_error(rc);
     }
@@ -571,7 +549,7 @@ int can_start(int handle, const can_bitrate_t *bitrate)
 #if (0)
     value = (can[handle].mode.err) ? PCAN_PARAMETER_ON : PCAN_PARAMETER_OFF;
     if ((rc = CAN_SetValue(can[handle].board, PCAN_ALLOW_ERROR_FRAMES,
-                     (void*)&value, sizeof(value))) != PCAN_ERROR_OK) {
+                  (void*)&value, sizeof(value))) != PCAN_ERROR_OK) {
         CAN_Uninitialize(can[handle].board);
         return pcan_error(rc);
     }
@@ -1121,6 +1099,31 @@ char *can_firmware(int handle)
 
 /*  -----------  local functions  ----------------------------------------
  */
+static void var_init(void)
+{
+    int i;
+
+    for (i = 0; i < PCAN_MAX_HANDLES; i++) {
+        memset(&can[i], 0, sizeof(can_interface_t));
+        can[i].board = PCAN_NONEBUS;
+        can[i].brd_type = 0u;
+        can[i].brd_port = 0u;
+        can[i].brd_irq = 0u;
+#if defined(_WIN32) || defined(_WIN64)
+        can[i].event = NULL;
+#else
+        can[i].fdes = -1;
+#endif
+        can[i].mode.byte = CANMODE_DEFAULT;
+        can[i].status.byte = CANSTAT_RESET;
+        can[i].error.lec = 0x00u;
+        can[i].error.rx_err = 0u;
+        can[i].error.tx_err = 0u;
+        can[i].counters.tx = 0ull;
+        can[i].counters.rx = 0ull;
+        can[i].counters.err = 0ull;
+    }
+}
 
 #define PCAN_ERROR_MASK  (PCAN_ERROR_REGTEST | PCAN_ERROR_NODRIVER | PCAN_ERROR_HWINUSE | PCAN_ERROR_NETINUSE | \
                           PCAN_ERROR_ILLHW | PCAN_ERROR_ILLHW | PCAN_ERROR_ILLCLIENT)
@@ -1215,13 +1218,13 @@ static TPCANStatus pcan_capability(TPCANHandle board, can_mode_t *capability)
 static int lib_parameter(uint16_t param, void *value, size_t nbyte)
 {
     int rc = CANERR_ILLPARA;            // suppose an invalid parameter
-
     static int idx_board = EOF;         // actual index in the interface list
     TPCANStatus sts;                    // status or error code
 
     if (value == NULL) {                // check for null-pointer
         if ((param != CANPROP_SET_FIRST_CHANNEL) &&
-           (param != CANPROP_SET_NEXT_CHANNEL))
+            (param != CANPROP_SET_NEXT_CHANNEL) &&
+            (param != CANPROP_SET_FILTER_RESET))
             return CANERR_NULLPTR;
     }
     /* CAN library properties */
@@ -1253,7 +1256,7 @@ static int lib_parameter(uint16_t param, void *value, size_t nbyte)
         break;
     case CANPROP_GET_LIBRARY_ID:        // library id of the library (int32_t)
         if (nbyte >= sizeof(int32_t)) {
-            *(int32_t*)value = (int32_t)PCAN_LIB_ID;
+            *(int32_t*)value = (int32_t)LIB_ID;
             rc = CANERR_NOERROR;
         }
         break;
@@ -1264,20 +1267,20 @@ static int lib_parameter(uint16_t param, void *value, size_t nbyte)
         }
         break;
     case CANPROP_GET_LIBRARY_DLLNAME:   // file name of the library (char[256])
-        if ((nbyte > strlen(PCAN_LIB_WRAPPER)) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
-            strcpy((char*)value, PCAN_LIB_WRAPPER);
+        if ((nbyte > strlen(LIB_DLLNAME)) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
+            strcpy((char*)value, LIB_DLLNAME);
             rc = CANERR_NOERROR;
         }
         break;
     case CANPROP_GET_DEVICE_VENDOR:     // vendor name of the CAN interface (char[256])
-        if ((nbyte > strlen(PCAN_LIB_VENDOR)) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
-            strcpy((char*)value, PCAN_LIB_VENDOR);
+        if ((nbyte > strlen(DEV_VENDOR)) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
+            strcpy((char*)value, DEV_VENDOR);
             rc = CANERR_NOERROR;
         }
         break;
     case CANPROP_GET_DEVICE_DLLNAME:    // file name of the CAN interface DLL (char[256])
-        if ((nbyte > strlen(PCAN_LIB_BASIC)) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
-            strcpy((char*)value, PCAN_LIB_BASIC);
+        if ((nbyte > strlen(DEV_DLLNAME)) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
+            strcpy((char*)value, DEV_DLLNAME);
             rc = CANERR_NOERROR;
         }
         break;
@@ -1286,7 +1289,7 @@ static int lib_parameter(uint16_t param, void *value, size_t nbyte)
         rc = (can_boards[idx_board].type != EOF) ? CANERR_NOERROR : CANERR_RESOURCE;
         break;
     case CANPROP_SET_NEXT_CHANNEL:      // set index to the next entry in the interface list (NULL)
-        if ((0 <= idx_board) && (idx_board < PCAN_BOARDS)) {
+        if ((0 <= idx_board) && (idx_board < NUM_CHANNELS)) {
             if (can_boards[idx_board].type != EOF)
                 idx_board++;
             rc = (can_boards[idx_board].type != EOF) ? CANERR_NOERROR : CANERR_RESOURCE;
@@ -1296,7 +1299,7 @@ static int lib_parameter(uint16_t param, void *value, size_t nbyte)
         break;
     case CANPROP_GET_CHANNEL_NO:        // get channel no. at actual index in the interface list (int32_t)
         if (nbyte >= sizeof(int32_t)) {
-            if ((0 <= idx_board) && (idx_board < PCAN_BOARDS) &&
+            if ((0 <= idx_board) && (idx_board < NUM_CHANNELS) &&
                 (can_boards[idx_board].type != EOF)) {
                 *(int32_t*)value = (int32_t)can_boards[idx_board].type;
                 rc = CANERR_NOERROR;
@@ -1307,7 +1310,7 @@ static int lib_parameter(uint16_t param, void *value, size_t nbyte)
         break;
     case CANPROP_GET_CHANNEL_NAME:      // get channel name at actual index in the interface list (char[256])
         if ((0U < nbyte) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
-            if ((0 <= idx_board) && (idx_board < PCAN_BOARDS) &&
+            if ((0 <= idx_board) && (idx_board < NUM_CHANNELS) &&
                 (can_boards[idx_board].type != EOF)) {
                 strncpy((char*)value, can_boards[idx_board].name, nbyte);
                 ((char*)value)[(nbyte - 1)] = '\0';
@@ -1319,9 +1322,9 @@ static int lib_parameter(uint16_t param, void *value, size_t nbyte)
         break;
     case CANPROP_GET_CHANNEL_DLLNAME:   // get file name of the DLL at actual index in the interface list (char[256])
         if ((0U < nbyte) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
-            if ((0 <= idx_board) && (idx_board < PCAN_BOARDS) &&
+            if ((0 <= idx_board) && (idx_board < NUM_CHANNELS) &&
                 (can_boards[idx_board].type != EOF)) {
-                strncpy((char*)value, PCAN_LIB_BASIC, nbyte);
+                strncpy((char*)value, DEV_DLLNAME, nbyte);
                 ((char*)value)[(nbyte - 1)] = '\0';
                 rc = CANERR_NOERROR;
             }
@@ -1331,9 +1334,9 @@ static int lib_parameter(uint16_t param, void *value, size_t nbyte)
         break;
     case CANPROP_GET_CHANNEL_VENDOR_ID: // get library id at actual index in the interface list (int32_t)
         if (nbyte >= sizeof(int32_t)) {
-            if ((0 <= idx_board) && (idx_board < PCAN_BOARDS) &&
+            if ((0 <= idx_board) && (idx_board < NUM_CHANNELS) &&
                 (can_boards[idx_board].type != EOF)) {
-                *(int32_t*)value = (int32_t)PCAN_LIB_ID;
+                *(int32_t*)value = (int32_t)LIB_ID;
                 rc = CANERR_NOERROR;
             }
             else
@@ -1342,9 +1345,9 @@ static int lib_parameter(uint16_t param, void *value, size_t nbyte)
         break;
     case CANPROP_GET_CHANNEL_VENDOR_NAME: // get vendor name at actual index in the interface list (char[256])
         if ((0U < nbyte) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
-            if ((0 <= idx_board) && (idx_board < PCAN_BOARDS) &&
+            if ((0 <= idx_board) && (idx_board < NUM_CHANNELS) &&
                 (can_boards[idx_board].type != EOF)) {
-                strncpy((char*)value, PCAN_LIB_VENDOR, nbyte);
+                strncpy((char*)value, DEV_VENDOR, nbyte);
                 ((char*)value)[(nbyte - 1)] = '\0';
                 rc = CANERR_NOERROR;
             }
@@ -1402,19 +1405,20 @@ static int lib_parameter(uint16_t param, void *value, size_t nbyte)
 static int drv_parameter(int handle, uint16_t param, void *value, size_t nbyte)
 {
     int rc = CANERR_ILLPARA;            // suppose an invalid parameter
-    can_bitrate_t bitrate;
-    can_speed_t speed;
-    can_mode_t mode;
-    uint8_t status = 0U;
-    uint8_t load = 0U;
-    TPCANStatus sts;
+    can_bitrate_t bitrate;              // bit-rate settings
+    can_speed_t speed;                  // current bus speed
+    can_mode_t mode;                    // current operation mode
+    uint8_t status = 0U;                // status register
+    uint8_t load = 0U;                  // bus load
+    TPCANStatus sts;                    // status or error code
 
     assert(IS_HANDLE_VALID(handle));    // just to make sure
 
     if (value == NULL) {                // check for null-pointer
         if ((param != CANPROP_SET_FIRST_CHANNEL) &&
-           (param != CANPROP_SET_NEXT_CHANNEL))
-        return CANERR_NULLPTR;
+            (param != CANPROP_SET_NEXT_CHANNEL) &&
+            (param != CANPROP_SET_FILTER_RESET))
+            return CANERR_NULLPTR;
     }
     /* CAN interface properties */
     switch (param) {
@@ -1434,14 +1438,14 @@ static int drv_parameter(int handle, uint16_t param, void *value, size_t nbyte)
         }
         break;
     case CANPROP_GET_DEVICE_VENDOR:     // vendor name of the CAN interface (char[256])
-        if ((nbyte > strlen(PCAN_LIB_VENDOR)) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
-            strcpy((char*)value, PCAN_LIB_VENDOR);
+        if ((nbyte > strlen(DEV_VENDOR)) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
+            strcpy((char*)value, DEV_VENDOR);
             rc = CANERR_NOERROR;
         }
         break;
     case CANPROP_GET_DEVICE_DLLNAME:    // file name of the CAN interface DLL (char[256])
-        if ((nbyte > strlen(PCAN_LIB_BASIC)) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
-            strcpy((char*)value, PCAN_LIB_BASIC);
+        if ((nbyte > strlen(DEV_DLLNAME)) && (nbyte <= CANPROP_MAX_BUFFER_SIZE)) {
+            strcpy((char*)value, DEV_DLLNAME);
             rc = CANERR_NOERROR;
         }
         break;
@@ -1564,9 +1568,8 @@ static int drv_parameter(int handle, uint16_t param, void *value, size_t nbyte)
 
 /*  -----------  revision control  ---------------------------------------
  */
-
 EXPORT
-char* can_version(void)
+char *can_version(void)
 {
     return (char*)version;
 }
@@ -1818,5 +1821,5 @@ TPCANStatus CAN_LookUpChannel(LPSTR Parameters, TPCANHandle* FoundChannel)
 /*  ----------------------------------------------------------------------
  *  Uwe Vogt,  UV Software,  Chausseestrasse 33 A,  10115 Berlin,  Germany
  *  Tel.: +49-30-46799872,  Fax: +49-30-46799873,  Mobile: +49-170-3801903
- *  E-Mail: uwe.vogt@uv-software.de,  Homepage: http://www.uv-software.de/
+ *  E-Mail: uwe.vogt@uv-software.de, Homepage: https://www.uv-software.de/
  */
diff --git a/Sources/Wrapper/can_defs.h b/Sources/Wrapper/can_defs.h
index 3e9f017..dd37578 100644
--- a/Sources/Wrapper/can_defs.h
+++ b/Sources/Wrapper/can_defs.h
@@ -1,17 +1,18 @@
 /*  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later */
 /*
- *  CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
+ *  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
  *
- *  Copyright (c) 2005-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+ *  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
+ *  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
  *  All rights reserved.
  *
- *  This file is part of PCBUSB-Wrapper.
+ *  This file is part of PCANBasic-Wrapper.
  *
- *  PCBUSB-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  PCANBasic-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
  *  and under the GNU General Public License v3.0 (or any later version). You can
- *  choose between one of them if you use PCBUSB-Wrapper in whole or in part.
+ *  choose between one of them if you use PCANBasic-Wrapper in whole or in part.
  *
- *  BSD 2-Clause Simplified License:
+ *  BSD 2-Clause "Simplified" License:
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
  *  1. Redistributions of source code must retain the above copyright notice, this
@@ -20,7 +21,7 @@
  *     this list of conditions and the following disclaimer in the documentation
  *     and/or other materials provided with the distribution.
  *
- *  PCBUSB-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
+ *  PCANBasic-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
@@ -29,21 +30,21 @@
  *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF PCBUSB-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  OF PCANBasic-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *  GNU General Public License v3.0 or later:
- *  PCBUSB-Wrapper is free software: you can redistribute it and/or modify
+ *  PCANBasic-Wrapper is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  PCBUSB-Wrapper is distributed in the hope that it will be useful,
+ *  PCANBasic-Wrapper is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with PCBUSB-Wrapper.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
  */
 /** @addtogroup  can_api
  *  @{
@@ -79,5 +80,5 @@
 /*  ----------------------------------------------------------------------
  *  Uwe Vogt,  UV Software,  Chausseestrasse 33 A,  10115 Berlin,  Germany
  *  Tel.: +49-30-46799872,  Fax: +49-30-46799873,  Mobile: +49-170-3801903
- *  E-Mail: uwe.vogt@uv-software.de,  Homepage: http://www.uv-software.de/
+ *  E-Mail: uwe.vogt@uv-software.de, Homepage: https://www.uv-software.de/
  */

From 8ac2d6fa4189bbf62d355b7ebe7c3cf672837fcd Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Thu, 25 Apr 2024 17:51:20 +0200
Subject: [PATCH 05/13] Add unique `Version.h` to the project

Relates to [MACCAN-191]
---
 Sources/PeakCAN.cpp        | 24 +++++---------
 Sources/PeakCAN.h          |  2 +-
 Sources/PeakCAN_Defaults.h |  2 +-
 Sources/PeakCAN_Defines.h  |  2 +-
 Sources/Version.h          | 67 ++++++++++++++++++++++++++++++++++++++
 Sources/Wrapper/can_api.c  | 23 +++++--------
 Sources/Wrapper/can_defs.h |  2 +-
 7 files changed, 88 insertions(+), 34 deletions(-)
 create mode 100644 Sources/Version.h

diff --git a/Sources/PeakCAN.cpp b/Sources/PeakCAN.cpp
index 58a2366..b2ee0ec 100644
--- a/Sources/PeakCAN.cpp
+++ b/Sources/PeakCAN.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
 //
-//  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
+//  CAN Interface API, Version 3 (for PEAK-System PCAN Interfaces)
 //
 //  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
 //  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
@@ -46,18 +46,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
 //
-#include "build_no.h"
-#ifdef _MSC_VER
-#define VERSION_MAJOR    0
-#define VERSION_MINOR    5
-#define VERSION_PATCH    0
-#else
-#define VERSION_MAJOR    0
-#define VERSION_MINOR    2
-#define VERSION_PATCH    99
-#endif
-#define VERSION_BUILD    BUILD_NO
-#define VERSION_STRING   TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
 #ifdef _MSC_VER
 //no Microsoft extensions please!
 #ifndef _CRT_SECURE_NO_WARNINGS
@@ -65,6 +53,8 @@
 #endif
 #endif
 #include "PeakCAN.h"
+#include "Version.h"
+
 #include "can_defs.h"
 #include "can_api.h"
 #include "can_btr.h"
@@ -98,7 +88,7 @@
 #define SPRINTF_S(buf,size,format,...)  sprintf_s(buf,size,format,__VA_ARGS__)
 #endif
 
-#if (OPTION_PEAKCAN_DYLIB != 0)
+#if (OPTION_PEAKCAN_DYLIB != 0) || (OPTION_PEAKCAN_SO != 0)
 __attribute__((constructor))
 static void _initializer() {
     // default initializer
@@ -112,7 +102,11 @@ static void _finalizer() {
 #define EXPORT
 #endif
 
-static const char version[] = "CAN API V3 for PEAK-System PCAN-USB Interfaces, Version " VERSION_STRING;
+#if !defined(__APPLE__)
+static const char version[] = "CAN API V3 for PEAK-System PCAN Interfaces, Version " VERSION_STRING;
+#else
+static const char version[] = "CAN API V3 for PEAK-System PCAN USB Interfaces, Version " VERSION_STRING;
+#endif
 
 EXPORT
 CPeakCAN::CPeakCAN() {
diff --git a/Sources/PeakCAN.h b/Sources/PeakCAN.h
index 02f7bc0..20a55ef 100644
--- a/Sources/PeakCAN.h
+++ b/Sources/PeakCAN.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
 //
-//  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
+//  CAN Interface API, Version 3 (for PEAK-System PCAN Interfaces)
 //
 //  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
 //  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
diff --git a/Sources/PeakCAN_Defaults.h b/Sources/PeakCAN_Defaults.h
index 8e4e18d..5b66d28 100644
--- a/Sources/PeakCAN_Defaults.h
+++ b/Sources/PeakCAN_Defaults.h
@@ -1,6 +1,6 @@
 /*  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later */
 /*
- *  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
+ *  CAN Interface API, Version 3 (for PEAK-System PCAN Interfaces)
  *
  *  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
  *  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
diff --git a/Sources/PeakCAN_Defines.h b/Sources/PeakCAN_Defines.h
index c27aad5..c63b69f 100644
--- a/Sources/PeakCAN_Defines.h
+++ b/Sources/PeakCAN_Defines.h
@@ -1,6 +1,6 @@
 /*  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later */
 /*
- *  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
+ *  CAN Interface API, Version 3 (for PEAK-System PCAN Interfaces)
  *
  *  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
  *  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
diff --git a/Sources/Version.h b/Sources/Version.h
new file mode 100644
index 0000000..66ca873
--- /dev/null
+++ b/Sources/Version.h
@@ -0,0 +1,67 @@
+/*  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later */
+/*
+ *  CAN Interface API, Version 3 (for PEAK-System PCAN Interfaces)
+ *
+ *  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
+ *  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
+ *  All rights reserved.
+ *
+ *  This file is part of PCANBasic-Wrapper.
+ *
+ *  PCANBasic-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
+ *  and under the GNU General Public License v3.0 (or any later version). You can
+ *  choose between one of them if you use PCANBasic-Wrapper in whole or in part.
+ *
+ *  BSD 2-Clause "Simplified" License:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  1. Redistributions of source code must retain the above copyright notice, this
+ *     list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ *
+ *  PCANBasic-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF PCANBasic-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  GNU General Public License v3.0 or later:
+ *  PCANBasic-Wrapper is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  PCANBasic-Wrapper is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#ifndef VERSION_H_INCLUDED
+#define VERSION_H_INCLUDED
+#include "build_no.h"
+#ifdef _MSC_VER
+#define VERSION_MAJOR    0
+#define VERSION_MINOR    5
+#define VERSION_PATCH    0
+#else
+#define VERSION_MAJOR    0
+#define VERSION_MINOR    2
+#define VERSION_PATCH    99
+#endif
+#define VERSION_BUILD    BUILD_NO
+#if (VERSION_PATCH == 0)
+#define VERSION_STRING   TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) " (" TOSTRING(BUILD_NO) ")"
+#else
+#define VERSION_STRING   TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
+#endif
+#endif
diff --git a/Sources/Wrapper/can_api.c b/Sources/Wrapper/can_api.c
index 0514a66..c921d04 100755
--- a/Sources/Wrapper/can_api.c
+++ b/Sources/Wrapper/can_api.c
@@ -1,6 +1,6 @@
 /*  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later */
 /*
- *  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
+ *  CAN Interface API, Version 3 (for PEAK-System PCAN Interfaces)
  *
  *  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
  *  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
@@ -49,18 +49,6 @@
 /** @addtogroup  can_api
  *  @{
  */
-#include "build_no.h"
-#ifdef _MSC_VER
-#define VERSION_MAJOR    0
-#define VERSION_MINOR    5
-#define VERSION_PATCH    0
-#else
-#define VERSION_MAJOR    0
-#define VERSION_MINOR    2
-#define VERSION_PATCH    99
-#endif
-#define VERSION_BUILD    BUILD_NO
-#define VERSION_STRING   TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
 #ifdef _MSC_VER
 //no Microsoft extensions please!
 #ifndef _CRT_SECURE_NO_WARNINGS
@@ -97,6 +85,7 @@
 #include "PCANBasic.h"
 #endif
 #endif
+#include "Version.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -107,7 +96,7 @@
 #if (OPTION_CAN_2_0_ONLY != 0)
 #error Compilation with legacy CAN 2.0 frame format!
 #endif
-#if (OPTION_CANAPI_PCBUSB_DYLIB != 0)
+#if (OPTION_CANAPI_PCBUSB_DYLIB != 0) || (OPTION_CANAPI_PCANBASIC_SO != 0)
 __attribute__((constructor))
 static void _initializer() {
     // default initializer
@@ -205,7 +194,11 @@ static int drv_parameter(int handle, uint16_t param, void *value, size_t nbyte);
 
 /*  -----------  variables  ----------------------------------------------
  */
-static const char version[] = "CAN API V3 for PEAK-System PCAN-USB Interfaces, Version " VERSION_STRING;
+#if !defined(__APPLE__)
+static const char version[] = "CAN API V3 for PEAK-System PCAN Interfaces, Version " VERSION_STRING;
+#else
+static const char version[] = "CAN API V3 for PEAK-System PCAN USB Interfaces, Version " VERSION_STRING;
+#endif
 
 EXPORT
 can_board_t can_boards[PCAN_BOARDS+1]=// list of CAN Interface boards:
diff --git a/Sources/Wrapper/can_defs.h b/Sources/Wrapper/can_defs.h
index dd37578..cf99060 100644
--- a/Sources/Wrapper/can_defs.h
+++ b/Sources/Wrapper/can_defs.h
@@ -1,6 +1,6 @@
 /*  SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later */
 /*
- *  CAN Interface API, Version 3 (for Peak-System PCAN Interfaces)
+ *  CAN Interface API, Version 3 (for PEAK-System PCAN Interfaces)
  *
  *  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
  *  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)

From 7eb3870471ec28c4acb5852f5849227ff6b45bc6 Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Thu, 25 Apr 2024 18:44:02 +0200
Subject: [PATCH 06/13] Update my beloved utilities

Relates to [MACCAN-191]
---
 Utilities/can_moni/Driver.h            |   81 +-
 Utilities/can_moni/README.md           |   63 +-
 Utilities/can_moni/Sources/Message.cpp |    8 +-
 Utilities/can_moni/Sources/Message.h   |    8 +-
 Utilities/can_moni/Sources/Timer.cpp   |   46 +-
 Utilities/can_moni/Sources/Timer.h     |   28 +-
 Utilities/can_moni/Sources/main.cpp    |  736 +--------------
 Utilities/can_moni/Sources/main_p.cpp  |  959 ++++++++++++++++++++
 Utilities/can_test/Driver.h            |   81 +-
 Utilities/can_test/README.md           |   83 +-
 Utilities/can_test/Sources/Timer.cpp   |   46 +-
 Utilities/can_test/Sources/Timer.h     |   28 +-
 Utilities/can_test/Sources/main.cpp    |  931 +------------------
 Utilities/can_test/Sources/main_p.cpp  | 1130 ++++++++++++++++++++++++
 14 files changed, 2373 insertions(+), 1855 deletions(-)
 mode change 100755 => 100644 Utilities/can_moni/Sources/main.cpp
 create mode 100755 Utilities/can_moni/Sources/main_p.cpp
 create mode 100644 Utilities/can_test/Sources/main_p.cpp

diff --git a/Utilities/can_moni/Driver.h b/Utilities/can_moni/Driver.h
index 16bc5f7..cb7c76c 100644
--- a/Utilities/can_moni/Driver.h
+++ b/Utilities/can_moni/Driver.h
@@ -1,8 +1,8 @@
 //  SPDX-License-Identifier: GPL-3.0-or-later
 //
-//  CAN Monitor for generic Interfaces (CAN API V3)
+//  CAN Monitor for Peak-System PCAN Interfaces (CAN API V3)
 //
-//  Copyright (c) 2007,2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//  Copyright (c) 2007,2012-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -19,34 +19,65 @@
 //
 #ifndef DRIVER_H_INCLUDED
 #define DRIVER_H_INCLUDED
-#include "build_no.h"
-#define VERSION_MAJOR      0
-#define VERSION_MINOR      2
-#define VERSION_PATCH      8
-#define VERSION_BUILD      BUILD_NO
-#define VERSION_STRING     TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
-#if defined(_WIN64)
-#define PLATFORM          "x64"
-#elif defined(_WIN32)
-#define PLATFORM          "x86"
-#elif defined(__linux__)
-#define PLATFORM          "Linux"
-#elif defined(__APPLE__)
-#define PLATFORM          "macOS"
-#elif defined(__CYGWIN__)
-#define PLATFORM          "Cygwin"
-#else
-#error Unsupported architecture
-#endif
+
+#include "PeakCAN.h"
+
 #if (OPTION_CAN_2_0_ONLY != 0)
 #error Compilation with legacy CAN 2.0 frame format!
 #else
-#define CAN_FD_SUPPORTED   1  // don't touch that dial
+#define CAN_FD_SUPPORTED  1  // don't touch that dial
+#endif
+#if !defined(__APPLE__)
+#define MONITOR_INTERFACE  "PEAK-System PCAN Interfaces"
+#else
+#define MONITOR_INTERFACE  "PEAK-System PCAN USB Interfaces"
 #endif
-#define MONITOR_INTEFACE  "PEAK-System PCAN-USB Interfaces"
-#define MONITOR_COPYRIGHT "2007,2012-2024 by Uwe Vogt, UV Software, Berlin"
+#define MONITOR_COPYRIGHT  "2007,2012-2024 by Uwe Vogt, UV Software, Berlin"
 
-#include "PeakCAN.h"
+#if (OPTION_PCAN_BIT_TIMING == 1)
+#define BITRATE_1M(x)    PEAKCAN_BR_1M(x)
+#define BITRATE_800K(x)  PEAKCAN_BR_800K(x)
+#define BITRATE_500K(x)  PEAKCAN_BR_500K(x)
+#define BITRATE_250K(x)  PEAKCAN_BR_250K(x)
+#define BITRATE_125K(x)  PEAKCAN_BR_125K(x)
+#define BITRATE_100K(x)  PEAKCAN_BR_100K(x)
+#define BITRATE_50K(x)   PEAKCAN_BR_50K(x)
+#define BITRATE_20K(x)   PEAKCAN_BR_20K(x)
+#define BITRATE_10K(x)   PEAKCAN_BR_10K(x)
+#define BITRATE_5K(x)    PEAKCAN_BR_5K(x)
+#else
+#define BITRATE_1M(x)    DEFAULT_CAN_BR_1M(x)  
+#define BITRATE_800K(x)  DEFAULT_CAN_BR_800K(x)
+#define BITRATE_500K(x)  DEFAULT_CAN_BR_500K(x)
+#define BITRATE_250K(x)  DEFAULT_CAN_BR_250K(x)
+#define BITRATE_125K(x)  DEFAULT_CAN_BR_125K(x)
+#define BITRATE_100K(x)  DEFAULT_CAN_BR_100K(x)
+#define BITRATE_50K(x)   DEFAULT_CAN_BR_50K(x) 
+#define BITRATE_20K(x)   DEFAULT_CAN_BR_20K(x) 
+#define BITRATE_10K(x)   DEFAULT_CAN_BR_10K(x) 
+#define BITRATE_5K(x)    DEFAULT_CAN_BR_5K(x)  
+#endif
+#if (CAN_FD_SUPPORTED != 0)
+#if (OPTION_PCAN_BIT_TIMING == 1)
+#define BITRATE_FD_1M(x)      PEAKCAN_FD_BR_1M(x)
+#define BITRATE_FD_500K(x)    PEAKCAN_FD_BR_500K(x)
+#define BITRATE_FD_250K(x)    PEAKCAN_FD_BR_250K(x)
+#define BITRATE_FD_125K(x)    PEAKCAN_FD_BR_125K(x)
+#define BITRATE_FD_1M8M(x)    PEAKCAN_FD_BR_1M8M(x)
+#define BITRATE_FD_500K4M(x)  PEAKCAN_FD_BR_500K4M(x)
+#define BITRATE_FD_250K2M(x)  PEAKCAN_FD_BR_250K2M(x)
+#define BITRATE_FD_125K1M(x)  PEAKCAN_FD_BR_125K1M(x)
+#else
+#define BITRATE_FD_1M(x)      DEFAULT_CAN_FD_BR_1M(x)
+#define BITRATE_FD_500K(x)    DEFAULT_CAN_FD_BR_500K(x)
+#define BITRATE_FD_250K(x)    DEFAULT_CAN_FD_BR_250K(x)
+#define BITRATE_FD_125K(x)    DEFAULT_CAN_FD_BR_125K(x)
+#define BITRATE_FD_1M8M(x)    DEFAULT_CAN_FD_BR_1M8M(x)
+#define BITRATE_FD_500K4M(x)  DEFAULT_CAN_FD_BR_500K4M(x)
+#define BITRATE_FD_250K2M(x)  DEFAULT_CAN_FD_BR_250K2M(x)
+#define BITRATE_FD_125K1M(x)  DEFAULT_CAN_FD_BR_125K1M(x)
+#endif
+#endif
 
 typedef CPeakCAN  CCanDriver;
 
diff --git a/Utilities/can_moni/README.md b/Utilities/can_moni/README.md
index e88d876..873955d 100644
--- a/Utilities/can_moni/README.md
+++ b/Utilities/can_moni/README.md
@@ -4,25 +4,26 @@ Copyright &copy; 2007,2012-2024 by Uwe Vogt, UV Software, Berlin
 ```
 Usage: can_moni <interface> [<option>...]
 Options:
- -t, --time=(ZERO|ABS|REL)     absolute or relative time (default=0)
- -i  --id=(HEX|DEC|OCT)        display mode of CAN-IDs (default=HEX)
- -d, --data=(HEX|DEC|OCT)      display mode of data bytes (default=HEX)
- -a, --ascii=(ON|OFF)          display data bytes in ASCII (default=ON)
- -w, --wrap=(NO|8|10|16|32|64) wraparound after n data bytes (default=NO)
- -x, --exclude=[~]<id-list>    exclude CAN-IDs: <id>[-<id>]{,<id>[-<id>]}
- -m, --mode=(2.0|FDF[+BRS])    CAN operation mode: CAN 2.0 or CAN FD mode
-     --shared                  shared CAN controller access (if supported)
-     --listen-only             monitor mode (listen-only, transmitter is off)
-     --error-frames            allow reception of error frames
-     --no-remote-frames        suppress remote frames (RTR frames)
-     --no-extended-frames      suppress extended frames (29-bit identifier)
- -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250), or
-     --bitrate=<bit-rate>      CAN bit-rate settings (as a string)
- -v, --verbose                 show detailed bit-rate settings
- -L, --list-boards             list all supported CAN interfaces and exit
- -T, --test-boards             list all available CAN interfaces and exit
- -h, --help                    display this help screen and exit
-     --version                 show version information and exit
+ -t, --time=(ZERO|ABS|REL)            absolute or relative time (default=0)
+ -i  --id=(HEX|DEC|OCT)               display mode of CAN-IDs (default=HEX)
+ -d, --data=(HEX|DEC|OCT)             display mode of data bytes (default=HEX)
+ -a, --ascii=(ON|OFF)                 display data bytes in ASCII (default=ON)
+ -w, --wrap=(NO|8|10|16|32|64)        wraparound after n data bytes (default=NO)
+ -x, --exclude=[~]<id-list>           exclude CAN-IDs: <id-list> = <id>[-<id>]{,<id>[-<id>]}
+ -m, --mode=(2.0|FDF[+BRS])           CAN operation mode: CAN 2.0 or CAN FD mode
+     --shared                         shared CAN controller access (if supported)
+     --listen-only                    monitor mode (listen-only, transmitter is off)
+     --error-frames                   allow reception of error frames
+     --no-remote-frames               suppress remote frames (RTR frames)
+     --no-extended-frames             suppress extended frames (29-bit identifier)
+ -b, --baudrate=<baudrate>            CAN bit-timing in kbps (default=250), or
+     --bitrate=<bit-rate>             CAN bit-rate settings (as a string)
+ -v, --verbose                        show detailed bit-rate settings
+     --list-bitrates[=<mode>]         list standard bit-rate settings
+ -L, --list-boards                    list all supported CAN interfaces and exit
+ -T, --test-boards                    list all available CAN interfaces and exit
+ -h, --help                           display this help screen and exit
+     --version                        show version information and exit
 Arguments:
   <id>           CAN identifier (11-bit)
   <interface>    CAN interface board (list all with /LIST)
@@ -37,17 +38,17 @@ Arguments:
                  7 = 20 kbps
                  8 = 10 kbps
   <bitrate>      comma-separated <key>=<value>-list:
-                 f_clock=<value>         frequency in Hz or
-                 f_clock_mhz=<value>     frequency in MHz
-                 nom_brp=<value>         bit-rate prescaler (nominal)
-                 nom_tseg1=<value>       time segment 1 (nominal)
-                 nom_tseg2=<value>       time segment 2 (nominal)
-                 nom_sjw=<value>         sync. jump width (nominal)
-                 nom_sam=<value>         sampling (only SJA1000)
-                 data_brp=<value>        bit-rate prescaler (FD data)
-                 data_tseg1=<value>      time segment 1 (FD data)
-                 data_tseg2=<value>      time segment 2 (FD data)
-                 data_sjw=<value>        sync. jump width (FD data).
+                 f_clock=<value>      frequency in Hz or
+                 f_clock_mhz=<value>  frequency in MHz
+                 nom_brp=<value>      bit-rate prescaler (nominal)
+                 nom_tseg1=<value>    time segment 1 (nominal)
+                 nom_tseg2=<value>    time segment 2 (nominal)
+                 nom_sjw=<value>      sync. jump width (nominal)
+                 nom_sam=<value>      sampling (only SJA1000)
+                 data_brp=<value>     bit-rate prescaler (FD data)
+                 data_tseg1=<value>   time segment 1 (FD data)
+                 data_tseg2=<value>   time segment 2 (FD data)
+                 data_sjw=<value>     sync. jump width (FD data).
 Hazard note:
   If you connect your CAN device to a real CAN network when using this program,
   you might damage your application.
@@ -64,4 +65,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/Utilities/can_moni/Sources/Message.cpp b/Utilities/can_moni/Sources/Message.cpp
index 02273c6..52630d2 100644
--- a/Utilities/can_moni/Sources/Message.cpp
+++ b/Utilities/can_moni/Sources/Message.cpp
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Message Formatter)
 //
-//  Copyright (c) 2020-2021 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2020-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #include "Message.h"
 #include "can_msg.h"
diff --git a/Utilities/can_moni/Sources/Message.h b/Utilities/can_moni/Sources/Message.h
index c625568..2f73da3 100644
--- a/Utilities/can_moni/Sources/Message.h
+++ b/Utilities/can_moni/Sources/Message.h
@@ -2,13 +2,13 @@
 //
 //  CAN Interface API, Version 3 (Message Formatter)
 //
-//  Copyright (c) 2020-2021 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2020-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
 //  This file is part of CAN API V3.
 //
-//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this file.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -43,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+//  along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef MESSAGE_H_INCLUDED
 #define MESSAGE_H_INCLUDED
diff --git a/Utilities/can_moni/Sources/Timer.cpp b/Utilities/can_moni/Sources/Timer.cpp
index 3fa6612..6a80c60 100644
--- a/Utilities/can_moni/Sources/Timer.cpp
+++ b/Utilities/can_moni/Sources/Timer.cpp
@@ -2,11 +2,13 @@
 //
 //  Software for Industrial Communication, Motion Control and Automation
 //
-//  Copyright (c) 2002-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
-//  This class is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  Class CTimer
+//
+//  This class is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this class.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -41,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this class.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this class.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifdef _DEBUG
 #undef THIS_FILE
@@ -58,48 +60,50 @@ static char THIS_FILE[]=__FILE__;
 #endif
 #define POSIX_DEPRECATED  0  /* set to non-zero value to use 'gettimeofday' and 'usleep'*/
 
-CTimer::CTimer(uint32_t u32Microseconds) {
+CTimer::CTimer(uint64_t u64Microseconds) {
 #if !defined(_WIN32) && !defined(_WIN64)
 #if (POSIX_DEPRECATED != 0)
     struct timeval tv;
     gettimeofday(&tv, NULL);
     m_u64UntilStop = ((uint64_t)tv.tv_sec * (uint64_t)1000000) + (uint64_t)tv.tv_usec
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #else
     struct timespec now = { 0, 0 };
     clock_gettime(CLOCK_MONOTONIC, &now);
     m_u64UntilStop = ((uint64_t)now.tv_sec * (uint64_t)1000000)
                    + ((uint64_t)now.tv_nsec / (uint64_t)1000)
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #endif
 #else
     LARGE_INTEGER largeCounter;  // high-resolution performance counter
 
+    m_llUntilStop = (LONGLONG)0; // counter value for the desired time-out
+
     // retrieve the frequency of the high-resolution performance counter
     if(!QueryPerformanceFrequency(&m_largeFrequency))
         return;
     // retrieve the current value of the high-resolution performance counter
-    if(!QueryPerformanceCounter(&largeCounter))
+    if (!QueryPerformanceCounter(&largeCounter))
         return;
     // calculate the counter value for the desired time-out
-    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u32Microseconds)
+    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
                                                                         / (LONGLONG)1000000);
 #endif
 }
 
-bool CTimer::Restart(uint32_t u32Microseconds) {
+bool CTimer::Restart(uint64_t u64Microseconds) {
 #if !defined(_WIN32) && !defined(_WIN64)
 #if (POSIX_DEPRECATED != 0)
     struct timeval tv;
     gettimeofday(&tv, NULL);
     m_u64UntilStop = ((uint64_t)tv.tv_sec * (uint64_t)1000000) + (uint64_t)tv.tv_usec
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #else
     struct timespec now = { 0, 0 };
     clock_gettime(CLOCK_MONOTONIC, &now);
     m_u64UntilStop = ((uint64_t)now.tv_sec * (uint64_t)1000000)
                    + ((uint64_t)now.tv_nsec / (uint64_t)1000)
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #endif
     return true;
 #else
@@ -109,7 +113,7 @@ bool CTimer::Restart(uint32_t u32Microseconds) {
     if(!QueryPerformanceCounter(&largeCounter))
         return false;
     // calculate the counter value for the desired time-out
-    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u32Microseconds)
+    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
                                                                         / (LONGLONG)1000000);
     return true;
 #endif
@@ -146,15 +150,15 @@ bool CTimer::Timeout() {
 #endif
 }
 
-bool CTimer::Delay(uint32_t u32Microseconds) {
+bool CTimer::Delay(uint64_t u64Microseconds) {
 #if !defined(_WIN32) && !defined(_WIN64)
 #if (POSIX_DEPRECATED != 0)
-    return (usleep((useconds_t)u32Microseconds) != 0) ? false : true;
+    return (usleep((useconds_t)u64Microseconds) != 0) ? false : true;
 #else
     int rc;
     struct timespec delay;
-    delay.tv_sec = (time_t)(u32Microseconds / CTimer::SEC);
-    delay.tv_nsec = (long)((u32Microseconds % CTimer::SEC) * (uint32_t)1000);
+    delay.tv_sec = (time_t)(u64Microseconds / CTimer::SEC);
+    delay.tv_nsec = (long)((u64Microseconds % CTimer::SEC) * (uint32_t)1000);
     errno = 0;
     while ((rc = nanosleep(&delay, &delay))) {
         if (errno != EINTR)
@@ -175,7 +179,7 @@ bool CTimer::Delay(uint32_t u32Microseconds) {
     if(!QueryPerformanceFrequency(&largeFrequency))
         return false;
     // calculate the counter value for the desired delay
-    llUntilStop = largeCounter.QuadPart + ((largeFrequency.QuadPart * (LONGLONG)u32Microseconds)
+    llUntilStop = largeCounter.QuadPart + ((largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
                                                                     / (LONGLONG)1000000);
     // wait until the counter overruns the delay time
     for(;;)
@@ -189,9 +193,9 @@ bool CTimer::Delay(uint32_t u32Microseconds) {
     HANDLE timer;
     LARGE_INTEGER ft;
 
-    ft.QuadPart = -(10 * (LONGLONG)u32Microseconds); // Convert to 100 nanosecond interval, negative value indicates relative time
+    ft.QuadPart = -(10 * (LONGLONG)u64Microseconds); // Convert to 100 nanosecond interval, negative value indicates relative time
 
-    if(u32Microseconds >= 100) {  // FIXME: Who made this decision?
+    if(u64Microseconds >= 100) {  // FIXME: Who made this decision?
         if ((timer = CreateWaitableTimer(NULL, TRUE, NULL)) != NULL) {
             SetWaitableTimer(timer, &ft, 0, NULL, NULL, 0);
             WaitForSingleObject(timer, INFINITE);
@@ -256,4 +260,4 @@ double CTimer::DiffTime(struct timespec start, struct timespec stop) {
             ((double)start.tv_sec + ((double)start.tv_nsec / 1000000000.f)));
 }
 
-// $Id: Timer.cpp 799 2023-10-07 19:15:23Z makemake $  Copyright (c) UV Software, Berlin //
+// $Id: Timer.cpp 810 2024-04-18 14:01:00Z quaoar $  Copyright (c) UV Software, Berlin //
diff --git a/Utilities/can_moni/Sources/Timer.h b/Utilities/can_moni/Sources/Timer.h
index 5f0ebc5..3bb4460 100644
--- a/Utilities/can_moni/Sources/Timer.h
+++ b/Utilities/can_moni/Sources/Timer.h
@@ -2,11 +2,13 @@
 //
 //  Software for Industrial Communication, Motion Control and Automation
 //
-//  Copyright (c) 2002-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
-//  This class is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  Class CTimer
+//
+//  This class is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this class.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -41,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this class.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this class.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef TIMER_H_INCLUDED
 #define TIMER_H_INCLUDED
@@ -62,10 +64,10 @@
 
 class CTimer {
 public:
-    static const uint32_t USEC = 1U;  // 1 microsecond
-    static const uint32_t MSEC = 1000U;  // 1 millisecond
-    static const uint32_t SEC = 1000000U;  // 1 second
-    static const uint32_t MIN = 60000000U;  // 1 minute
+    static const uint64_t USEC = 1U;  // 1 microsecond
+    static const uint64_t MSEC = 1000U;  // 1 millisecond
+    static const uint64_t SEC = 1000000U;  // 1 second
+    static const uint64_t MIN = 60000000U;  // 1 minute
 private:
 #if !defined(_WIN32) && !defined(_WIN64)
     uint64_t m_u64UntilStop;  // counter value for the desired time-out
@@ -74,13 +76,13 @@ class CTimer {
     LONGLONG      m_llUntilStop;     // counter value for the desired time-out
 #endif
 public:
-    CTimer(uint32_t u32Microseconds = 0);
+    CTimer(uint64_t u64Microseconds = 0);
     virtual ~CTimer() {};
 
-    bool Restart(uint32_t u32Timeout);  // restart the timer!
-    bool Timeout();                     // time-out occurred?
+    bool Restart(uint64_t u64Microseconds);  // restart the timer!
+    bool Timeout();                          // time-out occurred?
 
-    static bool Delay(uint32_t u32Delay); // delay timer
+    static bool Delay(uint64_t u64Microseconds);  // delay timer
 
     static struct timespec GetTime();  // time with nanosecond resolution
     static double DiffTime(struct timespec start, struct timespec stop);
@@ -88,4 +90,4 @@ class CTimer {
 
 #endif // TIMER_H_INCLUDED
 
-// $Id: Timer.h 799 2023-10-07 19:15:23Z makemake $  Copyright (c) UV Software, Berlin //
+// $Id: Timer.h 810 2024-04-18 14:01:00Z quaoar $  Copyright (c) UV Software, Berlin //
diff --git a/Utilities/can_moni/Sources/main.cpp b/Utilities/can_moni/Sources/main.cpp
old mode 100755
new mode 100644
index f7de2c5..64a6b10
--- a/Utilities/can_moni/Sources/main.cpp
+++ b/Utilities/can_moni/Sources/main.cpp
@@ -2,7 +2,7 @@
 //
 //  CAN Monitor for generic Interfaces (CAN API V3)
 //
-//  Copyright (c) 2007,2012-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//  Copyright (c) 2007,2012-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -15,736 +15,10 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //
-#include "Driver.h"
-#include "Timer.h"
-#include "Message.h"
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <getopt.h>
-#include <signal.h>
-#include <errno.h>
-#include <time.h>
-
-#include <inttypes.h>
-
-#ifdef _MSC_VER
-//not #if defined(_WIN32) || defined(_WIN64) because we have strncasecmp in mingw
-#define strncasecmp _strnicmp
-#define strcasecmp _stricmp
-#endif
-
-#define MAX_ID  (CAN_MAX_STD_ID + 1)
-
-static int get_exclusion(const char *arg);
-
-class CCanDevice : public CCanDriver {
-public:
-    uint64_t ReceptionLoop();
-public:
-    static int ListCanDevices(void);
-    static int TestCanDevices(CANAPI_OpMode_t opMode);
-};
-
-static void sigterm(int signo);
-static void usage(FILE *stream, const char *program);
-static void version(FILE *stream, const char *program);
-
-static int can_id[MAX_ID];
-static int can_id_xtd = 1;
-static volatile int running = 1;
-
-static CCanDevice canDevice = CCanDevice();
-
-static const char APPLICATION[] = "CAN Monitor for " MONITOR_INTEFACE ", Version " VERSION_STRING;
-static const char COPYRIGHT[]   = "Copyright (c) " MONITOR_COPYRIGHT;
-static const char WARRANTY[]    = "This program comes with ABSOLUTELY NO WARRANTY!\n\n" \
-                                  "This is free software, and you are welcome to redistribute it\n" \
-                                  "under certain conditions; type '--version' for details.";
-static const char LICENSE[]     = "This program is free software: you can redistribute it and/or modify\n" \
-                                  "it under the terms of the GNU General Public License as published by\n" \
-                                  "the Free Software Foundation, either version 3 of the License, or\n" \
-                                  "(at your option) any later version.\n\n" \
-                                  "This program is distributed in the hope that it will be useful,\n" \
-                                  "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" \
-                                  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" \
-                                  "GNU General Public License for more details.\n\n" \
-                                  "You should have received a copy of the GNU General Public License\n" \
-                                  "along with this program.  If not, see <http://www.gnu.org/licenses/>.";
-#define basename(x)  "can_moni" // FIXME: Where is my `basename' function?
-
-int main(int argc, const char * argv[]) {
-    int opt;
-    CCanDevice::SChannelInfo channel;
-    int op = 0, rf = 0, xf = 0, ef = 0, lo = 0, sh = 0;
-    long baudrate = CANBDR_250; int bd = 0;
-    CCanMessage::EFormatTimestamp modeTime = CCanMessage::OptionZero; int mt = 0;
-    CCanMessage::EFormatNumber modeId = CCanMessage::OptionHex; int mi = 0;
-    CCanMessage::EFormatNumber modeData = CCanMessage::OptionHex; int md = 0;
-    CCanMessage::EFormatOption modeAscii = CCanMessage::OptionOn; int ma = 0;
-    CCanMessage::EFormatWraparound wraparound = CCanMessage::OptionWraparoundNo; int mw = 0;
-    int exclude = 0;
-//    char *script_file = NULL;
-    int verbose = 0;
-    int num_boards = 0;
-    int show_version = 0;
-    char *device, *firmware, *software;
-    char property[CANPROP_MAX_BUFFER_SIZE] = "";
-    struct option long_options[] = {
-        {"baudrate", required_argument, 0, 'b'},
-        {"bitrate", required_argument, 0, 'B'},
-        {"verbose", no_argument, 0, 'v'},
-        {"mode", required_argument, 0, 'm'},
-        {"shared", no_argument, 0, 'S'},
-        {"listen-only", no_argument, 0, 'M'},
-        {"error-frames", no_argument, 0, 'E'},
-        {"no-remote-frames", no_argument, 0, 'R'},
-        {"no-extended-frames", no_argument, 0, 'X'},
-        {"time", required_argument, 0, 't'},
-        {"id", required_argument, 0, 'i'},
-        {"data", required_argument, 0, 'd'},
-        {"ascii", required_argument, 0, 'a'},
-        {"wrap", required_argument, 0, 'w'},
-        {"wraparound", required_argument, 0, 'w'},
-        {"exclude", required_argument, 0, 'x'},
-        {"script", required_argument, 0, 's'},
-        {"list-boards", no_argument, 0, 'L'},
-        {"test-boards", no_argument, 0, 'T'},
-        {"help", no_argument, 0, 'h'},
-        {"version", no_argument, &show_version, 1},
-        {0, 0, 0, 0}
-    };
-    CANAPI_Bitrate_t bitrate = {};
-    bitrate.index = CANBTR_INDEX_250K;
-    bool hasDataPhase = false;
-    bool hasNoSamp = true;
-    CANAPI_OpMode_t opMode = {};
-    opMode.byte = CANMODE_DEFAULT;
-    CANAPI_Return_t retVal = 0;
-
-    /* default bit-timing */
-    CANAPI_BusSpeed_t speed = {};
-    (void)CCanDevice::MapIndex2Bitrate(bitrate.index, bitrate);
-    (void)CCanDevice::MapBitrate2Speed(bitrate, speed);
-    (void)op;
-
-    /* default format options */
-    (void)CCanMessage::SetTimestampFormat(modeTime);
-    (void)CCanMessage::SetIdentifierFormat(modeId);
-    (void)CCanMessage::SetDataFormat(modeData);
-    (void)CCanMessage::SetAsciiFormat(modeAscii);
-    (void)CCanMessage::SetWraparound(wraparound);
-    (void)mw;
-
-    /* exclude list (11-bit IDs only) */
-    for (int i = 0; i < MAX_ID; i++) {
-        can_id[i] = 1;
-    }
-    /* signal handler */
-    if ((signal(SIGINT, sigterm) == SIG_ERR) ||
-#if !defined(_WIN32) && !defined(_WIN64)
-       (signal(SIGHUP, sigterm) == SIG_ERR) ||
-#endif
-       (signal(SIGTERM, sigterm) == SIG_ERR)) {
-        perror("+++ error");
-        return errno;
-    }
-    /* scan command-line */
-    while ((opt = getopt_long(argc, (char * const *)argv, "b:vm:t:i:d:a:w:x:s:LTh", long_options, NULL)) != -1) {
-        switch (opt) {
-        case 'b':  /* option `--baudrate=<baudrate>' (-b) */
-            if (bd++) {
-                fprintf(stderr, "%s: duplicated option `--baudrate' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (sscanf(optarg, "%li", &baudrate) != 1) {
-                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            switch (baudrate) {
-                case 0: case 1000: case 1000000: bitrate.index = (int32_t)CANBTR_INDEX_1M; break;
-                case 1: case 800:  case 800000:  bitrate.index = (int32_t)CANBTR_INDEX_800K; break;
-                case 2: case 500:  case 500000:  bitrate.index = (int32_t)CANBTR_INDEX_500K; break;
-                case 3: case 250:  case 250000:  bitrate.index = (int32_t)CANBTR_INDEX_250K; break;
-                case 4: case 125:  case 125000:  bitrate.index = (int32_t)CANBTR_INDEX_125K; break;
-                case 5: case 100:  case 100000:  bitrate.index = (int32_t)CANBTR_INDEX_100K; break;
-                case 6: case 50:   case 50000:   bitrate.index = (int32_t)CANBTR_INDEX_50K; break;
-                case 7: case 20:   case 20000:   bitrate.index = (int32_t)CANBTR_INDEX_20K; break;
-                case 8: case 10:   case 10000:   bitrate.index = (int32_t)CANBTR_INDEX_10K; break;
-                default:                         bitrate.index = (int32_t)-baudrate; break;
-            }
-            if (CCanDevice::MapIndex2Bitrate(bitrate.index, bitrate) != CCanApi::NoError) {
-                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (CCanDevice::MapBitrate2Speed(bitrate, speed) != CCanApi::NoError) {
-                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-        case 'B':  /* option `--bitrate=<bit-rate>' as string */
-            if (bd++) {
-                fprintf(stderr, "%s: duplicated option `--bitrate'\n", basename(argv[0]));
-                return 1;
-            }
-            if (CCanDevice::MapString2Bitrate(optarg, bitrate, hasDataPhase, hasNoSamp) != CCanApi::NoError) {
-                fprintf(stderr, "%s: illegal argument for option `--bitrate'\n", basename(argv[0]));
-                return 1;
-            }
-            if (CCanDevice::MapBitrate2Speed(bitrate, speed) != CCanApi::NoError) {
-                fprintf(stderr, "%s: illegal argument for option `--bitrate'\n", basename(argv[0]));
-                return 1;
-            }
-            break;
-        case 'v':  /* option `--verbose' (-v) */
-            if (verbose) {
-                fprintf(stderr, "%s: duplicated option `--verbose' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            verbose = 1;
-            break;
-#if (CAN_FD_SUPPORTED != 0)
-        case 'm':  /* option `--mode=(2.0|FDF[+BRS])' (-m)*/
-            if (op++) {
-                fprintf(stderr, "%s: duplicated option `--mode' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!strcasecmp(optarg, "default") || !strcasecmp(optarg, "classic") ||
-                !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "2.0"))
-                opMode.byte |= CANMODE_DEFAULT;
-            else if (!strcasecmp(optarg, "CANFD") || !strcasecmp(optarg, "FDF") || !strcasecmp(optarg, "FD"))
-                opMode.byte |= CANMODE_FDOE;
-            else if (!strcasecmp(optarg, "CANFD+BRS") || !strcasecmp(optarg, "FDF+BRS") || !strcasecmp(optarg, "FD+BRS"))
-                opMode.byte |= CANMODE_FDOE | CANMODE_BRSE;
-            else {
-                fprintf(stderr, "%s: illegal argument for option `--mode' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-#endif
-        case 'S':  /* option `--shared' */
-            if (sh++) {
-                fprintf(stderr, "%s: duplicated option `--shared'\n", basename(argv[0]));
-                return 1;
-            }
-            opMode.shrd = 1;
-            break;
-        case 'M':  /* option `--listen-only' */
-            if (lo++) {
-                fprintf(stderr, "%s: duplicated option `--listen-only'\n", basename(argv[0]));
-                return 1;
-            }
-            opMode.mon = 1;
-            break;
-        case 'E':  /* option `--error-frames' */
-            if (ef++) {
-                fprintf(stderr, "%s: duplicated option `--error-frames'\n", basename(argv[0]));
-                return 1;
-            }
-            opMode.err = 1;
-            break;
-        case 'X':  /* option `--no-extended-frames' */
-            if (xf++) {
-                fprintf(stderr, "%s: duplicated option `--no-extended-frames'\n", basename(argv[0]));
-                return 1;
-            }
-            opMode.nxtd = 1;
-            break;
-        case 'R':  /* option `--no-remote-frames' */
-            if (rf++) {
-                fprintf(stderr, "%s: duplicated option `--no-remote-frames'\n", basename(argv[0]));
-                return 1;
-            }
-            opMode.nrtr = 1;
-            break;
-        case 't':  /* option `--time=(ABS|REL|ZERO)' (-t) */
-            if (mt++) {
-                fprintf(stderr, "%s: duplicated option `--time' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!strcasecmp(optarg, "ABSOLUTE") || !strcasecmp(optarg, "ABS") || !strcasecmp(optarg, "a"))
-                modeTime = CCanMessage::OptionAbsolute;
-            else if (!strcasecmp(optarg, "RELATIVE") || !strcasecmp(optarg, "REL") || !strcasecmp(optarg, "r"))
-                modeTime = CCanMessage::OptionRelative;
-            else if (!strcasecmp(optarg, "ZERO") || !strcasecmp(optarg, "0") || !strcasecmp(optarg, "z"))
-                modeTime = CCanMessage::OptionZero;
-            else {
-                fprintf(stderr, "%s: illegal argument for option `--time' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!CCanMessage::SetTimestampFormat(modeTime)) {
-                fprintf(stderr, "%s: illegal argument for option `--time' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-        case 'i':  /* option `--id=(HEX|DEC|OCT)' (-i) */
-            if (mi++) {
-                fprintf(stderr, "%s: duplicated option `--id' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!strcasecmp(optarg, "HEXADECIMAL") || !strcasecmp(optarg, "HEX") || !strcasecmp(optarg, "h") || !strcasecmp(optarg, "16"))
-                modeId = CCanMessage::OptionHex;
-            else if (!strcasecmp(optarg, "DECIMAL") || !strcasecmp(optarg, "DEC") || !strcasecmp(optarg, "d") || !strcasecmp(optarg, "10"))
-                modeId = CCanMessage::OptionDec;
-            else if (!strcasecmp(optarg, "OCTAL") || !strcasecmp(optarg, "OCT") || !strcasecmp(optarg, "o") || !strcasecmp(optarg, "8"))
-                modeId = CCanMessage::OptionOct;
-            else {
-                fprintf(stderr, "%s: illegal argument for option `--id' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!CCanMessage::SetIdentifierFormat(modeId)) {
-                fprintf(stderr, "%s: illegal argument for option `--id' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-        case 'd':  /* option `--data=(HEX|DEC|OCT)' (-d) */
-            if (md++) {
-                fprintf(stderr, "%s: duplicated option `--data' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!strcasecmp(optarg, "HEXADECIMAL") || !strcasecmp(optarg, "HEX") || !strcasecmp(optarg, "h") || !strcasecmp(optarg, "16"))
-                modeData = CCanMessage::OptionHex;
-            else if (!strcasecmp(optarg, "DECIMAL") || !strcasecmp(optarg, "DEC") || !strcasecmp(optarg, "d") || !strcasecmp(optarg, "10"))
-                modeData = CCanMessage::OptionDec;
-            else if (!strcasecmp(optarg, "OCTAL") || !strcasecmp(optarg, "OCT") || !strcasecmp(optarg, "o") || !strcasecmp(optarg, "8"))
-                modeData = CCanMessage::OptionOct;
-            else {
-                fprintf(stderr, "%s: illegal argument for option `--data' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!CCanMessage::SetDataFormat(modeData)) {
-                fprintf(stderr, "%s: illegal argument for option `--data' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-        case 'a':  /* option `--ascii=(ON|OFF)' (-a) */
-            if (ma++) {
-                fprintf(stderr, "%s: duplicated option `--ascii' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!strcasecmp(optarg, "OFF") || !strcasecmp(optarg, "NO") || !strcasecmp(optarg, "n") || !strcasecmp(optarg, "0"))
-                modeAscii = CCanMessage::OptionOff;
-            else if (!strcasecmp(optarg, "ON") || !strcasecmp(optarg, "YES") || !strcasecmp(optarg, "y") || !strcasecmp(optarg, "1"))
-                modeAscii = CCanMessage::OptionOn;
-            else {
-                fprintf(stderr, "%s: illegal argument for option `--ascii' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!CCanMessage::SetAsciiFormat(modeAscii)) {
-                fprintf(stderr, "%s: illegal argument for option `--ascii' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-#if (CAN_FD_SUPPORTED != 0)
-        case 'w':  /* option `--wrap=....' (-w) */
-            if (mw++) {
-                fprintf(stderr, "%s: duplicated option `--wrap' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!strcasecmp(optarg, "NO") || !strcasecmp(optarg, "n") || !strcasecmp(optarg, "0"))
-                wraparound = CCanMessage::OptionWraparoundNo;
-            else if (!strcasecmp(optarg, "8"))
-                wraparound = CCanMessage::OptionWraparound8;
-            else if (!strcasecmp(optarg, "10"))
-                wraparound = CCanMessage::OptionWraparound10;
-            else if (!strcasecmp(optarg, "16"))
-                wraparound = CCanMessage::OptionWraparound16;
-            else if (!strcasecmp(optarg, "32"))
-                wraparound = CCanMessage::OptionWraparound32;
-            else if (!strcasecmp(optarg, "64"))
-                wraparound = CCanMessage::OptionWraparound64;
-            else {
-                    fprintf(stderr, "%s: illegal argument for option `--wrap' (%c)\n", basename(argv[0]), opt);
-                    return 1;
-            }
-            if (!CCanMessage::SetWraparound(wraparound)) {
-                fprintf(stderr, "%s: illegal argument for option `--wrap' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-#endif
-        case 'x':  /* option `--exclude=[~]<id-list>' (-x) */
-            if (exclude++) {
-                fprintf(stderr, "%s: duplicated option `--exclude' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!get_exclusion(optarg)) {
-                fprintf(stderr, "%s: illegal argument for option `--exclude' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-        case 'L':  /* option `--list-boards[=<vendor>]' (-L) */
-            fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
-            /* list all supported interfaces */
-            num_boards = CCanDevice::ListCanDevices(/*optarg*/);
-            fprintf(stdout, "Number of supported CAN interfaces: %i\n", num_boards);
-            return (num_boards >= 0) ? 0 : 1;
-        case 'T':  /* option `--test-boards[=<vendor>]' (-T) */
-            fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
-            /* list all available interfaces */
-            num_boards = CCanDevice::TestCanDevices(opMode/*, optarg*/);
-            fprintf(stdout, "Number of present CAN interfaces: %i\n", num_boards);
-            return (num_boards >= 0) ? 0 : 1;
-        case 'h':  /* option `--help' (-h) */
-            usage(stdout, basename(argv[0]));
-            return 0;
-        case '?':
-            if (!opterr)
-                usage(stderr, basename(argv[0]));
-            return 1;
-        default:
-            if (show_version) {
-                version(stdout, basename(argv[0]));
-                return 0;
-            }
-            else {
-                usage(stderr, basename(argv[0]));
-                return 1;
-            }
-        }
-    }
-    /* - check if one and only one <interface> is given */
-    if (optind + 1 != argc) {
-        if (optind == argc)
-            fprintf(stderr, "%s: no interface given\n", basename(argv[0]));
-        else
-            fprintf(stderr, "%s: too many arguments given\n", basename(argv[0]));
-        return 1;
-    }
-    /* - search the <interface> by its name in the device list */
-    bool result = CCanDevice::GetFirstChannel(channel);
-    while (result) {
-        if (strcasecmp(argv[optind], channel.m_szDeviceName) == 0) {
-            break;
-        }
-        result = CCanDevice::GetNextChannel(channel);
-    }
-    if (!result) {
-        fprintf(stderr, "%s: illegal argument `%s'\n", basename(argv[0]), argv[optind]);
-        return 1;
-    }
-    /* - check bit-timing index (n/a for CAN FD) */
-    if (opMode.fdoe && (bitrate.btr.frequency <= 0)) {
-        fprintf(stderr, "%s: illegal combination of options `--mode' (m) and `--bitrate'\n", basename(argv[0]));
-        return 1;
-    }
-    /* CAN Monitor for generic CAN interfaces */
-    fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
-    /* - show operation mode and bit-rate settings */
-    if (verbose) {
-        fprintf(stdout, "Op.-mode=%s", (opMode.byte & CANMODE_FDOE) ? "CANFD" : "CAN2.0");
-        if ((opMode.byte & CANMODE_BRSE)) fprintf(stdout, "+BRS");
-        if ((opMode.byte & CANMODE_NISO)) fprintf(stdout, "+NISO");
-        if ((opMode.byte & CANMODE_SHRD)) fprintf(stdout, "+SHRD");
-        if ((opMode.byte & CANMODE_NXTD)) fprintf(stdout, "+NXTD");
-        if ((opMode.byte & CANMODE_NRTR)) fprintf(stdout, "+NRTR");
-        if ((opMode.byte & CANMODE_ERR)) fprintf(stdout, "+ERR");
-        if ((opMode.byte & CANMODE_MON)) fprintf(stdout, "+MON");
-        fprintf(stdout, " (op_mode=%02Xh)\n", opMode.byte);
-        if (bitrate.btr.frequency > 0) {
-            fprintf(stdout, "Bit-rate=%.0fkbps@%.1f%%", speed.nominal.speed / 1000., speed.nominal.samplepoint * 100.);
-            if (opMode.byte & CANMODE_BRSE)
-                fprintf(stdout, ":%.0fkbps@%.1f%%", speed.data.speed / 1000., speed.data.samplepoint * 100.);
-            (void)CCanDevice::MapBitrate2String(bitrate, property, CANPROP_MAX_BUFFER_SIZE,
-                                                (opMode.byte & CANMODE_BRSE), hasNoSamp);
-            fprintf(stdout, " (%s)\n\n", property);
-        }
-        else {
-            fprintf(stdout, "Baudrate=%.0fkbps@%.1f%% (index %i)\n\n",
-                             speed.nominal.speed / 1000.,
-                             speed.nominal.samplepoint * 100., -bitrate.index);
-        }
-    }
-    /* - initialize interface */
-    fprintf(stdout, "Hardware=%s...", channel.m_szDeviceName);
-    fflush (stdout);
-    retVal = canDevice.InitializeChannel(channel.m_nChannelNo, opMode);
-    if (retVal != CCanApi::NoError) {
-        fprintf(stdout, "FAILED!\n");
-        fprintf(stderr, "+++ error: CAN Controller could not be initialized (%i)", retVal);
-        if (retVal == CCanApi::NotSupported)
-            fprintf(stderr, "\n           - possibly CAN operating mode %02Xh not supported", opMode.byte);
-        fputc('\n', stderr);
-        goto finalize;
-    }
-    fprintf(stdout, "OK!\n");
-    /* - start communication */
-    if (bitrate.btr.frequency > 0) {
-        fprintf(stdout, "Bit-rate=%.0fkbps", speed.nominal.speed / 1000.);
-        if (opMode.byte & CANMODE_BRSE)
-            fprintf(stdout, ":%.0fkbps", speed.data.speed / 1000.);
-        else if (opMode.byte & CANMODE_FDOE)
-            fprintf(stdout, ":%.0fkbps", speed.nominal.speed / 1000.);
-        fprintf(stdout, "...");
-    }
-    else {
-        fprintf(stdout, "Baudrate=%skbps...",
-            bitrate.index == CANBTR_INDEX_1M   ? "1000" :
-            bitrate.index == CANBTR_INDEX_800K ? "800" :
-            bitrate.index == CANBTR_INDEX_500K ? "500" :
-            bitrate.index == CANBTR_INDEX_250K ? "250" :
-            bitrate.index == CANBTR_INDEX_125K ? "125" :
-            bitrate.index == CANBTR_INDEX_100K ? "100" :
-            bitrate.index == CANBTR_INDEX_50K  ? "50" :
-            bitrate.index == CANBTR_INDEX_20K  ? "20" :
-            bitrate.index == CANBTR_INDEX_10K  ? "10" : "?");
-    }
-    fflush(stdout);
-    retVal = canDevice.StartController(bitrate);
-    if (retVal != CCanApi::NoError) {
-        fprintf(stdout, "FAILED!\n");
-        fprintf(stderr, "+++ error: CAN Controller could not be started (%i)\n", retVal);
-        goto teardown;
-    }
-    fprintf(stdout, "OK!\n");
-    /* - reception loop */
-    canDevice.ReceptionLoop();
-    /* - show interface information */
-    if ((device = canDevice.GetHardwareVersion()) != NULL)
-        fprintf(stdout, "Hardware: %s\n", device);
-    if ((firmware = canDevice.GetFirmwareVersion()) != NULL)
-        fprintf(stdout, "Firmware: %s\n", firmware);
-    if ((software = CCanDevice::GetVersion()) != NULL)
-        fprintf(stdout, "Software: %s\n", software);
-teardown:
-    /* - teardown the interface*/
-    retVal = canDevice.TeardownChannel();
-    if (retVal != CCanApi::NoError) {
-        fprintf(stderr, "+++ error: CAN Controller could not be reset (%i)\n", retVal);
-        goto finalize;
-    }
-finalize:
-    /* So long and farewell! */
-    fprintf(stdout, "%s\n", COPYRIGHT);
-    return retVal;
-}
-
-int CCanDevice::ListCanDevices(void) {
-    CCanDevice::SChannelInfo info;
-    int n = 0;
-
-    fprintf(stdout, "Suppored hardware:\n");
-    bool result = CCanDevice::GetFirstChannel(info);
-    while (result) {
-        fprintf(stdout, "\"%s\" (VendorName=\"%s\", LibraryId=%" PRIi32 ", ChannelNo=%" PRIi32 ")\n",
-                         info.m_szDeviceName, info.m_szVendorName, info.m_nLibraryId, info.m_nChannelNo);
-        n++;
-        result = CCanDevice::GetNextChannel(info);
-    }
-    return n;
-}
-
-int CCanDevice::TestCanDevices(CANAPI_OpMode_t opMode) {
-    CCanDevice::SChannelInfo info;
-    int n = 0;
-
-    bool result = CCanDevice::GetFirstChannel(info);
-    while (result) {
-        fprintf(stdout, "Hardware=%s...", info.m_szDeviceName);
-        fflush(stdout);
-        EChannelState state;
-        CANAPI_Return_t retVal = CCanDevice::ProbeChannel(info.m_nChannelNo, opMode, state);
-        if ((retVal == CCanApi::NoError) || (retVal == CCanApi::IllegalParameter)) {
-            CTimer::Delay(333U * CTimer::MSEC);  // to fake probing a hardware
-            switch (state) {
-                case CCanApi::ChannelOccupied: fprintf(stdout, "occupied\n"); n++; break;
-                case CCanApi::ChannelAvailable: fprintf(stdout, "available\n"); n++; break;
-                case CCanApi::ChannelNotAvailable: fprintf(stdout, "not available\n"); break;
-                default: fprintf(stdout, "not testable\n"); break;
-            }
-            if (retVal == CCanApi::IllegalParameter)
-                fprintf(stderr, "+++ warning: CAN operation mode not supported (%02xh)\n", opMode.byte);
-        } else
-            fprintf(stdout, "FAILED!\n");
-        result = CCanDevice::GetNextChannel(info);
-    }
-    return n;
-}
-
-uint64_t CCanDevice::ReceptionLoop() {
-    CANAPI_Message_t message;
-    CANAPI_Return_t retVal;
-    uint64_t frames = 0U;
-
-    char string[CANPROP_MAX_STRING_LENGTH+1];
-    memset(string, 0, CANPROP_MAX_STRING_LENGTH+1);
-
-    fprintf(stderr, "\nPress ^C to abort.\n\n");
-    while(running) {
-        if ((retVal = ReadMessage(message)) == CCanApi::NoError) {
-            if ((((message.id < MAX_ID) && can_id[message.id]) || ((message.id >= MAX_ID) && can_id_xtd))) {
-                (void)CCanMessage::Format(message, ++frames, string, CANPROP_MAX_STRING_LENGTH);
-                fprintf(stdout, "%s\n", string);
-            }
-        }
-    }
-    fprintf(stdout, "\n");
-    return frames;
-}
-
-static int get_exclusion(const char *arg)
-{
-    char *val, *end;
-    int i, inv = 0;
-    long id, last = -1;
-
-    if (!arg)
-        return 0;
-
-    val = (char *)arg;
-    if (*val == '~') {
-        inv = 1;
-        val++;
-    }
-    for (;;) {
-        errno = 0;
-        id = strtol(val, &end, 0);
-
-        if (errno == ERANGE && (id == LONG_MAX || id == LONG_MIN))
-            return 0;
-        if (errno != 0 && id == 0)
-            return 0;
-        if (val == end)
-            return 0;
-
-        if (id < MAX_ID)
-            can_id[id] = 0;
-
-        if (*end == '\0') {
-            if (last != -1) {
-                while (last != id) {
-                    if (last < id)
-                        last++;
-                    else
-                        last--;
-                    can_id[last] = 0;
-                }
-                /*last = -1; <<< dead store */
-            }
-            break;
-        }
-        if (*end == ',') {
-            if (last != -1) {
-                while (last != id) {
-                    if (last < id)
-                        last++;
-                    else
-                        last--;
-                    can_id[last] = 0;
-                }
-                last = -1;
-            }
-        }
-        else if (*end == '-')
-            last = id;
-        else
-            return 0;
-
-        val = ++end;
-    }
-    if (inv) {
-        for (i = 0; i < MAX_ID; i++)
-            can_id[i] = !can_id[i];
-    }
-    can_id_xtd = !inv;
-    return 1;
-}
-
-/** @brief       signal handler to catch Ctrl+C.
- *
- *  @param[in]   signo - signal number (SIGINT, SIGHUP, SIGTERM)
- */
-static void sigterm(int signo)
-{
-    //fprintf(stderr, "%s: got signal %d\n", __FILE__, signo);
-    (void)canDevice.SignalChannel();
-    running = 0;
-    (void)signo;
-}
-
-/** @brief       shows a help screen with all command-line options.
- *
- *  @param[in]   stream  - output stream (e.g. stdout)
- *  @param[in]   program - base name of the program
- */
-static void usage(FILE *stream, const char *program)
-{
-    fprintf(stream, "Usage: %s <interface> [<option>...]\n", program);
-    fprintf(stream, "Options:\n");
-    fprintf(stream, " -t, --time=(ZERO|ABS|REL)     absolute or relative time (default=0)\n");
-    fprintf(stream, " -i  --id=(HEX|DEC|OCT)        display mode of CAN-IDs (default=HEX)\n");
-    fprintf(stream, " -d, --data=(HEX|DEC|OCT)      display mode of data bytes (default=HEX)\n");
-    fprintf(stream, " -a, --ascii=(ON|OFF)          display data bytes in ASCII (default=ON)\n");
-#if (CAN_FD_SUPPORTED != 0)
-    fprintf(stream, " -w, --wrap=(NO|8|10|16|32|64) wraparound after n data bytes (default=NO)\n");
-#endif
-    fprintf(stream, " -x, --exclude=[~]<id-list>    exclude CAN-IDs: <id>[-<id>]{,<id>[-<id>]}\n");
-//    fprintf(stream, " -s, --script=<filename>       execute a script file\n"); // TODO: script engine
-#if (CAN_FD_SUPPORTED != 0)
-    fprintf(stream, " -m, --mode=(2.0|FDF[+BRS])    CAN operation mode: CAN 2.0 or CAN FD mode\n");
-#endif
-    fprintf(stream, "     --shared                  shared CAN controller access (if supported)\n");
-    fprintf(stream, "     --listen-only             monitor mode (listen-only, transmitter is off)\n");
-    fprintf(stream, "     --error-frames            allow reception of error frames\n");
-    fprintf(stream, "     --no-remote-frames        suppress remote frames (RTR frames)\n");
-    fprintf(stream, "     --no-extended-frames      suppress extended frames (29-bit identifier)\n");
-    fprintf(stream, " -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250), or\n");
-    fprintf(stream, "     --bitrate=<bit-rate>      CAN bit-rate settings (as a string)\n");
-    fprintf(stream, " -v, --verbose                 show detailed bit-rate settings\n");
-#if (OPTION_CANAPI_LIBRARY != 0)
-    fprintf(stream, " -L, --list-boards[=<vendor>]  list all supported CAN interfaces and exit\n");
-    fprintf(stream, " -T, --test-boards[=<vendor>]  list all available CAN interfaces and exit\n");
+#if defined(_WIN32) || defined(_WIN64)
+#include "main_w.cpp"
 #else
-    fprintf(stream, " -L, --list-boards             list all supported CAN interfaces and exit\n");
-    fprintf(stream, " -T, --test-boards             list all available CAN interfaces and exit\n");
-#endif
-    fprintf(stream, " -h, --help                    display this help screen and exit\n");
-    fprintf(stream, "     --version                 show version information and exit\n");
-#if (0)
-    fprintf(stream, "Arguments:\n");
-    fprintf(stream, "  <id>           CAN identifier (11-bit)\n");
-    fprintf(stream, "  <interface>    CAN interface board (list all with /LIST)\n");
-    fprintf(stream, "  <baudrate>     CAN baud rate index (default=3):\n");
-    fprintf(stream, "                 0 = 1000 kbps\n");
-    fprintf(stream, "                 1 = 800 kbps\n");
-    fprintf(stream, "                 2 = 500 kbps\n");
-    fprintf(stream, "                 3 = 250 kbps\n");
-    fprintf(stream, "                 4 = 125 kbps\n");
-    fprintf(stream, "                 5 = 100 kbps\n");
-    fprintf(stream, "                 6 = 50 kbps\n");
-    fprintf(stream, "                 7 = 20 kbps\n");
-    fprintf(stream, "                 8 = 10 kbps\n");
-    fprintf(stream, "  <bitrate>      comma-separated <key>=<value>-list:\n");
-    fprintf(stream, "                 f_clock=<value>         frequency in Hz or\n");
-    fprintf(stream, "                 f_clock_mhz=<value>     frequency in MHz\n");
-    fprintf(stream, "                 nom_brp=<value>         bit-rate prescaler (nominal)\n");
-    fprintf(stream, "                 nom_tseg1=<value>       time segment 1 (nominal)\n");
-    fprintf(stream, "                 nom_tseg2=<value>       time segment 2 (nominal)\n");
-    fprintf(stream, "                 nom_sjw=<value>         sync. jump width (nominal)\n");
-    fprintf(stream, "                 nom_sam=<value>         sampling (only SJA1000)\n");
-    fprintf(stream, "                 data_brp=<value>        bit-rate prescaler (FD data)\n");
-    fprintf(stream, "                 data_tseg1=<value>      time segment 1 (FD data)\n");
-    fprintf(stream, "                 data_tseg2=<value>      time segment 2 (FD data)\n");
-    fprintf(stream, "                 data_sjw=<value>        sync. jump width (FD data).\n");
+#include "main_p.cpp"
 #endif
-    fprintf(stream, "Hazard note:\n");
-    fprintf(stream, "  If you connect your CAN device to a real CAN network when using this program,\n");
-    fprintf(stream, "  you might damage your application.\n");
-}
-
-/** @brief       shows version information of the program.
- *
- *  @param[in]   stream  - output stream (e.g. stdout)
- *  @param[in]   program - base name of the program
- */
-static void version(FILE *stream, const char *program)
-{
-    fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, LICENSE);
-    (void)program;
-    fprintf(stream, "Written by Uwe Vogt, UV Software, Berlin <https://www.mac-can.net/>\n");
-}
diff --git a/Utilities/can_moni/Sources/main_p.cpp b/Utilities/can_moni/Sources/main_p.cpp
new file mode 100755
index 0000000..4ad1fed
--- /dev/null
+++ b/Utilities/can_moni/Sources/main_p.cpp
@@ -0,0 +1,959 @@
+//  SPDX-License-Identifier: GPL-3.0-or-later
+//
+//  CAN Monitor for generic Interfaces (CAN API V3)
+//
+//  Copyright (c) 2007,2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+//
+#include "Driver.h"
+#include "Timer.h"
+#include "Message.h"
+#include "Version.h"
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <getopt.h>
+#include <signal.h>
+#include <errno.h>
+#include <time.h>
+
+#include <inttypes.h>
+
+#if defined(_WIN64)
+#define PLATFORM  "x64"
+#elif defined(_WIN32)
+#define PLATFORM  "x86"
+#elif defined(__linux__)
+#define PLATFORM  "Linux"
+#elif defined(__APPLE__)
+#define PLATFORM  "macOS"
+#elif defined(__CYGWIN__)
+#define PLATFORM  "Cygwin"
+#else
+#error Platform not supported
+#endif
+#ifdef _MSC_VER
+//not #if defined(_WIN32) || defined(_WIN64) because we have strncasecmp in mingw
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+#endif
+
+#define MAX_ID  (CAN_MAX_STD_ID + 1)
+
+static int get_exclusion(const char *arg);
+
+class CCanDevice : public CCanDriver {
+public:
+    uint64_t ReceptionLoop();
+public:
+    static int ListCanDevices(void);
+    static int TestCanDevices(CANAPI_OpMode_t opMode);
+    static int ListCanBitrates(CANAPI_OpMode_t opMode);
+};
+
+static void sigterm(int signo);
+static void usage(FILE *stream, const char *program);
+static void version(FILE *stream, const char *program);
+
+static int can_id[MAX_ID];
+static int can_id_xtd = 1;
+static volatile int running = 1;
+
+static CCanDevice canDevice = CCanDevice();
+
+static const char APPLICATION[] = "CAN Monitor for " MONITOR_INTERFACE ", Version " VERSION_STRING;
+static const char COPYRIGHT[]   = "Copyright (c) " MONITOR_COPYRIGHT;
+static const char WARRANTY[]    = "This program comes with ABSOLUTELY NO WARRANTY!\n\n" \
+                                  "This is free software, and you are welcome to redistribute it\n" \
+                                  "under certain conditions; type '--version' for details.";
+static const char LICENSE[]     = "This program is free software: you can redistribute it and/or modify\n" \
+                                  "it under the terms of the GNU General Public License as published by\n" \
+                                  "the Free Software Foundation, either version 3 of the License, or\n" \
+                                  "(at your option) any later version.\n\n" \
+                                  "This program is distributed in the hope that it will be useful,\n" \
+                                  "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" \
+                                  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" \
+                                  "GNU General Public License for more details.\n\n" \
+                                  "You should have received a copy of the GNU General Public License\n" \
+                                  "along with this program.  If not, see <https://www.gnu.org/licenses/>.";
+#define basename(x)  "can_moni" // FIXME: Where is my `basename' function?
+
+int main(int argc, const char * argv[]) {
+    int opt;
+#if (SERIAL_CAN_SUPPORTED == 0)
+    CCanDevice::SChannelInfo channel;
+#else
+    char *port = NULL;
+#endif
+    int op = 0, rf = 0, xf = 0, ef = 0, lo = 0, sh = 0;
+    long baudrate = CANBDR_250; int bd = 0;
+    CCanMessage::EFormatTimestamp modeTime = CCanMessage::OptionZero; int mt = 0;
+    CCanMessage::EFormatNumber modeId = CCanMessage::OptionHex; int mi = 0;
+    CCanMessage::EFormatNumber modeData = CCanMessage::OptionHex; int md = 0;
+    CCanMessage::EFormatOption modeAscii = CCanMessage::OptionOn; int ma = 0;
+    CCanMessage::EFormatWraparound wraparound = CCanMessage::OptionWraparoundNo; int mw = 0;
+    int exclude = 0;
+//    char *script_file = NULL;
+    int verbose = 0;
+    int num_boards = 0;
+    int show_version = 0;
+    char *device, *firmware, *software;
+    char property[CANPROP_MAX_BUFFER_SIZE] = "";
+    struct option long_options[] = {
+        {"baudrate", required_argument, 0, 'b'},
+        {"bitrate", required_argument, 0, 'B'},
+        {"verbose", no_argument, 0, 'v'},
+        {"mode", required_argument, 0, 'm'},
+        {"shared", no_argument, 0, 'S'},
+        {"listen-only", no_argument, 0, 'M'},
+        {"error-frames", no_argument, 0, 'E'},
+        {"no-remote-frames", no_argument, 0, 'R'},
+        {"no-extended-frames", no_argument, 0, 'X'},
+        {"time", required_argument, 0, 't'},
+        {"id", required_argument, 0, 'i'},
+        {"data", required_argument, 0, 'd'},
+        {"ascii", required_argument, 0, 'a'},
+        {"wrap", required_argument, 0, 'w'},
+        {"wraparound", required_argument, 0, 'w'},
+        {"exclude", required_argument, 0, 'x'},
+        {"script", required_argument, 0, 's'},
+        {"list-bitrates", optional_argument, 0, 'l'},
+        {"list-boards", no_argument, 0, 'L'},
+        {"test-boards", no_argument, 0, 'T'},
+        {"help", no_argument, 0, 'h'},
+        {"version", no_argument, &show_version, 1},
+        {0, 0, 0, 0}
+    };
+    CANAPI_Bitrate_t bitrate = {};
+    bitrate.index = CANBTR_INDEX_250K;
+    bool hasDataPhase = false;
+    bool hasNoSamp = true;
+    CANAPI_OpMode_t opMode = {};
+    opMode.byte = CANMODE_DEFAULT;
+    CANAPI_OpMode_t brMode = {};
+    brMode.byte = CANMODE_DEFAULT;
+    CANAPI_Return_t retVal = 0;
+
+    /* default bit-timing */
+    CANAPI_BusSpeed_t speed = {};
+    (void)CCanDevice::MapIndex2Bitrate(bitrate.index, bitrate);
+    (void)CCanDevice::MapBitrate2Speed(bitrate, speed);
+    (void)op;
+
+    /* default format options */
+    (void)CCanMessage::SetTimestampFormat(modeTime);
+    (void)CCanMessage::SetIdentifierFormat(modeId);
+    (void)CCanMessage::SetDataFormat(modeData);
+    (void)CCanMessage::SetAsciiFormat(modeAscii);
+    (void)CCanMessage::SetWraparound(wraparound);
+    (void)mw;
+
+#ifdef ACCEPTANCE_FILTERING
+    /* default acceptance filter */
+    uint32_t code11 = CANACC_CODE_11BIT, mask11 = CANACC_MASK_11BIT;
+    uint32_t code29 = CANACC_CODE_29BIT, mask29 = CANACC_MASK_29BIT;
+#endif
+    /* exclude list (11-bit IDs only) */
+    for (int i = 0; i < MAX_ID; i++) {
+        can_id[i] = 1;
+    }
+    /* signal handler */
+    if ((signal(SIGINT, sigterm) == SIG_ERR) ||
+#if !defined(_WIN32) && !defined(_WIN64)
+       (signal(SIGHUP, sigterm) == SIG_ERR) ||
+#endif
+       (signal(SIGTERM, sigterm) == SIG_ERR)) {
+        perror("+++ error");
+        return errno;
+    }
+    /* scan command-line */
+    while ((opt = getopt_long(argc, (char * const *)argv, "b:vm:t:i:d:a:w:x:s:lLTh", long_options, NULL)) != -1) {
+        switch (opt) {
+        /* option `--baudrate=<baudrate>' (-b) */
+        case 'b': 
+            if (bd++) {
+                fprintf(stderr, "%s: duplicated option `--baudrate' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (sscanf(optarg, "%li", &baudrate) != 1) {
+                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            switch (baudrate) {
+                case 0: case 1000: case 1000000: bitrate.index = (int32_t)CANBTR_INDEX_1M; break;
+                case 1: case 800:  case 800000:  bitrate.index = (int32_t)CANBTR_INDEX_800K; break;
+                case 2: case 500:  case 500000:  bitrate.index = (int32_t)CANBTR_INDEX_500K; break;
+                case 3: case 250:  case 250000:  bitrate.index = (int32_t)CANBTR_INDEX_250K; break;
+                case 4: case 125:  case 125000:  bitrate.index = (int32_t)CANBTR_INDEX_125K; break;
+                case 5: case 100:  case 100000:  bitrate.index = (int32_t)CANBTR_INDEX_100K; break;
+                case 6: case 50:   case 50000:   bitrate.index = (int32_t)CANBTR_INDEX_50K; break;
+                case 7: case 20:   case 20000:   bitrate.index = (int32_t)CANBTR_INDEX_20K; break;
+                case 8: case 10:   case 10000:   bitrate.index = (int32_t)CANBTR_INDEX_10K; break;
+                default:                         bitrate.index = (int32_t)-baudrate; break;
+            }
+            if (CCanDevice::MapIndex2Bitrate(bitrate.index, bitrate) != CCanApi::NoError) {
+                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (CCanDevice::MapBitrate2Speed(bitrate, speed) != CCanApi::NoError) {
+                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+        /* option `--bitrate=<bit-rate>' as string */
+        case 'B':
+            if (bd++) {
+                fprintf(stderr, "%s: duplicated option `--bitrate'\n", basename(argv[0]));
+                return 1;
+            }
+            if (CCanDevice::MapString2Bitrate(optarg, bitrate, hasDataPhase, hasNoSamp) != CCanApi::NoError) {
+                fprintf(stderr, "%s: illegal argument for option `--bitrate'\n", basename(argv[0]));
+                return 1;
+            }
+            if (CCanDevice::MapBitrate2Speed(bitrate, speed) != CCanApi::NoError) {
+                fprintf(stderr, "%s: illegal argument for option `--bitrate'\n", basename(argv[0]));
+                return 1;
+            }
+            break;
+        /* option `--verbose' (-v) */
+        case 'v':
+            if (verbose) {
+                fprintf(stderr, "%s: duplicated option `--verbose' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            verbose = 1;
+            break;
+        /* option `--mode=(2.0|FDF[+BRS])' (-m) */
+        case 'm':
+            if (op++) {
+                fprintf(stderr, "%s: duplicated option `--mode' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!strcasecmp(optarg, "default") || !strcasecmp(optarg, "classic") || !strcasecmp(optarg, "classical") ||
+                !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "2.0"))
+                opMode.byte |= CANMODE_DEFAULT;
+#if (CAN_FD_SUPPORTED != 0)
+            else if (!strcasecmp(optarg, "CANFD") || !strcasecmp(optarg, "FD") || !strcasecmp(optarg, "FDF"))
+                opMode.byte |= CANMODE_FDOE;
+            else if (!strcasecmp(optarg, "CANFD+BRS") || !strcasecmp(optarg, "FD+BRS") || !strcasecmp(optarg, "FDF+BRS"))
+                opMode.byte |= CANMODE_FDOE | CANMODE_BRSE;
+#endif
+            else {
+                fprintf(stderr, "%s: illegal argument for option `--mode' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+        /* option `--shared' */
+        case 'S':
+            if (sh++) {
+                fprintf(stderr, "%s: duplicated option `--shared'\n", basename(argv[0]));
+                return 1;
+            }
+            opMode.shrd = 1;
+            break;
+        /* option `--listen-only' */
+        case 'M':
+            if (lo++) {
+                fprintf(stderr, "%s: duplicated option `--listen-only'\n", basename(argv[0]));
+                return 1;
+            }
+            opMode.mon = 1;
+            break;
+        /* option `--error-frames' */
+        case 'E':
+            if (ef++) {
+                fprintf(stderr, "%s: duplicated option `--error-frames'\n", basename(argv[0]));
+                return 1;
+            }
+            opMode.err = 1;
+            break;
+        /* option `--no-extended-frames' */
+        case 'X':
+            if (xf++) {
+                fprintf(stderr, "%s: duplicated option `--no-extended-frames'\n", basename(argv[0]));
+                return 1;
+            }
+            opMode.nxtd = 1;
+            break;
+        /* option `--no-remote-frames' */
+        case 'R':
+            if (rf++) {
+                fprintf(stderr, "%s: duplicated option `--no-remote-frames'\n", basename(argv[0]));
+                return 1;
+            }
+            opMode.nrtr = 1;
+            break;
+        /* option `--time=(ABS|REL|ZERO)' (-t) */
+        case 't':
+            if (mt++) {
+                fprintf(stderr, "%s: duplicated option `--time' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!strcasecmp(optarg, "ABSOLUTE") || !strcasecmp(optarg, "ABS") || !strcasecmp(optarg, "a"))
+                modeTime = CCanMessage::OptionAbsolute;
+            else if (!strcasecmp(optarg, "RELATIVE") || !strcasecmp(optarg, "REL") || !strcasecmp(optarg, "r"))
+                modeTime = CCanMessage::OptionRelative;
+            else if (!strcasecmp(optarg, "ZERO") || !strcasecmp(optarg, "0") || !strcasecmp(optarg, "z"))
+                modeTime = CCanMessage::OptionZero;
+            else {
+                fprintf(stderr, "%s: illegal argument for option `--time' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!CCanMessage::SetTimestampFormat(modeTime)) {
+                fprintf(stderr, "%s: illegal argument for option `--time' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+        /* option `--id=(HEX|DEC|OCT)' (-i) */
+        case 'i':
+            if (mi++) {
+                fprintf(stderr, "%s: duplicated option `--id' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!strcasecmp(optarg, "HEXADECIMAL") || !strcasecmp(optarg, "HEX") || !strcasecmp(optarg, "h") || !strcasecmp(optarg, "16"))
+                modeId = CCanMessage::OptionHex;
+            else if (!strcasecmp(optarg, "DECIMAL") || !strcasecmp(optarg, "DEC") || !strcasecmp(optarg, "d") || !strcasecmp(optarg, "10"))
+                modeId = CCanMessage::OptionDec;
+            else if (!strcasecmp(optarg, "OCTAL") || !strcasecmp(optarg, "OCT") || !strcasecmp(optarg, "o") || !strcasecmp(optarg, "8"))
+                modeId = CCanMessage::OptionOct;
+            else {
+                fprintf(stderr, "%s: illegal argument for option `--id' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!CCanMessage::SetIdentifierFormat(modeId)) {
+                fprintf(stderr, "%s: illegal argument for option `--id' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+        /* option `--data=(HEX|DEC|OCT)' (-d) */
+        case 'd':
+            if (md++) {
+                fprintf(stderr, "%s: duplicated option `--data' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!strcasecmp(optarg, "HEXADECIMAL") || !strcasecmp(optarg, "HEX") || !strcasecmp(optarg, "h") || !strcasecmp(optarg, "16"))
+                modeData = CCanMessage::OptionHex;
+            else if (!strcasecmp(optarg, "DECIMAL") || !strcasecmp(optarg, "DEC") || !strcasecmp(optarg, "d") || !strcasecmp(optarg, "10"))
+                modeData = CCanMessage::OptionDec;
+            else if (!strcasecmp(optarg, "OCTAL") || !strcasecmp(optarg, "OCT") || !strcasecmp(optarg, "o") || !strcasecmp(optarg, "8"))
+                modeData = CCanMessage::OptionOct;
+            else {
+                fprintf(stderr, "%s: illegal argument for option `--data' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!CCanMessage::SetDataFormat(modeData)) {
+                fprintf(stderr, "%s: illegal argument for option `--data' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+        /* option `--ascii=(ON|OFF)' (-a) */
+        case 'a':
+            if (ma++) {
+                fprintf(stderr, "%s: duplicated option `--ascii' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!strcasecmp(optarg, "OFF") || !strcasecmp(optarg, "NO") || !strcasecmp(optarg, "n") || !strcasecmp(optarg, "0"))
+                modeAscii = CCanMessage::OptionOff;
+            else if (!strcasecmp(optarg, "ON") || !strcasecmp(optarg, "YES") || !strcasecmp(optarg, "y") || !strcasecmp(optarg, "1"))
+                modeAscii = CCanMessage::OptionOn;
+            else {
+                fprintf(stderr, "%s: illegal argument for option `--ascii' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!CCanMessage::SetAsciiFormat(modeAscii)) {
+                fprintf(stderr, "%s: illegal argument for option `--ascii' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+#if (CAN_FD_SUPPORTED != 0)
+        /* option `--wrap=....' (-w) */
+        case 'w':
+            if (mw++) {
+                fprintf(stderr, "%s: duplicated option `--wrap' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!strcasecmp(optarg, "NO") || !strcasecmp(optarg, "n") || !strcasecmp(optarg, "0"))
+                wraparound = CCanMessage::OptionWraparoundNo;
+            else if (!strcasecmp(optarg, "8"))
+                wraparound = CCanMessage::OptionWraparound8;
+            else if (!strcasecmp(optarg, "10"))
+                wraparound = CCanMessage::OptionWraparound10;
+            else if (!strcasecmp(optarg, "16"))
+                wraparound = CCanMessage::OptionWraparound16;
+            else if (!strcasecmp(optarg, "32"))
+                wraparound = CCanMessage::OptionWraparound32;
+            else if (!strcasecmp(optarg, "64"))
+                wraparound = CCanMessage::OptionWraparound64;
+            else {
+                    fprintf(stderr, "%s: illegal argument for option `--wrap' (%c)\n", basename(argv[0]), opt);
+                    return 1;
+            }
+            if (!CCanMessage::SetWraparound(wraparound)) {
+                fprintf(stderr, "%s: illegal argument for option `--wrap' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+#endif
+        /* option `--exclude=[~]<id-list>' (-x) */
+        case 'x':
+            if (exclude++) {
+                fprintf(stderr, "%s: duplicated option `--exclude' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!get_exclusion(optarg)) {
+                fprintf(stderr, "%s: illegal argument for option `--exclude' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+#ifdef ACCEPTANCE_FILTERING
+        /* option `--code=<11-bit-code>' */
+        /* option `--mask=<11-bit-mask>' */
+        /* option `--xtd-code=<29-bit-code>' */
+        /* option `--xtd-mask=<29-bit-mask>' */
+#endif
+        /* option `--list-bitrates[=(2.0|FDF[+BRS])]' */
+        case 'l':
+            if (optarg != NULL) {
+                if (!strcasecmp(optarg, "default") || !strcasecmp(optarg, "classic") || !strcasecmp(optarg, "classical") ||
+                    !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "2.0"))
+                    brMode.byte |= CANMODE_DEFAULT;
+#if (CAN_FD_SUPPORTED != 0)
+                else if (!strcasecmp(optarg, "CANFD") || !strcasecmp(optarg, "FD") || !strcasecmp(optarg, "FDF"))
+                    brMode.byte |= CANMODE_FDOE;
+                else if (!strcasecmp(optarg, "CANFD+BRS") || !strcasecmp(optarg, "FD+BRS") || !strcasecmp(optarg, "FDF+BRS"))
+                    brMode.byte |= CANMODE_FDOE | CANMODE_BRSE;
+#endif
+                else {
+                    fprintf(stderr, "%s: illegal argument for option `--list-bitrates' (%c)\n", basename(argv[0]), opt);
+                    return 1;
+                }
+            } else {
+                brMode.byte = CANMODE_DEFAULT;
+            }
+            fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
+            /* list standard bit-rates */
+            (void)CCanDevice::ListCanBitrates(brMode);
+            return 0;
+        /* option `--list-boards[=<vendor>]' (-L) */
+        case 'L':
+            fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
+            /* list all supported interfaces */
+            num_boards = CCanDevice::ListCanDevices(/*optarg*/);
+            fprintf(stdout, "Number of supported CAN interfaces: %i\n", num_boards);
+            return (num_boards >= 0) ? 0 : 1;
+        /* option `--test-boards[=<vendor>]' (-T) */
+        case 'T':
+            fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
+            /* list all available interfaces */
+            num_boards = CCanDevice::TestCanDevices(opMode/*, optarg*/);
+            fprintf(stdout, "Number of present CAN interfaces: %i\n", num_boards);
+            return (num_boards >= 0) ? 0 : 1;
+        /* option `--help' (-h) */
+        case 'h':
+            usage(stdout, basename(argv[0]));
+            return 0;
+        case '?':
+            if (!opterr)
+                usage(stderr, basename(argv[0]));
+            return 1;
+        default:
+            if (show_version) {
+                version(stdout, basename(argv[0]));
+                return 0;
+            }
+            else {
+                usage(stderr, basename(argv[0]));
+                return 1;
+            }
+        }
+    }
+    /* - check if one and only one <interface> is given */
+    if (optind + 1 != argc) {
+        if (optind == argc)
+            fprintf(stderr, "%s: no interface given\n", basename(argv[0]));
+        else
+            fprintf(stderr, "%s: too many arguments given\n", basename(argv[0]));
+        return 1;
+    }
+#if (SERIAL_CAN_SUPPORTED == 0)
+    /* - search the <interface> by its name in the device list */
+    bool result = CCanDevice::GetFirstChannel(channel);
+    while (result) {
+        if (strcasecmp(argv[optind], channel.m_szDeviceName) == 0) {
+            break;
+        }
+        result = CCanDevice::GetNextChannel(channel);
+    }
+    if (!result) {
+        fprintf(stderr, "%s: illegal argument `%s'\n", basename(argv[0]), argv[optind]);
+        return 1;
+    }
+#else
+    /* - take serial device name from command line */
+    port = (char*)argv[optind];
+#endif
+#if (CAN_FD_SUPPORTED != 0)
+    /* - check bit-timing index (n/a for CAN FD) */
+    if (opMode.fdoe && (bitrate.btr.frequency <= 0)) {
+        fprintf(stderr, "%s: illegal combination of options `--mode' (m) and `--bitrate'\n", basename(argv[0]));
+        return 1;
+    }
+#endif
+    /* CAN Monitor for generic CAN interfaces */
+    fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
+    /* - show operation mode and bit-rate settings */
+    if (verbose) {
+        fprintf(stdout, "Op.-mode=%s", (opMode.byte & CANMODE_FDOE) ? "CANFD" : "CAN2.0");
+        if ((opMode.byte & CANMODE_BRSE)) fprintf(stdout, "+BRS");
+        if ((opMode.byte & CANMODE_NISO)) fprintf(stdout, "+NISO");
+        if ((opMode.byte & CANMODE_SHRD)) fprintf(stdout, "+SHRD");
+        if ((opMode.byte & CANMODE_NXTD)) fprintf(stdout, "+NXTD");
+        if ((opMode.byte & CANMODE_NRTR)) fprintf(stdout, "+NRTR");
+        if ((opMode.byte & CANMODE_ERR)) fprintf(stdout, "+ERR");
+        if ((opMode.byte & CANMODE_MON)) fprintf(stdout, "+MON");
+        fprintf(stdout, " (op_mode=%02Xh)\n", opMode.byte);
+        if (bitrate.btr.frequency > 0) {
+            fprintf(stdout, "Bit-rate=%.0fkbps@%.1f%%", speed.nominal.speed / 1000., speed.nominal.samplepoint * 100.);
+#if (CAN_FD_SUPPORTED != 0)
+            if (opMode.byte & CANMODE_BRSE)
+                fprintf(stdout, ":%.0fkbps@%.1f%%", speed.data.speed / 1000., speed.data.samplepoint * 100.);
+#endif
+            (void)CCanDevice::MapBitrate2String(bitrate, property, CANPROP_MAX_BUFFER_SIZE,
+                                                (opMode.byte & CANMODE_BRSE), hasNoSamp);
+            fprintf(stdout, " (%s)\n", property);
+        }
+        else {
+            fprintf(stdout, "Baudrate=%.0fkbps@%.1f%% (index %i)\n",
+                             speed.nominal.speed / 1000.,
+                             speed.nominal.samplepoint * 100., -bitrate.index);
+        }
+#ifdef ACCEPTANCE_FILTERING
+        if ((code11 != CANACC_CODE_11BIT) || (mask11 != CANACC_MASK_11BIT))
+            fprintf(stdout, "Acc.-filter 11-bit=set (code=%03Xh, mask=%03Xh)\n", code11, mask11);
+        if (((code29 != CANACC_CODE_29BIT) || (mask29 != CANACC_MASK_29BIT)) && !opMode.nxtd)
+            fprintf(stdout, "Acc.-filter 29-bit=set (code=%08Xh, mask=%08Xh)\n", code29, mask29);
+#endif
+        fputc('\n', stdout);
+    }
+    /* - initialize interface */
+#if (SERIAL_CAN_SUPPORTED == 0)
+    fprintf(stdout, "Hardware=%s...", channel.m_szDeviceName);
+    fflush (stdout);
+    retVal = canDevice.InitializeChannel(channel.m_nChannelNo, opMode);
+#else
+    fprintf(stdout, "Hardware=%s...", port);
+    fflush (stdout);
+    retVal = canDevice.InitializeChannel(port, opMode);
+#endif
+    if (retVal != CCanApi::NoError) {
+        fprintf(stdout, "FAILED!\n");
+        fprintf(stderr, "+++ error: CAN Controller could not be initialized (%i)", retVal);
+        if (retVal == CCanApi::NotSupported)
+            fprintf(stderr, "\n           - possibly CAN operating mode %02Xh not supported", opMode.byte);
+        fputc('\n', stderr);
+        goto finalize;
+    }
+#ifdef ACCEPTANCE_FILTERING
+    /* -- set acceptance filter for 11-bit IDs */
+    if ((code11 != CANACC_CODE_11BIT) || (mask11 != CANACC_MASK_11BIT)) {
+        retVal = canDevice.SetFilter11Bit(code11, mask11);
+        if (retVal != CCanApi::NoError) {
+            fprintf(stdout, "FAILED!\n");
+            fprintf(stderr, "+++ error: CAN acceptance filter could not be set (%i)\n", retVal);
+            goto teardown;
+        }
+    }
+    /* -- set acceptance filter for 29-bit IDs */
+    if (((code29 != CANACC_CODE_29BIT) || (mask29 != CANACC_MASK_29BIT)) && !opMode.nxtd) {
+        retVal = canDevice.SetFilter29Bit(code29, mask29);
+        if (retVal != CCanApi::NoError) {
+            fprintf(stdout, "FAILED!\n");
+            fprintf(stderr, "+++ error: CAN acceptance filter could not be set (%i)\n", retVal);
+            goto teardown;
+        }
+    }
+#endif
+    fprintf(stdout, "OK!\n");
+    /* - start communication */
+    if (bitrate.btr.frequency > 0) {
+        fprintf(stdout, "Bit-rate=%.0fkbps", speed.nominal.speed / 1000.);
+#if (CAN_FD_SUPPORTED != 0)
+        if (opMode.byte & CANMODE_BRSE)
+            fprintf(stdout, ":%.0fkbps", speed.data.speed / 1000.);
+        else if (opMode.byte & CANMODE_FDOE)
+            fprintf(stdout, ":%.0fkbps", speed.nominal.speed / 1000.);
+#endif
+        fprintf(stdout, "...");
+    }
+    else {
+        fprintf(stdout, "Baudrate=%skbps...",
+            bitrate.index == CANBTR_INDEX_1M   ? "1000" :
+            bitrate.index == CANBTR_INDEX_800K ? "800" :
+            bitrate.index == CANBTR_INDEX_500K ? "500" :
+            bitrate.index == CANBTR_INDEX_250K ? "250" :
+            bitrate.index == CANBTR_INDEX_125K ? "125" :
+            bitrate.index == CANBTR_INDEX_100K ? "100" :
+            bitrate.index == CANBTR_INDEX_50K  ? "50" :
+            bitrate.index == CANBTR_INDEX_20K  ? "20" :
+            bitrate.index == CANBTR_INDEX_10K  ? "10" : "?");
+    }
+    fflush(stdout);
+    retVal = canDevice.StartController(bitrate);
+    if (retVal != CCanApi::NoError) {
+        fprintf(stdout, "FAILED!\n");
+        fprintf(stderr, "+++ error: CAN Controller could not be started (%i)\n", retVal);
+        goto teardown;
+    }
+    fprintf(stdout, "OK!\n");
+    /* - reception loop */
+    canDevice.ReceptionLoop();
+    /* - show interface information */
+    if ((device = canDevice.GetHardwareVersion()) != NULL)
+        fprintf(stdout, "Hardware: %s\n", device);
+    if ((firmware = canDevice.GetFirmwareVersion()) != NULL)
+        fprintf(stdout, "Firmware: %s\n", firmware);
+    if ((software = CCanDevice::GetVersion()) != NULL)
+        fprintf(stdout, "Software: %s\n", software);
+teardown:
+    /* - teardown the interface*/
+    retVal = canDevice.TeardownChannel();
+    if (retVal != CCanApi::NoError) {
+        fprintf(stderr, "+++ error: CAN Controller could not be reset (%i)\n", retVal);
+        goto finalize;
+    }
+finalize:
+    /* So long and farewell! */
+    fprintf(stdout, "%s\n", COPYRIGHT);
+    return retVal;
+}
+
+int CCanDevice::ListCanDevices(void) {
+    CCanDevice::SChannelInfo info;
+    int n = 0;
+
+    fprintf(stdout, "Suppored hardware:\n");
+    bool result = CCanDevice::GetFirstChannel(info);
+    while (result) {
+        fprintf(stdout, "\"%s\" (VendorName=\"%s\", LibraryId=%" PRIi32 ", ChannelNo=%" PRIi32 ")\n",
+                         info.m_szDeviceName, info.m_szVendorName, info.m_nLibraryId, info.m_nChannelNo);
+        n++;
+        result = CCanDevice::GetNextChannel(info);
+    }
+#if (SERIAL_CAN_SUPPORTED != 0)
+    if (n == 0) {
+        fprintf(stdout, "Check the Device Manager for compatible serial communication devices!\n");
+    }
+#endif
+    return n;
+}
+
+int CCanDevice::TestCanDevices(CANAPI_OpMode_t opMode) {
+    CCanDevice::SChannelInfo info;
+    int n = 0;
+
+    bool result = CCanDevice::GetFirstChannel(info);
+    while (result) {
+        fprintf(stdout, "Hardware=%s...", info.m_szDeviceName);
+        fflush(stdout);
+        EChannelState state;
+        CANAPI_Return_t retVal = CCanDevice::ProbeChannel(info.m_nChannelNo, opMode, state);
+        if ((retVal == CCanApi::NoError) || (retVal == CCanApi::IllegalParameter)) {
+            CTimer::Delay(333U * CTimer::MSEC);  // to fake probing a hardware
+            switch (state) {
+                case CCanApi::ChannelOccupied: fprintf(stdout, "occupied\n"); n++; break;
+                case CCanApi::ChannelAvailable: fprintf(stdout, "available\n"); n++; break;
+                case CCanApi::ChannelNotAvailable: fprintf(stdout, "not available\n"); break;
+                default: fprintf(stdout, "not testable\n"); break;
+            }
+            if (retVal == CCanApi::IllegalParameter)
+                fprintf(stderr, "+++ warning: CAN operation mode not supported (%02xh)\n", opMode.byte);
+        } else
+            fprintf(stdout, "FAILED!\n");
+        result = CCanDevice::GetNextChannel(info);
+    }
+#if (SERIAL_CAN_SUPPORTED != 0)
+    if (n == 0) {
+        fprintf(stdout, "Check the Device Manager for compatible serial communication devices!\n");
+    }
+#endif
+    return n;
+}
+
+int CCanDevice::ListCanBitrates(CANAPI_OpMode_t opMode) {
+    CANAPI_Bitrate_t bitrate[9];
+    CANAPI_BusSpeed_t speed;
+    CANAPI_Return_t retVal;
+
+    char string[CANPROP_MAX_BUFFER_SIZE] = "";
+    bool hasDataPhase = false;
+    bool hasNoSamp = true;
+    int i, n = 0;
+
+#if (CAN_FD_SUPPORTED != 0)
+    if (opMode.fdoe) {
+        if (opMode.brse) {
+            fprintf(stdout, "CAN FD with Bit-rate Switching (BRS):\n");
+            BITRATE_FD_1M8M(bitrate[n]); n += 1;
+            BITRATE_FD_500K4M(bitrate[n]); n += 1;
+            BITRATE_FD_250K2M(bitrate[n]); n += 1;
+            BITRATE_FD_125K1M(bitrate[n]); n += 1;
+            hasDataPhase = true;
+            hasNoSamp = false;
+        }
+        else {
+            fprintf(stdout, "CAN FD without Bit-rate Switching (BRS):\n");
+            BITRATE_FD_1M(bitrate[n]); n += 1;
+            BITRATE_FD_500K(bitrate[n]); n += 1;
+            BITRATE_FD_250K(bitrate[n]); n += 1;
+            BITRATE_FD_125K(bitrate[n]); n += 1;
+            hasDataPhase = false;
+            hasNoSamp = false;
+        }
+    }
+    else {
+#else
+    {
+#endif
+        fprintf(stdout, "Classical CAN:\n");
+        BITRATE_1M(bitrate[n]); n += 1;
+#if (BITRATE_800K_UNSUPPORTED == 0)
+        BITRATE_800K(bitrate[n]); n += 1;
+#endif
+        BITRATE_500K(bitrate[n]); n += 1;
+        BITRATE_250K(bitrate[n]); n += 1;
+        BITRATE_125K(bitrate[n]); n += 1;
+        BITRATE_100K(bitrate[n]); n += 1;
+        BITRATE_50K(bitrate[n]); n += 1;
+        BITRATE_20K(bitrate[n]); n += 1;
+        BITRATE_10K(bitrate[n]); n += 1;
+        hasDataPhase = false;
+        hasNoSamp = true;
+    }
+    for (i = 0; i < n; i++) {
+        if ((retVal = CCanDevice::MapBitrate2Speed(bitrate[i], speed)) == CCanApi::NoError) {
+            fprintf(stdout, "  %4.0fkbps@%.1f%%", speed.nominal.speed / 1000., speed.nominal.samplepoint * 100.);
+#if (CAN_FD_SUPPORTED != 0)
+            if (opMode.brse)
+                fprintf(stdout, ":%4.0fkbps@%.1f%%", speed.data.speed / 1000., speed.data.samplepoint * 100.);
+#else
+            (void)opMode;  // to avoid compiler warnings
+#endif
+        }
+        strcpy(string, "=oops, something went wrong!");
+        (void)CCanDevice::MapBitrate2String(bitrate[i], string, CANPROP_MAX_BUFFER_SIZE, hasDataPhase, hasNoSamp);
+        fprintf(stdout, "=\"%s\"\n", string);
+    }
+    return n;
+}
+
+uint64_t CCanDevice::ReceptionLoop() {
+    CANAPI_Message_t message;
+    CANAPI_Return_t retVal;
+    uint64_t frames = 0U;
+
+    char string[CANPROP_MAX_STRING_LENGTH+1];
+    memset(string, 0, CANPROP_MAX_STRING_LENGTH+1);
+
+    fprintf(stderr, "\nPress ^C to abort.\n\n");
+    while(running) {
+        if ((retVal = ReadMessage(message)) == CCanApi::NoError) {
+            if ((((message.id < MAX_ID) && can_id[message.id]) || ((message.id >= MAX_ID) && can_id_xtd))) {
+                (void)CCanMessage::Format(message, ++frames, string, CANPROP_MAX_STRING_LENGTH);
+                fprintf(stdout, "%s\n", string);
+            }
+        }
+    }
+    fprintf(stdout, "\n");
+    return frames;
+}
+
+// FIXME: matured code from can_moni for BerliOS SocketCAN
+static int get_exclusion(const char *arg)
+{
+    char *val, *end;
+    int i, inv = 0;
+    long id, last = -1;
+
+    if (!arg)
+        return 0;
+
+    val = (char *)arg;
+    if (*val == '~') {
+        inv = 1;
+        val++;
+    }
+    for (;;) {
+        errno = 0;
+        id = strtol(val, &end, 0);
+
+        if (errno == ERANGE && (id == LONG_MAX || id == LONG_MIN))
+            return 0;
+        if (errno != 0 && id == 0)
+            return 0;
+        if (val == end)
+            return 0;
+
+        if (id < MAX_ID)
+            can_id[id] = 0;
+
+        if (*end == '\0') {
+            if (last != -1) {
+                while (last != id) {
+                    if (last < id)
+                        last++;
+                    else
+                        last--;
+                    can_id[last] = 0;
+                }
+                /*last = -1; <<< dead store */
+            }
+            break;
+        }
+        if (*end == ',') {
+            if (last != -1) {
+                while (last != id) {
+                    if (last < id)
+                        last++;
+                    else
+                        last--;
+                    can_id[last] = 0;
+                }
+                last = -1;
+            }
+        }
+        else if (*end == '-')
+            last = id;
+        else
+            return 0;
+
+        val = ++end;
+    }
+    if (inv) {
+        for (i = 0; i < MAX_ID; i++)
+            can_id[i] = !can_id[i];
+    }
+    can_id_xtd = !inv;
+    return 1;
+}
+
+/** @brief       signal handler to catch Ctrl+C.
+ *
+ *  @param[in]   signo - signal number (SIGINT, SIGHUP, SIGTERM)
+ */
+static void sigterm(int signo)
+{
+    //fprintf(stderr, "%s: got signal %d\n", __FILE__, signo);
+    (void)canDevice.SignalChannel();
+    running = 0;
+    (void)signo;
+}
+
+/** @brief       shows a help screen with all command-line options.
+ *
+ *  @param[in]   stream  - output stream (e.g. stdout)
+ *  @param[in]   program - base name of the program
+ */
+static void usage(FILE *stream, const char *program)
+{
+    fprintf(stream, "Usage: %s <interface> [<option>...]\n", program);
+    fprintf(stream, "Options:\n");
+    fprintf(stream, " -t, --time=(ZERO|ABS|REL)            absolute or relative time (default=0)\n");
+    fprintf(stream, " -i  --id=(HEX|DEC|OCT)               display mode of CAN-IDs (default=HEX)\n");
+    fprintf(stream, " -d, --data=(HEX|DEC|OCT)             display mode of data bytes (default=HEX)\n");
+    fprintf(stream, " -a, --ascii=(ON|OFF)                 display data bytes in ASCII (default=ON)\n");
+#if (CAN_FD_SUPPORTED != 0)
+    fprintf(stream, " -w, --wrap=(NO|8|10|16|32|64)        wraparound after n data bytes (default=NO)\n");
+#endif
+    fprintf(stream, " -x, --exclude=[~]<id-list>           exclude CAN-IDs: <id-list> = <id>[-<id>]{,<id>[-<id>]}\n");
+#ifdef ACCEPTANCE_FILTERING
+    fprintf(stream, "     --code=<id>                      acceptance code for 11-bit IDs (default=0x%03x)\n", CANACC_CODE_11BIT);
+    fprintf(stream, "     --mask=<id>                      acceptance mask for 11-bit IDs (default=0x%03x)\n", CANACC_MASK_11BIT);
+    fprintf(stream, "     --xtd-code=<id>                  acceptance code for 29-bit IDs (default=0x%08x)\n", CANACC_CODE_29BIT);
+    fprintf(stream, "     --xtd-mask=<id>                  acceptance mask for 29-bit IDs (default=0x%08x)\n", CANACC_MASK_29BIT);
+#endif
+//    fprintf(stream, " -s, --script=<filename>              execute a script file\n"); // TODO: script engine
+#if (CAN_FD_SUPPORTED != 0)
+    fprintf(stream, " -m, --mode=(2.0|FDF[+BRS])           CAN operation mode: CAN 2.0 or CAN FD mode\n");
+#else
+    fprintf(stream, " -m, --mode=2.0                       CAN operation mode: CAN 2.0\n");
+#endif
+    fprintf(stream, "     --shared                         shared CAN controller access (if supported)\n");
+    fprintf(stream, "     --listen-only                    monitor mode (listen-only, transmitter is off)\n");
+    fprintf(stream, "     --error-frames                   allow reception of error frames\n");
+    fprintf(stream, "     --no-remote-frames               suppress remote frames (RTR frames)\n");
+    fprintf(stream, "     --no-extended-frames             suppress extended frames (29-bit identifier)\n");
+    fprintf(stream, " -b, --baudrate=<baudrate>            CAN bit-timing in kbps (default=250), or\n");
+    fprintf(stream, "     --bitrate=<bit-rate>             CAN bit-rate settings (as a string)\n");
+    fprintf(stream, " -v, --verbose                        show detailed bit-rate settings\n");
+#if (CAN_FD_SUPPORTED != 0)
+    fprintf(stream, "     --list-bitrates[=<mode>]         list standard bit-rate settings\n");
+#else
+    fprintf(stream, "     --list-bitrates[=2.0]            list standard bit-rate settings\n");
+#endif
+#if (OPTION_CANAPI_LIBRARY != 0)
+    fprintf(stream, " -L, --list-boards[=<vendor>]         list all supported CAN interfaces and exit\n");
+    fprintf(stream, " -T, --test-boards[=<vendor>]         list all available CAN interfaces and exit\n");
+#elif (SERIAL_CAN_SUPPORTED == 0)
+    fprintf(stream, " -L, --list-boards                    list all supported CAN interfaces and exit\n");
+    fprintf(stream, " -T, --test-boards                    list all available CAN interfaces and exit\n");
+#endif
+    fprintf(stream, " -h, --help                           display this help screen and exit\n");
+    fprintf(stream, "     --version                        show version information and exit\n");
+#if (0)
+    fprintf(stream, "Arguments:\n");
+    fprintf(stream, "  <id>           CAN identifier (11-bit)\n");
+    fprintf(stream, "  <interface>    CAN interface board (list all with /LIST)\n");
+    fprintf(stream, "  <baudrate>     CAN baud rate index (default=3):\n");
+    fprintf(stream, "                 0 = 1000 kbps\n");
+    fprintf(stream, "                 1 = 800 kbps\n");
+    fprintf(stream, "                 2 = 500 kbps\n");
+    fprintf(stream, "                 3 = 250 kbps\n");
+    fprintf(stream, "                 4 = 125 kbps\n");
+    fprintf(stream, "                 5 = 100 kbps\n");
+    fprintf(stream, "                 6 = 50 kbps\n");
+    fprintf(stream, "                 7 = 20 kbps\n");
+    fprintf(stream, "                 8 = 10 kbps\n");
+    fprintf(stream, "  <bitrate>      comma-separated <key>=<value>-list:\n");
+    fprintf(stream, "                 f_clock=<value>      frequency in Hz or\n");
+    fprintf(stream, "                 f_clock_mhz=<value>  frequency in MHz\n");
+    fprintf(stream, "                 nom_brp=<value>      bit-rate prescaler (nominal)\n");
+    fprintf(stream, "                 nom_tseg1=<value>    time segment 1 (nominal)\n");
+    fprintf(stream, "                 nom_tseg2=<value>    time segment 2 (nominal)\n");
+    fprintf(stream, "                 nom_sjw=<value>      sync. jump width (nominal)\n");
+    fprintf(stream, "                 nom_sam=<value>      sampling (only SJA1000)\n");
+    fprintf(stream, "                 data_brp=<value>     bit-rate prescaler (FD data)\n");
+    fprintf(stream, "                 data_tseg1=<value>   time segment 1 (FD data)\n");
+    fprintf(stream, "                 data_tseg2=<value>   time segment 2 (FD data)\n");
+    fprintf(stream, "                 data_sjw=<value>     sync. jump width (FD data).\n");
+#endif
+    fprintf(stream, "Hazard note:\n");
+    fprintf(stream, "  If you connect your CAN device to a real CAN network when using this program,\n");
+    fprintf(stream, "  you might damage your application.\n");
+}
+
+/** @brief       shows version information of the program.
+ *
+ *  @param[in]   stream  - output stream (e.g. stdout)
+ *  @param[in]   program - base name of the program
+ */
+static void version(FILE *stream, const char *program)
+{
+    fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, LICENSE);
+    (void)program;
+    fprintf(stream, "Written by Uwe Vogt, UV Software, Berlin <https://www.mac-can.net/>\n");
+}
diff --git a/Utilities/can_test/Driver.h b/Utilities/can_test/Driver.h
index 4c80654..0038a5d 100644
--- a/Utilities/can_test/Driver.h
+++ b/Utilities/can_test/Driver.h
@@ -1,8 +1,8 @@
 //  SPDX-License-Identifier: GPL-3.0-or-later
 //
-//  CAN Tester for generic Interfaces (CAN API V3)
+//  CAN Tester for for Peak-System PCAN Interfaces (CAN API V3)
 //
-//  Copyright (c) 2008-2010,2014-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//  Copyright (c) 2008-2010,2012-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -19,34 +19,65 @@
 //
 #ifndef DRIVER_H_INCLUDED
 #define DRIVER_H_INCLUDED
-#include "build_no.h"
-#define VERSION_MAJOR      0
-#define VERSION_MINOR      2
-#define VERSION_PATCH      8
-#define VERSION_BUILD      BUILD_NO
-#define VERSION_STRING     TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
-#if defined(_WIN64)
-#define PLATFORM          "x64"
-#elif defined(_WIN32)
-#define PLATFORM          "x86"
-#elif defined(__linux__)
-#define PLATFORM          "Linux"
-#elif defined(__APPLE__)
-#define PLATFORM          "macOS"
-#elif defined(__CYGWIN__)
-#define PLATFORM          "Cygwin"
-#else
-#error Unsupported architecture
-#endif
+
+#include "PeakCAN.h"
+
 #if (OPTION_CAN_2_0_ONLY != 0)
 #error Compilation with legacy CAN 2.0 frame format!
 #else
-#define CAN_FD_SUPPORTED   1  // don't touch that dial
+#define CAN_FD_SUPPORTED  1  // don't touch that dial
+#endif
+#if !defined(__APPLE__)
+#define TESTER_INTERFACE  "PEAK-System PCAN Interfaces"
+#else
+#define TESTER_INTERFACE  "PEAK-System PCAN USB Interfaces"
 #endif
-#define TESTER_INTEFACE   "PEAK-System PCAN-USB Interfaces"
-#define TESTER_COPYRIGHT  "2008-2010,2014-2024 by Uwe Vogt, UV Software, Berlin"
+#define TESTER_COPYRIGHT  "2008-2010,2012-2024 by Uwe Vogt, UV Software, Berlin"
 
-#include "PeakCAN.h"
+#if (OPTION_PCAN_BIT_TIMING == 1)
+#define BITRATE_1M(x)    PEAKCAN_BR_1M(x)
+#define BITRATE_800K(x)  PEAKCAN_BR_800K(x)
+#define BITRATE_500K(x)  PEAKCAN_BR_500K(x)
+#define BITRATE_250K(x)  PEAKCAN_BR_250K(x)
+#define BITRATE_125K(x)  PEAKCAN_BR_125K(x)
+#define BITRATE_100K(x)  PEAKCAN_BR_100K(x)
+#define BITRATE_50K(x)   PEAKCAN_BR_50K(x)
+#define BITRATE_20K(x)   PEAKCAN_BR_20K(x)
+#define BITRATE_10K(x)   PEAKCAN_BR_10K(x)
+#define BITRATE_5K(x)    PEAKCAN_BR_5K(x)
+#else
+#define BITRATE_1M(x)    DEFAULT_CAN_BR_1M(x)  
+#define BITRATE_800K(x)  DEFAULT_CAN_BR_800K(x)
+#define BITRATE_500K(x)  DEFAULT_CAN_BR_500K(x)
+#define BITRATE_250K(x)  DEFAULT_CAN_BR_250K(x)
+#define BITRATE_125K(x)  DEFAULT_CAN_BR_125K(x)
+#define BITRATE_100K(x)  DEFAULT_CAN_BR_100K(x)
+#define BITRATE_50K(x)   DEFAULT_CAN_BR_50K(x) 
+#define BITRATE_20K(x)   DEFAULT_CAN_BR_20K(x) 
+#define BITRATE_10K(x)   DEFAULT_CAN_BR_10K(x) 
+#define BITRATE_5K(x)    DEFAULT_CAN_BR_5K(x)  
+#endif
+#if (CAN_FD_SUPPORTED != 0)
+#if (OPTION_PCAN_BIT_TIMING == 1)
+#define BITRATE_FD_1M(x)      PEAKCAN_FD_BR_1M(x)
+#define BITRATE_FD_500K(x)    PEAKCAN_FD_BR_500K(x)
+#define BITRATE_FD_250K(x)    PEAKCAN_FD_BR_250K(x)
+#define BITRATE_FD_125K(x)    PEAKCAN_FD_BR_125K(x)
+#define BITRATE_FD_1M8M(x)    PEAKCAN_FD_BR_1M8M(x)
+#define BITRATE_FD_500K4M(x)  PEAKCAN_FD_BR_500K4M(x)
+#define BITRATE_FD_250K2M(x)  PEAKCAN_FD_BR_250K2M(x)
+#define BITRATE_FD_125K1M(x)  PEAKCAN_FD_BR_125K1M(x)
+#else
+#define BITRATE_FD_1M(x)      DEFAULT_CAN_FD_BR_1M(x)
+#define BITRATE_FD_500K(x)    DEFAULT_CAN_FD_BR_500K(x)
+#define BITRATE_FD_250K(x)    DEFAULT_CAN_FD_BR_250K(x)
+#define BITRATE_FD_125K(x)    DEFAULT_CAN_FD_BR_125K(x)
+#define BITRATE_FD_1M8M(x)    DEFAULT_CAN_FD_BR_1M8M(x)
+#define BITRATE_FD_500K4M(x)  DEFAULT_CAN_FD_BR_500K4M(x)
+#define BITRATE_FD_250K2M(x)  DEFAULT_CAN_FD_BR_250K2M(x)
+#define BITRATE_FD_125K1M(x)  DEFAULT_CAN_FD_BR_125K1M(x)
+#endif
+#endif
 
 typedef CPeakCAN  CCanDriver;
 
diff --git a/Utilities/can_test/README.md b/Utilities/can_test/README.md
index 6c83c42..a945c88 100644
--- a/Utilities/can_test/README.md
+++ b/Utilities/can_test/README.md
@@ -4,37 +4,38 @@ Copyright &copy; 2008-2010,2014-2024 by Uwe Vogt, UV Software, Berlin
 ```
 Usage: can_test <interface> [<option>...]
 Options for receiver test (default test mode):
- -r, --receive                 count received messages until ^C is pressed
- -n, --number=<number>         check up-counting numbers starting with <number>
- -s, --stop                    stop on error (with option --number)
- -m, --mode=(2.0|FDF[+BRS])    CAN operation mode: CAN 2.0 or CAN FD mode
-     --shared                  shared CAN controller access (if supported)
-     --listen-only             monitor mode (listen-only, transmitter is off)
-     --error-frames            allow reception of error frames
-     --no-remote-frames        suppress remote frames (RTR frames)
-     --no-extended-frames      suppress extended frames (29-bit identifier)
- -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250), or
-     --bitrate=<bit-rate>      CAN bit-rate settings (as a string)
- -v, --verbose                 show detailed bit-rate settings
+ -r, --receive                        count received messages until ^C is pressed
+ -n, --number=<number>                check up-counting numbers starting with <number>
+ -s, --stop                           stop on error (with option --number)
+ -m, --mode=(2.0|FDF[+BRS])           CAN operation mode: CAN 2.0 or CAN FD mode
+     --shared                         shared CAN controller access (if supported)
+     --listen-only                    monitor mode (listen-only, transmitter is off)
+     --error-frames                   allow reception of error frames
+     --no-remote-frames               suppress remote frames (RTR frames)
+     --no-extended-frames             suppress extended frames (29-bit identifier)
+ -b, --baudrate=<baudrate>            CAN bit-timing in kbps (default=250), or
+     --bitrate=<bit-rate>             CAN bit-rate settings (as a string)
+ -v, --verbose                        show detailed bit-rate settings
 Options for transmitter test:
- -t, --transmit=<time>         send messages for the given time in seconds, or
- -f, --frames=<number>,        alternatively send the given number of messages, or
-     --random=<number>         optionally with random cycle time and data length
- -c, --cycle=<cycle>           cycle time in milliseconds (default=0) or
- -u, --usec=<cycle>            cycle time in microseconds (default=0)
- -d, --dlc=<length>            send messages of given length (default=8)
- -i, --id=<can-id>             use given identifier (default=100h)
- -n, --number=<number>         set first up-counting number (default=0)
- -m, --mode=(2.0|FDF[+BRS])    CAN operation mode: CAN 2.0 or CAN FD mode
-     --shared                  shared CAN controller access (if supported)
- -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250), or
-     --bitrate=<bit-rate>      CAN bit-rate settings (as a string)
- -v, --verbose                 show detailed bit-rate settings
+ -t, --transmit=<time>                send messages for the given time in seconds, or
+ -f, --frames=<number>,               alternatively send the given number of messages, or
+     --random=<number>                optionally with random cycle time and data length
+ -c, --cycle=<cycle>                  cycle time in milliseconds (default=0) or
+ -u, --usec=<cycle>                   cycle time in microseconds (default=0)
+ -d, --dlc=<length>                   send messages of given length (default=8)
+ -i, --id=<can-id>                    use given identifier (default=100h)
+ -n, --number=<number>                set first up-counting number (default=0)
+ -m, --mode=(2.0|FDF[+BRS])           CAN operation mode: CAN 2.0 or CAN FD mode
+     --shared                         shared CAN controller access (if supported)
+ -b, --baudrate=<baudrate>            CAN bit-timing in kbps (default=250), or
+     --bitrate=<bit-rate>             CAN bit-rate settings (as a string)
+ -v, --verbose                        show detailed bit-rate settings
 Other options:
- -L, --list-boards             list all supported CAN interfaces and exit
- -T, --test-boards             list all available CAN interfaces and exit
- -h, --help                    display this help screen and exit
-     --version                 show version information and exit
+     --list-bitrates[=<mode>]         list standard bit-rate settings
+ -L, --list-boards                    list all supported CAN interfaces and exit
+ -T, --test-boards                    list all available CAN interfaces and exit
+ -h, --help                           display this help screen and exit
+     --version                        show version information and exit
 Arguments:
   <frames>       send this number of messages (frames), or
   <time>         send messages for the given time in seconds
@@ -55,17 +56,17 @@ Arguments:
                  7 = 20 kbps
                  8 = 10 kbps
   <bitrate>      comma-separated <key>=<value>-list:
-                 f_clock=<value>         frequency in Hz or
-                 f_clock_mhz=<value>     frequency in MHz
-                 nom_brp=<value>         bit-rate prescaler (nominal)
-                 nom_tseg1=<value>       time segment 1 (nominal)
-                 nom_tseg2=<value>       time segment 2 (nominal)
-                 nom_sjw=<value>         sync. jump width (nominal)
-                 nom_sam=<value>         sampling (only SJA1000)
-                 data_brp=<value>        bit-rate prescaler (FD data)
-                 data_tseg1=<value>      time segment 1 (FD data)
-                 data_tseg2=<value>      time segment 2 (FD data)
-                 data_sjw=<value>        sync. jump width (FD data).
+                 f_clock=<value>      frequency in Hz or
+                 f_clock_mhz=<value>  frequency in MHz
+                 nom_brp=<value>      bit-rate prescaler (nominal)
+                 nom_tseg1=<value>    time segment 1 (nominal)
+                 nom_tseg2=<value>    time segment 2 (nominal)
+                 nom_sjw=<value>      sync. jump width (nominal)
+                 nom_sam=<value>      sampling (only SJA1000)
+                 data_brp=<value>     bit-rate prescaler (FD data)
+                 data_tseg1=<value>   time segment 1 (FD data)
+                 data_tseg2=<value>   time segment 2 (FD data)
+                 data_sjw=<value>     sync. jump width (FD data).
 Hazard note:
   If you connect your CAN device to a real CAN network when using this program,
   you might damage your application.
@@ -82,4 +83,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/Utilities/can_test/Sources/Timer.cpp b/Utilities/can_test/Sources/Timer.cpp
index 3fa6612..6a80c60 100644
--- a/Utilities/can_test/Sources/Timer.cpp
+++ b/Utilities/can_test/Sources/Timer.cpp
@@ -2,11 +2,13 @@
 //
 //  Software for Industrial Communication, Motion Control and Automation
 //
-//  Copyright (c) 2002-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
-//  This class is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  Class CTimer
+//
+//  This class is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this class.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -41,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this class.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this class.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifdef _DEBUG
 #undef THIS_FILE
@@ -58,48 +60,50 @@ static char THIS_FILE[]=__FILE__;
 #endif
 #define POSIX_DEPRECATED  0  /* set to non-zero value to use 'gettimeofday' and 'usleep'*/
 
-CTimer::CTimer(uint32_t u32Microseconds) {
+CTimer::CTimer(uint64_t u64Microseconds) {
 #if !defined(_WIN32) && !defined(_WIN64)
 #if (POSIX_DEPRECATED != 0)
     struct timeval tv;
     gettimeofday(&tv, NULL);
     m_u64UntilStop = ((uint64_t)tv.tv_sec * (uint64_t)1000000) + (uint64_t)tv.tv_usec
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #else
     struct timespec now = { 0, 0 };
     clock_gettime(CLOCK_MONOTONIC, &now);
     m_u64UntilStop = ((uint64_t)now.tv_sec * (uint64_t)1000000)
                    + ((uint64_t)now.tv_nsec / (uint64_t)1000)
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #endif
 #else
     LARGE_INTEGER largeCounter;  // high-resolution performance counter
 
+    m_llUntilStop = (LONGLONG)0; // counter value for the desired time-out
+
     // retrieve the frequency of the high-resolution performance counter
     if(!QueryPerformanceFrequency(&m_largeFrequency))
         return;
     // retrieve the current value of the high-resolution performance counter
-    if(!QueryPerformanceCounter(&largeCounter))
+    if (!QueryPerformanceCounter(&largeCounter))
         return;
     // calculate the counter value for the desired time-out
-    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u32Microseconds)
+    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
                                                                         / (LONGLONG)1000000);
 #endif
 }
 
-bool CTimer::Restart(uint32_t u32Microseconds) {
+bool CTimer::Restart(uint64_t u64Microseconds) {
 #if !defined(_WIN32) && !defined(_WIN64)
 #if (POSIX_DEPRECATED != 0)
     struct timeval tv;
     gettimeofday(&tv, NULL);
     m_u64UntilStop = ((uint64_t)tv.tv_sec * (uint64_t)1000000) + (uint64_t)tv.tv_usec
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #else
     struct timespec now = { 0, 0 };
     clock_gettime(CLOCK_MONOTONIC, &now);
     m_u64UntilStop = ((uint64_t)now.tv_sec * (uint64_t)1000000)
                    + ((uint64_t)now.tv_nsec / (uint64_t)1000)
-                   + ((uint64_t)u32Microseconds);
+                   + ((uint64_t)u64Microseconds);
 #endif
     return true;
 #else
@@ -109,7 +113,7 @@ bool CTimer::Restart(uint32_t u32Microseconds) {
     if(!QueryPerformanceCounter(&largeCounter))
         return false;
     // calculate the counter value for the desired time-out
-    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u32Microseconds)
+    m_llUntilStop = largeCounter.QuadPart + ((m_largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
                                                                         / (LONGLONG)1000000);
     return true;
 #endif
@@ -146,15 +150,15 @@ bool CTimer::Timeout() {
 #endif
 }
 
-bool CTimer::Delay(uint32_t u32Microseconds) {
+bool CTimer::Delay(uint64_t u64Microseconds) {
 #if !defined(_WIN32) && !defined(_WIN64)
 #if (POSIX_DEPRECATED != 0)
-    return (usleep((useconds_t)u32Microseconds) != 0) ? false : true;
+    return (usleep((useconds_t)u64Microseconds) != 0) ? false : true;
 #else
     int rc;
     struct timespec delay;
-    delay.tv_sec = (time_t)(u32Microseconds / CTimer::SEC);
-    delay.tv_nsec = (long)((u32Microseconds % CTimer::SEC) * (uint32_t)1000);
+    delay.tv_sec = (time_t)(u64Microseconds / CTimer::SEC);
+    delay.tv_nsec = (long)((u64Microseconds % CTimer::SEC) * (uint32_t)1000);
     errno = 0;
     while ((rc = nanosleep(&delay, &delay))) {
         if (errno != EINTR)
@@ -175,7 +179,7 @@ bool CTimer::Delay(uint32_t u32Microseconds) {
     if(!QueryPerformanceFrequency(&largeFrequency))
         return false;
     // calculate the counter value for the desired delay
-    llUntilStop = largeCounter.QuadPart + ((largeFrequency.QuadPart * (LONGLONG)u32Microseconds)
+    llUntilStop = largeCounter.QuadPart + ((largeFrequency.QuadPart * (LONGLONG)u64Microseconds)
                                                                     / (LONGLONG)1000000);
     // wait until the counter overruns the delay time
     for(;;)
@@ -189,9 +193,9 @@ bool CTimer::Delay(uint32_t u32Microseconds) {
     HANDLE timer;
     LARGE_INTEGER ft;
 
-    ft.QuadPart = -(10 * (LONGLONG)u32Microseconds); // Convert to 100 nanosecond interval, negative value indicates relative time
+    ft.QuadPart = -(10 * (LONGLONG)u64Microseconds); // Convert to 100 nanosecond interval, negative value indicates relative time
 
-    if(u32Microseconds >= 100) {  // FIXME: Who made this decision?
+    if(u64Microseconds >= 100) {  // FIXME: Who made this decision?
         if ((timer = CreateWaitableTimer(NULL, TRUE, NULL)) != NULL) {
             SetWaitableTimer(timer, &ft, 0, NULL, NULL, 0);
             WaitForSingleObject(timer, INFINITE);
@@ -256,4 +260,4 @@ double CTimer::DiffTime(struct timespec start, struct timespec stop) {
             ((double)start.tv_sec + ((double)start.tv_nsec / 1000000000.f)));
 }
 
-// $Id: Timer.cpp 799 2023-10-07 19:15:23Z makemake $  Copyright (c) UV Software, Berlin //
+// $Id: Timer.cpp 810 2024-04-18 14:01:00Z quaoar $  Copyright (c) UV Software, Berlin //
diff --git a/Utilities/can_test/Sources/Timer.h b/Utilities/can_test/Sources/Timer.h
index 5f0ebc5..3bb4460 100644
--- a/Utilities/can_test/Sources/Timer.h
+++ b/Utilities/can_test/Sources/Timer.h
@@ -2,11 +2,13 @@
 //
 //  Software for Industrial Communication, Motion Control and Automation
 //
-//  Copyright (c) 2002-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+//  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //  All rights reserved.
 //
-//  This class is dual-licensed under the BSD 2-Clause "Simplified" License and
-//  under the GNU General Public License v3.0 (or any later version).
+//  Class CTimer
+//
+//  This class is dual-licensed under the BSD 2-Clause "Simplified" License
+//  and under the GNU General Public License v3.0 (or any later version).
 //  You can choose between one of them if you use this class.
 //
 //  BSD 2-Clause "Simplified" License:
@@ -41,7 +43,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this class.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this class.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef TIMER_H_INCLUDED
 #define TIMER_H_INCLUDED
@@ -62,10 +64,10 @@
 
 class CTimer {
 public:
-    static const uint32_t USEC = 1U;  // 1 microsecond
-    static const uint32_t MSEC = 1000U;  // 1 millisecond
-    static const uint32_t SEC = 1000000U;  // 1 second
-    static const uint32_t MIN = 60000000U;  // 1 minute
+    static const uint64_t USEC = 1U;  // 1 microsecond
+    static const uint64_t MSEC = 1000U;  // 1 millisecond
+    static const uint64_t SEC = 1000000U;  // 1 second
+    static const uint64_t MIN = 60000000U;  // 1 minute
 private:
 #if !defined(_WIN32) && !defined(_WIN64)
     uint64_t m_u64UntilStop;  // counter value for the desired time-out
@@ -74,13 +76,13 @@ class CTimer {
     LONGLONG      m_llUntilStop;     // counter value for the desired time-out
 #endif
 public:
-    CTimer(uint32_t u32Microseconds = 0);
+    CTimer(uint64_t u64Microseconds = 0);
     virtual ~CTimer() {};
 
-    bool Restart(uint32_t u32Timeout);  // restart the timer!
-    bool Timeout();                     // time-out occurred?
+    bool Restart(uint64_t u64Microseconds);  // restart the timer!
+    bool Timeout();                          // time-out occurred?
 
-    static bool Delay(uint32_t u32Delay); // delay timer
+    static bool Delay(uint64_t u64Microseconds);  // delay timer
 
     static struct timespec GetTime();  // time with nanosecond resolution
     static double DiffTime(struct timespec start, struct timespec stop);
@@ -88,4 +90,4 @@ class CTimer {
 
 #endif // TIMER_H_INCLUDED
 
-// $Id: Timer.h 799 2023-10-07 19:15:23Z makemake $  Copyright (c) UV Software, Berlin //
+// $Id: Timer.h 810 2024-04-18 14:01:00Z quaoar $  Copyright (c) UV Software, Berlin //
diff --git a/Utilities/can_test/Sources/main.cpp b/Utilities/can_test/Sources/main.cpp
index e821878..57b269d 100644
--- a/Utilities/can_test/Sources/main.cpp
+++ b/Utilities/can_test/Sources/main.cpp
@@ -2,7 +2,7 @@
 //
 //  CAN Tester for generic Interfaces (CAN API V3)
 //
-//  Copyright (c) 2008-2010,2014-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//  Copyright (c) 2008-2010,2012-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -15,931 +15,10 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //
-#include "Driver.h"
-#include "Timer.h"
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <getopt.h>
-#include <signal.h>
-#include <errno.h>
-#include <time.h>
-
-#include <inttypes.h>
-
-#ifdef _MSC_VER
-//not #if defined(_WIN32) || defined(_WIN64) because we have strncasecmp in mingw
-#define strncasecmp _strnicmp
-#define strcasecmp _stricmp
-#endif
-
-#define RxMODE  (0)
-#define TxMODE  (1)
-#define TxFRAMES  (2)
-#define TxRANDOM  (3)
-class CCanDevice : public CCanDriver {
-public:
-    uint64_t ReceiverTest(bool checkCounter = false, uint64_t expectedNumber = 0U, bool stopOnError = false);
-    uint64_t TransmitterTest(time_t duration, CANAPI_OpMode_t opMode, uint32_t id = 0x100U, uint8_t dlc = 0U, uint32_t delay = 0U, uint64_t offset = 0U);
-    uint64_t TransmitterTest(uint64_t count, CANAPI_OpMode_t opMode, bool random = false, uint32_t id = 0x100U, uint8_t dlc = 0U, uint32_t delay = 0U, uint64_t offset = 0U);
-public:
-    static int ListCanDevices(void);
-    static int TestCanDevices(CANAPI_OpMode_t opMode);
-};
-
-static void sigterm(int signo);
-static void usage(FILE *stream, const char *program);
-static void version(FILE *stream, const char *program);
-
-static const char *prompt[4] = {"-\b", "/\b", "|\b", "\\\b"};
-static volatile int running = 1;
-
-static CCanDevice canDevice = CCanDevice();
-
-static const char APPLICATION[] = "CAN Tester for " TESTER_INTEFACE ", Version " VERSION_STRING;
-static const char COPYRIGHT[]   = "Copyright (c) " TESTER_COPYRIGHT;
-static const char WARRANTY[]    = "This program comes with ABSOLUTELY NO WARRANTY!\n\n" \
-                                  "This is free software, and you are welcome to redistribute it\n" \
-                                  "under certain conditions; type '--version' for details.";
-static const char LICENSE[]     = "This program is free software: you can redistribute it and/or modify\n" \
-                                  "it under the terms of the GNU General Public License as published by\n" \
-                                  "the Free Software Foundation, either version 3 of the License, or\n" \
-                                  "(at your option) any later version.\n\n" \
-                                  "This program is distributed in the hope that it will be useful,\n" \
-                                  "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" \
-                                  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" \
-                                  "GNU General Public License for more details.\n\n" \
-                                  "You should have received a copy of the GNU General Public License\n" \
-                                  "along with this program.  If not, see <http://www.gnu.org/licenses/>.";
-#define basename(x)  "can_test" // FIXME: Where is my `basename' function?
-
-int main(int argc, const char * argv[]) {
-    int opt;
-    CCanDevice::SChannelInfo channel;
-    int mode = RxMODE, m = 0;
-    int op = 0, rf = 0, xf = 0, ef = 0, lo = 0, sh = 0;
-    long baudrate = CANBDR_250; int bd = 0;
-    int verbose = 0;
-    time_t txtime = 0;
-    long txframes = 0;
-    long can_id = 0x100; int c = 0;
-    long can_dlc = 8; int d = 0;
-    long delay = 0; int t = 0;
-    long number = 0; int n = 0;
-    int stop_on_error = 0;
-    int num_boards = 0;
-    int show_version = 0;
-    char *device, *firmware, *software;
-    char property[CANPROP_MAX_BUFFER_SIZE] = "";
-    struct option long_options[] = {
-        {"baudrate", required_argument, 0, 'b'},
-        {"bitrate", required_argument, 0, 'B'},
-        {"verbose", no_argument, 0, 'v'},
-        {"mode", required_argument, 0, 'm'},
-        {"shared", no_argument, 0, 'S'},
-        {"listen-only", no_argument, 0, 'M'},
-        {"error-frames", no_argument, 0, 'E'},
-        {"no-remote-frames", no_argument, 0, 'R'},
-        {"no-extended-frames", no_argument, 0, 'X'},
-        {"receive", no_argument, 0, 'r'},
-        {"number", required_argument, 0, 'n'},
-        {"stop", no_argument, 0, 's'},
-        {"transmit", required_argument, 0, 't'},
-        {"frames", required_argument, 0, 'f'},
-        {"random", required_argument, 0, 'F'},
-        {"cycle", required_argument, 0, 'c'},
-        {"usec", required_argument, 0, 'u'},
-        {"dlc", required_argument, 0, 'd'},
-        {"data", required_argument, 0, 'd'},
-        {"id", required_argument, 0, 'i'},
-        {"list-boards", no_argument, 0, 'L'},
-        {"test-boards", no_argument, 0, 'T'},
-        {"help", no_argument, 0, 'h'},
-        {"version", no_argument, &show_version, 1},
-        {0, 0, 0, 0}
-    };
-    CANAPI_Bitrate_t bitrate = {};
-    bitrate.index = CANBTR_INDEX_250K;
-    bool hasDataPhase = false;
-    bool hasNoSamp = true;
-    CANAPI_OpMode_t opMode = {};
-    opMode.byte = CANMODE_DEFAULT;
-    CANAPI_Return_t retVal = 0;
-
-    /* default bit-timing */
-    CANAPI_BusSpeed_t speed = {};
-    (void)CCanDevice::MapIndex2Bitrate(bitrate.index, bitrate);
-    (void)CCanDevice::MapBitrate2Speed(bitrate, speed);
-    (void)op;
-
-    /* signal handler */
-    if ((signal(SIGINT, sigterm) == SIG_ERR) ||
-#if !defined(_WIN32) && !defined(_WIN64)
-       (signal(SIGHUP, sigterm) == SIG_ERR) ||
-#endif
-       (signal(SIGTERM, sigterm) == SIG_ERR)) {
-        perror("+++ error");
-        return errno;
-    }
-    /* scan command-line */
-    while ((opt = getopt_long(argc, (char * const *)argv, "b:vm:rn:st:f:R:c:u:d:i:aLTvh", long_options, NULL)) != -1) {
-        switch (opt) {
-        case 'b':  /* option `--baudrate=<baudrate>' (-b) */
-            if (bd++) {
-                fprintf(stderr, "%s: duplicated option `--baudrate' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (sscanf(optarg, "%li", &baudrate) != 1) {
-                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            switch (baudrate) {
-                case 0: case 1000: case 1000000: bitrate.index = (int32_t)CANBTR_INDEX_1M; break;
-                case 1: case 800:  case 800000:  bitrate.index = (int32_t)CANBTR_INDEX_800K; break;
-                case 2: case 500:  case 500000:  bitrate.index = (int32_t)CANBTR_INDEX_500K; break;
-                case 3: case 250:  case 250000:  bitrate.index = (int32_t)CANBTR_INDEX_250K; break;
-                case 4: case 125:  case 125000:  bitrate.index = (int32_t)CANBTR_INDEX_125K; break;
-                case 5: case 100:  case 100000:  bitrate.index = (int32_t)CANBTR_INDEX_100K; break;
-                case 6: case 50:   case 50000:   bitrate.index = (int32_t)CANBTR_INDEX_50K; break;
-                case 7: case 20:   case 20000:   bitrate.index = (int32_t)CANBTR_INDEX_20K; break;
-                case 8: case 10:   case 10000:   bitrate.index = (int32_t)CANBTR_INDEX_10K; break;
-                default:                         bitrate.index = (int32_t)-baudrate; break;
-            }
-            if (CCanDevice::MapIndex2Bitrate(bitrate.index, bitrate) != CCanApi::NoError) {
-                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (CCanDevice::MapBitrate2Speed(bitrate, speed) != CCanApi::NoError) {
-                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-        case 'B':  /* option `--bitrate=<bit-rate>' as string */
-            if (bd++) {
-                fprintf(stderr, "%s: duplicated option `--bitrate'\n", basename(argv[0]));
-                return 1;
-            }
-            if (CCanDevice::MapString2Bitrate(optarg, bitrate, hasDataPhase, hasNoSamp) != CCanApi::NoError) {
-                fprintf(stderr, "%s: illegal argument for option `--bitrate'\n", basename(argv[0]));
-                return 1;
-            }
-            if (CCanDevice::MapBitrate2Speed(bitrate, speed) != CCanApi::NoError) {
-                fprintf(stderr, "%s: illegal argument for option `--bitrate'\n", basename(argv[0]));
-                return 1;
-            }
-            break;
-        case 'v':  /* option `--verbose' (-v) */
-            if (verbose) {
-                fprintf(stderr, "%s: duplicated option `--verbose' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            verbose = 1;
-            break;
-#if (CAN_FD_SUPPORTED != 0)
-        case 'm':  /* option `--mode=(2.0|FDF[+BRS])' (-m)*/
-            if (op++) {
-                fprintf(stderr, "%s: duplicated option `--mode' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!strcasecmp(optarg, "default") || !strcasecmp(optarg, "classic") ||
-                !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "2.0"))
-                opMode.byte |= CANMODE_DEFAULT;
-            else if (!strcasecmp(optarg, "CANFD") || !strcasecmp(optarg, "FDF") || !strcasecmp(optarg, "FD"))
-                opMode.byte |= CANMODE_FDOE;
-            else if (!strcasecmp(optarg, "CANFD+BRS") || !strcasecmp(optarg, "FDF+BRS") || !strcasecmp(optarg, "FD+BRS"))
-                opMode.byte |= CANMODE_FDOE | CANMODE_BRSE;
-            else {
-                fprintf(stderr, "%s: illegal argument for option `--mode' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-#endif
-        case 'S':  /* option `--shared' */
-            if (sh++) {
-                fprintf(stderr, "%s: duplicated option `--shared'\n", basename(argv[0]));
-                return 1;
-            }
-            opMode.shrd = 1;
-            break;
-        case 'M':  /* option `--listen-only' */
-            if (lo++) {
-                fprintf(stderr, "%s: duplicated option `--listen-only'\n", basename(argv[0]));
-                return 1;
-            }
-            opMode.mon = 1;
-            break;
-        case 'E':  /* option `--error-frames' */
-            if (ef++) {
-                fprintf(stderr, "%s: duplicated option `--error-frames'\n", basename(argv[0]));
-                return 1;
-            }
-            opMode.err = 1;
-            break;
-        case 'X':  /* option `--no-extended-frames' */
-            if (xf++) {
-                fprintf(stderr, "%s: duplicated option `--no-extended-frames'\n", basename(argv[0]));
-                return 1;
-            }
-            opMode.nxtd = 1;
-            break;
-        case 'R':  /* option `--no-remote-frames' */
-            if (rf++) {
-                fprintf(stderr, "%s: duplicated option `--no-remote-frames'\n", basename(argv[0]));
-                return 1;
-            }
-            opMode.nrtr = 1;
-            break;
-        case 'r':  /* option `--receive' (-r) */
-            if (m++) {
-                fprintf(stderr, "%s: duplicated option `--receive' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            mode = RxMODE;
-            break;
-        case 'n':  /* option `--number=<offset>' (-n) */
-            if (n++) {
-                fprintf(stderr, "%s: duplicated option `--number' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (sscanf(optarg, "%li", &number) != 1) {
-                fprintf(stderr, "%s: illegal argument for option `--number' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (number < 0) {
-                fprintf(stderr, "%s: illegal argument for option `--number' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-        case 's':  /* option `--stop' (-s) */
-            if (stop_on_error) {
-                fprintf(stderr, "%s: duplicated option `--stop' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            stop_on_error = 1;
-            break;
-        case 't':  /* option `--transmit=<duration>' (-t) in [s] */
-            if (m++) {
-                fprintf(stderr, "%s: duplicated option `--transmit' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (sscanf(optarg, "%li", &txtime) != 1) {
-                fprintf(stderr, "%s: illegal argument for option `--transmit' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (txtime < 0) {
-                fprintf(stderr, "%s: illegal argument for option `--transmit' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            mode = TxMODE;
-            break;
-        case 'f':  /* option `--frames=<frames>' (-f) */
-            if (m++) {
-                fprintf(stderr, "%s: duplicated option `--frames' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (sscanf(optarg, "%li", &txframes) != 1) {
-                fprintf(stderr, "%s: illegal argument for option `--frames' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (txframes < 0) {
-                fprintf(stderr, "%s: illegal argument for option `--frames' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            mode = TxFRAMES;
-            break;
-        case 'F':  /* option `--random=<frames>' */
-            if (m++) {
-                fprintf(stderr, "%s: duplicated option `--random'\n", basename(argv[0]));
-                return 1;
-            }
-            if (sscanf(optarg, "%li", &txframes) != 1) {
-                fprintf(stderr, "%s: illegal argument for option `--random'\n", basename(argv[0]));
-                return 1;
-            }
-            if (txframes < 0) {
-                fprintf(stderr, "%s: illegal argument for option `--random' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (!d) /* let the tester generate messages of arbitrary length */
-                can_dlc = 0;
-            mode = TxRANDOM;
-            break;
-        case 'c':  /* option `--cycle=<msec>' (-c) */
-            if (t++) {
-                fprintf(stderr, "%s: duplicated option `--cycle' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (sscanf(optarg, "%li", &delay) != 1) {
-                fprintf(stderr, "%s: illegal argument for option `--cycle' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if ((delay < 0) || (delay > (LONG_MAX / 1000l))) {
-                fprintf(stderr, "%s: illegal argument for option `--cycle' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            delay *= 1000l;
-            break;
-        case 'u':  /* option `--usec=<usec>' (-u) */
-            if (t++) {
-                fprintf(stderr, "%s: duplicated option `--usec' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (sscanf(optarg, "%li", &delay) != 1) {
-                fprintf(stderr, "%s: illegal argument for option `--usec' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (delay < 0) {
-                fprintf(stderr, "%s: illegal argument for option `--usec' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-        case 'd':  /* option `--dlc=<length>' (-d) */
-            if (d++) {
-                fprintf(stderr, "%s: duplicated option `--dlc' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (sscanf(optarg, "%li", &can_dlc) != 1) {
-                fprintf(stderr, "%s: illegal argument for option `--dlc' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-#if (CAN_FD_SUPPORTED != 0)
-            if ((can_dlc < 0) || (CANFD_MAX_LEN < can_dlc)) {
-#else
-            if ((can_dlc < 0) || (CAN_MAX_LEN < can_dlc)) {
-#endif
-                fprintf(stderr, "%s: illegal argument for option `--dlc' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-        case 'i':  /* option `--id=<identifier>' (-i) */
-            if (c++) {
-                fprintf(stderr, "%s: duplicated option `--id' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if (sscanf(optarg, "%li", &can_id) != 1) {
-                fprintf(stderr, "%s: illegal argument for option `--id' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            if ((can_id < 0x000) || (0x1FFFFFFF < can_id)) { // TODO: to be checked with --mode=NXTD
-                fprintf(stderr, "%s: illegal argument for option `--id' (%c)\n", basename(argv[0]), opt);
-                return 1;
-            }
-            break;
-        case 'a':  /* option `--list-boards[=<vendor>]' (-a, deprecated) */
-        case 'L':  /* option `--list-boards[=<vendor>]' (-L) */
-            fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
-            /* list all supported interfaces */
-            num_boards = CCanDevice::ListCanDevices(/*optarg*/);
-            fprintf(stdout, "Number of supported CAN interfaces: %i\n", num_boards);
-            return (num_boards >= 0) ? 0 : 1;
-        case 'T':  /* option `--test-boards[=<vendor>]' (-T) */
-            fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
-            /* list all available interfaces */
-            num_boards = CCanDevice::TestCanDevices(opMode/*, optarg*/);
-            fprintf(stdout, "Number of present CAN interfaces: %i\n", num_boards);
-            return (num_boards >= 0) ? 0 : 1;
-        case 'h':  /* option `--help' (-h) */
-            usage(stdout, basename(argv[0]));
-            return 0;
-        case '?':
-            if (!opterr)
-                usage(stderr, basename(argv[0]));
-            return 1;
-        default:
-            if (show_version) {
-                version(stdout, basename(argv[0]));
-                return 0;
-            }
-            else {
-                usage(stderr, basename(argv[0]));
-                return 1;
-            }
-        }
-    }
-    /* - check if one and only one <interface> is given */
-    if (optind + 1 != argc) {
-        if (optind == argc)
-            fprintf(stderr, "%s: no interface given\n", basename(argv[0]));
-        else
-            fprintf(stderr, "%s: too many arguments given\n", basename(argv[0]));
-        return 1;
-    }
-    /* - search the <interface> by its name in the device list */
-    bool result = CCanDevice::GetFirstChannel(channel);
-    while (result) {
-        if (strcasecmp(argv[optind], channel.m_szDeviceName) == 0) {
-            break;
-        }
-        result = CCanDevice::GetNextChannel(channel);
-    }
-    if (!result) {
-        fprintf(stderr, "%s: illegal argument `%s'\n", basename(argv[0]), argv[optind]);
-        return 1;
-    }
-    /* - check bit-timing index (n/a for CAN FD) */
-    if (opMode.fdoe && (bitrate.btr.frequency <= 0)) {
-        fprintf(stderr, "%s: illegal combination of options `--mode' (m) and `--bitrate'\n", basename(argv[0]));
-        return 1;
-    }
-    /* - check data length and make CAN FD DLC (0x0..0xF) */
-    if (!opMode.fdoe && (can_dlc > CAN_MAX_LEN)) {
-        fprintf(stderr, "%s: illegal combination of options `--mode' (m) and `--dlc' (d)\n", basename(argv[0]));
-        return 1;
-    } else {
-        if (can_dlc > 48) can_dlc = 0xF;
-        else if (can_dlc > 32) can_dlc = 0xE;
-        else if (can_dlc > 24) can_dlc = 0xD;
-        else if (can_dlc > 20) can_dlc = 0xC;
-        else if (can_dlc > 16) can_dlc = 0xB;
-        else if (can_dlc > 12) can_dlc = 0xA;
-        else if (can_dlc > 8) can_dlc = 0x9;
-    }
-    /* - check operation mode flags */
-    if ((mode != RxMODE) && opMode.mon) {
-        fprintf(stderr, "%s: illegal option `--listen-only' for transmitter test\n", basename(argv[0]));
-        return 1;
-    }
-    if ((mode != RxMODE) && opMode.err) {
-        fprintf(stderr, "%s: illegal option `--error-frames' for transmitter test\n", basename(argv[0]));
-        return 1;
-    }
-    if ((mode != RxMODE) && opMode.nxtd) {
-        fprintf(stderr, "%s: illegal option `--no-extended-frames' for transmitter test\n", basename(argv[0]));
-        return 1;
-    }
-    if ((mode != RxMODE) && opMode.nrtr) {
-        fprintf(stderr, "%s: illegal option `--no-remote-frames' for transmitter test\n", basename(argv[0]));
-        return 1;
-    }
-    /* CAN Tester for generic CAN interfaces */
-    fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
-    /* - show operation mode and bit-rate settings */
-    if (verbose) {
-        fprintf(stdout, "Op.-mode=%s", (opMode.byte & CANMODE_FDOE) ? "CANFD" : "CAN2.0");
-        if ((opMode.byte & CANMODE_BRSE)) fprintf(stdout, "+BRS");
-        if ((opMode.byte & CANMODE_NISO)) fprintf(stdout, "+NISO");
-        if ((opMode.byte & CANMODE_SHRD)) fprintf(stdout, "+SHRD");
-        if ((opMode.byte & CANMODE_NXTD)) fprintf(stdout, "+NXTD");
-        if ((opMode.byte & CANMODE_NRTR)) fprintf(stdout, "+NRTR");
-        if ((opMode.byte & CANMODE_ERR)) fprintf(stdout, "+ERR");
-        if ((opMode.byte & CANMODE_MON)) fprintf(stdout, "+MON");
-        fprintf(stdout, " (op_mode=%02Xh)\n", opMode.byte);
-        if (bitrate.btr.frequency > 0) {
-            fprintf(stdout, "Bit-rate=%.0fkbps@%.1f%%", speed.nominal.speed / 1000., speed.nominal.samplepoint * 100.);
-            if (opMode.byte & CANMODE_BRSE)
-                fprintf(stdout, ":%.0fkbps@%.1f%%", speed.data.speed / 1000., speed.data.samplepoint * 100.);
-            (void)CCanDevice::MapBitrate2String(bitrate, property, CANPROP_MAX_BUFFER_SIZE,
-                                                (opMode.byte & CANMODE_BRSE), hasNoSamp);
-            fprintf(stdout, " (%s)\n\n", property);
-        }
-        else {
-            fprintf(stdout, "Baudrate=%.0fkbps@%.1f%% (index %i)\n\n",
-                             speed.nominal.speed / 1000.,
-                             speed.nominal.samplepoint * 100., -bitrate.index);
-        }
-    }
-    /* - initialize interface */
-    fprintf(stdout, "Hardware=%s...", channel.m_szDeviceName);
-    fflush (stdout);
-    retVal = canDevice.InitializeChannel(channel.m_nChannelNo, opMode);
-    if (retVal != CCanApi::NoError) {
-        fprintf(stdout, "FAILED!\n");
-        fprintf(stderr, "+++ error: CAN Controller could not be initialized (%i)", retVal);
-        if (retVal == CCanApi::NotSupported)
-            fprintf(stderr, "\n           - possibly CAN operating mode %02Xh not supported", opMode.byte);
-        fputc('\n', stderr);
-        goto finalize;
-    }
-    fprintf(stdout, "OK!\n");
-    /* - start communication */
-    if (bitrate.btr.frequency > 0) {
-        fprintf(stdout, "Bit-rate=%.0fkbps", speed.nominal.speed / 1000.);
-        if (opMode.byte & CANMODE_BRSE)
-            fprintf(stdout, ":%.0fkbps", speed.data.speed / 1000.);
-        else if (opMode.byte & CANMODE_FDOE)
-            fprintf(stdout, ":%.0fkbps", speed.nominal.speed / 1000.);
-        fprintf(stdout, "...");
-    }
-    else {
-        fprintf(stdout, "Baudrate=%skbps...",
-            bitrate.index == CANBTR_INDEX_1M   ? "1000" :
-            bitrate.index == CANBTR_INDEX_800K ? "800" :
-            bitrate.index == CANBTR_INDEX_500K ? "500" :
-            bitrate.index == CANBTR_INDEX_250K ? "250" :
-            bitrate.index == CANBTR_INDEX_125K ? "125" :
-            bitrate.index == CANBTR_INDEX_100K ? "100" :
-            bitrate.index == CANBTR_INDEX_50K  ? "50" :
-            bitrate.index == CANBTR_INDEX_20K  ? "20" :
-            bitrate.index == CANBTR_INDEX_10K  ? "10" : "?");
-    }
-    fflush(stdout);
-    retVal = canDevice.StartController(bitrate);
-    if (retVal != CCanApi::NoError) {
-        fprintf(stdout, "FAILED!\n");
-        fprintf(stderr, "+++ error: CAN Controller could not be started (%i)\n", retVal);
-        goto teardown;
-    }
-    fprintf(stdout, "OK!\n");
-    /* - do your job well: */
-    switch (mode) {
-    case TxMODE:    /* transmitter test (duration) */
-        (void)canDevice.TransmitterTest((time_t)txtime, opMode, (uint32_t)can_id, (uint8_t)can_dlc, (uint32_t)delay, (uint64_t)number);
-        break;
-    case TxFRAMES:  /* transmitter test (frames) */
-        (void)canDevice.TransmitterTest((uint64_t)txframes, opMode, false, (uint32_t)can_id, (uint8_t)can_dlc, (uint32_t)delay, (uint64_t)number);
-        break;
-    case TxRANDOM:  /* transmitter test (random) */
-        (void)canDevice.TransmitterTest((uint64_t)txframes, opMode, true, (uint32_t)can_id, (uint8_t)can_dlc, (uint32_t)delay, (uint64_t)number);
-        break;
-    default:        /* receiver test (abort with Ctrl+C) */
-        (void)canDevice.ReceiverTest((bool)n, (uint64_t)number, (bool)stop_on_error);
-        break;
-    }
-    /* - show interface information */
-    if ((device = canDevice.GetHardwareVersion()) != NULL)
-        fprintf(stdout, "Hardware: %s\n", device);
-    if ((firmware = canDevice.GetFirmwareVersion()) != NULL)
-        fprintf(stdout, "Firmware: %s\n", firmware);
-    if ((software = CCanDevice::GetVersion()) != NULL)
-        fprintf(stdout, "Software: %s\n", software);
-teardown:
-    /* - teardown the interface*/
-    retVal = canDevice.TeardownChannel();
-    if (retVal != CCanApi::NoError) {
-        fprintf(stderr, "+++ error: CAN Controller could not be reset (%i)\n", retVal);
-        goto finalize;
-    }
-finalize:
-    /* So long and farewell! */
-    fprintf(stdout, "%s\n", COPYRIGHT);
-    return retVal;
-}
-
-int CCanDevice::ListCanDevices(void) {
-    CCanDevice::SChannelInfo info;
-    int n = 0;
-
-    fprintf(stdout, "Suppored hardware:\n");
-    bool result = CCanDevice::GetFirstChannel(info);
-    while (result) {
-        fprintf(stdout, "\"%s\" (VendorName=\"%s\", LibraryId=%" PRIi32 ", ChannelNo=%" PRIi32 ")\n",
-                         info.m_szDeviceName, info.m_szVendorName, info.m_nLibraryId, info.m_nChannelNo);
-        n++;
-        result = CCanDevice::GetNextChannel(info);
-    }
-    return n;
-}
-
-int CCanDevice::TestCanDevices(CANAPI_OpMode_t opMode) {
-    CCanDevice::SChannelInfo info;
-    int n = 0;
-
-    bool result = CCanDevice::GetFirstChannel(info);
-    while (result) {
-        fprintf(stdout, "Hardware=%s...", info.m_szDeviceName);
-        fflush(stdout);
-        EChannelState state;
-        CANAPI_Return_t retVal = CCanDevice::ProbeChannel(info.m_nChannelNo, opMode, state);
-        if ((retVal == CCanApi::NoError) || (retVal == CCanApi::IllegalParameter)) {
-            CTimer::Delay(333U * CTimer::MSEC);  // to fake probing a hardware
-            switch (state) {
-                case CCanApi::ChannelOccupied: fprintf(stdout, "occupied\n"); n++; break;
-                case CCanApi::ChannelAvailable: fprintf(stdout, "available\n"); n++; break;
-                case CCanApi::ChannelNotAvailable: fprintf(stdout, "not available\n"); break;
-                default: fprintf(stdout, "not testable\n"); break;
-            }
-            if (retVal == CCanApi::IllegalParameter)
-                fprintf(stderr, "+++ warning: CAN operation mode not supported (%02xh)\n", opMode.byte);
-        } else
-            fprintf(stdout, "FAILED!\n");
-        result = CCanDevice::GetNextChannel(info);
-    }
-    return n;
-}
-
-uint64_t CCanDevice::TransmitterTest(time_t duration, CANAPI_OpMode_t opMode, uint32_t id, uint8_t dlc, uint32_t delay, uint64_t offset) {
-    CANAPI_Message_t message;
-    CANAPI_Return_t retVal;
-
-    time_t start = time(NULL);
-    uint64_t frames = 0;
-    uint64_t errors = 0;
-    uint64_t calls = 0;
-
-    memset(&message, 0, sizeof(CANAPI_Message_t));
-
-    fprintf(stderr, "\nPress ^C to abort.\n");
-    message.id  = id;
-    message.xtd = 0;
-    message.rtr = 0;
-    message.fdf = opMode.fdoe;
-    message.brs = opMode.brse;
-    message.dlc = dlc;
-    fprintf(stdout, "\nTransmitting message(s)...");
-    fflush (stdout);
-    while (time(NULL) < (start + duration)) {
-        message.data[0] = (uint8_t)((frames + offset) >> 0);
-        message.data[1] = (uint8_t)((frames + offset) >> 8);
-        message.data[2] = (uint8_t)((frames + offset) >> 16);
-        message.data[3] = (uint8_t)((frames + offset) >> 24);
-        message.data[4] = (uint8_t)((frames + offset) >> 32);
-        message.data[5] = (uint8_t)((frames + offset) >> 40);
-        message.data[6] = (uint8_t)((frames + offset) >> 48);
-        message.data[7] = (uint8_t)((frames + offset) >> 56);
-        memset(&message.data[8], 0, CANFD_MAX_LEN - 8);
-        /* transmit message (repeat when busy) */
-retry_tx_test:
-        calls++;
-        retVal = WriteMessage(message);
-        if (retVal == CCanApi::NoError)
-            fprintf(stderr, "%s", prompt[(frames++ % 4)]);
-        else if ((retVal == CCanApi::TransmitterBusy) && running)
-            goto retry_tx_test;
-        else
-            errors++;
-        /* pause between two messages, as you please */
-        CTimer::Delay(delay * CTimer::USEC);
-        if (!running) {
-            fprintf(stderr, "\b");
-            fprintf(stdout, "STOP!\n\n");
-            fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
-            fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
-            fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
-            fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
-            return frames;
-        }
-    }
-    fprintf(stderr, "\b");
-    fprintf(stdout, "OK!\n\n");
-    fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
-    fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
-    fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
-    fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
-
-    CTimer::Delay(1U * CTimer::SEC);  /* afterburner */
-    return frames;
-}
-
-uint64_t CCanDevice::TransmitterTest(uint64_t count, CANAPI_OpMode_t opMode, bool random, uint32_t id, uint8_t dlc, uint32_t delay, uint64_t offset) {
-    CANAPI_Message_t message;
-    CANAPI_Return_t retVal;
-
-    time_t start = time(NULL);
-    uint64_t frames = 0;
-    uint64_t errors = 0;
-    uint64_t calls = 0;
-
-    srand((unsigned int)time(NULL));
-    memset(&message, 0, sizeof(CANAPI_Message_t));
-
-    fprintf(stderr, "\nPress ^C to abort.\n");
-    message.id  = id;
-    message.xtd = 0;
-    message.rtr = 0;
-    message.fdf = opMode.fdoe;
-    message.brs = opMode.brse;
-    message.dlc = dlc;
-    fprintf(stdout, "\nTransmitting message(s)...");
-    fflush (stdout);
-    while (frames < count) {
-        message.data[0] = (uint8_t)((frames + offset) >> 0);
-        message.data[1] = (uint8_t)((frames + offset) >> 8);
-        message.data[2] = (uint8_t)((frames + offset) >> 16);
-        message.data[3] = (uint8_t)((frames + offset) >> 24);
-        message.data[4] = (uint8_t)((frames + offset) >> 32);
-        message.data[5] = (uint8_t)((frames + offset) >> 40);
-        message.data[6] = (uint8_t)((frames + offset) >> 48);
-        message.data[7] = (uint8_t)((frames + offset) >> 56);
-        memset(&message.data[8], 0, CANFD_MAX_LEN - 8);
-        if (random)
-            message.dlc = dlc + (uint8_t)(rand() % ((CANFD_MAX_DLC - dlc) + 1));
-        /* transmit message (repeat when busy) */
-retry_tx_test:
-        calls++;
-        retVal = WriteMessage(message);
-        if (retVal == CCanApi::NoError)
-            fprintf(stderr, "%s", prompt[(frames++ % 4)]);
-        else if ((retVal == CCanApi::TransmitterBusy) && running)
-            goto retry_tx_test;
-        else
-            errors++;
-        /* pause between two messages, as you please */
-        if (random)
-            CTimer::Delay(CTimer::USEC * (delay + (uint32_t)(rand() % 54945)));
-        else
-            CTimer::Delay(CTimer::USEC * delay);
-        if (!running) {
-            fprintf(stderr, "\b");
-            fprintf(stdout, "STOP!\n\n");
-            fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
-            fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
-            fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
-            fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
-            return frames;
-        }
-    }
-    fprintf(stderr, "\b");
-    fprintf(stdout, "OK!\n\n");
-    fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
-    fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
-    fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
-    fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
-
-    CTimer::Delay(1U * CTimer::SEC);  /* afterburner */
-    return frames;}
-
-uint64_t CCanDevice::ReceiverTest(bool checkCounter, uint64_t expectedNumber, bool stopOnError) {
-    CANAPI_Message_t message;
-    CANAPI_Status_t status;
-    CANAPI_Return_t retVal;
-
-    time_t start = time(NULL);
-    uint64_t frames = 0U;
-    uint64_t errors = 0U;
-    uint64_t calls = 0U;
-    uint64_t data;
-
-    fprintf(stderr, "\nPress ^C to abort.\n");
-    fprintf(stdout, "\nReceiving message(s)...");
-    fflush (stdout);
-    for (;;) {
-        retVal = ReadMessage(message);
-        if (retVal == CCanApi::NoError) {
-            fprintf(stderr, "%s", prompt[(frames++ % 4)]);
-            // checking PCBUSB issue #198 (aka. MACCAN-2)
-            if (checkCounter) {
-                data = 0;
-                if (message.dlc > 0)
-                    data |= (uint64_t)message.data[0] << 0;
-                if (message.dlc > 1)
-                    data |= (uint64_t)message.data[1] << 8;
-                if (message.dlc > 2)
-                    data |= (uint64_t)message.data[2] << 16;
-                if (message.dlc > 3)
-                    data |= (uint64_t)message.data[3] << 24;
-                if (message.dlc > 4)
-                    data |= (uint64_t)message.data[4] << 32;
-                if (message.dlc > 5)
-                    data |= (uint64_t)message.data[5] << 40;
-                if (message.dlc > 6)
-                    data |= (uint64_t)message.data[6] << 48;
-                if (message.dlc > 7)
-                    data |= (uint64_t)message.data[7] << 56;
-                if (data != expectedNumber) {
-                    fprintf(stderr, "\b");
-                    fprintf(stdout, "ISSUE#198!\n");
-                    fprintf(stderr, "+++ data inconsistent: %" PRIu64 " received / %" PRIu64 " expected\n", data, expectedNumber);
-                    retVal = GetStatus(status);
-                    if ((retVal == CCanApi::NoError) && ((status.byte & ~CANSTAT_RESET) != 0x00U)) {
-                        fprintf(stderr, "    status register:%s%s%s%s%s%s (%02X)\n",
-                            (status.bus_off) ? " BO" : "",
-                            (status.warning_level) ? " WL" : "",
-                            (status.bus_error) ? " BE" : "",
-                            (status.transmitter_busy) ? " TP" : "",
-                            (status.message_lost) ? " ML" : "",
-                            (status.queue_overrun) ? " QUE" : "", status.byte);
-                    }
-                    if (stopOnError) {
-                        fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
-                        fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
-                        fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
-                        fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
-                        return frames;
-                    }
-                    else {
-                        fprintf(stderr, "Receiving message(s)... ");
-                        expectedNumber = data;
-                    }
-                }
-                expectedNumber++;  // depending on DLC received data may wrap around while number is counting up!
-            }
-        } else if (retVal != CCanApi::ReceiverEmpty)
-            errors++;
-        calls++;
-        if (!running) {
-            fprintf(stderr, "\b");
-            fprintf(stdout, "OK!\n\n");
-            fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
-            fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
-            fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
-            fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
-            return frames;
-        }
-    }
-}
-
-/** @brief       signal handler to catch Ctrl+C.
- *
- *  @param[in]   signo - signal number (SIGINT, SIGHUP, SIGTERM)
- */
-static void sigterm(int signo)
-{
-    //fprintf(stderr, "%s: got signal %d\n", __FILE__, signo);
-    (void)canDevice.SignalChannel();
-    running = 0;
-    (void)signo;
-}
-
-/** @brief       shows a help screen with all command-line options.
- *
- *  @param[in]   stream  - output stream (e.g. stdout)
- *  @param[in]   program - base name of the program
- */
-static void usage(FILE *stream, const char *program)
-{
-    fprintf(stream, "Usage: %s <interface> [<option>...]\n", program);
-    fprintf(stream, "Options for receiver test (default test mode):\n");
-    fprintf(stream, " -r, --receive                 count received messages until ^C is pressed\n");
-    fprintf(stream, " -n, --number=<number>         check up-counting numbers starting with <number>\n");
-    fprintf(stream, " -s, --stop                    stop on error (with option --number)\n");
-#if (CAN_FD_SUPPORTED != 0)
-    fprintf(stream, " -m, --mode=(2.0|FDF[+BRS])    CAN operation mode: CAN 2.0 or CAN FD mode\n");
-#endif
-    fprintf(stream, "     --shared                  shared CAN controller access (if supported)\n");
-    fprintf(stream, "     --listen-only             monitor mode (listen-only, transmitter is off)\n");
-    fprintf(stream, "     --error-frames            allow reception of error frames\n");
-    fprintf(stream, "     --no-remote-frames        suppress remote frames (RTR frames)\n");
-    fprintf(stream, "     --no-extended-frames      suppress extended frames (29-bit identifier)\n");
-    fprintf(stream, " -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250), or\n");
-    fprintf(stream, "     --bitrate=<bit-rate>      CAN bit-rate settings (as a string)\n");
-    fprintf(stream, " -v, --verbose                 show detailed bit-rate settings\n");
-    fprintf(stream, "Options for transmitter test:\n");
-    fprintf(stream, " -t, --transmit=<time>         send messages for the given time in seconds, or\n");
-    fprintf(stream, " -f, --frames=<number>,        alternatively send the given number of messages, or\n");
-    fprintf(stream, "     --random=<number>         optionally with random cycle time and data length\n");
-    fprintf(stream, " -c, --cycle=<cycle>           cycle time in milliseconds (default=0) or\n");
-    fprintf(stream, " -u, --usec=<cycle>            cycle time in microseconds (default=0)\n");
-    fprintf(stream, " -d, --dlc=<length>            send messages of given length (default=8)\n");
-    fprintf(stream, " -i, --id=<can-id>             use given identifier (default=100h)\n");
-    fprintf(stream, " -n, --number=<number>         set first up-counting number (default=0)\n");
-#if (CAN_FD_SUPPORTED != 0)
-    fprintf(stream, " -m, --mode=(2.0|FDF[+BRS])    CAN operation mode: CAN 2.0 or CAN FD mode\n");
-#endif
-    fprintf(stream, "     --shared                  shared CAN controller access (if supported)\n");
-    fprintf(stream, " -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250), or\n");
-    fprintf(stream, "     --bitrate=<bit-rate>      CAN bit-rate settings (as a string)\n");
-    fprintf(stream, " -v, --verbose                 show detailed bit-rate settings\n");
-    fprintf(stream, "Other options:\n");
-#if (OPTION_CANAPI_LIBRARY != 0)
-    fprintf(stream, " -L, --list-boards[=<vendor>]  list all supported CAN interfaces and exit\n");
-    fprintf(stream, " -T, --test-boards[=<vendor>]  list all available CAN interfaces and exit\n");
+#if defined(_WIN32) || defined(_WIN64)
+#include "main_w.cpp"
 #else
-    fprintf(stream, " -L, --list-boards             list all supported CAN interfaces and exit\n");
-    fprintf(stream, " -T, --test-boards             list all available CAN interfaces and exit\n");
-#endif
-    fprintf(stream, " -h, --help                    display this help screen and exit\n");
-    fprintf(stream, "     --version                 show version information and exit\n");
-#if (0)
-    fprintf(stream, "Arguments:\n");
-    fprintf(stream, "  <frames>       send this number of messages (frames), or\n");
-    fprintf(stream, "  <time>         send messages for the given time in seconds\n");
-    fprintf(stream, "  <msec>         cycle time in milliseconds (default=0), or \n");
-    fprintf(stream, "  <usec>         cycle time in microseconds (default=0)\n");
-    fprintf(stream, "  <can-id>       send with given identifier (default=100h)\n");
-    fprintf(stream, "  <length>       send data of given length (default=8)\n");
-    fprintf(stream, "  <number>       set first up-counting number (default=0)\n");
-    fprintf(stream, "  <interface>    CAN interface board (list all with /LIST)\n");
-    fprintf(stream, "  <baudrate>     CAN baud rate index (default=3):\n");
-    fprintf(stream, "                 0 = 1000 kbps\n");
-    fprintf(stream, "                 1 = 800 kbps\n");
-    fprintf(stream, "                 2 = 500 kbps\n");
-    fprintf(stream, "                 3 = 250 kbps\n");
-    fprintf(stream, "                 4 = 125 kbps\n");
-    fprintf(stream, "                 5 = 100 kbps\n");
-    fprintf(stream, "                 6 = 50 kbps\n");
-    fprintf(stream, "                 7 = 20 kbps\n");
-    fprintf(stream, "                 8 = 10 kbps\n");
-    fprintf(stream, "  <bitrate>      comma-separated <key>=<value>-list:\n");
-    fprintf(stream, "                 f_clock=<value>         frequency in Hz or\n");
-    fprintf(stream, "                 f_clock_mhz=<value>     frequency in MHz\n");
-    fprintf(stream, "                 nom_brp=<value>         bit-rate prescaler (nominal)\n");
-    fprintf(stream, "                 nom_tseg1=<value>       time segment 1 (nominal)\n");
-    fprintf(stream, "                 nom_tseg2=<value>       time segment 2 (nominal)\n");
-    fprintf(stream, "                 nom_sjw=<value>         sync. jump width (nominal)\n");
-    fprintf(stream, "                 nom_sam=<value>         sampling (only SJA1000)\n");
-    fprintf(stream, "                 data_brp=<value>        bit-rate prescaler (FD data)\n");
-    fprintf(stream, "                 data_tseg1=<value>      time segment 1 (FD data)\n");
-    fprintf(stream, "                 data_tseg2=<value>      time segment 2 (FD data)\n");
-    fprintf(stream, "                 data_sjw=<value>        sync. jump width (FD data).\n");
+#include "main_p.cpp"
 #endif
-    fprintf(stream, "Hazard note:\n");
-    fprintf(stream, "  If you connect your CAN device to a real CAN network when using this program,\n");
-    fprintf(stream, "  you might damage your application.\n");
-}
-
-/** @brief       shows version information of the program.
- *
- *  @param[in]   stream  - output stream (e.g. stdout)
- *  @param[in]   program - base name of the program
- */
-static void version(FILE *stream, const char *program)
-{
-    fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, LICENSE);
-    (void)program;
-    fprintf(stream, "Written by Uwe Vogt, UV Software, Berlin <https://www.mac-can.net/>\n");
-}
diff --git a/Utilities/can_test/Sources/main_p.cpp b/Utilities/can_test/Sources/main_p.cpp
new file mode 100644
index 0000000..497fbad
--- /dev/null
+++ b/Utilities/can_test/Sources/main_p.cpp
@@ -0,0 +1,1130 @@
+//  SPDX-License-Identifier: GPL-3.0-or-later
+//
+//  CAN Tester for generic Interfaces (CAN API V3)
+//
+//  Copyright (c) 2008-2010,2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+//
+#include "Driver.h"
+#include "Timer.h"
+#include "Version.h"
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <getopt.h>
+#include <signal.h>
+#include <errno.h>
+#include <time.h>
+
+#include <inttypes.h>
+
+#if defined(_WIN64)
+#define PLATFORM  "x64"
+#elif defined(_WIN32)
+#define PLATFORM  "x86"
+#elif defined(__linux__)
+#define PLATFORM  "Linux"
+#elif defined(__APPLE__)
+#define PLATFORM  "macOS"
+#elif defined(__CYGWIN__)
+#define PLATFORM  "Cygwin"
+#else
+#error Platform not supported
+#endif
+#ifdef _MSC_VER
+//not #if defined(_WIN32) || defined(_WIN64) because we have strncasecmp in mingw
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+#endif
+
+#define RxMODE  (0)
+#define TxMODE  (1)
+#define TxFRAMES  (2)
+#define TxRANDOM  (3)
+class CCanDevice : public CCanDriver {
+public:
+    uint64_t ReceiverTest(bool checkCounter = false, uint64_t expectedNumber = 0U, bool stopOnError = false);
+    uint64_t TransmitterTest(time_t duration, CANAPI_OpMode_t opMode, uint32_t id = 0x100U, uint8_t dlc = 0U, uint64_t delay = 0U, uint64_t offset = 0U);
+    uint64_t TransmitterTest(uint64_t count, CANAPI_OpMode_t opMode, bool random = false, uint32_t id = 0x100U, uint8_t dlc = 0U, uint64_t delay = 0U, uint64_t offset = 0U);
+public:
+    static int ListCanDevices(void);
+    static int TestCanDevices(CANAPI_OpMode_t opMode);
+    static int ListCanBitrates(CANAPI_OpMode_t opMode);
+};
+
+static void sigterm(int signo);
+static void usage(FILE *stream, const char *program);
+static void version(FILE *stream, const char *program);
+
+static const char *prompt[4] = {"-\b", "/\b", "|\b", "\\\b"};
+static volatile int running = 1;
+
+static CCanDevice canDevice = CCanDevice();
+
+static const char APPLICATION[] = "CAN Tester for " TESTER_INTERFACE ", Version " VERSION_STRING;
+static const char COPYRIGHT[]   = "Copyright (c) " TESTER_COPYRIGHT;
+static const char WARRANTY[]    = "This program comes with ABSOLUTELY NO WARRANTY!\n\n" \
+                                  "This is free software, and you are welcome to redistribute it\n" \
+                                  "under certain conditions; type '--version' for details.";
+static const char LICENSE[]     = "This program is free software: you can redistribute it and/or modify\n" \
+                                  "it under the terms of the GNU General Public License as published by\n" \
+                                  "the Free Software Foundation, either version 3 of the License, or\n" \
+                                  "(at your option) any later version.\n\n" \
+                                  "This program is distributed in the hope that it will be useful,\n" \
+                                  "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" \
+                                  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" \
+                                  "GNU General Public License for more details.\n\n" \
+                                  "You should have received a copy of the GNU General Public License\n" \
+                                  "along with this program.  If not, see <https://www.gnu.org/licenses/>.";
+#define basename(x)  "can_test" // FIXME: Where is my `basename' function?
+
+int main(int argc, const char * argv[]) {
+    int opt;
+#if (SERIAL_CAN_SUPPORTED == 0)
+    CCanDevice::SChannelInfo channel;
+#else
+    char *port = NULL;
+#endif
+    int mode = RxMODE, m = 0;
+    int op = 0, rf = 0, xf = 0, ef = 0, lo = 0, sh = 0;
+    long baudrate = CANBDR_250; int bd = 0;
+    int verbose = 0;
+    time_t txtime = 0;
+    long txframes = 0;
+    long can_id = 0x100; int c = 0;
+    long can_dlc = 8; int d = 0;
+    long delay = 0; int t = 0;
+    long number = 0; int n = 0;
+    int stop_on_error = 0;
+    int num_boards = 0;
+    int show_version = 0;
+    char *device, *firmware, *software;
+    char property[CANPROP_MAX_BUFFER_SIZE] = "";
+    struct option long_options[] = {
+        {"baudrate", required_argument, 0, 'b'},
+        {"bitrate", required_argument, 0, 'B'},
+        {"verbose", no_argument, 0, 'v'},
+        {"mode", required_argument, 0, 'm'},
+        {"shared", no_argument, 0, 'S'},
+        {"listen-only", no_argument, 0, 'M'},
+        {"error-frames", no_argument, 0, 'E'},
+        {"no-remote-frames", no_argument, 0, 'R'},
+        {"no-extended-frames", no_argument, 0, 'X'},
+        {"receive", no_argument, 0, 'r'},
+        {"number", required_argument, 0, 'n'},
+        {"stop", no_argument, 0, 's'},
+        {"transmit", required_argument, 0, 't'},
+        {"frames", required_argument, 0, 'f'},
+        {"random", required_argument, 0, 'F'},
+        {"cycle", required_argument, 0, 'c'},
+        {"usec", required_argument, 0, 'u'},
+        {"dlc", required_argument, 0, 'd'},
+        {"data", required_argument, 0, 'd'},
+        {"id", required_argument, 0, 'i'},
+        {"list-bitrates", optional_argument, 0, 'l'},
+        {"list-boards", no_argument, 0, 'L'},
+        {"test-boards", no_argument, 0, 'T'},
+        {"help", no_argument, 0, 'h'},
+        {"version", no_argument, &show_version, 1},
+        {0, 0, 0, 0}
+    };
+    CANAPI_Bitrate_t bitrate = {};
+    bitrate.index = CANBTR_INDEX_250K;
+    bool hasDataPhase = false;
+    bool hasNoSamp = true;
+    CANAPI_OpMode_t opMode = {};
+    opMode.byte = CANMODE_DEFAULT;
+    CANAPI_OpMode_t brMode = {};
+    brMode.byte = CANMODE_DEFAULT;
+    CANAPI_Return_t retVal = 0;
+
+    /* default bit-timing */
+    CANAPI_BusSpeed_t speed = {};
+    (void)CCanDevice::MapIndex2Bitrate(bitrate.index, bitrate);
+    (void)CCanDevice::MapBitrate2Speed(bitrate, speed);
+    (void)op;
+
+    /* signal handler */
+    if ((signal(SIGINT, sigterm) == SIG_ERR) ||
+#if !defined(_WIN32) && !defined(_WIN64)
+       (signal(SIGHUP, sigterm) == SIG_ERR) ||
+#endif
+       (signal(SIGTERM, sigterm) == SIG_ERR)) {
+        perror("+++ error");
+        return errno;
+    }
+    /* scan command-line */
+    while ((opt = getopt_long(argc, (char * const *)argv, "b:vm:rn:st:f:R:c:u:d:i:lLaTh", long_options, NULL)) != -1) {
+        switch (opt) {
+        /* option `--baudrate=<baudrate>' (-b) */
+        case 'b':
+            if (bd++) {
+                fprintf(stderr, "%s: duplicated option `--baudrate' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (sscanf(optarg, "%li", &baudrate) != 1) {
+                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            switch (baudrate) {
+                case 0: case 1000: case 1000000: bitrate.index = (int32_t)CANBTR_INDEX_1M; break;
+                case 1: case 800:  case 800000:  bitrate.index = (int32_t)CANBTR_INDEX_800K; break;
+                case 2: case 500:  case 500000:  bitrate.index = (int32_t)CANBTR_INDEX_500K; break;
+                case 3: case 250:  case 250000:  bitrate.index = (int32_t)CANBTR_INDEX_250K; break;
+                case 4: case 125:  case 125000:  bitrate.index = (int32_t)CANBTR_INDEX_125K; break;
+                case 5: case 100:  case 100000:  bitrate.index = (int32_t)CANBTR_INDEX_100K; break;
+                case 6: case 50:   case 50000:   bitrate.index = (int32_t)CANBTR_INDEX_50K; break;
+                case 7: case 20:   case 20000:   bitrate.index = (int32_t)CANBTR_INDEX_20K; break;
+                case 8: case 10:   case 10000:   bitrate.index = (int32_t)CANBTR_INDEX_10K; break;
+                default:                         bitrate.index = (int32_t)-baudrate; break;
+            }
+            if (CCanDevice::MapIndex2Bitrate(bitrate.index, bitrate) != CCanApi::NoError) {
+                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (CCanDevice::MapBitrate2Speed(bitrate, speed) != CCanApi::NoError) {
+                fprintf(stderr, "%s: illegal argument for option `--baudrate' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+        /* option `--bitrate=<bit-rate>' as string */
+        case 'B':
+            if (bd++) {
+                fprintf(stderr, "%s: duplicated option `--bitrate'\n", basename(argv[0]));
+                return 1;
+            }
+            if (CCanDevice::MapString2Bitrate(optarg, bitrate, hasDataPhase, hasNoSamp) != CCanApi::NoError) {
+                fprintf(stderr, "%s: illegal argument for option `--bitrate'\n", basename(argv[0]));
+                return 1;
+            }
+            if (CCanDevice::MapBitrate2Speed(bitrate, speed) != CCanApi::NoError) {
+                fprintf(stderr, "%s: illegal argument for option `--bitrate'\n", basename(argv[0]));
+                return 1;
+            }
+            break;
+        /* option `--verbose' (-v) */
+        case 'v':
+            if (verbose) {
+                fprintf(stderr, "%s: duplicated option `--verbose' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            verbose = 1;
+            break;
+        /* option `--mode=(2.0|FDF[+BRS])' (-m) */
+        case 'm':
+            if (op++) {
+                fprintf(stderr, "%s: duplicated option `--mode' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!strcasecmp(optarg, "default") || !strcasecmp(optarg, "classic") || !strcasecmp(optarg, "classical") ||
+                !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "2.0"))
+                opMode.byte |= CANMODE_DEFAULT;
+#if (CAN_FD_SUPPORTED != 0)
+            else if (!strcasecmp(optarg, "CANFD") || !strcasecmp(optarg, "FD") || !strcasecmp(optarg, "FDF"))
+                opMode.byte |= CANMODE_FDOE;
+            else if (!strcasecmp(optarg, "CANFD+BRS") || !strcasecmp(optarg, "FD+BRS") || !strcasecmp(optarg, "FDF+BRS"))
+                opMode.byte |= CANMODE_FDOE | CANMODE_BRSE;
+#endif
+            else {
+                fprintf(stderr, "%s: illegal argument for option `--mode' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+        /* option `--shared' */
+        case 'S':
+            if (sh++) {
+                fprintf(stderr, "%s: duplicated option `--shared'\n", basename(argv[0]));
+                return 1;
+            }
+            opMode.shrd = 1;
+            break;
+        /* option `--listen-only' */
+        case 'M':
+            if (lo++) {
+                fprintf(stderr, "%s: duplicated option `--listen-only'\n", basename(argv[0]));
+                return 1;
+            }
+            opMode.mon = 1;
+            break;
+        /* option `--error-frames' */
+        case 'E':
+            if (ef++) {
+                fprintf(stderr, "%s: duplicated option `--error-frames'\n", basename(argv[0]));
+                return 1;
+            }
+            opMode.err = 1;
+            break;
+        /* option `--no-extended-frames' */
+        case 'X':
+            if (xf++) {
+                fprintf(stderr, "%s: duplicated option `--no-extended-frames'\n", basename(argv[0]));
+                return 1;
+            }
+            opMode.nxtd = 1;
+            break;
+        /* option `--no-remote-frames' */
+        case 'R':
+            if (rf++) {
+                fprintf(stderr, "%s: duplicated option `--no-remote-frames'\n", basename(argv[0]));
+                return 1;
+            }
+            opMode.nrtr = 1;
+            break;
+        /* option `--receive' (-r) */
+        case 'r':
+            if (m++) {
+                fprintf(stderr, "%s: duplicated option `--receive' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            mode = RxMODE;
+            break;
+        /* option `--number=<offset>' (-n) */
+        case 'n':
+            if (n++) {
+                fprintf(stderr, "%s: duplicated option `--number' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (sscanf(optarg, "%li", &number) != 1) {
+                fprintf(stderr, "%s: illegal argument for option `--number' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (number < 0) {
+                fprintf(stderr, "%s: illegal argument for option `--number' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+        /* option `--stop' (-s) */
+        case 's':
+            if (stop_on_error) {
+                fprintf(stderr, "%s: duplicated option `--stop' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            stop_on_error = 1;
+            break;
+        /* option `--transmit=<duration>' (-t) in [s] */
+        case 't':
+            if (m++) {
+                fprintf(stderr, "%s: duplicated option `--transmit' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (sscanf(optarg, "%li", &txtime) != 1) {
+                fprintf(stderr, "%s: illegal argument for option `--transmit' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (txtime < 0) {
+                fprintf(stderr, "%s: illegal argument for option `--transmit' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            mode = TxMODE;
+            break;
+        /* option `--frames=<frames>' (-f) */
+        case 'f':
+            if (m++) {
+                fprintf(stderr, "%s: duplicated option `--frames' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (sscanf(optarg, "%li", &txframes) != 1) {
+                fprintf(stderr, "%s: illegal argument for option `--frames' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (txframes < 0) {
+                fprintf(stderr, "%s: illegal argument for option `--frames' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            mode = TxFRAMES;
+            break;
+        /* option `--random=<frames>' */
+        case 'F':
+            if (m++) {
+                fprintf(stderr, "%s: duplicated option `--random'\n", basename(argv[0]));
+                return 1;
+            }
+            if (sscanf(optarg, "%li", &txframes) != 1) {
+                fprintf(stderr, "%s: illegal argument for option `--random'\n", basename(argv[0]));
+                return 1;
+            }
+            if (txframes < 0) {
+                fprintf(stderr, "%s: illegal argument for option `--random' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (!d) /* let the tester generate messages of arbitrary length */
+                can_dlc = 0;
+            mode = TxRANDOM;
+            break;
+        /* option `--cycle=<msec>' (-c) */
+        case 'c':
+            if (t++) {
+                fprintf(stderr, "%s: duplicated option `--cycle' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (sscanf(optarg, "%li", &delay) != 1) {
+                fprintf(stderr, "%s: illegal argument for option `--cycle' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if ((delay < 0) || (delay > (LONG_MAX / 1000l))) {
+                fprintf(stderr, "%s: illegal argument for option `--cycle' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            delay *= 1000l;
+            break;
+        /* option `--usec=<usec>' (-u) */
+        case 'u':
+            if (t++) {
+                fprintf(stderr, "%s: duplicated option `--usec' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (sscanf(optarg, "%li", &delay) != 1) {
+                fprintf(stderr, "%s: illegal argument for option `--usec' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (delay < 0) {
+                fprintf(stderr, "%s: illegal argument for option `--usec' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+        /* option `--dlc=<length>' (-d) */
+        case 'd':
+            if (d++) {
+                fprintf(stderr, "%s: duplicated option `--dlc' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (sscanf(optarg, "%li", &can_dlc) != 1) {
+                fprintf(stderr, "%s: illegal argument for option `--dlc' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+#if (CAN_FD_SUPPORTED != 0)
+            if ((can_dlc < 0) || (CANFD_MAX_LEN < can_dlc)) {
+#else
+            if ((can_dlc < 0) || (CAN_MAX_LEN < can_dlc)) {
+#endif
+                fprintf(stderr, "%s: illegal argument for option `--dlc' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+        /* option `--id=<identifier>' (-i) */
+        case 'i':
+            if (c++) {
+                fprintf(stderr, "%s: duplicated option `--id' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if (sscanf(optarg, "%li", &can_id) != 1) {
+                fprintf(stderr, "%s: illegal argument for option `--id' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            if ((can_id < 0x000) || (0x1FFFFFFF < can_id)) { // TODO: to be checked with --mode=NXTD
+                fprintf(stderr, "%s: illegal argument for option `--id' (%c)\n", basename(argv[0]), opt);
+                return 1;
+            }
+            break;
+        /* option `--list-bitrates[=(2.0|FDF[+BRS])]' */
+        case 'l':
+            if (optarg != NULL) {
+                if (!strcasecmp(optarg, "default") || !strcasecmp(optarg, "classic") || !strcasecmp(optarg, "classical") ||
+                    !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "2.0"))
+                    brMode.byte |= CANMODE_DEFAULT;
+#if (CAN_FD_SUPPORTED != 0)
+                else if (!strcasecmp(optarg, "CANFD") || !strcasecmp(optarg, "FD") || !strcasecmp(optarg, "FDF"))
+                    brMode.byte |= CANMODE_FDOE;
+                else if (!strcasecmp(optarg, "CANFD+BRS") || !strcasecmp(optarg, "FD+BRS") || !strcasecmp(optarg, "FDF+BRS"))
+                    brMode.byte |= CANMODE_FDOE | CANMODE_BRSE;
+#endif
+                else {
+                    fprintf(stderr, "%s: illegal argument for option `--list-bitrates' (%c)\n", basename(argv[0]), opt);
+                    return 1;
+                }
+            } else {
+                brMode.byte = CANMODE_DEFAULT;
+            }
+            fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
+            /* list standard bit-rates */
+            (void)CCanDevice::ListCanBitrates(brMode);
+            return 0;
+        /* option `--list-boards[=<vendor>]' (-L) */
+        case 'a':  /* (-a, deprecated) */
+        case 'L':  
+            fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
+            /* list all supported interfaces */
+            num_boards = CCanDevice::ListCanDevices(/*optarg*/);
+            fprintf(stdout, "Number of supported CAN interfaces: %i\n", num_boards);
+            return (num_boards >= 0) ? 0 : 1;
+        /* option `--test-boards[=<vendor>]' (-T) */
+        case 'T':
+            fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
+            /* list all available interfaces */
+            num_boards = CCanDevice::TestCanDevices(opMode/*, optarg*/);
+            fprintf(stdout, "Number of present CAN interfaces: %i\n", num_boards);
+            return (num_boards >= 0) ? 0 : 1;
+        /* option `--help' (-h) */
+        case 'h':
+            usage(stdout, basename(argv[0]));
+            return 0;
+        case '?':
+            if (!opterr)
+                usage(stderr, basename(argv[0]));
+            return 1;
+        default:
+            if (show_version) {
+                version(stdout, basename(argv[0]));
+                return 0;
+            }
+            else {
+                usage(stderr, basename(argv[0]));
+                return 1;
+            }
+        }
+    }
+    /* - check if one and only one <interface> is given */
+    if (optind + 1 != argc) {
+        if (optind == argc)
+            fprintf(stderr, "%s: no interface given\n", basename(argv[0]));
+        else
+            fprintf(stderr, "%s: too many arguments given\n", basename(argv[0]));
+        return 1;
+    }
+#if (SERIAL_CAN_SUPPORTED == 0)
+    /* - search the <interface> by its name in the device list */
+    bool result = CCanDevice::GetFirstChannel(channel);
+    while (result) {
+        if (strcasecmp(argv[optind], channel.m_szDeviceName) == 0) {
+            break;
+        }
+        result = CCanDevice::GetNextChannel(channel);
+    }
+    if (!result) {
+        fprintf(stderr, "%s: illegal argument `%s'\n", basename(argv[0]), argv[optind]);
+        return 1;
+    }
+#else
+    /* - take serial device name from command line */
+    port = (char*)argv[optind];
+#endif
+#if (CAN_FD_SUPPORTED != 0)
+    /* - check bit-timing index (n/a for CAN FD) */
+    if (opMode.fdoe && (bitrate.btr.frequency <= 0)) {
+        fprintf(stderr, "%s: illegal combination of options `--mode' (m) and `--bitrate'\n", basename(argv[0]));
+        return 1;
+    }
+    /* - check data length and make CAN FD DLC (0x0..0xF) */
+    if (!opMode.fdoe && (can_dlc > CAN_MAX_LEN)) {
+        fprintf(stderr, "%s: illegal combination of options `--mode' (m) and `--dlc' (d)\n", basename(argv[0]));
+        return 1;
+    } else {
+        if (can_dlc > 48) can_dlc = 0xF;
+        else if (can_dlc > 32) can_dlc = 0xE;
+        else if (can_dlc > 24) can_dlc = 0xD;
+        else if (can_dlc > 20) can_dlc = 0xC;
+        else if (can_dlc > 16) can_dlc = 0xB;
+        else if (can_dlc > 12) can_dlc = 0xA;
+        else if (can_dlc > 8) can_dlc = 0x9;
+    }
+#endif
+    /* - check operation mode flags */
+    if ((mode != RxMODE) && opMode.mon) {
+        fprintf(stderr, "%s: illegal option `--listen-only' for transmitter test\n", basename(argv[0]));
+        return 1;
+    }
+    if ((mode != RxMODE) && opMode.err) {
+        fprintf(stderr, "%s: illegal option `--error-frames' for transmitter test\n", basename(argv[0]));
+        return 1;
+    }
+    if ((mode != RxMODE) && opMode.nxtd) {
+        fprintf(stderr, "%s: illegal option `--no-extended-frames' for transmitter test\n", basename(argv[0]));
+        return 1;
+    }
+    if ((mode != RxMODE) && opMode.nrtr) {
+        fprintf(stderr, "%s: illegal option `--no-remote-frames' for transmitter test\n", basename(argv[0]));
+        return 1;
+    }
+    /* CAN Tester for generic CAN interfaces */
+    fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
+    /* - show operation mode and bit-rate settings */
+    if (verbose) {
+        fprintf(stdout, "Op.-mode=%s", (opMode.byte & CANMODE_FDOE) ? "CANFD" : "CAN2.0");
+        if ((opMode.byte & CANMODE_BRSE)) fprintf(stdout, "+BRS");
+        if ((opMode.byte & CANMODE_NISO)) fprintf(stdout, "+NISO");
+        if ((opMode.byte & CANMODE_SHRD)) fprintf(stdout, "+SHRD");
+        if ((opMode.byte & CANMODE_NXTD)) fprintf(stdout, "+NXTD");
+        if ((opMode.byte & CANMODE_NRTR)) fprintf(stdout, "+NRTR");
+        if ((opMode.byte & CANMODE_ERR)) fprintf(stdout, "+ERR");
+        if ((opMode.byte & CANMODE_MON)) fprintf(stdout, "+MON");
+        fprintf(stdout, " (op_mode=%02Xh)\n", opMode.byte);
+        if (bitrate.btr.frequency > 0) {
+            fprintf(stdout, "Bit-rate=%.0fkbps@%.1f%%", speed.nominal.speed / 1000., speed.nominal.samplepoint * 100.);
+#if (CAN_FD_SUPPORTED != 0)
+            if (opMode.byte & CANMODE_BRSE)
+                fprintf(stdout, ":%.0fkbps@%.1f%%", speed.data.speed / 1000., speed.data.samplepoint * 100.);
+#endif
+            (void)CCanDevice::MapBitrate2String(bitrate, property, CANPROP_MAX_BUFFER_SIZE,
+                                                (opMode.byte & CANMODE_BRSE), hasNoSamp);
+            fprintf(stdout, " (%s)\n\n", property);
+        }
+        else {
+            fprintf(stdout, "Baudrate=%.0fkbps@%.1f%% (index %i)\n\n",
+                             speed.nominal.speed / 1000.,
+                             speed.nominal.samplepoint * 100., -bitrate.index);
+        }
+    }
+    /* - initialize interface */
+#if (SERIAL_CAN_SUPPORTED == 0)
+    fprintf(stdout, "Hardware=%s...", channel.m_szDeviceName);
+    fflush (stdout);
+    retVal = canDevice.InitializeChannel(channel.m_nChannelNo, opMode);
+#else
+    fprintf(stdout, "Hardware=%s...", port);
+    fflush (stdout);
+    retVal = canDevice.InitializeChannel(port, opMode);
+#endif
+    if (retVal != CCanApi::NoError) {
+        fprintf(stdout, "FAILED!\n");
+        fprintf(stderr, "+++ error: CAN Controller could not be initialized (%i)", retVal);
+        if (retVal == CCanApi::NotSupported)
+            fprintf(stderr, "\n           - possibly CAN operating mode %02Xh not supported", opMode.byte);
+        fputc('\n', stderr);
+        goto finalize;
+    }
+    fprintf(stdout, "OK!\n");
+    /* - start communication */
+    if (bitrate.btr.frequency > 0) {
+        fprintf(stdout, "Bit-rate=%.0fkbps", speed.nominal.speed / 1000.);
+#if (CAN_FD_SUPPORTED != 0)
+        if (opMode.byte & CANMODE_BRSE)
+            fprintf(stdout, ":%.0fkbps", speed.data.speed / 1000.);
+        else if (opMode.byte & CANMODE_FDOE)
+            fprintf(stdout, ":%.0fkbps", speed.nominal.speed / 1000.);
+#endif
+        fprintf(stdout, "...");
+    }
+    else {
+        fprintf(stdout, "Baudrate=%skbps...",
+            bitrate.index == CANBTR_INDEX_1M   ? "1000" :
+            bitrate.index == CANBTR_INDEX_800K ? "800" :
+            bitrate.index == CANBTR_INDEX_500K ? "500" :
+            bitrate.index == CANBTR_INDEX_250K ? "250" :
+            bitrate.index == CANBTR_INDEX_125K ? "125" :
+            bitrate.index == CANBTR_INDEX_100K ? "100" :
+            bitrate.index == CANBTR_INDEX_50K  ? "50" :
+            bitrate.index == CANBTR_INDEX_20K  ? "20" :
+            bitrate.index == CANBTR_INDEX_10K  ? "10" : "?");
+    }
+    fflush(stdout);
+    retVal = canDevice.StartController(bitrate);
+    if (retVal != CCanApi::NoError) {
+        fprintf(stdout, "FAILED!\n");
+        fprintf(stderr, "+++ error: CAN Controller could not be started (%i)\n", retVal);
+        goto teardown;
+    }
+    fprintf(stdout, "OK!\n");
+    /* - do your job well: */
+    switch (mode) {
+    case TxMODE:    /* transmitter test (duration) */
+        (void)canDevice.TransmitterTest((time_t)txtime, opMode, (uint32_t)can_id, (uint8_t)can_dlc, (uint64_t)delay, (uint64_t)number);
+        break;
+    case TxFRAMES:  /* transmitter test (frames) */
+        (void)canDevice.TransmitterTest((uint64_t)txframes, opMode, false, (uint32_t)can_id, (uint8_t)can_dlc, (uint64_t)delay, (uint64_t)number);
+        break;
+    case TxRANDOM:  /* transmitter test (random) */
+        (void)canDevice.TransmitterTest((uint64_t)txframes, opMode, true, (uint32_t)can_id, (uint8_t)can_dlc, (uint64_t)delay, (uint64_t)number);
+        break;
+    default:        /* receiver test (abort with Ctrl+C) */
+        (void)canDevice.ReceiverTest((bool)n, (uint64_t)number, (bool)stop_on_error);
+        break;
+    }
+    /* - show interface information */
+    if ((device = canDevice.GetHardwareVersion()) != NULL)
+        fprintf(stdout, "Hardware: %s\n", device);
+    if ((firmware = canDevice.GetFirmwareVersion()) != NULL)
+        fprintf(stdout, "Firmware: %s\n", firmware);
+    if ((software = CCanDevice::GetVersion()) != NULL)
+        fprintf(stdout, "Software: %s\n", software);
+teardown:
+    /* - teardown the interface*/
+    retVal = canDevice.TeardownChannel();
+    if (retVal != CCanApi::NoError) {
+        fprintf(stderr, "+++ error: CAN Controller could not be reset (%i)\n", retVal);
+        goto finalize;
+    }
+finalize:
+    /* So long and farewell! */
+    fprintf(stdout, "%s\n", COPYRIGHT);
+    return retVal;
+}
+
+int CCanDevice::ListCanDevices(void) {
+    CCanDevice::SChannelInfo info;
+    int n = 0;
+
+    fprintf(stdout, "Suppored hardware:\n");
+    bool result = CCanDevice::GetFirstChannel(info);
+    while (result) {
+        fprintf(stdout, "\"%s\" (VendorName=\"%s\", LibraryId=%" PRIi32 ", ChannelNo=%" PRIi32 ")\n",
+                         info.m_szDeviceName, info.m_szVendorName, info.m_nLibraryId, info.m_nChannelNo);
+        n++;
+        result = CCanDevice::GetNextChannel(info);
+    }
+#if (SERIAL_CAN_SUPPORTED != 0)
+    if (n == 0) {
+        fprintf(stdout, "Check the Device Manager for compatible serial communication devices!\n");
+    }
+#endif
+    return n;
+}
+
+int CCanDevice::TestCanDevices(CANAPI_OpMode_t opMode) {
+    CCanDevice::SChannelInfo info;
+    int n = 0;
+
+    bool result = CCanDevice::GetFirstChannel(info);
+    while (result) {
+        fprintf(stdout, "Hardware=%s...", info.m_szDeviceName);
+        fflush(stdout);
+        EChannelState state;
+        CANAPI_Return_t retVal = CCanDevice::ProbeChannel(info.m_nChannelNo, opMode, state);
+        if ((retVal == CCanApi::NoError) || (retVal == CCanApi::IllegalParameter)) {
+            CTimer::Delay(333U * CTimer::MSEC);  // to fake probing a hardware
+            switch (state) {
+                case CCanApi::ChannelOccupied: fprintf(stdout, "occupied\n"); n++; break;
+                case CCanApi::ChannelAvailable: fprintf(stdout, "available\n"); n++; break;
+                case CCanApi::ChannelNotAvailable: fprintf(stdout, "not available\n"); break;
+                default: fprintf(stdout, "not testable\n"); break;
+            }
+            if (retVal == CCanApi::IllegalParameter)
+                fprintf(stderr, "+++ warning: CAN operation mode not supported (%02xh)\n", opMode.byte);
+        } else
+            fprintf(stdout, "FAILED!\n");
+        result = CCanDevice::GetNextChannel(info);
+    }
+#if (SERIAL_CAN_SUPPORTED != 0)
+    if (n == 0) {
+        fprintf(stdout, "Check the Device Manager for compatible serial communication devices!\n");
+    }
+#endif
+    return n;
+}
+
+int CCanDevice::ListCanBitrates(CANAPI_OpMode_t opMode) {
+    CANAPI_Bitrate_t bitrate[9];
+    CANAPI_BusSpeed_t speed;
+    CANAPI_Return_t retVal;
+
+    char string[CANPROP_MAX_BUFFER_SIZE] = "";
+    bool hasDataPhase = false;
+    bool hasNoSamp = true;
+    int i, n = 0;
+
+#if (CAN_FD_SUPPORTED != 0)
+    if (opMode.fdoe) {
+        if (opMode.brse) {
+            fprintf(stdout, "CAN FD with Bit-rate Switching (BRS):\n");
+            BITRATE_FD_1M8M(bitrate[n]); n += 1;
+            BITRATE_FD_500K4M(bitrate[n]); n += 1;
+            BITRATE_FD_250K2M(bitrate[n]); n += 1;
+            BITRATE_FD_125K1M(bitrate[n]); n += 1;
+            hasDataPhase = true;
+            hasNoSamp = false;
+        }
+        else {
+            fprintf(stdout, "CAN FD without Bit-rate Switching (BRS):\n");
+            BITRATE_FD_1M(bitrate[n]); n += 1;
+            BITRATE_FD_500K(bitrate[n]); n += 1;
+            BITRATE_FD_250K(bitrate[n]); n += 1;
+            BITRATE_FD_125K(bitrate[n]); n += 1;
+            hasDataPhase = false;
+            hasNoSamp = false;
+        }
+    }
+    else {
+#else
+    {
+#endif
+        fprintf(stdout, "Classical CAN:\n");
+        BITRATE_1M(bitrate[n]); n += 1;
+#if (BITRATE_800K_UNSUPPORTED == 0)
+        BITRATE_800K(bitrate[n]); n += 1;
+#endif
+        BITRATE_500K(bitrate[n]); n += 1;
+        BITRATE_250K(bitrate[n]); n += 1;
+        BITRATE_125K(bitrate[n]); n += 1;
+        BITRATE_100K(bitrate[n]); n += 1;
+        BITRATE_50K(bitrate[n]); n += 1;
+        BITRATE_20K(bitrate[n]); n += 1;
+        BITRATE_10K(bitrate[n]); n += 1;
+        hasDataPhase = false;
+        hasNoSamp = true;
+    }
+    for (i = 0; i < n; i++) {
+        if ((retVal = CCanDevice::MapBitrate2Speed(bitrate[i], speed)) == CCanApi::NoError) {
+            fprintf(stdout, "  %4.0fkbps@%.1f%%", speed.nominal.speed / 1000., speed.nominal.samplepoint * 100.);
+#if (CAN_FD_SUPPORTED != 0)
+            if (opMode.brse)
+                fprintf(stdout, ":%4.0fkbps@%.1f%%", speed.data.speed / 1000., speed.data.samplepoint * 100.);
+#else
+            (void)opMode;  // to avoid compiler warnings
+#endif
+        }
+        strcpy(string, "=oops, something went wrong!");
+        (void)CCanDevice::MapBitrate2String(bitrate[i], string, CANPROP_MAX_BUFFER_SIZE, hasDataPhase, hasNoSamp);
+        fprintf(stdout, "=\"%s\"\n", string);
+    }
+    return n;
+}
+
+uint64_t CCanDevice::TransmitterTest(time_t duration, CANAPI_OpMode_t opMode, uint32_t id, uint8_t dlc, uint64_t delay, uint64_t offset) {
+    CANAPI_Message_t message;
+    CANAPI_Return_t retVal;
+
+    time_t start = time(NULL);
+    uint64_t frames = 0;
+    uint64_t errors = 0;
+    uint64_t calls = 0;
+
+    memset(&message, 0, sizeof(CANAPI_Message_t));
+
+    fprintf(stderr, "\nPress ^C to abort.\n");
+    message.id  = id;
+    message.xtd = 0;
+    message.rtr = 0;
+#if (CAN_FD_SUPPORTED != 0)
+    message.fdf = opMode.fdoe;
+    message.brs = opMode.brse;
+#else
+    (void) opMode;
+#endif
+    message.dlc = dlc;
+    fprintf(stdout, "\nTransmitting message(s)...");
+    fflush (stdout);
+    while (time(NULL) < (start + duration)) {
+        message.data[0] = (uint8_t)((frames + offset) >> 0);
+        message.data[1] = (uint8_t)((frames + offset) >> 8);
+        message.data[2] = (uint8_t)((frames + offset) >> 16);
+        message.data[3] = (uint8_t)((frames + offset) >> 24);
+        message.data[4] = (uint8_t)((frames + offset) >> 32);
+        message.data[5] = (uint8_t)((frames + offset) >> 40);
+        message.data[6] = (uint8_t)((frames + offset) >> 48);
+        message.data[7] = (uint8_t)((frames + offset) >> 56);
+#if (CAN_FD_SUPPORTED != 0)
+        memset(&message.data[8], 0, CANFD_MAX_LEN - 8);
+#endif
+        /* transmit message (repeat when busy) */
+retry_tx_test:
+        calls++;
+        retVal = WriteMessage(message);
+        if (retVal == CCanApi::NoError)
+            fprintf(stderr, "%s", prompt[(frames++ % 4)]);
+        else if ((retVal == CCanApi::TransmitterBusy) && running)
+            goto retry_tx_test;
+        else
+            errors++;
+        /* pause between two messages, as you please */
+        CTimer::Delay(delay * CTimer::USEC);
+        if (!running) {
+            fprintf(stderr, "\b");
+            fprintf(stdout, "STOP!\n\n");
+            fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
+            fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
+            fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
+            fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
+            return frames;
+        }
+    }
+    fprintf(stderr, "\b");
+    fprintf(stdout, "OK!\n\n");
+    fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
+    fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
+    fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
+    fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
+
+    CTimer::Delay(1U * CTimer::SEC);  /* afterburner */
+    return frames;
+}
+
+uint64_t CCanDevice::TransmitterTest(uint64_t count, CANAPI_OpMode_t opMode, bool random, uint32_t id, uint8_t dlc, uint64_t delay, uint64_t offset) {
+    CANAPI_Message_t message;
+    CANAPI_Return_t retVal;
+
+    time_t start = time(NULL);
+    uint64_t frames = 0;
+    uint64_t errors = 0;
+    uint64_t calls = 0;
+
+    srand((unsigned int)time(NULL));
+    memset(&message, 0, sizeof(CANAPI_Message_t));
+
+    fprintf(stderr, "\nPress ^C to abort.\n");
+    message.id  = id;
+    message.xtd = 0;
+    message.rtr = 0;
+#if (CAN_FD_SUPPORTED != 0)
+    message.fdf = opMode.fdoe;
+    message.brs = opMode.brse;
+#else
+    (void) opMode;
+#endif
+    message.dlc = dlc;
+    fprintf(stdout, "\nTransmitting message(s)...");
+    fflush (stdout);
+    while (frames < count) {
+        message.data[0] = (uint8_t)((frames + offset) >> 0);
+        message.data[1] = (uint8_t)((frames + offset) >> 8);
+        message.data[2] = (uint8_t)((frames + offset) >> 16);
+        message.data[3] = (uint8_t)((frames + offset) >> 24);
+        message.data[4] = (uint8_t)((frames + offset) >> 32);
+        message.data[5] = (uint8_t)((frames + offset) >> 40);
+        message.data[6] = (uint8_t)((frames + offset) >> 48);
+        message.data[7] = (uint8_t)((frames + offset) >> 56);
+#if (CAN_FD_SUPPORTED != 0)
+        memset(&message.data[8], 0, CANFD_MAX_LEN - 8);
+        if (random)
+            message.dlc = dlc + (uint8_t)(rand() % ((CANFD_MAX_DLC - dlc) + 1));
+#else
+        if (random)
+            message.dlc = dlc + (uint8_t)(rand() % ((CAN_MAX_DLC - dlc) + 1));
+#endif
+        /* transmit message (repeat when busy) */
+retry_tx_test:
+        calls++;
+        retVal = WriteMessage(message);
+        if (retVal == CCanApi::NoError)
+            fprintf(stderr, "%s", prompt[(frames++ % 4)]);
+        else if ((retVal == CCanApi::TransmitterBusy) && running)
+            goto retry_tx_test;
+        else
+            errors++;
+        /* pause between two messages, as you please */
+        if (random)
+            CTimer::Delay(CTimer::USEC * (delay + (uint64_t)(rand() % 54945)));
+        else
+            CTimer::Delay(CTimer::USEC * delay);
+        if (!running) {
+            fprintf(stderr, "\b");
+            fprintf(stdout, "STOP!\n\n");
+            fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
+            fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
+            fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
+            fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
+            return frames;
+        }
+    }
+    fprintf(stderr, "\b");
+    fprintf(stdout, "OK!\n\n");
+    fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
+    fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
+    fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
+    fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
+
+    CTimer::Delay(1U * CTimer::SEC);  /* afterburner */
+    return frames;}
+
+uint64_t CCanDevice::ReceiverTest(bool checkCounter, uint64_t expectedNumber, bool stopOnError) {
+    CANAPI_Message_t message;
+    CANAPI_Status_t status;
+    CANAPI_Return_t retVal;
+
+    time_t start = time(NULL);
+    uint64_t frames = 0U;
+    uint64_t errors = 0U;
+    uint64_t calls = 0U;
+    uint64_t data;
+
+    fprintf(stderr, "\nPress ^C to abort.\n");
+    fprintf(stdout, "\nReceiving message(s)...");
+    fflush (stdout);
+    for (;;) {
+        retVal = ReadMessage(message);
+        if (retVal == CCanApi::NoError) {
+            fprintf(stderr, "%s", prompt[(frames++ % 4)]);
+            // checking PCBUSB issue #198 (aka. MACCAN-2)
+            if (checkCounter) {
+                data = 0;
+                if (message.dlc > 0)
+                    data |= (uint64_t)message.data[0] << 0;
+                if (message.dlc > 1)
+                    data |= (uint64_t)message.data[1] << 8;
+                if (message.dlc > 2)
+                    data |= (uint64_t)message.data[2] << 16;
+                if (message.dlc > 3)
+                    data |= (uint64_t)message.data[3] << 24;
+                if (message.dlc > 4)
+                    data |= (uint64_t)message.data[4] << 32;
+                if (message.dlc > 5)
+                    data |= (uint64_t)message.data[5] << 40;
+                if (message.dlc > 6)
+                    data |= (uint64_t)message.data[6] << 48;
+                if (message.dlc > 7)
+                    data |= (uint64_t)message.data[7] << 56;
+                if (data != expectedNumber) {
+                    fprintf(stderr, "\b");
+                    fprintf(stdout, "ISSUE#198!\n");
+                    fprintf(stderr, "+++ data inconsistent: %" PRIu64 " received / %" PRIu64 " expected\n", data, expectedNumber);
+                    retVal = GetStatus(status);
+                    if ((retVal == CCanApi::NoError) && ((status.byte & ~CANSTAT_RESET) != 0x00U)) {
+                        fprintf(stderr, "    status register:%s%s%s%s%s%s (%02X)\n",
+                            (status.bus_off) ? " BO" : "",
+                            (status.warning_level) ? " WL" : "",
+                            (status.bus_error) ? " BE" : "",
+                            (status.transmitter_busy) ? " TP" : "",
+                            (status.message_lost) ? " ML" : "",
+                            (status.queue_overrun) ? " QUE" : "", status.byte);
+                    }
+                    if (stopOnError) {
+                        fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
+                        fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
+                        fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
+                        fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
+                        return frames;
+                    }
+                    else {
+                        fprintf(stderr, "Receiving message(s)... ");
+                        expectedNumber = data;
+                    }
+                }
+                expectedNumber++;  // depending on DLC received data may wrap around while number is counting up!
+            }
+        } else if (retVal != CCanApi::ReceiverEmpty)
+            errors++;
+        calls++;
+        if (!running) {
+            fprintf(stderr, "\b");
+            fprintf(stdout, "OK!\n\n");
+            fprintf(stdout, "Message(s)=%" PRIu64 "\n", frames);
+            fprintf(stdout, "Error(s)=%" PRIu64 "\n", errors);
+            fprintf(stdout, "Call(s)=%" PRIu64 "\n", calls);
+            fprintf(stdout, "Time=%lisec\n\n", time(NULL) - start);
+            return frames;
+        }
+    }
+}
+
+/** @brief       signal handler to catch Ctrl+C.
+ *
+ *  @param[in]   signo - signal number (SIGINT, SIGHUP, SIGTERM)
+ */
+static void sigterm(int signo)
+{
+    //fprintf(stderr, "%s: got signal %d\n", __FILE__, signo);
+    (void)canDevice.SignalChannel();
+    running = 0;
+    (void)signo;
+}
+
+/** @brief       shows a help screen with all command-line options.
+ *
+ *  @param[in]   stream  - output stream (e.g. stdout)
+ *  @param[in]   program - base name of the program
+ */
+static void usage(FILE *stream, const char *program)
+{
+    fprintf(stream, "Usage: %s <interface> [<option>...]\n", program);
+    fprintf(stream, "Options for receiver test (default test mode):\n");
+    fprintf(stream, " -r, --receive                        count received messages until ^C is pressed\n");
+    fprintf(stream, " -n, --number=<number>                check up-counting numbers starting with <number>\n");
+    fprintf(stream, " -s, --stop                           stop on error (with option --number)\n");
+#if (CAN_FD_SUPPORTED != 0)
+    fprintf(stream, " -m, --mode=(2.0|FDF[+BRS])           CAN operation mode: CAN 2.0 or CAN FD mode\n");
+#else
+    fprintf(stream, " -m, --mode=2.0                       CAN operation mode: CAN 2.0\n");
+#endif
+    fprintf(stream, "     --shared                         shared CAN controller access (if supported)\n");
+    fprintf(stream, "     --listen-only                    monitor mode (listen-only, transmitter is off)\n");
+    fprintf(stream, "     --error-frames                   allow reception of error frames\n");
+    fprintf(stream, "     --no-remote-frames               suppress remote frames (RTR frames)\n");
+    fprintf(stream, "     --no-extended-frames             suppress extended frames (29-bit identifier)\n");
+    fprintf(stream, " -b, --baudrate=<baudrate>            CAN bit-timing in kbps (default=250), or\n");
+    fprintf(stream, "     --bitrate=<bit-rate>             CAN bit-rate settings (as a string)\n");
+    fprintf(stream, " -v, --verbose                        show detailed bit-rate settings\n");
+    fprintf(stream, "Options for transmitter test:\n");
+    fprintf(stream, " -t, --transmit=<time>                send messages for the given time in seconds, or\n");
+    fprintf(stream, " -f, --frames=<number>,               alternatively send the given number of messages, or\n");
+    fprintf(stream, "     --random=<number>                optionally with random cycle time and data length\n");
+    fprintf(stream, " -c, --cycle=<cycle>                  cycle time in milliseconds (default=0) or\n");
+    fprintf(stream, " -u, --usec=<cycle>                   cycle time in microseconds (default=0)\n");
+    fprintf(stream, " -d, --dlc=<length>                   send messages of given length (default=8)\n");
+    fprintf(stream, " -i, --id=<can-id>                    use given identifier (default=100h)\n");
+    fprintf(stream, " -n, --number=<number>                set first up-counting number (default=0)\n");
+#if (CAN_FD_SUPPORTED != 0)
+    fprintf(stream, " -m, --mode=(2.0|FDF[+BRS])           CAN operation mode: CAN 2.0 or CAN FD mode\n");
+#else
+    fprintf(stream, " -m, --mode=2.0                       CAN operation mode: CAN 2.0\n");
+#endif
+    fprintf(stream, "     --shared                         shared CAN controller access (if supported)\n");
+    fprintf(stream, " -b, --baudrate=<baudrate>            CAN bit-timing in kbps (default=250), or\n");
+    fprintf(stream, "     --bitrate=<bit-rate>             CAN bit-rate settings (as a string)\n");
+    fprintf(stream, " -v, --verbose                        show detailed bit-rate settings\n");
+    fprintf(stream, "Other options:\n");
+#if (CAN_FD_SUPPORTED != 0)
+    fprintf(stream, "     --list-bitrates[=<mode>]         list standard bit-rate settings\n");
+#else
+    fprintf(stream, "     --list-bitrates[=2.0]            list standard bit-rate settings\n");
+#endif
+#if (OPTION_CANAPI_LIBRARY != 0)
+    fprintf(stream, " -L, --list-boards[=<vendor>]         list all supported CAN interfaces and exit\n");
+    fprintf(stream, " -T, --test-boards[=<vendor>]         list all available CAN interfaces and exit\n");
+#elif (SERIAL_CAN_SUPPORTED == 0)
+    fprintf(stream, " -L, --list-boards                    list all supported CAN interfaces and exit\n");
+    fprintf(stream, " -T, --test-boards                    list all available CAN interfaces and exit\n");
+#endif
+    fprintf(stream, " -h, --help                           display this help screen and exit\n");
+    fprintf(stream, "     --version                        show version information and exit\n");
+#if (0)
+    fprintf(stream, "Arguments:\n");
+    fprintf(stream, "  <frames>       send this number of messages (frames), or\n");
+    fprintf(stream, "  <time>         send messages for the given time in seconds\n");
+    fprintf(stream, "  <msec>         cycle time in milliseconds (default=0), or \n");
+    fprintf(stream, "  <usec>         cycle time in microseconds (default=0)\n");
+    fprintf(stream, "  <can-id>       send with given identifier (default=100h)\n");
+    fprintf(stream, "  <length>       send data of given length (default=8)\n");
+    fprintf(stream, "  <number>       set first up-counting number (default=0)\n");
+    fprintf(stream, "  <interface>    CAN interface board (list all with /LIST)\n");
+    fprintf(stream, "  <baudrate>     CAN baud rate index (default=3):\n");
+    fprintf(stream, "                 0 = 1000 kbps\n");
+    fprintf(stream, "                 1 = 800 kbps\n");
+    fprintf(stream, "                 2 = 500 kbps\n");
+    fprintf(stream, "                 3 = 250 kbps\n");
+    fprintf(stream, "                 4 = 125 kbps\n");
+    fprintf(stream, "                 5 = 100 kbps\n");
+    fprintf(stream, "                 6 = 50 kbps\n");
+    fprintf(stream, "                 7 = 20 kbps\n");
+    fprintf(stream, "                 8 = 10 kbps\n");
+    fprintf(stream, "  <bitrate>      comma-separated <key>=<value>-list:\n");
+    fprintf(stream, "                 f_clock=<value>      frequency in Hz or\n");
+    fprintf(stream, "                 f_clock_mhz=<value>  frequency in MHz\n");
+    fprintf(stream, "                 nom_brp=<value>      bit-rate prescaler (nominal)\n");
+    fprintf(stream, "                 nom_tseg1=<value>    time segment 1 (nominal)\n");
+    fprintf(stream, "                 nom_tseg2=<value>    time segment 2 (nominal)\n");
+    fprintf(stream, "                 nom_sjw=<value>      sync. jump width (nominal)\n");
+    fprintf(stream, "                 nom_sam=<value>      sampling (only SJA1000)\n");
+    fprintf(stream, "                 data_brp=<value>     bit-rate prescaler (FD data)\n");
+    fprintf(stream, "                 data_tseg1=<value>   time segment 1 (FD data)\n");
+    fprintf(stream, "                 data_tseg2=<value>   time segment 2 (FD data)\n");
+    fprintf(stream, "                 data_sjw=<value>     sync. jump width (FD data).\n");
+#endif
+    fprintf(stream, "Hazard note:\n");
+    fprintf(stream, "  If you connect your CAN device to a real CAN network when using this program,\n");
+    fprintf(stream, "  you might damage your application.\n");
+}
+
+/** @brief       shows version information of the program.
+ *
+ *  @param[in]   stream  - output stream (e.g. stdout)
+ *  @param[in]   program - base name of the program
+ */
+static void version(FILE *stream, const char *program)
+{
+    fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, LICENSE);
+    (void)program;
+    fprintf(stream, "Written by Uwe Vogt, UV Software, Berlin <https://www.mac-can.net/>\n");
+}

From 86328683af7c364904c85f3bc6f26920900974a6 Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Thu, 25 Apr 2024 19:53:42 +0200
Subject: [PATCH 07/13] Update Python wrapper and examples

Relates to [MACCAN-191]
---
 Examples/Python/CANAPI.py   | 83 +++++++++++++++++++++++++++++++++----
 Examples/Python/can_recv.py |  6 +++
 Examples/Python/can_send.py |  6 +++
 3 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/Examples/Python/CANAPI.py b/Examples/Python/CANAPI.py
index 4ca5307..5b19731 100644
--- a/Examples/Python/CANAPI.py
+++ b/Examples/Python/CANAPI.py
@@ -2,7 +2,7 @@
 #
 #   CAN Interface API, Version 3 (Python Wrapper)
 #
-#   Copyright (c) 2005-2023 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
+#   Copyright (c) 2005-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 #	All rights reserved.
 #
 #   This file is part of CAN API V3.
@@ -43,7 +43,7 @@
 #	GNU General Public License for more details.
 #
 #	You should have received a copy of the GNU General Public License
-#	along with CAN API V3.  If not, see <http://www.gnu.org/licenses/>.
+#	along with CAN API V3.  If not, see <https://www.gnu.org/licenses/>.
 #
 """
     CAN API V3 Python Wrapper for generic CAN Interfaces.
@@ -54,7 +54,7 @@
 
     $Author: makemake $
 
-    $Rev: 1198 $
+    $Rev: 1274 $
 """
 from ctypes import *
 import platform
@@ -69,7 +69,7 @@
 
 # CAN API V3 - Python Wrapper
 #
-CAN_API_V3_PYTHON = {'major': 0, 'minor': 2, 'patch': 0}
+CAN_API_V3_PYTHON = {'major': 0, 'minor': 2, 'patch': 2}
 
 # CAN Identifier Ranges
 #
@@ -210,8 +210,9 @@
 
 # Control of blocking read
 #
-CANREAD_INFINITE = c_uint16(65535)  # infinite time-out (blocking read)
-
+CANWAIT_INFINITE = 65535  # infinite time-out (blocking operation)
+CANREAD_INFINITE = CANWAIT_INFINITE
+CANWRITE_INFINITE = CANWAIT_INFINITE
 
 # CAN Status-register
 #
@@ -637,6 +638,69 @@ def bitrate(self):
             print('+++ exception: {}'.format(e))
             raise
 
+    def hardware(self):
+        """
+          retrieves the hardware version of the CAN controller
+          board as a zero-terminated string.
+
+          note: API function 'can_hardware' is marked as deprecated.
+
+          :return: version
+            version: version information as string
+        """
+        try:
+            self.__m_library.can_hardware.restype = c_char_p
+            version_c = self.__m_library.can_hardware(self.__m_handle)
+            if version_c is not None:
+                return version_c.decode('utf-8')
+            else:
+                raise Exception('+++ error: can_hardware returned None')
+        except Exception as e:
+            print('+++ exception: {}'.format(e))
+            raise
+
+    def firmware(self):
+        """
+          retrieves the firmware version of the CAN controller
+          board as a zero-terminated string.
+
+          note: API function 'can_firmware' is marked as deprecated.
+
+          :return: version
+            version: version information as string
+        """
+        try:
+            self.__m_library.can_firmware.restype = c_char_p
+            version_c = self.__m_library.can_firmware(self.__m_handle)
+            if version_c is not None:
+                return version_c.decode('utf-8')
+            else:
+                raise Exception('+++ error: can_firmware returned None')
+        except Exception as e:
+            print('+++ exception: {}'.format(e))
+            raise
+
+    def software(self):
+        """
+          retrieves version information of the CAN API V3 DLL
+          as a zero-terminated string.
+
+          note: API function 'can_version' is marked as deprecated.
+
+          :return: version
+            version: version information as string
+        """
+        try:
+            self.__m_library.can_version.restype = c_char_p
+            version_c = self.__m_library.can_version()
+            if version_c is not None:
+                return version_c.decode('utf-8')
+            else:
+                raise Exception('+++ error: can_version returned None')
+        except Exception as e:
+            print('+++ exception: {}'.format(e))
+            raise
+
     @staticmethod
     def version():
         """
@@ -703,6 +767,7 @@ def len2dlc(length):
     print(CANAPI.version())
     print('>>> can = CANAPI(' + lib + ')')
     can = CANAPI(lib)
+    print(can.software())
 
     # initialize the CAN interface
     print('>>> can.init({}, 0x{:02X})'.format(chn, opMode.byte))
@@ -753,6 +818,10 @@ def len2dlc(length):
     else:
         print('>>> can.status() >>> 0x{:02X}'.format(status.byte))
 
+    # print some version information
+    print('>>> can.hardware() >>> ' + can.hardware())
+    print('>>> can.firmware() >>> ' + can.firmware())
+
     # shutdown the CAN interface
     print('>>> can.exit()')
     res = can.exit()
@@ -762,5 +831,5 @@ def len2dlc(length):
     # have a great time
     print('Bye, bye!')
 
-# * $Id: CANAPI.py 1198 2023-09-13 08:43:19Z makemake $ *** (c) UV Software, Berlin ***
+# * $Id: CANAPI.py 1274 2024-04-21 17:34:21Z makemake $ *** (c) UV Software, Berlin ***
 #
diff --git a/Examples/Python/can_recv.py b/Examples/Python/can_recv.py
index 4a62884..3546512 100644
--- a/Examples/Python/can_recv.py
+++ b/Examples/Python/can_recv.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 from CANAPI import *
+import platform
 import argparse
 import signal
 import sys
@@ -55,6 +56,7 @@ def sigterm(signo, frame):
 print(CANAPI.version())
 print('>>> can = CANAPI(' + lib + ')')
 can = CANAPI(lib)
+print(can.software())
 
 # initialize the CAN interface
 print('>>> can.init({}, 0x{:02X})'.format(chn, opMode.byte))
@@ -147,6 +149,10 @@ def sigterm(signo, frame):
 else:
     print('>>> can.status() >>> 0x{:02X}'.format(status.byte))
 
+# print some version information
+print('>>> can.hardware() >>> ' + can.hardware())
+print('>>> can.firmware() >>> ' + can.firmware())
+
 # shutdown the CAN interface
 print('>>> can.exit()')
 res = can.exit()
diff --git a/Examples/Python/can_send.py b/Examples/Python/can_send.py
index f7ae1a2..72f3a32 100644
--- a/Examples/Python/can_send.py
+++ b/Examples/Python/can_send.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 from CANAPI import *
+import platform
 import argparse
 import signal
 import sys
@@ -68,6 +69,7 @@ def sigterm(signo, frame):
 print(CANAPI.version())
 print('>>> can = CANAPI(' + lib + ')')
 can = CANAPI(lib)
+print(can.software())
 
 # initialize the CAN interface
 print('>>> can.init({}, 0x{:02X})'.format(chn, opMode.byte))
@@ -137,6 +139,10 @@ def sigterm(signo, frame):
 else:
     print('>>> can.status() >>> 0x{:02X}'.format(status.byte))
 
+# print some version information
+print('>>> can.hardware() >>> ' + can.hardware())
+print('>>> can.firmware() >>> ' + can.firmware())
+
 # shutdown the CAN interface
 print('>>> can.exit()')
 res = can.exit()

From 66f08392b20f12dbe5024c21fb2ffe2a3991d902 Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Thu, 25 Apr 2024 19:54:13 +0200
Subject: [PATCH 08/13] Update C/C++ examples

Relates to [MACCAN-191]
---
 Examples/C++/Makefile     | 20 ++++++++++----------
 Examples/C++/can_recv.cpp | 19 ++++++++++++++++---
 Examples/C++/can_send.cpp | 16 ++++++++++++++--
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/Examples/C++/Makefile b/Examples/C++/Makefile
index d78f806..d9ed86e 100644
--- a/Examples/C++/Makefile
+++ b/Examples/C++/Makefile
@@ -1,30 +1,30 @@
 OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown OS')
 
-ifeq ($(OS),Darwin)  # macOS - libPeakCAN.dylib
-LIBRARY = libPeakCAN.a
-CXXFLAGS =
+ifeq ($(OS),Darwin)  # macOS - libPeakCAN.a (C++) and libUVCANPCB.a (C)
+LIBRARY1 = libPeakCAN.a
+LIBRARY2 = libUVCANPCB.a
+CXXFLAGS = -Wall -Wextra -pthread
 LDFLAGS = -rpath /usr/local/lib
 CXX = clang++
-LD = clang++
 RM = rm -f
 endif
-ifeq ($(OS),Linux)  # Linux - libpeakcan.so
-LIBRARY = libpeakcan.a
-CXXFLAGS =
+ifeq ($(OS),Linux)  # Linux - libpeakcan.a (C++) and libuvcanpcb.a (C)
+LIBRARY1 = libpeakcan.a
+LIBRARY2 = libuvcanpcb.a
+CXXFLAGS = -Wall -Wextra -pthread
 LDFLAGS =
 CXX = g++
-LD = g++
 RM = rm -f
 endif
 BINARIES = ../../Binaries
 INCLUDES = ../../Includes
 
 TARGET1 = can_recv
-SOURCE1 = $(TARGET1).cpp $(BINARIES)/$(LIBRARY)
+SOURCE1 = $(TARGET1).cpp $(BINARIES)/$(LIBRARY1)
 DEFINES1 = -DCHANNEL=0x51 -DBAUDRATE=CANBTR_INDEX_250K
 
 TARGET2 = can_send
-SOURCE2 = $(TARGET2).cpp $(BINARIES)/$(LIBRARY)
+SOURCE2 = $(TARGET2).cpp $(BINARIES)/$(LIBRARY2)
 DEFINES2 = -DCHANNEL=0x52 -DBAUDRATE=CANBTR_INDEX_250K
 
 
diff --git a/Examples/C++/can_recv.cpp b/Examples/C++/can_recv.cpp
index 0aaa0d0..e1f9910 100755
--- a/Examples/C++/can_recv.cpp
+++ b/Examples/C++/can_recv.cpp
@@ -1,3 +1,15 @@
+//
+//  can_recv.cpp
+//  PCANBasic-Wrapper
+//  Receive some CAN messages using the C++ API (PeakCAN.h)
+//  Library: PeakCAN.dll, libPeakCAN.dylib, libpeakcan.so
+//
+#ifdef _MSC_VER
+//no Microsoft extensions please!
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS 1
+#endif
+#endif
 #include <iostream>
 #include <signal.h>
 #include <errno.h>
@@ -16,7 +28,7 @@ static volatile int running = 1;
 
 static CPeakCAN myDriver = CPeakCAN();
 
-int main(int argc, const char * argv[]) {
+int main(/*int argc, const char * argv[]*/) {
     CANAPI_OpMode_t opMode = {};
     opMode.byte = CANMODE_DEFAULT;
     CANAPI_Bitrate_t bitrate = {};
@@ -59,14 +71,15 @@ int main(int argc, const char * argv[]) {
             fprintf(stdout, "\n");
         }
         else if (retVal != CCanApi::ReceiverEmpty) {
-            fprintf(stderr, "+++ error: read message returned %i\n", retVal);
+            fprintf(stderr, "+++ error: read message returned %i", retVal);
             running = 0;
         }
     }
+    std::cout << std::endl;
 teardown:
     if ((retVal = myDriver.TeardownChannel()) != CCanApi::NoError)
         std::cerr << "+++ error: interface could not be shutdown" << std::endl;
-    std::cerr << "Cheers!" << std::endl;
+    std::cout << "Cheers!" << std::endl;
     return retVal;
 }
 
diff --git a/Examples/C++/can_send.cpp b/Examples/C++/can_send.cpp
index 3f45340..537682b 100755
--- a/Examples/C++/can_send.cpp
+++ b/Examples/C++/can_send.cpp
@@ -1,3 +1,15 @@
+//
+//  can_send.cpp
+//  PCANBasic-Wrapper
+//  Send some CAN messages using the C API (can_api.h)
+//  Library: u3canpcb.dll, libUVCANPCB.dylib, libuvcanpcb.so
+//
+#ifdef _MSC_VER
+//no Microsoft extensions please!
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS 1
+#endif
+#endif
 #include <iostream>
 #if !defined(_WIN32) && !defined(_WIN64)
 #include <unistd.h>
@@ -15,7 +27,7 @@
 #endif
 #define FRAMES  (CAN_MAX_STD_ID+1)
 
-int main(int argc, const char * argv[]) {
+int main(/*int argc, const char * argv[]*/) {
     int handle, result, i;
     can_bitrate_t bitrate;
     can_message_t message;
@@ -64,6 +76,6 @@ int main(int argc, const char * argv[]) {
 end:
     if ((result = can_exit(handle)) < CANERR_NOERROR)
         std::cerr << "+++ error: interface could not be shutdown" << std::endl;
-    std::cerr << "Cheers!" << std::endl;
+    std::cout << "Cheers!" << std::endl;
     return result;
 }

From a89ddd810a7a06c05d3d9e02fcb799d8e3fe1900 Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Thu, 25 Apr 2024 21:08:38 +0200
Subject: [PATCH 09/13] Improve compiler and linker flags

Relates to [MACCAN-191]
---
 Libraries/CANAPI/Makefile   | 126 ++++++++++++++++++------------------
 Libraries/PeakCAN/Makefile  | 126 ++++++++++++++++++------------------
 Makefile                    |  30 +++++----
 Utilities/Makefile          |   7 +-
 Utilities/can_moni/Makefile |  55 ++++++----------
 Utilities/can_test/Makefile |  55 ++++++----------
 build_no.sh                 | 109 +++++++++++++++----------------
 7 files changed, 240 insertions(+), 268 deletions(-)

diff --git a/Libraries/CANAPI/Makefile b/Libraries/CANAPI/Makefile
index 949a7bd..4771da3 100644
--- a/Libraries/CANAPI/Makefile
+++ b/Libraries/CANAPI/Makefile
@@ -1,16 +1,18 @@
+#	SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
 #
-#	CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
+#	CAN Interface API, Version 3 (for PEAK-System PCAN Interfaces)
 #
-#	Copyright (c) 2012-204 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+#	Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
+#	Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
 #	All rights reserved.
 #
-#	This library is part of PCBUSB-Wrapper.
+#	This file is part of PCANBasic-Wrapper.
 #
-#	PCBUSB-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
+#	PCANBasic-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
 #	and under the GNU General Public License v3.0 (or any later version). You can
-#	choose between one of them if you use PCBUSB-Wrapper in whole or in part.
+#	choose between one of them if you use PCANBasic-Wrapper in whole or in part.
 #
-#	BSD 2-Clause Simplified License:
+#	BSD 2-Clause "Simplified" License:
 #	Redistribution and use in source and binary forms, with or without
 #	modification, are permitted provided that the following conditions are met:
 #	1. Redistributions of source code must retain the above copyright notice, this
@@ -19,7 +21,7 @@
 #	   this list of conditions and the following disclaimer in the documentation
 #	   and/or other materials provided with the distribution.
 #
-#	PCBUSB-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
+#	PCANBasic-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 #	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 #	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 #	DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
@@ -28,27 +30,37 @@
 #	SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 #	CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 #	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF PCBUSB-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#	OF PCANBasic-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	GNU General Public License v3.0 or later:
-#	PCBUSB-Wrapper is free software: you can redistribute it and/or modify
+#	PCANBasic-Wrapper is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
 #	the Free Software Foundation, either version 3 of the License, or
 #	(at your option) any later version.
 #
-#	PCBUSB-Wrapper is distributed in the hope that it will be useful,
+#	PCANBasic-Wrapper is distributed in the hope that it will be useful,
 #	but WITHOUT ANY WARRANTY; without even the implied warranty of
 #	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #	GNU General Public License for more details.
 #
 #	You should have received a copy of the GNU General Public License
-#	along with PCBUSB-Wrapper.  If not, see <http://www.gnu.org/licenses/>.
+#	along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
 #
 current_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown OS')
 current_OS := $(patsubst CYGWIN%,Cygwin,$(current_OS))
 current_OS := $(patsubst MINGW%,MinGW,$(current_OS))
 current_OS := $(patsubst MSYS%,MinGW,$(current_OS))
 
+MAJOR = 0
+MINOR = 2
+PATCH = 8
+
+ifeq ($(PATCH),0)
+VERSION = $(MAJOR).$(MINOR)
+else
+VERSION = $(MAJOR).$(MINOR).$(PATCH)
+endif
+
 HOME_DIR = ../..
 
 SOURCE_DIR = $(HOME_DIR)/Sources
@@ -58,38 +70,34 @@ WRAPPER_DIR = $(HOME_DIR)/Sources/Wrapper
 
 OBJECTS = $(OUTDIR)/can_api.o $(OUTDIR)/can_btr.o
 
+DEFINES = -DOPTION_CAN_2_0_ONLY=0 \
+	-DOPTION_CANAPI_DRIVER=1 \
+	-DOPTION_CANAPI_RETVALS=1 \
+	-DOPTION_CANAPI_COMPANIONS=1
+
+HEADERS = -I$(SOURCE_DIR) \
+	-I$(CANAPI_DIR) \
+	-I$(PCBUSB_DIR)/macOS \
+	-I$(WRAPPER_DIR)
+
 
 ifeq ($(current_OS),Darwin)  # macOS - libUVCANPCB.dylib
 
 LIBRARY = libUVCANPCB
 
-MAJOR = 0
-MINOR = 2
-PATCH = 8
-
-VERSION = $(MAJOR).$(MINOR).$(PATCH)
 TARGET  = $(LIBRARY).$(VERSION).dylib
 STATIC  = $(LIBRARY).a
 
-INSTALL_NAME = @rpath/$(TARGET)
+INSTALL_NAME = $(TARGET)
 CURRENT_VERSION = $(MAJOR).$(MINOR).$(PATCH)
 COMPATIBILITY_VERSION = $(MAJOR).$(MINOR).0
 
 INSTALL = /usr/local/lib
 
-INCLUDE = /usr/local/include
-
-DEFINES = -DOPTION_CANAPI_PCBUSB_DYLIB=1 \
-	-DOPTION_CANAPI_DRIVER=1 \
-	-DOPTION_CANAPI_COMPANIONS=1
-
-HEADERS = -I$(SOURCE_DIR) \
-	-I$(PCBUSB_DIR)/macOS \
-	-I$(CANAPI_DIR) \
-	-I$(WRAPPER_DIR)
+DEFINES += -DOPTION_CANAPI_PCBUSB_DYLIB=1
 
 CFLAGS += -O2 -Wall -Wextra -Wno-parentheses \
-	-fmessage-length=0 -fno-strict-aliasing \
+	-fno-strict-aliasing \
 	$(DEFINES) \
 	$(HEADERS)
 
@@ -97,11 +105,8 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
 	$(DEFINES) \
 	$(HEADERS)
 
-LIBRARIES =
-
-LDFLAGS  += -lpthread \
-	-nostartfiles -dynamiclib -fvisibility=hidden \
-	-Wl,-install_name,$(INSTALL_NAME) \
+LDFLAGS += -nostartfiles -dynamiclib -fvisibility=hidden \
+	-Wl,-install_name,@rpath/$(INSTALL_NAME) \
 	-Wl,-current_version,$(CURRENT_VERSION) \
 	-Wl,-compatibility_version,$(COMPATIBILITY_VERSION) \
 	-rpath $(INSTALL)
@@ -114,46 +119,33 @@ CXXFLAGS += -arch arm64 -arch x86_64
 LDFLAGS += -arch arm64 -arch x86_64
 endif
 
+LIBRARIES = -lpthread
+
 CXX = clang++
 CC = clang
 LD = clang
 LT = libtool
 endif
 
+
 ifeq ($(current_OS),Linux)  # linux - libuvcanpcb.so
 
 LIBRARY = libuvcanpcb
 
-MAJOR = 0
-MINOR = 2
-PATCH = 8
-
-VERSION = $(MAJOR).$(MINOR).$(PATCH)
 SONAME  = $(LIBRARY).so
 TARGET  = $(SONAME).$(VERSION)
 STATIC  = $(LIBRARY).a
 
 INSTALL = /usr/local/lib
 
-INCLUDE = /usr/local/include
-
-DEFINES = -DOPTION_CANAPI_PCBUSB_DYLIB=1 \
-	-DOPTION_CANAPI_DRIVER=1 \
-	-DOPTION_CANAPI_COMPANIONS=1
-
-HEADERS = -I$(SOURCE_DIR) \
-	-I$(PCBUSB_DIR)/Linux \
-	-I$(CANAPI_DIR) \
-	-I$(WRAPPER_DIR)
+DEFINES += -DOPTION_CANAPI_PCANBASIC_SO=1
 
-CFLAGS += -fPIC -O2 -Wall -Wno-parentheses \
+CFLAGS += -fPIC -O2 -Wall -Wextra -Wno-parentheses \
 	-fno-strict-aliasing \
 	$(DEFINES) \
 	$(HEADERS)
 
-LIBRARIES = -lpthread
-
-CXXFLAGS += -fPIC -g -Wall -Wextra -pthread \
+CXXFLAGS += -fPIC -O2 -g -Wall -Wextra -pthread\
 	$(DEFINES) \
 	$(HEADERS)
 
@@ -161,12 +153,15 @@ LDFLAGS  += --shared -Wl,-soname,$(SONAME) -lc
 
 ARFLAGS = r
 
+LIBRARIES = -lc -lpthread
+
 CXX = g++
 CC = gcc
 LD = gcc
 AR = ar
 endif
 
+
 RM = rm -f
 CP = cp -f
 LN = ln -s
@@ -195,18 +190,24 @@ incdir:
 	@mkdir -p $(INCDIR)
 	@cp $(SOURCE_DIR)/PeakCAN_Defines.h $(INCDIR)
 	@cp $(SOURCE_DIR)/PeakCAN_Defaults.h $(INCDIR)
-	@cp $(CANAPI_DIR)/can_api.h $(INCDIR)
-	@cp $(CANAPI_DIR)/can_btr.h $(INCDIR)
 	@cp $(CANAPI_DIR)/CANAPI_Types.h $(INCDIR)
 	@cp $(CANAPI_DIR)/CANAPI_Defines.h $(INCDIR)
 	@cp $(CANAPI_DIR)/CANBTR_Defaults.h $(INCDIR)
+	@cp $(CANAPI_DIR)/can_api.h $(INCDIR)
+	@cp $(CANAPI_DIR)/can_btr.h $(INCDIR)
 
 clean:
 	$(RM) $(TARGET) $(STATIC) $(OUTDIR)/*.o $(OUTDIR)/*.d
 
 pristine:
-	$(RM) $(TARGET) $(STATIC) $(OUTDIR)/*.o $(OUTDIR)/*.d
-	$(RM) $(BINDIR)/$(TARGET) $(BINDIR)/$(STATIC)
+ifeq ($(current_OS),Darwin)
+	$(RM) *.dylib *.a $(OUTDIR)/*.o $(OUTDIR)/*.d
+	$(RM) $(BINDIR)/*.dylib $(BINDIR)/*.a
+endif
+ifeq ($(current_OS),Linux)
+	$(RM) *.so.* *.a $(OUTDIR)/*.o $(OUTDIR)/*.d
+	$(RM) $(BINDIR)/*.so.* $(BINDIR)/*.a
+endif
 	$(RM) $(INCDIR)/*.h
 
 install:
@@ -216,9 +217,8 @@ ifeq ($(current_OS),Darwin)
 	$(RM) $(INSTALL)/$(LIBRARY).dylib ; $(LN) $(INSTALL)/$(TARGET) $(INSTALL)/$(LIBRARY).dylib
 endif
 ifeq ($(current_OS),Linux)
-	$(RM) $(INSTALL)/$(SONAME).$(MAJOR).$(MINOR) ; $(LN) $(INSTALL)/$(TARGET) $(INSTALL)/$(SONAME).$(MAJOR).$(MINOR)
-	$(RM) $(INSTALL)/$(SONAME).$(MAJOR) ; $(LN) $(INSTALL)/$(SONAME).$(MAJOR).$(MINOR) $(INSTALL)/$(SONAME).$(MAJOR)
-	$(RM) $(INSTALL)/$(SONAME) ; $(LN) $(INSTALL)/$(SONAME).$(MAJOR) $(INSTALL)/$(SONAME)
+	$(RM) $(INSTALL)/$(SONAME) ; ln -s $(INSTALL)/$(TARGET) $(INSTALL)/$(SONAME)
+	$(RM) $(INSTALL)/$(LIBRARY).so ; ln -s $(INSTALL)/$(SONAME) $(INSTALL)/$(LIBRARY).so
 endif
 
 
@@ -232,20 +232,18 @@ $(OUTDIR)/can_btr.o: $(CANAPI_DIR)/can_btr.c
 $(STATIC): $(OBJECTS)
 ifeq ($(current_OS),Darwin)
 	$(LT) $(LTFLAGS) -o $@ $(OBJECTS)
-	$(CP) $(STATIC) $(BINDIR)
 	@lipo -archs $@
-	@echo "\033[1mTarget '"$@"' successfully build\033[0m"
 endif
 ifeq ($(current_OS),Linux)
 	$(AR) $(ARFLAGS) $@ $(OBJECTS)
-	$(CP) $(STATIC) $(BINDIR)
-	@echo "\033[1mTarget '"$@"' successfully build\033[0m"
 endif
+	$(CP) $@ $(BINDIR)
+	@echo "\033[1mTarget '"$@"' successfully build\033[0m"
 
 $(TARGET): $(OBJECTS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES)
-	$(CP) $@ $(BINDIR)
 ifeq ($(current_OS),Darwin)
 	@lipo -archs $@
 endif
+	$(CP) $@ $(BINDIR)
 	@echo "\033[1mTarget '"$@"' successfully build\033[0m"
diff --git a/Libraries/PeakCAN/Makefile b/Libraries/PeakCAN/Makefile
index ab0c4c1..bc4a831 100644
--- a/Libraries/PeakCAN/Makefile
+++ b/Libraries/PeakCAN/Makefile
@@ -1,16 +1,18 @@
+#	SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
 #
-#	CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
+#	CAN Interface API, Version 3 (for PEAK-System PCAN Interfaces)
 #
-#	Copyright (c) 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+#	Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
+#	Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
 #	All rights reserved.
 #
-#	This library is part of PCBUSB-Wrapper.
+#	This file is part of PCANBasic-Wrapper.
 #
-#	PCBUSB-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
+#	PCANBasic-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
 #	and under the GNU General Public License v3.0 (or any later version). You can
-#	choose between one of them if you use PCBUSB-Wrapper in whole or in part.
+#	choose between one of them if you use PCANBasic-Wrapper in whole or in part.
 #
-#	BSD 2-Clause Simplified License:
+#	BSD 2-Clause "Simplified" License:
 #	Redistribution and use in source and binary forms, with or without
 #	modification, are permitted provided that the following conditions are met:
 #	1. Redistributions of source code must retain the above copyright notice, this
@@ -19,7 +21,7 @@
 #	   this list of conditions and the following disclaimer in the documentation
 #	   and/or other materials provided with the distribution.
 #
-#	PCBUSB-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
+#	PCANBasic-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 #	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 #	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 #	DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
@@ -28,27 +30,37 @@
 #	SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 #	CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 #	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF PCBUSB-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#	OF PCANBasic-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	GNU General Public License v3.0 or later:
-#	PCBUSB-Wrapper is free software: you can redistribute it and/or modify
+#	PCANBasic-Wrapper is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
 #	the Free Software Foundation, either version 3 of the License, or
 #	(at your option) any later version.
 #
-#	PCBUSB-Wrapper is distributed in the hope that it will be useful,
+#	PCANBasic-Wrapper is distributed in the hope that it will be useful,
 #	but WITHOUT ANY WARRANTY; without even the implied warranty of
 #	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #	GNU General Public License for more details.
 #
 #	You should have received a copy of the GNU General Public License
-#	along with PCBUSB-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
+#	along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
 #
 current_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown OS')
 current_OS := $(patsubst CYGWIN%,Cygwin,$(current_OS))
 current_OS := $(patsubst MINGW%,MinGW,$(current_OS))
 current_OS := $(patsubst MSYS%,MinGW,$(current_OS))
 
+MAJOR = 0
+MINOR = 2
+PATCH = 8
+
+ifeq ($(PATCH),0)
+VERSION = $(MAJOR).$(MINOR)
+else
+VERSION = $(MAJOR).$(MINOR).$(PATCH)
+endif
+
 HOME_DIR = ../..
 
 SOURCE_DIR = $(HOME_DIR)/Sources
@@ -58,38 +70,35 @@ WRAPPER_DIR = $(HOME_DIR)/Sources/Wrapper
 
 OBJECTS = $(OUTDIR)/PeakCAN.o $(OUTDIR)/can_api.o $(OUTDIR)/can_btr.o
 
+DEFINES = -DOPTION_CAN_2_0_ONLY=0 \
+	-DOPTION_CANAPI_DRIVER=1 \
+	-DOPTION_CANAPI_RETVALS=0 \
+	-DOPTION_CANAPI_COMPANIONS=1
+
+HEADERS = -I$(SOURCE_DIR) \
+	-I$(CANAPI_DIR) \
+	-I$(PCBUSB_DIR)/macOS \
+	-I$(WRAPPER_DIR)
+
 
 ifeq ($(current_OS),Darwin)  # macOS - libPeakCAN.dylib
 
 LIBRARY = libPeakCAN
 
-MAJOR = 0
-MINOR = 2
-PATCH = 8
-
-VERSION = $(MAJOR).$(MINOR).$(PATCH)
 TARGET  = $(LIBRARY).$(VERSION).dylib
 STATIC  = $(LIBRARY).a
 
-INSTALL_NAME = @rpath/$(TARGET)
+INSTALL_NAME = $(TARGET)
 CURRENT_VERSION = $(MAJOR).$(MINOR).$(PATCH)
 COMPATIBILITY_VERSION = $(MAJOR).$(MINOR).0
 
 INSTALL = /usr/local/lib
 
-INCLUDE = /usr/local/include
-
-DEFINES = -DOPTION_PCAN_DYLIB=1 \
-	-DOPTION_CANAPI_DRIVER=1 \
-	-DOPTION_CANAPI_COMPANIONS=1
-
-HEADERS = -I$(SOURCE_DIR) \
-	-I$(PCBUSB_DIR)/macOS \
-	-I$(CANAPI_DIR) \
-	-I$(WRAPPER_DIR)
+DEFINES += -DOPTION_CANAPI_PCBUSB_DYLIB=0 \
+	-DOPTION_PEAKCAN_DYLIB=1
 
 CFLAGS += -O2 -Wall -Wextra -Wno-parentheses \
-	-fmessage-length=0 -fno-strict-aliasing \
+	-fno-strict-aliasing \
 	$(DEFINES) \
 	$(HEADERS)
 
@@ -97,11 +106,8 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
 	$(DEFINES) \
 	$(HEADERS)
 
-LIBRARIES =
-
-LDFLAGS  += -lpthread \
-	-nostartfiles -dynamiclib -fvisibility=hidden \
-	-Wl,-install_name,$(INSTALL_NAME) \
+LDFLAGS += -nostartfiles -dynamiclib -fvisibility=hidden \
+	-Wl,-install_name,@rpath/$(INSTALL_NAME) \
 	-Wl,-current_version,$(CURRENT_VERSION) \
 	-Wl,-compatibility_version,$(COMPATIBILITY_VERSION) \
 	-rpath $(INSTALL)
@@ -114,46 +120,34 @@ CXXFLAGS += -arch arm64 -arch x86_64
 LDFLAGS += -arch arm64 -arch x86_64
 endif
 
+LIBRARIES = -lpthread
+
 CXX = clang++
 CC = clang
 LD = clang++
 LT = libtool
 endif
 
+
 ifeq ($(current_OS),Linux)  # Linux - libpeakcan.so
 
 LIBRARY = libpeakcan
 
-MAJOR = 0
-MINOR = 2
-PATCH = 8
-
-VERSION = $(MAJOR).$(MINOR).$(PATCH)
 SONAME  = $(LIBRARY).so
 TARGET  = $(SONAME).$(VERSION)
 STATIC  = $(LIBRARY).a
 
 INSTALL = /usr/local/lib
 
-INCLUDE = /usr/local/include
-
-DEFINES = -DOPTION_PCAN_DYLIB=1 \
-	-DOPTION_CANAPI_DRIVER=1 \
-	-DOPTION_CANAPI_COMPANIONS=1
-
-HEADERS = -I$(SOURCE_DIR) \
-	-I$(PCBUSB_DIR)/Linux \
-	-I$(CANAPI_DIR) \
-	-I$(WRAPPER_DIR)
+DEFINES += -DOPTION_CANAPI_PCANBASIC_SO=0 \
+	-DOPTION_PEAKCAN_SO=1
 
-CFLAGS += -fPIC -O2 -Wall -Wno-parentheses \
+CFLAGS += -fPIC -O2 -Wall -Wextra -Wno-parentheses \
 	-fno-strict-aliasing \
 	$(DEFINES) \
 	$(HEADERS)
 
-LIBRARIES = -lpthread
-
-CXXFLAGS += -fPIC -g -Wall -Wextra -pthread \
+CXXFLAGS += -fPIC -O2 -g -Wall -Wextra -pthread\
 	$(DEFINES) \
 	$(HEADERS)
 
@@ -161,12 +155,15 @@ LDFLAGS  += --shared -Wl,-soname,$(SONAME) -lc
 
 ARFLAGS = r
 
+LIBRARIES = -lc -lpthread
+
 CXX = g++
 CC = gcc
 LD = g++
 AR = ar
 endif
 
+
 RM = rm -f
 CP = cp -f
 LN = ln -s
@@ -196,17 +193,23 @@ incdir:
 	@cp $(SOURCE_DIR)/PeakCAN.h $(INCDIR)
 	@cp $(SOURCE_DIR)/PeakCAN_Defines.h $(INCDIR)
 	@cp $(SOURCE_DIR)/PeakCAN_Defaults.h $(INCDIR)
-	@cp $(CANAPI_DIR)/CANAPI.h $(INCDIR)
 	@cp $(CANAPI_DIR)/CANAPI_Types.h $(INCDIR)
 	@cp $(CANAPI_DIR)/CANAPI_Defines.h $(INCDIR)
 	@cp $(CANAPI_DIR)/CANBTR_Defaults.h $(INCDIR)
+	@cp $(CANAPI_DIR)/CANAPI.h $(INCDIR)
 
 clean:
 	$(RM) $(TARGET) $(STATIC) $(OUTDIR)/*.o $(OUTDIR)/*.d
 
 pristine:
-	$(RM) $(TARGET) $(STATIC) $(OUTDIR)/*.o $(OUTDIR)/*.d
-	$(RM) $(BINDIR)/$(TARGET) $(BINDIR)/$(STATIC)
+ifeq ($(current_OS),Darwin)
+	$(RM) *.dylib *.a $(OUTDIR)/*.o $(OUTDIR)/*.d
+	$(RM) $(BINDIR)/*.dylib $(BINDIR)/*.a
+endif
+ifeq ($(current_OS),Linux)
+	$(RM) *.so.* *.a $(OUTDIR)/*.o $(OUTDIR)/*.d
+	$(RM) $(BINDIR)/*.so.* $(BINDIR)/*.a
+endif
 	$(RM) $(INCDIR)/*.h
 
 install:
@@ -216,9 +219,8 @@ ifeq ($(current_OS),Darwin)
 	$(RM) $(INSTALL)/$(LIBRARY).dylib ; $(LN) $(INSTALL)/$(TARGET) $(INSTALL)/$(LIBRARY).dylib
 endif
 ifeq ($(current_OS),Linux)
-	$(RM) $(INSTALL)/$(SONAME).$(MAJOR).$(MINOR) ; $(LN) $(INSTALL)/$(TARGET) $(INSTALL)/$(SONAME).$(MAJOR).$(MINOR)
-	$(RM) $(INSTALL)/$(SONAME).$(MAJOR) ; $(LN) $(INSTALL)/$(SONAME).$(MAJOR).$(MINOR) $(INSTALL)/$(SONAME).$(MAJOR)
-	$(RM) $(INSTALL)/$(SONAME) ; $(LN) $(INSTALL)/$(SONAME).$(MAJOR) $(INSTALL)/$(SONAME)
+	$(RM) $(INSTALL)/$(SONAME) ; ln -s $(INSTALL)/$(TARGET) $(INSTALL)/$(SONAME)
+	$(RM) $(INSTALL)/$(LIBRARY).so ; ln -s $(INSTALL)/$(SONAME) $(INSTALL)/$(LIBRARY).so
 endif
 
 
@@ -235,20 +237,18 @@ $(OUTDIR)/PeakCAN.o: $(SOURCE_DIR)/PeakCAN.cpp
 $(STATIC): $(OBJECTS)
 ifeq ($(current_OS),Darwin)
 	$(LT) $(LTFLAGS) -o $@ $(OBJECTS)
-	$(CP) $(STATIC) $(BINDIR)
 	@lipo -archs $@
-	@echo "\033[1mTarget '"$@"' successfully build\033[0m"
 endif
 ifeq ($(current_OS),Linux)
 	$(AR) $(ARFLAGS) $@ $(OBJECTS)
-	$(CP) $(STATIC) $(BINDIR)
-	@echo "\033[1mTarget '"$@"' successfully build\033[0m"
 endif
+	$(CP) $@ $(BINDIR)
+	@echo "\033[1mTarget '"$@"' successfully build\033[0m"
 
 $(TARGET): $(OBJECTS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES)
-	$(CP) $@ $(BINDIR)
 ifeq ($(current_OS),Darwin)
 	@lipo -archs $@
 endif
+	$(CP) $@ $(BINDIR)
 	@echo "\033[1mTarget '"$@"' successfully build\033[0m"
diff --git a/Makefile b/Makefile
index 537ae1e..5fbeb12 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,18 @@
+#	SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later
 #
-#	CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)
+#	CAN Interface API, Version 3 (for PEAK-System PCAN Interfaces)
 #
-#	Copyright (c) 2012-2023  Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+#	Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen
+#	Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.de.com)
 #	All rights reserved.
 #
-#	This file is part of PCBUSB-Wrapper.
+#	This file is part of PCANBasic-Wrapper.
 #
-#	PCBUSB-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
+#	PCANBasic-Wrapper is dual-licensed under the BSD 2-Clause "Simplified" License
 #	and under the GNU General Public License v3.0 (or any later version). You can
-#	choose between one of them if you use PCBUSB-Wrapper in whole or in part.
+#	choose between one of them if you use PCANBasic-Wrapper in whole or in part.
 #
-#	BSD 2-Clause Simplified License:
+#	BSD 2-Clause "Simplified" License:
 #	Redistribution and use in source and binary forms, with or without
 #	modification, are permitted provided that the following conditions are met:
 #	1. Redistributions of source code must retain the above copyright notice, this
@@ -19,7 +21,7 @@
 #	   this list of conditions and the following disclaimer in the documentation
 #	   and/or other materials provided with the distribution.
 #
-#	PCBUSB-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
+#	PCANBasic-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 #	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 #	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 #	DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
@@ -28,21 +30,21 @@
 #	SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 #	CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 #	OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#	OF PCBUSB-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#	OF PCANBasic-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	GNU General Public License v3.0 or later:
-#	PCBUSB-Wrapper is free software: you can redistribute it and/or modify
+#	PCANBasic-Wrapper is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
 #	the Free Software Foundation, either version 3 of the License, or
 #	(at your option) any later version.
 #
-#	PCBUSB-Wrapper is distributed in the hope that it will be useful,
+#	PCANBasic-Wrapper is distributed in the hope that it will be useful,
 #	but WITHOUT ANY WARRANTY; without even the implied warranty of
 #	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #	GNU General Public License for more details.
 #
 #	You should have received a copy of the GNU General Public License
-#	along with PCBUSB-Wrapper.  If not, see <http://www.gnu.org/licenses/>.
+#	along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>.
 #
 all:
 	@./build_no.sh
@@ -52,7 +54,7 @@ all:
 	$(MAKE) -C Libraries/PeakCAN $@
 	$(MAKE) -C Utilities/can_test $@
 	$(MAKE) -C Utilities/can_moni $@
-#	$(MAKE) -C Tests/CANAPI $@
+	$(MAKE) -C Tests/CANAPI $@
 
 clean:
 	$(MAKE) -C Trial $@
@@ -60,7 +62,7 @@ clean:
 	$(MAKE) -C Libraries/PeakCAN $@
 	$(MAKE) -C Utilities/can_test $@
 	$(MAKE) -C Utilities/can_moni $@
-#	$(MAKE) -C Tests/CANAPI $@
+	$(MAKE) -C Tests/CANAPI $@
 
 pristine:
 	$(MAKE) -C Trial $@
@@ -68,7 +70,7 @@ pristine:
 	$(MAKE) -C Libraries/PeakCAN $@
 	$(MAKE) -C Utilities/can_test $@
 	$(MAKE) -C Utilities/can_moni $@
-#	$(MAKE) -C Tests/CANAPI $@
+	$(MAKE) -C Tests/CANAPI $@
 
 install:
 #	$(MAKE) -C Trial $@
diff --git a/Utilities/Makefile b/Utilities/Makefile
index 636ee4b..d38e5cf 100644
--- a/Utilities/Makefile
+++ b/Utilities/Makefile
@@ -1,9 +1,10 @@
 #
 #	CAN Utilities for generic CAN Interfaces (CAN API V3)
 #
-#	Copyright (c) 2007-2023  Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+#	Copyright (c) 2007-2010 Uwe Vogt, UV Software, Friedrichshafen
+#	Copyright (c) 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
 #
-#	These utilities is free software: you can redistribute it and/or modify
+#	These utilities are free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
 #	the Free Software Foundation, either version 3 of the License, or
 #	(at your option) any later version.
@@ -14,7 +15,7 @@
 #	GNU General Public License for more details.
 #
 #	You should have received a copy of the GNU General Public License
-#	along with these utilities.  If not, see <http://www.gnu.org/licenses/>.
+#	along with these utilities.  If not, see <https://www.gnu.org/licenses/>.
 #
 all:
 	@echo "\033[1mBuilding my beloved CAN Utilities...\033[0m"
diff --git a/Utilities/can_moni/Makefile b/Utilities/can_moni/Makefile
index 0a45ee8..a6fc053 100644
--- a/Utilities/can_moni/Makefile
+++ b/Utilities/can_moni/Makefile
@@ -1,7 +1,8 @@
 #
-#	CAN Monitor for PEAK-System PCAN-USB Interfaces (CAN API V3)
+#	CAN Monitor for PEAK-System PCAN Interfaces (CAN API V3)
 #
-#	Copyright (c) 2007,2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+#	Copyright (c) 2007 by Uwe Vogt, UV Software, Friedrichshafen
+#	Copyright (c) 2012-2024  Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 #
 #	This program is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
@@ -21,6 +22,11 @@ current_OS := $(patsubst CYGWIN%,Cygwin,$(current_OS))
 current_OS := $(patsubst MINGW%,MinGW,$(current_OS))
 current_OS := $(patsubst MSYS%,MinGW,$(current_OS))
 
+
+TARGET  = can_moni
+
+INSTALL = ~/bin
+
 PROJ_DIR = ../..
 HOME_DIR = .
 MAIN_DIR = ./Sources
@@ -31,15 +37,6 @@ CANAPI_DIR = $(PROJ_DIR)/Sources/CANAPI
 OBJECTS = $(OUTDIR)/main.o $(OUTDIR)/Timer.o \
 	$(OUTDIR)/Message.o $(OUTDIR)/can_msg.o 
 
-
-ifeq ($(current_OS),Darwin)  # macOS - libPeakCAN.dylib
-
-VERSION = 0.2.8
-
-TARGET  = can_moni
-
-INSTALL = ~/bin
-
 DEFINES = -DOPTION_CANAPI_DRIVER=1 \
 	-DOPTION_CANAPI_COMPANIONS=1
 
@@ -48,6 +45,11 @@ HEADERS = -I$(MAIN_DIR) \
 	-I$(DRIVER_DIR) \
 	-I$(CANAPI_DIR)
 
+
+ifeq ($(current_OS),Darwin)  # macOS - libPeakCAN.dylib
+
+OBJECTS  += $(BINDIR)/libPeakCAN.a
+
 CFLAGS += -O2 -Wall -Wextra -Wno-parentheses \
 	-fno-strict-aliasing \
 	$(DEFINES) \
@@ -57,12 +59,7 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
 	$(DEFINES) \
 	$(HEADERS)
 
-OBJECTS  += $(BINDIR)/libPeakCAN.a
-
-LIBRARIES =
-
-LDFLAGS  += -lpthread \
-	-rpath /usr/local/lib
+LDFLAGS  += -rpath /usr/local/lib
 
 ifeq ($(BINARY),UNIVERSAL)
 CFLAGS += -arch arm64 -arch x86_64
@@ -70,6 +67,8 @@ CXXFLAGS += -arch arm64 -arch x86_64
 LDFLAGS += -arch arm64 -arch x86_64
 endif
 
+LIBRARIES = -lpthread
+
 CXX = clang++
 CC = clang
 LD = clang++
@@ -77,19 +76,7 @@ endif
 
 ifeq ($(current_OS),Linux)  # linux - libuvcanpcb.so
 
-VERSION = 0.2.8
-
-TARGET  = can_moni
-
-INSTALL = ~/bin
-
-DEFINES = -DOPTION_CANAPI_DRIVER=1 \
-	-DOPTION_CANAPI_COMPANIONS=1
-
-HEADERS = -I$(MAIN_DIR) \
-	-I$(HOME_DIR) \
-	-I$(DRIVER_DIR) \
-	-I$(CANAPI_DIR)
+OBJECTS  += $(BINDIR)/libpeakcan.a
 
 CFLAGS += -O2 -Wall -Wextra -Wno-parentheses \
 	-fno-strict-aliasing \
@@ -100,11 +87,9 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
 	$(DEFINES) \
 	$(HEADERS)
 
-OBJECTS  += $(BINDIR)/libpeakcan.a
-
-LIBRARIES =
+LDFLAGS  +=
 
-LDFLAGS  += -lpthread
+LIBRARIES = -lpthread
 
 CXX = g++
 CC = gcc
@@ -149,7 +134,7 @@ install:
 	$(CP) $(TARGET) $(INSTALL)
 
 
-$(OUTDIR)/main.o: $(MAIN_DIR)/main.cpp
+$(OUTDIR)/main.o: $(MAIN_DIR)/main.cpp $(MAIN_DIR)/main_p.cpp
 	$(CXX) $(CXXFLAGS) -MMD -MF $*.d -o $@ -c $<
 
 $(OUTDIR)/Timer.o: $(MAIN_DIR)/Timer.cpp
diff --git a/Utilities/can_test/Makefile b/Utilities/can_test/Makefile
index a6855c7..a7d0ef2 100644
--- a/Utilities/can_test/Makefile
+++ b/Utilities/can_test/Makefile
@@ -1,7 +1,8 @@
 #
-#	CAN Tester for PEAK-System PCAN-USB Interfaces (CAN API V3)
+#	CAN Tester for PEAK-System PCAN Interfaces (CAN API V3)
 #
-#	Copyright (c) 2008-2010,2014-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+#	Copyright (c) 2008-2010  Uwe Vogt, UV Software, Friedrichshafen
+#	Copyright (c) 2012-2024  Uwe Vogt, UV Software, Berlin (info@uv-software.com)
 #
 #	This program is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
@@ -21,6 +22,11 @@ current_OS := $(patsubst CYGWIN%,Cygwin,$(current_OS))
 current_OS := $(patsubst MINGW%,MinGW,$(current_OS))
 current_OS := $(patsubst MSYS%,MinGW,$(current_OS))
 
+
+TARGET  = can_test
+
+INSTALL = ~/bin
+
 PROJ_DIR = ../..
 HOME_DIR = .
 MAIN_DIR = ./Sources
@@ -30,15 +36,6 @@ CANAPI_DIR = $(PROJ_DIR)/Sources/CANAPI
 
 OBJECTS = $(OUTDIR)/main.o $(OUTDIR)/Timer.o 
 
-
-ifeq ($(current_OS),Darwin)  # macOS - libPeakCAN.dylib
-
-VERSION = 0.2.8
-
-TARGET  = can_test
-
-INSTALL = ~/bin
-
 DEFINES = -DOPTION_CANAPI_DRIVER=1 \
 	-DOPTION_CANAPI_COMPANIONS=1
 
@@ -47,6 +44,11 @@ HEADERS = -I$(MAIN_DIR) \
 	-I$(DRIVER_DIR) \
 	-I$(CANAPI_DIR)
 
+
+ifeq ($(current_OS),Darwin)  # macOS - libPeakCAN.dylib
+
+OBJECTS  += $(BINDIR)/libPeakCAN.a
+
 CFLAGS += -O2 -Wall -Wextra -Wno-parentheses \
 	-fno-strict-aliasing \
 	$(DEFINES) \
@@ -56,12 +58,7 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
 	$(DEFINES) \
 	$(HEADERS)
 
-OBJECTS  += $(BINDIR)/libPeakCAN.a
-
-LIBRARIES =
-
-LDFLAGS  += -lpthread \
-	-rpath /usr/local/lib
+LDFLAGS  += -rpath /usr/local/lib
 
 ifeq ($(BINARY),UNIVERSAL)
 CFLAGS += -arch arm64 -arch x86_64
@@ -69,6 +66,8 @@ CXXFLAGS += -arch arm64 -arch x86_64
 LDFLAGS += -arch arm64 -arch x86_64
 endif
 
+LIBRARIES = -lpthread
+
 CXX = clang++
 CC = clang
 LD = clang++
@@ -76,19 +75,7 @@ endif
 
 ifeq ($(current_OS),Linux)  # linux - libuvcanpcb.so
 
-VERSION = 0.2.8
-
-TARGET  = can_test
-
-INSTALL = ~/bin
-
-DEFINES = -DOPTION_CANAPI_DRIVER=1 \
-	-DOPTION_CANAPI_COMPANIONS=1
-
-HEADERS = -I$(MAIN_DIR) \
-	-I$(HOME_DIR) \
-	-I$(DRIVER_DIR) \
-	-I$(CANAPI_DIR)
+OBJECTS  += $(BINDIR)/libpeakcan.a
 
 CFLAGS += -O2 -Wall -Wextra -Wno-parentheses \
 	-fno-strict-aliasing \
@@ -99,11 +86,9 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
 	$(DEFINES) \
 	$(HEADERS)
 
-OBJECTS  += $(BINDIR)/libpeakcan.a
-
-LIBRARIES =
+LDFLAGS  +=
 
-LDFLAGS  += -lpthread
+LIBRARIES = -lpthread
 
 CXX = g++
 CC = gcc
@@ -148,7 +133,7 @@ install:
 	$(CP) $(TARGET) $(INSTALL)
 
 
-$(OUTDIR)/main.o: $(MAIN_DIR)/main.cpp
+$(OUTDIR)/main.o: $(MAIN_DIR)/main.cpp $(MAIN_DIR)/main_p.cpp
 	$(CXX) $(CXXFLAGS) -MMD -MF $*.d -o $@ -c $<
 
 $(OUTDIR)/Timer.o: $(MAIN_DIR)/Timer.cpp
diff --git a/build_no.sh b/build_no.sh
index 09385c2..acd6171 100755
--- a/build_no.sh
+++ b/build_no.sh
@@ -1,60 +1,61 @@
 #!/bin/sh
-echo "/*  -- Do not commit this file --" > Sources/build_no.h
-echo " *" >> Sources/build_no.h
-echo " *  CAN Interface API, Version 3 (for PEAK-System PCAN-USB Interfaces)" >> Sources/build_no.h
-echo " *" >> Sources/build_no.h
-echo " *  Copyright (c) 2012-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)" >> Sources/build_no.h
-echo " *  All rights reserved." >> Sources/build_no.h
-echo " *" >> Sources/build_no.h
-echo " *  This file is part of PCBUSB-Wrapper." >> Sources/build_no.h
-echo " *" >> Sources/build_no.h
-echo " *  PCBUSB-Wrapper is dual-licensed under the BSD 2-Clause \"Simplified\" License" >> Sources/build_no.h
-echo " *  and under the GNU General Public License v3.0 (or any later version). You can" >> Sources/build_no.h
-echo " *  choose between one of them if you use PCBUSB-Wrapper in whole or in part." >> Sources/build_no.h
-echo " *" >> Sources/build_no.h
-echo " *  BSD 2-Clause \"Simplified\" License:" >> Sources/build_no.h
-echo " *  Redistribution and use in source and binary forms, with or without" >> Sources/build_no.h
-echo " *  modification, are permitted provided that the following conditions are met:" >> Sources/build_no.h
-echo " *  1. Redistributions of source code must retain the above copyright notice, this" >> Sources/build_no.h
-echo " *     list of conditions and the following disclaimer." >> Sources/build_no.h
-echo " *  2. Redistributions in binary form must reproduce the above copyright notice," >> Sources/build_no.h
-echo " *     this list of conditions and the following disclaimer in the documentation" >> Sources/build_no.h
-echo " *     and/or other materials provided with the distribution." >> Sources/build_no.h
-echo " *" >> Sources/build_no.h
-echo " *  PCBUSB-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"" >> Sources/build_no.h
-echo " *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE" >> Sources/build_no.h
-echo " *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE" >> Sources/build_no.h
-echo " *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE" >> Sources/build_no.h
-echo " *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL" >> Sources/build_no.h
-echo " *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR" >> Sources/build_no.h
-echo " *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER" >> Sources/build_no.h
-echo " *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY," >> Sources/build_no.h
-echo " *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE" >> Sources/build_no.h
-echo " *  OF PCBUSB-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." >> Sources/build_no.h
-echo " *" >> Sources/build_no.h
-echo " *  GNU General Public License v3.0 or later:" >> Sources/build_no.h
-echo " *  PCBUSB-Wrapper is free software : you can redistribute it and/or modify" >> Sources/build_no.h
-echo " *  it under the terms of the GNU General Public License as published by" >> Sources/build_no.h
-echo " *  the Free Software Foundation, either version 3 of the License, or" >> Sources/build_no.h
-echo " *  (at your option) any later version." >> Sources/build_no.h
-echo " *" >> Sources/build_no.h
-echo " *  PCBUSB-Wrapper is distributed in the hope that it will be useful," >> Sources/build_no.h
-echo " *  but WITHOUT ANY WARRANTY; without even the implied warranty of" >> Sources/build_no.h
-echo " *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the" >> Sources/build_no.h
-echo " *  GNU General Public License for more details." >> Sources/build_no.h
-echo " *" >> Sources/build_no.h
-echo " *  You should have received a copy of the GNU General Public License" >> Sources/build_no.h
-echo " *  along with PCBUSB-Wrapper.  If not, see <http://www.gnu.org/licenses/>." >> Sources/build_no.h
-echo " */" >> Sources/build_no.h
-echo "#ifndef BUILD_NO_H_INCLUDED" >> Sources/build_no.h
-echo "#define BUILD_NO_H_INCLUDED" >> Sources/build_no.h
+echo "/*  -- Do not commit this file --" > ./Sources/build_no.h
+echo " *" >> ./Sources/build_no.h
+echo " *  CAN Interface API, Version 3 (for PEAK-System PCAN Interfaces)" >> ./Sources/build_no.h
+echo " *" >> ./Sources/build_no.h
+echo " *  Copyright (c) 2005-2012 Uwe Vogt, UV Software, Friedrichshafen" >> ./Sources/build_no.h
+echo " *  Copyright (c) 2013-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)" >> ./Sources/build_no.h
+echo " *  All rights reserved." >> ./Sources/build_no.h
+echo " *" >> ./Sources/build_no.h
+echo " *  This file is part of PCANBasic-Wrapper." >> ./Sources/build_no.h
+echo " *" >> ./Sources/build_no.h
+echo " *  PCANBasic-Wrapper is dual-licensed under the BSD 2-Clause \"Simplified\" License" >> ./Sources/build_no.h
+echo " *  and under the GNU General Public License v3.0 (or any later version). You can" >> ./Sources/build_no.h
+echo " *  choose between one of them if you use PCANBasic-Wrapper in whole or in part." >> ./Sources/build_no.h
+echo " *" >> ./Sources/build_no.h
+echo " *  BSD 2-Clause \"Simplified\" License:" >> ./Sources/build_no.h
+echo " *  Redistribution and use in source and binary forms, with or without" >> ./Sources/build_no.h
+echo " *  modification, are permitted provided that the following conditions are met:" >> ./Sources/build_no.h
+echo " *  1. Redistributions of source code must retain the above copyright notice, this" >> ./Sources/build_no.h
+echo " *     list of conditions and the following disclaimer." >> ./Sources/build_no.h
+echo " *  2. Redistributions in binary form must reproduce the above copyright notice," >> ./Sources/build_no.h
+echo " *     this list of conditions and the following disclaimer in the documentation" >> ./Sources/build_no.h
+echo " *     and/or other materials provided with the distribution." >> ./Sources/build_no.h
+echo " *" >> ./Sources/build_no.h
+echo " *  PCANBasic-Wrapper IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"" >> ./Sources/build_no.h
+echo " *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE" >> ./Sources/build_no.h
+echo " *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE" >> ./Sources/build_no.h
+echo " *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE" >> ./Sources/build_no.h
+echo " *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL" >> ./Sources/build_no.h
+echo " *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR" >> ./Sources/build_no.h
+echo " *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER" >> ./Sources/build_no.h
+echo " *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY," >> ./Sources/build_no.h
+echo " *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE" >> ./Sources/build_no.h
+echo " *  OF PCANBasic-Wrapper, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." >> ./Sources/build_no.h
+echo " *" >> ./Sources/build_no.h
+echo " *  GNU General Public License v3.0 or later:" >> ./Sources/build_no.h
+echo " *  PCANBasic-Wrapper is free software : you can redistribute it and/or modify" >> ./Sources/build_no.h
+echo " *  it under the terms of the GNU General Public License as published by" >> ./Sources/build_no.h
+echo " *  the Free Software Foundation, either version 3 of the License, or" >> ./Sources/build_no.h
+echo " *  (at your option) any later version." >> ./Sources/build_no.h
+echo " *" >> ./Sources/build_no.h
+echo " *  PCANBasic-Wrapper is distributed in the hope that it will be useful," >> ./Sources/build_no.h
+echo " *  but WITHOUT ANY WARRANTY; without even the implied warranty of" >> ./Sources/build_no.h
+echo " *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the" >> ./Sources/build_no.h
+echo " *  GNU General Public License for more details." >> ./Sources/build_no.h
+echo " *" >> ./Sources/build_no.h
+echo " *  You should have received a copy of the GNU General Public License" >> ./Sources/build_no.h
+echo " *  along with PCANBasic-Wrapper.  If not, see <https://www.gnu.org/licenses/>." >> ./Sources/build_no.h
+echo " */" >> ./Sources/build_no.h
+echo "#ifndef BUILD_NO_H_INCLUDED" >> ./Sources/build_no.h
+echo "#define BUILD_NO_H_INCLUDED" >> ./Sources/build_no.h
 git log -1 --pretty=format:%h > /dev/null 2> /dev/null
 if [ $? -eq 0 ]
 then
-    echo "#define BUILD_NO 0x"$(git log -1 --pretty=format:%h) >> Sources/build_no.h
+    echo "#define BUILD_NO 0x"$(git log -1 --pretty=format:%h) >> ./Sources/build_no.h
 else
-    echo "#define BUILD_NO 0xDEADC0DE" >> Sources/build_no.h
+    echo "#define BUILD_NO 0xDEADC0DE" >> ./Sources/build_no.h
 fi
-echo "#define STRINGIFY(X) #X" >> Sources/build_no.h
-echo "#define TOSTRING(X) STRINGIFY(X)" >> Sources/build_no.h
-echo "#endif" >> Sources/build_no.h
+echo "#define STRINGIFY(X) #X" >> ./Sources/build_no.h
+echo "#define TOSTRING(X) STRINGIFY(X)" >> ./Sources/build_no.h
+echo "#endif" >> ./Sources/build_no.h

From f606c1897ae0ead0203330bde974ed745cc843ec Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Thu, 25 Apr 2024 21:08:51 +0200
Subject: [PATCH 10/13] Update README.md

Relates to [MACCAN-191]
---
 README.md | 45 ++++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 12e2280..1361ef7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-### macOS&reg; Wrapper Library for PCAN-USB Interfaces from PEAK-System
+### macOS&reg; Wrapper Library for PCAN Interfaces from PEAK-System
 
-_Copyright&copy; 2005-2010, 2012-2023  Uwe Vogt, UV Software, Berlin (info@mac-can.com)_
+_Copyright&copy; 2005-2010,2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)_
 
 # CAN API V3 for PCAN-USB Interfaces
 
@@ -68,7 +68,6 @@ public:
 };
 /// \}
 ```
-See header file `PeakCAN.h` for a description of the provided methods.
 
 ### Build Targets
 
@@ -87,7 +86,7 @@ uv-pc013mac:PeakCAN eris$ make all
 uv-pc013mac:PeakCAN eris$ sudo make install
 uv-pc013mac:PeakCAN eris$
 ```
-_(The version number of the library can be adapted by editing the appropriated `Makefile` and changing the variable `VERSION` accordingly. Don´t forget to set the version number also in the source files.)_
+_(The version number of the libraries can be adapted by editing the `Makefile`s in the subfolders and changing the variable `VERSION` accordingly.  Don´t forget to set the version number also in the header file `Version.h`.)_
 
 #### libPeakCAN
 
@@ -114,41 +113,35 @@ Originally developed for electronic environmental tests on an embedded Linux sys
 
 Type `can_test --help` to display all program options.
 
-### Target Platform
+### Target Platforms
 
-- macOS 11.0 and later (Intel x64 and Apple silicon)
+- macOS 12.0 and later (Intel x64 and Apple silicon)
 - Debian GNU/Linux 12 (Linux Kernel 6.x)
 
-### Development Environment
+### Development Environments
 
-#### macOS Ventura
+#### macOS Sonoma
 
-- macOS Ventura (13.6.1) on a Mac mini (M1, 2020)
-- Apple clang version 15.0.0 (clang-1500.0.40.1)
-- Xcode Version 15.0.1 (15A507)
+- macOS Sonoma (14.4.1) on a Mac mini (M1, 2020)
+- Apple clang version 15.0.0 (clang-1500.3.9.4)
+- Xcode Version 15.3 (15E204a)
 
-#### macOS Big Sur
+#### macOS Monterey
 
-- macOS Big Sur (11.7.10) on a MacBook Pro (2019)
+- macOS Monterey (12.7.4) on a MacBook Pro (2019)
 - Apple clang version 13.0.0 (clang-1300.0.29.30)
 - Xcode Version 13.2.1 (13C100)
 
-#### Debian Bookworm
+#### Debian "bookworm" (12.5)
 
-- Debian Bookworm (Debian GNU/Linux 12) on an Intel Core i5
+- Debian 6.1,76-1 (2024-02-01) x86_64 GNU/Linux
 - gcc (Debian 12.2.0-14) 12.2.0
-- PCAN Driver and Library for Linux v8.16
+- PCAN Driver and Library for Linux v8.17
 
 ### Required PCBUSB Library
 
 - `libPCBUSB.x.y.dylib` - Version 0.9 or later _(Latest is Greatest!)_
 
-### Testing
-
-The Xcode project for the trial program includes an xctest target with one test suite for each CAN API V3 **C** interface function.
-To run the test suites or single test cases two CAN devices are required.
-General test settings can be adapted in the file `Settings.h`.
-
 ## Known Bugs and Caveats
 
 - For a list of known bugs and caveats see tab [Issues](https://github.com/mac-can/PCBUSB-Wrapper/issues) in the GitHub repo.
@@ -177,9 +170,9 @@ A generic documentation of the CAN API V3 application programming interface can
 
 ### Dual-License
 
-This work is dual-licensed under the terms of the BSD 2-Clause "Simplified" License
+Except where otherwise noted, this work is dual-licensed under the terms of the BSD 2-Clause "Simplified" License
 and under the terms of the GNU General Public License v3.0 (or any later version).
-You can choose between one of them if you use this work in whole or in part.
+You can choose between one of them if you use these portions of this work in whole or in part.
 
 `SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later`
 
@@ -187,8 +180,10 @@ You can choose between one of them if you use this work in whole or in part.
 
 Mac and macOS are trademarks of Apple Inc., registered in the U.S. and other countries. \
 PCAN is a registered trademark of PEAK-System Technik GmbH, Darmstadt, Germany. \
-Windows is a registered trademark of Microsoft Corporation in the United States and/or other countries. \
+POSIX is a registered trademark of the Institute of Electrical and Electronic Engineers, Inc. \
+GNU C/C++ is a registered trademark of Free Software Foundation, Inc. \
 Linux is a registered trademark of Linus Torvalds. \
+Windows is a registered trademark of Microsoft Corporation in the United States and/or other countries. \
 All other company, product and service names mentioned herein may be trademarks, registered trademarks, or service marks of their respective owners.
 
 ### Hazard Note

From 5f9b654a06f06689124a7df0b534cc390bfc55f0 Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Fri, 26 Apr 2024 08:45:37 +0200
Subject: [PATCH 11/13] Set version number for release

Relates to [MACCAN-190]
---
 .gitattributes    | 5 +++++
 .travis.yml       | 4 ----
 Sources/Version.h | 2 +-
 configure         | 1 -
 4 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 .gitattributes
 delete mode 100644 .travis.yml
 delete mode 100755 configure

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..bf5e415
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Never modify line endings of bash scripts
+*.sh text eol=lf
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 82094e6..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: c++
-os: osx
-compiler: clang
-osx_image: xcode12.5
diff --git a/Sources/Version.h b/Sources/Version.h
index 66ca873..efeaec2 100644
--- a/Sources/Version.h
+++ b/Sources/Version.h
@@ -56,7 +56,7 @@
 #else
 #define VERSION_MAJOR    0
 #define VERSION_MINOR    2
-#define VERSION_PATCH    99
+#define VERSION_PATCH    8
 #endif
 #define VERSION_BUILD    BUILD_NO
 #if (VERSION_PATCH == 0)
diff --git a/configure b/configure
deleted file mode 100755
index 39e2ae8..0000000
--- a/configure
+++ /dev/null
@@ -1 +0,0 @@
-echo "PeakCAN - macOS Wrapper Library for PCAN-USB Interfaces"

From c1ac9a981bd4ad3170169adcad4bad43b83cdef9 Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Fri, 26 Apr 2024 08:45:52 +0200
Subject: [PATCH 12/13] Update Deployment.md

Relates to [MACCAN-190]
---
 Deployment.md | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/Deployment.md b/Deployment.md
index 954a5dc..a3cf8bf 100644
--- a/Deployment.md
+++ b/Deployment.md
@@ -1,6 +1,6 @@
 ### macOS® Wrapper Library for PCAN-USB Interfaces from PEAK-System
 
-_Copyright &copy; 2005-2010, 2012-2023 Uwe Vogt, UV Software, Berlin (info@mac-can.com)_ \
+_Copyright &copy; 2005-2010, 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)_ \
 _All rights reserved._
 
 # Deployment
@@ -26,16 +26,15 @@ _All rights reserved._
   - `Update CAN API V3 testing sources to rev. `_nnn_ \
     `- `_list of major changes (optional)_
 4. Check and update the version and date information in the following files:
+  - `$(PROJROOT)\Sources\Version.h`
   - `$(PROJROOT)/Sources/PeakCAN.h`
   - `$(PROJROOT)/Sources/PeakCAN.cpp`
-  - `$(PROJROOT)/Sources/Wrapper\can_api.cpp`
+  - `$(PROJROOT)/Sources/Wrapper\can_api.c`
   - `$(PROJROOT)/Libraries/CANAPI/Makefile`<sup>*</sup>
   - `$(PROJROOT)/Libraries/PeakCAN/Makefile`<sup>*</sup>
   - `$(PROJROOT)/Utilities/can_moni/Driver.h`
-  - `$(PROJROOT)/Utilities/can_moni/Makefile`
   - `$(PROJROOT)/Utilities/can_moni/README.md`
   - `$(PROJROOT)/Utilities/can_test/Driver.h`
-  - `$(PROJROOT)/Utilities/can_test/Makefile`
   - `$(PROJROOT)/Utilities/can_test/README.md`
 
   <sup>*</sup>_) Set variable_ `CURRENT_VERSION` _and_ `COMPATIBILITY_VERSION` _accordingly._
@@ -60,7 +59,7 @@ _All rights reserved._
 7. Try out the utilities with different options.
   - _**There should be no crash, hangup, or any other error.**_
   - _If there is an error then fix it or create an issue in the repo._
-8. Build and try out the examples (repair them when necessary);
+8. Build and try out the examples (fix them if necessary);
   - `$(PROJROOT)/Examples/C++`
   - `$(PROJROOT)/Examples/Python`
 
@@ -76,40 +75,39 @@ _All rights reserved._
 ### Preparation
 
 1. Pull or clone the default branch on all development systems.
-   >>> Don't forget the Linux system! <<<
+   > Don't forget the Linux system!
 2. Double check all version numbers again (see above).
 3. Run the `Makefile` in the project root directory:
   - `uv-pc013mac:~ eris$ cd $(PROJROOT)`
   - `uv-pc013mac:PCBUSB eris$ make pristine`
-  - `uv-pc013mac:PCBUSB eris$ make BINARY=UNIVERSAL`
-  - `uv-pc013mac:PCBUSB eris$ make test`
+  - `uv-pc013mac:PCBUSB eris$ make all BINARY=UNIVERSAL`
   - `uv-pc013mac:PCBUSB eris$ sudo make install`
 4. Build the CAN API V3 GoogleTest program:
   - `uv-pc013mac:~ eris$ cd $(PROJROOT)/Tests/CANAPI`
-  - `uv-pc013mac:CANAPI eris$ make pristine`
+  - `uv-pc013mac:CANAPI eris$ make clean`
   - `uv-pc013mac:CANAPI eris$ make all`
-5. Run the CAN API V3 GoogleTest program with two PCAN-USB devices:
+5. Run the CAN API V3 GoogleTest program with two PCAN-USB devices in CAN 2.0 mode:
   - `uv-pc013mac:CANAPI eris$./pcb_testing --can_dut1=PCAN-USB1 --can_dut2=PCAN-USB2 --gtest_output=xml:TestReport_PCAN-USB.xml --run_all=YES --smoketest_frames=100000` [...]
   - _If there is any error then **stop** here or create an issue for each error in the repo._
   - Copy the test report into the binary's directory `$(PROJROOT)/Binaries`.
-6. Run the CAN API V3 GoogleTest program with two PCAN-USB FD devices:
-  - `uv-pc013mac:CANAPI eris$./pcb_testing --can_dut1=PCAN-USB3 --can_dut2=PCAN-USB4  --gtest_output=xml:TestReport_PCAN-USB_FD.xml --run_all=YES --smoketest_frames=100000` [...]
+6. Run the CAN API V3 GoogleTest program with two PCAN-USB FD devices in CAN FD mode:
+  - `uv-pc013mac:CANAPI eris$./pcb_testing --can_dut1=PCAN-USB3 --can_dut2=PCAN-USB4 --can_mode=FDF+BRS --can_bitrate=DEFAULT --gtest_output=xml:TestReport_PCAN-USB_FD.xml --run_all=YES --smoketest_frames=100000` [...]
   - _If there is any error then **stop** here or create an issue for each error in the repo._
   - Copy the test report into the binary's directory `$(PROJROOT)/Binaries`.
 7. Pack the artifacts into a .zip-archive, e.g. `artifacts.zip`:
   - `$(PROJROOT)/Binaries/*.*`
   - `$(PROJROOT)/Includes/*.*`
   - `$(PROJROOT)/README.md`
-  - `$(PROJROOT)/LICENSE`
-8. Double check and update the [`README.md`](https://github.com/mac-can/PCANBasic-Wrapper/blob/main/README.md) on GitHub (or insert just a blank).
+  - `$(PROJROOT)/LICENSE.*`
+8. Double check and update the [`README.md`](https://github.com/mac-can/PCBUSB-Wrapper/blob/main/README.md) on GitHub (or insert just a blank).
 
 ### Procedure
 
-1. Click on `Draft a new release` in the [GitHub](https://github.com/mac-can/PCANBasic-Wrapper) repo.
+1. Click on `Draft a new release` in the [GitHub](https://github.com/mac-can/PCBUSB-Wrapper) repo.
 2. Fill out all required fields:
-  - Tag version: e.g `v0.2.6` (cf. semantic versioning)
+  - Tag version: e.g `v0.2.8` (cf. semantic versioning)
   - Target: `main` (default branch)
-  - Release title: e.g. `Release of November 6, 2023`
+  - Release title: e.g. `Release of January 19, 2038`
   - Change-log: list all major changes, e.g. from commit comments
   - Assets: drag and drop the artifacts archive (see above)
 3. Click on `Publish release`.

From b9589a441d2023383124836b1348b8f4729c968b Mon Sep 17 00:00:00 2001
From: Uwe McVogt <mac@uv-software.de>
Date: Fri, 26 Apr 2024 08:46:16 +0200
Subject: [PATCH 13/13] Update README.md

Relates to [MACCAN-190]
---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1361ef7..c85cc9d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 ### macOS&reg; Wrapper Library for PCAN Interfaces from PEAK-System
 
-_Copyright&copy; 2005-2010,2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)_
+_Copyright&copy; 2005-2010, 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)_
+
+![macOS Build](https://github.com/mac-can/PCBUSB-Wrapper/actions/workflows/macos-build.yml/badge.svg)
 
 # CAN API V3 for PCAN-USB Interfaces