diff --git a/README.md b/README.md
index bc122bb..47ceda8 100644
--- a/README.md
+++ b/README.md
@@ -44,25 +44,27 @@ Type `can_test --help` to display all program options.
 - macOS 13.0 and later (Intel and Apple silicon)
 - Debian GNU/Linux 12 (Linux Kernel 6.x)
 
-### Development Environment
+### Development Environments
 
 #### macOS Sequoia
-
-- macOS Sequoia (15.2) on a Mac mini (M1, 2020)
+- macOS Sequoia (15.3.1) on a Mac mini (M4 Pro, 2024)
 - Apple clang version 16.0.0 (clang-1600.0.26.6)
 
 #### macOS Ventura
-
-- macOS Ventura (13.7.2) on a MacBook Pro (2019)
+- macOS Ventura (13.7.4) on a MacBook Pro (2019)
 - Apple clang version 14.0.3 (clang-1403.0.22.14.1)
 
 #### Debian 12.9 ("bookworm")
-- Debian 6.1.123-1 (2024-11-22) x86_64 GNU/Linux
+- Debian 6.1.128-1 (2025-02-07) x86_64 GNU/Linux
 - gcc (Debian 12.2.0-14) 12.2.0
-- PCAN Driver and Library for Linux v8.19
 
-### Required PCBUSB Library
-libPCBUSB.x.y.dylib - Version 0.13 or later (Latest is Greatest!)
+### Required Library
+
+#### macOS
+- libPCBUSB.x.y.dylib - Version 0.13 or later (Latest is Greatest!)
+
+#### Linux
+- libpcanbasic.so - PCAN Driver and Library for Linux, Version 8.20
 
 ### Supported Devices
 
@@ -115,7 +117,7 @@ It can be downloaded from <https://www.mac-can.com/>.
 
 ### Trademarks
 
-Mac and macOS are trademarks of Apple Inc., registered in the U.S. and other countries. \
+Mac and macOS are trademarks of Apple Inc., registered in the U.S. and other countries and regions. \
 PCAN is a registered trademark of PEAK-System Technik GmbH, Darmstadt, Germany. \
 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. \
diff --git a/Utilities/Makefile b/Utilities/Makefile
index 19c99c0..da8622b 100644
--- a/Utilities/Makefile
+++ b/Utilities/Makefile
@@ -1,12 +1,12 @@
 #
 #	CAN Utilities for PEAK-System PCAN USB Interfaces (macOS, x86_64 & arm64)
 #
-#	Copyright (c) 2007-2010 Uwe Vogt, UV Software, Friedrichshafen
-#	Copyright (c) 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
+#	Copyright (c) 2005-2010 Uwe Vogt, UV Software, Friedrichshafen
+#	Copyright (c) 2012-2025 Uwe Vogt, UV Software, Berlin (info@mac-can.com)
 #
-#	These utilities are 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
+#	the Free Software Foundation; either version 2 of the License, or
 #	(at your option) any later version.
 #
 #	These utilities is distributed in the hope that it will be useful,
@@ -14,8 +14,8 @@
 #	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 these utilities.  If not, see <https://www.gnu.org/licenses/>.
+#	You should have received a copy of the GNU General Public License along
+#	with these utilities; if not, see <https://www.gnu.org/licenses/>.
 #
 all:
 	@rm -r build_no.h 2> /dev/null || true
diff --git a/Utilities/build_no.sh b/Utilities/build_no.sh
index facccfc..7884815 100755
--- a/Utilities/build_no.sh
+++ b/Utilities/build_no.sh
@@ -2,9 +2,9 @@ echo "/*  -- Do not commit this file --" > ./build_no.h
 echo " *" >> ./build_no.h
 echo " *  project   :  CAN - Controller Area Network" >> ./build_no.h
 echo " *" >> ./build_no.h
-echo " *  purpose   :  CAN Tester (based on macOS Library for PCAN-USB Interfaces)" >> ./build_no.h
+echo " *  purpose   :  CAN Utilities (based on macOS Library for PCAN-USB Interfaces)" >> ./build_no.h
 echo " *" >> ./build_no.h
-echo " *  copyright :  (C) 2019,2023 UV Software, Berlin" >> ./build_no.h
+echo " *  copyright :  (C) 2005-2025 UV Software, Berlin" >> ./build_no.h
 echo " *" >> ./build_no.h
 echo " *  author(s) :  Uwe Vogt, UV Software" >> ./build_no.h
 echo " *" >> ./build_no.h
diff --git a/Utilities/can_moni/Makefile b/Utilities/can_moni/Makefile
index b088075..2873b9f 100644
--- a/Utilities/can_moni/Makefile
+++ b/Utilities/can_moni/Makefile
@@ -32,7 +32,7 @@ MAIN_DIR = .
 
 MISC_DIR = $(HOME_DIR)/misc
 DRIVER_DIR = $(HOME_DIR)/driver
-WRAPPER_DIR = $(HOME_DIR)/macOS
+INCLUDE_DIR = $(HOME_DIR)/include
 
 OBJECTS = $(OUTDIR)/main.o $(OUTDIR)/bitrates.o $(OUTDIR)/timer.o $(OUTDIR)/printmsg.o
 
@@ -47,7 +47,7 @@ ifeq ($(current_OS),Darwin)  # macOS - libPCBUSB.dylib
 ifneq ($(VARIANT),STANDALONE)
   DEFINES += -DOPTION_PCBUSB_STANDALONE=0
 
-  HEADERS += -I$(HOME_DIR)/macOS
+  HEADERS += -I$(INCLUDE_DIR)/mac/pcbusb
 
   OBJECTS += $(OUTDIR)/PCBUSB.o
 
@@ -55,7 +55,7 @@ ifneq ($(VARIANT),STANDALONE)
 else
   DEFINES += -DOPTION_PCBUSB_STANDALONE=1
 
-  HEADERS += -I$(HOME_DIR)/macOS -I$(DRIVER_DIR)
+  HEADERS += -I$(INCLUDE_DIR)/mac/pcbusb -I$(DRIVER_DIR)
 
   OBJECTS += $(OUTDIR)/pcan_api.o \
 	$(OUTDIR)/pcan_drv.o \
@@ -79,13 +79,7 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
 	$(DEFINES) \
 	$(HEADERS)
 
-LDFLAGS += -rpath /usr/local/lib
-
-LIBRARIES = -lpthread
-
-ifeq ($(VARIANT),STANDALONE)
-  LDFLAGS += -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation
-endif
+LDFLAGS  += -rpath /usr/local/lib
 
 ifeq ($(BINARY),UNIVERSAL)
 CFLAGS += -arch arm64 -arch x86_64
@@ -93,6 +87,12 @@ CXXFLAGS += -arch arm64 -arch x86_64
 LDFLAGS += -arch arm64 -arch x86_64
 endif
 
+ifeq ($(VARIANT),STANDALONE)
+LDFLAGS += -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation
+endif
+
+LIBRARIES = -lpthread
+
 CXX = clang++
 CC = clang
 LD = clang
@@ -102,7 +102,7 @@ ifeq ($(current_OS),Linux)  # linux - libpcanbasic.so
 
 DEFINES += 
 
-HEADERS += -I$(HOME_DIR)/Linux
+HEADERS += -I$(INCLUDE_DIR)/linux/pcanbasic
 
 OBJECTS += $(OUTDIR)/PCBUSB.o
 
@@ -131,6 +131,7 @@ CP = cp -f
 
 CHECKER  = warning,information
 IGNORE   = -i tester.c -i dosopt.c
+LEVEL    = exhaustive  # normal or exhaustive
 
 OUTDIR = .objects
 BINDIR = $(BIN_DIR)
@@ -155,7 +156,7 @@ incdir:
 	@mkdir -p $(INCDIR)
 
 check:
-	cppcheck --enable=$(CHECKER) --suppressions-list=$(HOME_DIR)/suppress.txt \
+	cppcheck --enable=$(CHECKER) --check-level=$(LEVEL) --suppressions-list=$(HOME_DIR)/suppress.txt \
 	-D__APPLE__ $(DEFINES) $(HEADERS) $(IGNORE) $(MAIN_DIR) $(MISC_DIR) 
 
 clean:
@@ -167,13 +168,14 @@ pristine:
 
 install:
 	@echo "Copying binary file..."
-	@-$(CP) $(TARGET) $(INSTALL)
+	@mkdir -p $(INSTALL)
+	$(CP) $(TARGET) $(INSTALL)
 
 
 $(OUTDIR)/main.o: $(MAIN_DIR)/main.c
 	$(CC) $(CFLAGS) -MMD -MF $*.d -o $@ -c $<
 
-$(OUTDIR)/PCBUSB.o: $(WRAPPER_DIR)/PCBUSB.c
+$(OUTDIR)/PCBUSB.o: $(MISC_DIR)/PCBUSB.c
 	$(CC) $(CFLAGS) -MMD -MF $*.d -o $@ -c $<
 
 $(OUTDIR)/bitrates.o: $(MISC_DIR)/bitrates.c
@@ -215,8 +217,9 @@ $(OUTDIR)/pcan_log.o: $(DRIVER_DIR)/pcan_log.c
 
 $(TARGET): $(OBJECTS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES)
-	$(CP) $(TARGET) $(BINDIR)
 ifeq ($(current_OS),Darwin)
 	@lipo -archs $@
 endif
+	@mkdir -p $(BINDIR)
+	$(CP) $(TARGET) $(BINDIR)
 	@echo "\033[1mTarget '"$@"' successfully build\033[0m"
diff --git a/Utilities/can_moni/README b/Utilities/can_moni/README
index ff6db87..13d60b7 100644
--- a/Utilities/can_moni/README
+++ b/Utilities/can_moni/README
@@ -1,26 +1,26 @@
 CAN Monitor for PEAK-System PCAN USB Interfaces (macOS, x86_64 & arm64)
 
-Copyright (c) 2007,2012-2024 by Uwe Vogt, UV Software, Berlin.
+Copyright (c) 2007,2012-2025 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) 
- -x, --exclude=[~]<id-list>    exclude CAN-IDs: <id>[-<id>]{,<id>[-<id>]}
+ -a, --ascii=(ON|OFF)          display data bytes in ASCII (default=ON)
+ -x, --exclude=[~]<id-list>    exclude CAN-IDs: <id-list>=<id>[-<id>]{,<id>[-<id>]}
      --code=<id>               acceptance code for 11-bit IDs (default=0x000)
      --mask=<id>               acceptance mask for 11-bit IDs (default=0x7FF)
      --xtd-code=<id>           acceptance code for 29-bit IDs (default=0x00000000)
      --xtd-mask=<id>           acceptance mask for 29-bit IDs (default=0x1FFFFFFF)
- -m, --mode=(2.0|FDF[+BRS])    CAN operation mode: CAN 2.0 or CAN FD format
-     --listen-only             monitor mode (transmitter is off)
+ -m, --mode=(CCF|FDF[+BRS])    CAN operation mode: CAN CC or CAN FD
+     --listen-only             monitor mode (listen-only mode)
      --no-status-frames        suppress reception of status frames
      --no-remote-frames        suppress reception of remote frames
- -b, --baudrate=<baudrate>     CAN 2.0 bit timing in kbps (default=250)
-     --bitrate=<bit-rate>      CAN FD bit rate (as a string)
- -v, --verbose                 show detailed bit rate settings
- -y, --trace=(ON|OFF)          write a trace file (default=OFF)
+ -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250)
+     --bitrate=<bit-rate>      CAN bit-rate settings (as key/value list)
+ -v, --verbose                 show detailed bit-rate settings
+     --trace=(ON|OFF)          write a trace file (default=OFF)
      --list-bitrates[=<mode>]  list standard bit-rate settings and exit
  -L, --list-boards             list all supported CAN interfaces and exit
  -T, --test-boards             list all available CAN interfaces and exit
@@ -45,7 +45,7 @@ CAN 2.0 baud rate index (default=3):
   6 = 50 kbps
   7 = 20 kbps
   8 = 10 kbps
-CAN FD bit rate as comma-separeted <key>=<value>-list:
+CAN FD bit rate as 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)
@@ -68,6 +68,9 @@ Hazard note:
 License type:
   This software is freeware without any warranty or support!
 Change log:
+- Version 0.6 SR2 of March 1, 2025:
+  Minor changes: mainly commandline argument handling
+  Compiled against PCBUSB v0.13 sources as Universal macOS Binary
 - Version 0.6 SR1 of December 30, 2024:
   Realized new program option:
   - '--list-bitrates[=<mode>]'  list standard bit-rate settings and exit
diff --git a/Utilities/can_moni/main.c b/Utilities/can_moni/main.c
index 869b5b9..1f1396b 100644
--- a/Utilities/can_moni/main.c
+++ b/Utilities/can_moni/main.c
@@ -7,7 +7,7 @@
  *  copyright :  (c) 2007,2012 by UV Software, Friedrichshafen
  *               (c) 2013-2025 by UV Software, Berlin
  *
- *  revision  :  $Rev: 2065 $ of $Date: 2024-12-30 16:48:19 +0100 (Mo, 30 Dez 2024) $
+ *  revision  :  $Rev: 2087 $ of $Date: 2025-03-01 12:36:40 +0100 (Sa, 01 Mär 2025) $
  * 
  *  author(s) :  Uwe Vogt, UV Software
  *
@@ -19,26 +19,28 @@
  *  CAN Monitor (based on macOS Library for PCAN USB Interfaces)
  *
  *  (1) Standalone version with compiled PCBUSB sources
- * 
+ *
  *  This program is freeware without any warranty or support!
  *  Please note the copyright and license agreements.
  *
+ *  Note: This version does not require the libPCBUSB to be installed.
+ *
  *  (2) Open-source version with libPCBUSB support
- * 
- *  This program is free software: you can redistribute it and/or modify
+ *
+ *  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 2 of the License, or
+ *  the Free Software Foundation; either version 2 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/>.
  *
- *  Note:  The libPCBUSB is licensed under a freeware license without any
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, see <https://www.gnu.org/licenses/>.
+ *
+ *  Note: The libPCBUSB is licensed under a freeware license without any
  *  warranty or support.  The libPCBUSB is not part of this program.
  *  It can be downloaded from <https://www.mac-can.com/>.
  *
@@ -49,14 +51,14 @@
 #if (OPTION_PCBUSB_STANDALONE != 0)
 #define VERSION_MAJOR     0
 #define VERSION_MINOR     6
-#define VERSION_PATCH     1
+#define VERSION_PATCH     2
 #else
 #define VERSION_MAJOR     1
-#define VERSION_MINOR     0
-#define VERSION_PATCH     99
+#define VERSION_MINOR     1
+#define VERSION_PATCH     0
 #endif
 #define VERSION_BUILD     BUILD_NO
-#define VERSION_STRING    TOSTRING(VERSION_MAJOR)"." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
+#define VERSION_STRING    TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
 #if defined(__APPLE__)
 #define PLATFORM    "macOS"
 #elif defined(__linux__)
@@ -65,19 +67,16 @@
 #error Unsupported platform
 #endif
 #if defined(__APPLE__)
-static const char APPLICATION[] = "CAN Monitor for PEAK-System PCAN USB Interfaces, Version "VERSION_STRING;
-#else
-static const char APPLICATION[] = "CAN Monitor for PEAK-System PCAN Interfaces, Version "VERSION_STRING;
-#endif
+static const char APPLICATION[] = "CAN Monitor for PEAK-System PCAN USB Interfaces, Version " VERSION_STRING;
 static const char COPYRIGHT[]   = "Copyright (c) 2007,2012-2025 by Uwe Vogt, UV Software, Berlin";
 #if (OPTION_PCBUSB_STANDALONE != 0)
 static const char WARRANTY[]    = "This program is freeware without any warranty or support!";
 static const char LICENSE[]     = "This program is freeware without any warranty or support!\n\n" \
                                   "Note: This program does not require the libPCBUSB to be installed.";
 #else
-static const char WARRANTY[]    = "CAN Monitor comes with ABSOLUTELY NO WARRANTY; for details type `--version'.\n\n" \
+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.";
+                                  "under certain conditions; type `can_moni --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 2 of the License, or\n" \
@@ -92,6 +91,21 @@ static const char LICENSE[]     = "This program is free software; you can redist
                                   "warranty or support.  The libPCBUSB is not part of this program.\n" \
                                   "It can be downloaded from <https://www.mac-can.com/>.";
 #endif
+#else
+static const char APPLICATION[] = "CAN Monitor for PEAK-System PCAN Interfaces, Version " VERSION_STRING;
+static const char COPYRIGHT[]   = "Copyright (c) 2007,2012-2025 by Uwe Vogt, UV Software, Berlin";
+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 `can_moni --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 2 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.";
+#endif
 
 /*  -----------  includes  -----------------------------------------------
  */
@@ -238,24 +252,23 @@ int main(int argc, char *argv[])
     long unsigned freq = 0; struct btr_bit_timing slow, fast;
 
     struct option long_options[] = {
+        {"time", required_argument, 0, 't'},
+        {"id", required_argument, 0, 'i'},
+        {"data", required_argument, 0, 'd'},
+        {"ascii", required_argument, 0, 'a'},
+        {"exclude", required_argument, 0, 'x'},
         {"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'},
-        {"no-status-frames", no_argument, 0, 'S'},
+        {"no-status-frames", no_argument, 0, 'E'},
         {"no-remote-frames", no_argument, 0, 'R'},
         {"code", required_argument, 0, '1'},
         {"mask", required_argument, 0, '2'},
         {"xtd-code", required_argument, 0, '3'},
         {"xtd-mask", required_argument, 0, '4'},
-        {"time", required_argument, 0, 't'},
-        {"id", required_argument, 0, 'i'},
-        {"data", required_argument, 0, 'd'},
-        {"ascii", required_argument, 0, 'a'},
-        {"exclude", required_argument, 0, 'x'},
-        {"trace", required_argument, 0, 'y'},
+        {"trace", required_argument, 0, 'Y'},
         {"list-bitrates", optional_argument, 0, 'l'},
         {"list-boards", no_argument, 0, 'L'},
         {"test-boards", no_argument, 0, 'T'},
@@ -278,7 +291,7 @@ int main(int argc, char *argv[])
         return errno;
     }
     /* scan command-line */
-    while ((opt = getopt_long(argc, (char * const *)argv, "b:vm:t:i:d:a:x:s:y:lLTh", long_options, &i)) != -1) {
+    while ((opt = getopt_long(argc, (char * const *)argv, "b:vm:t:i:d:a:x:lLTh", long_options, &i)) != -1) {
         switch (opt) {
         /* option '--baudrate=<baudrate>' (-b) */
         case 'b':
@@ -327,14 +340,15 @@ int main(int argc, char *argv[])
             }
             verbose = 1;
             break;
-        /* option '--mode=(2.0|FDF[+BRS])' (-m)*/
+        /* 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, "CAN2.0") || !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "2.0"))
+            if (!strcasecmp(optarg, "DEFAULT") || !strcasecmp(optarg, "CLASSIC") || !strcasecmp(optarg, "CLASSICAL") ||
+                !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "2.0") ||
+                !strcasecmp(optarg, "CANCC") || !strcasecmp(optarg, "CCF") || !strcasecmp(optarg, "CC"))
                 op_mode = PCAN_MESSAGE_STANDARD;
             else if (!strcasecmp(optarg, "CANFD") || !strcasecmp(optarg, "FDF") || !strcasecmp(optarg, "FD"))
                 op_mode = PCAN_MESSAGE_FD;
@@ -354,7 +368,7 @@ int main(int argc, char *argv[])
             listenonly = PCAN_PARAMETER_ON;
             break;
         /* option '--no-status-frames' */
-        case 'S':
+        case 'E':
             if (sf++) {
                 fprintf(stderr, "%s: duplicated option `--no-status-frames'\n", basename(argv[0]));
                 return 1;
@@ -433,8 +447,8 @@ int main(int argc, char *argv[])
             }
             xtd_mask = (DWORD)intarg;
             break;
-        /* option '--trace=(ON|OFF)' (-y) */
-        case 'y':
+        /* option '--trace=(ON|OFF)' */
+        case 'Y':
             if (ts++) {
                 fprintf(stderr, "%s: duplicated option `--trace'\n", basename(argv[0]));
                 return 1;
@@ -525,17 +539,18 @@ int main(int argc, char *argv[])
                 return 1;
             }
             break;
-        /* option '--list-bitrates' */
+        /* option '--list-bitrates[=(2.0|FDF[+BRS])]' */
         case 'l':
             fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
             /* list bit-rates (depending on operation mode) */
             if (optarg != NULL) {
-                if (op != 0) {
+                if (op++) {
                     fprintf(stderr, "%s: option `--list-bitrates' - operation mode already set'\n", basename(argv[0]));
                     return 1;
                 }
-                if (!strcasecmp(optarg, "default") || !strcasecmp(optarg, "classic") ||
-                    !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "2.0"))
+                if (!strcasecmp(optarg, "DEFAULT") || !strcasecmp(optarg, "CLASSIC") || !strcasecmp(optarg, "CLASSICAL") ||
+                    !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "2.0") ||
+                    !strcasecmp(optarg, "CANCC") || !strcasecmp(optarg, "CCF") || !strcasecmp(optarg, "CC"))
                     op_mode = PCAN_MESSAGE_STANDARD;
                 else if (!strcasecmp(optarg, "CANFD") || !strcasecmp(optarg, "FDF") || !strcasecmp(optarg, "FD"))
                     op_mode = PCAN_MESSAGE_FD;
@@ -1107,19 +1122,19 @@ static void usage(FILE *stream, const char *program)
     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");
-    fprintf(stream, " -x, --exclude=[~]<id-list>    exclude CAN-IDs: <id>[-<id>]{,<id>[-<id>]}\n");
+    fprintf(stream, " -x, --exclude=[~]<id-list>    exclude CAN-IDs: <id-list>=<id>[-<id>]{,<id>[-<id>]}\n");
     fprintf(stream, "     --code=<id>               acceptance code for 11-bit IDs (default=0x%03X)\n", CODE_11BIT);
     fprintf(stream, "     --mask=<id>               acceptance mask for 11-bit IDs (default=0x%03X)\n", MASK_11BIT);
     fprintf(stream, "     --xtd-code=<id>           acceptance code for 29-bit IDs (default=0x%08X)\n", CODE_29BIT);
     fprintf(stream, "     --xtd-mask=<id>           acceptance mask for 29-bit IDs (default=0x%08X)\n", MASK_29BIT);
-    fprintf(stream, " -m, --mode=(2.0|FDF[+BRS])    CAN operation mode: CAN 2.0 or CAN FD format\n");
-    fprintf(stream, "     --listen-only             monitor mode (transmitter is off)\n");
+    fprintf(stream, " -m, --mode=(CCF|FDF[+BRS])    CAN operation mode: CAN CC or CAN FD\n");
+    fprintf(stream, "     --listen-only             monitor mode (listen-only mode)\n");
     fprintf(stream, "     --no-status-frames        suppress reception of status frames\n");
     fprintf(stream, "     --no-remote-frames        suppress reception of remote frames\n");
-    fprintf(stream, " -b, --baudrate=<baudrate>     CAN 2.0 bit timing in kbps (default=250)\n");
-    fprintf(stream, "     --bitrate=<bit-rate>      CAN FD bit rate (as a string)\n");
-    fprintf(stream, " -v, --verbose                 show detailed bit rate settings\n");
-    fprintf(stream, " -y, --trace=(ON|OFF)          write a trace file (default=OFF)\n");
+    fprintf(stream, " -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250)\n");
+    fprintf(stream, "     --bitrate=<bit-rate>      CAN bit-rate settings (as key/value list)\n");
+    fprintf(stream, " -v, --verbose                 show detailed bit-rate settings\n");
+    fprintf(stream, "     --trace=(ON|OFF)          write a trace file (default=OFF)\n");
     fprintf(stream, "     --list-bitrates[=<mode>]  list standard bit-rate settings and exit\n");
     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");
diff --git a/Utilities/can_test/Makefile b/Utilities/can_test/Makefile
index 32125e0..9b88ad4 100644
--- a/Utilities/can_test/Makefile
+++ b/Utilities/can_test/Makefile
@@ -32,7 +32,7 @@ MAIN_DIR = .
 
 MISC_DIR = $(HOME_DIR)/misc
 DRIVER_DIR = $(HOME_DIR)/driver
-WRAPPER_DIR = $(HOME_DIR)/macOS
+INCLUDE_DIR = $(HOME_DIR)/include
 
 OBJECTS = $(OUTDIR)/main.o $(OUTDIR)/bitrates.o $(OUTDIR)/timer.o
 
@@ -47,7 +47,7 @@ ifeq ($(current_OS),Darwin)  # macOS - libPCBUSB.dylib
 ifneq ($(VARIANT),STANDALONE)
   DEFINES += -DOPTION_PCBUSB_STANDALONE=0
 
-  HEADERS += -I$(HOME_DIR)/macOS
+  HEADERS += -I$(INCLUDE_DIR)/mac/pcbusb
 
   OBJECTS += $(OUTDIR)/PCBUSB.o
 
@@ -55,7 +55,7 @@ ifneq ($(VARIANT),STANDALONE)
 else
   DEFINES += -DOPTION_PCBUSB_STANDALONE=1
 
-  HEADERS += -I$(HOME_DIR)/macOS -I$(DRIVER_DIR)
+  HEADERS += -I$(INCLUDE_DIR)/mac/pcbusb -I$(DRIVER_DIR)
 
   OBJECTS += $(OUTDIR)/pcan_api.o \
 	$(OUTDIR)/pcan_drv.o \
@@ -79,13 +79,7 @@ CXXFLAGS += -O2 -g -Wall -Wextra -pthread \
 	$(DEFINES) \
 	$(HEADERS)
 
-LDFLAGS += -rpath /usr/local/lib
-
-LIBRARIES = -lpthread
-
-ifeq ($(VARIANT),STANDALONE)
-  LDFLAGS += -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation
-endif
+LDFLAGS  += -rpath /usr/local/lib
 
 ifeq ($(BINARY),UNIVERSAL)
 CFLAGS += -arch arm64 -arch x86_64
@@ -93,6 +87,12 @@ CXXFLAGS += -arch arm64 -arch x86_64
 LDFLAGS += -arch arm64 -arch x86_64
 endif
 
+ifeq ($(VARIANT),STANDALONE)
+LDFLAGS += -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation
+endif
+
+LIBRARIES = -lpthread
+
 CXX = clang++
 CC = clang
 LD = clang
@@ -102,7 +102,7 @@ ifeq ($(current_OS),Linux)  # linux - libpcanbasic.so
 
 DEFINES += 
 
-HEADERS += -I$(HOME_DIR)/Linux
+HEADERS += -I$(INCLUDE_DIR)/linux/pcanbasic
 
 OBJECTS += $(OUTDIR)/PCBUSB.o
 
@@ -131,6 +131,7 @@ CP = cp -f
 
 CHECKER  = warning,information
 IGNORE   = -i tester.c -i dosopt.c
+LEVEL    = exhaustive  # normal or exhaustive
 
 OUTDIR = .objects
 BINDIR = $(BIN_DIR)
@@ -155,7 +156,7 @@ incdir:
 	@mkdir -p $(INCDIR)
 
 check:
-	cppcheck --enable=$(CHECKER) --suppressions-list=$(HOME_DIR)/suppress.txt \
+	cppcheck --enable=$(CHECKER) --check-level=$(LEVEL) --suppressions-list=$(HOME_DIR)/suppress.txt \
 	-D__APPLE__ $(DEFINES) $(HEADERS) $(IGNORE) $(MAIN_DIR) $(MISC_DIR) 
 
 clean:
@@ -167,13 +168,14 @@ pristine:
 
 install:
 	@echo "Copying binary file..."
-	@-$(CP) $(TARGET) $(INSTALL)
+	@mkdir -p $(INSTALL)
+	$(CP) $(TARGET) $(INSTALL)
 
 
 $(OUTDIR)/main.o: $(MAIN_DIR)/main.c
 	$(CC) $(CFLAGS) -MMD -MF $*.d -o $@ -c $<
 
-$(OUTDIR)/PCBUSB.o: $(WRAPPER_DIR)/PCBUSB.c
+$(OUTDIR)/PCBUSB.o: $(MISC_DIR)/PCBUSB.c
 	$(CC) $(CFLAGS) -MMD -MF $*.d -o $@ -c $<
 
 $(OUTDIR)/bitrates.o: $(MISC_DIR)/bitrates.c
@@ -212,8 +214,9 @@ $(OUTDIR)/pcan_log.o: $(DRIVER_DIR)/pcan_log.c
 
 $(TARGET): $(OBJECTS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES)
-	$(CP) $(TARGET) $(BINDIR)
 ifeq ($(current_OS),Darwin)
 	@lipo -archs $@
 endif
+	@mkdir -p $(BINDIR)
+	$(CP) $(TARGET) $(BINDIR)
 	@echo "\033[1mTarget '"$@"' successfully build\033[0m"
diff --git a/Utilities/can_test/README b/Utilities/can_test/README
index 03e9e5c..9d1dc46 100644
--- a/Utilities/can_test/README
+++ b/Utilities/can_test/README
@@ -1,20 +1,24 @@
 CAN Tester for PEAK-System PCAN USB Interfaces (macOS, x86_64 & arm64)
 
-Copyright (c) 2005-2010,2012-2024 by Uwe Vogt, UV Software, Berlin
+Copyright (c) 2005-2010,2012-2025 by Uwe Vogt, UV Software, Berlin
 
 Usage: can_test <interface> [<option>...]
 Options for receiver test (default):
  -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 format
-     --listen-only             monitor mode (transmitter is off)
+ -m, --mode=(CCF|FDF[+BRS])    CAN operation mode: CAN CC or CAN FD
+     --listen-only             monitor mode (listen-only mode)
      --no-status-frames        suppress reception of status frames
      --no-remote-frames        suppress reception of remote frames
- -b, --baudrate=<baudrate>     CAN 2.0 bit timing in kbps (default=250)
-     --bitrate=<bit-rate>      CAN FD bit rate (as a string)
- -v, --verbose                 show detailed bit rate settings
- -y, --trace=(ON|OFF)          write a trace file (default=OFF)
+     --code=<id>               acceptance code for 11-bit IDs (default=0x000)
+     --mask=<id>               acceptance mask for 11-bit IDs (default=0x7FF)
+     --xtd-code=<id>           acceptance code for 29-bit IDs (default=0x00000000)
+     --xtd-mask=<id>           acceptance mask for 29-bit IDs (default=0x1FFFFFFF)
+ -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250)
+     --bitrate=<bit-rate>      CAN bit-rate settings (as key/value list)
+ -v, --verbose                 show detailed bit-rate settings
+     --trace=(ON|OFF)          write a trace file (default=OFF)
 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
@@ -24,11 +28,11 @@ Options for transmitter test:
  -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 format
- -b, --baudrate=<baudrate>     CAN 2.0 bit timing in kbps (default=250)
-     --bitrate=<bit-rate>      CAN FD bit rate (as a string)
- -v, --verbose                 show detailed bit rate settings
- -y, --trace=(ON|OFF)          write a trace file (default=OFF)
+ -m, --mode=(CCF|FDF[+BRS])    CAN operation mode: CAN CC or CAN FD
+ -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250)
+     --bitrate=<bit-rate>      CAN bit-rate settings (as key/value list)
+ -v, --verbose                 show detailed bit-rate settings
+     --trace=(ON|OFF)          write a trace file (default=OFF)
 Other options:
      --list-bitrates[=<mode>]  list standard bit-rate settings and exit
  -L, --list-boards             list all supported CAN interfaces and exit
@@ -77,6 +81,13 @@ Hazard note:
 License type:
   This software is freeware without any warranty or support!
 Change log:
+- Version 0.6 SR2 of March 1, 2025:
+  Realized new program options:
+  - '--code=<id>'      acceptance code for 11-bit IDs (default=0x000)
+  - '--mask=<id>'      acceptance mask for 11-bit IDs (default=0x7FF)
+  - '--xtd-code=<id>'  acceptance code for 29-bit IDs (default=0x00000000)
+  - '--xtd-mask=<id>'  acceptance mask for 29-bit IDs (default=0x1FFFFFFF)
+  Compiled against PCBUSB v0.13 sources as Universal macOS Binary
 - Version 0.6 SR1 of December 30, 2024:
   Realized new program option:
   - '--list-bitrates[=<mode>]'  list standard bit-rate settings and exit
@@ -87,10 +98,10 @@ Change log:
   - '--no-remote-frames'  suppress reception of remote frames (default=ON)
   - '--trace=(ON|OFF)'    write a trace file (default=OFF)
   Compiled against PCBUSB v0.13 sources as Universal macOS Binary
-- Version 0.6 SR8 of November 3, 2023:
+- Version 0.5 SR8 of November 3, 2023:
   Fixed a bug with new PCAN-USB FD product version (hardware 6.0)
   Compiled against PCBUSB v0.12.2 sources as Universal macOS Binary
-- Version 0.6 SR7 of July 15, 2023:
+- Version 0.5 SR7 of July 15, 2023:
   Fixed some bugs with bit-rate string conversion (SAM issue among others)
   Compiled against PCBUSB v0.12.1 sources as Universal macOS Binary
 - Version 0.5 SR6 of February 2, 2023:
@@ -108,17 +119,17 @@ Change log:
 - Version 0.5 SR2 of December 22, 2020:
   Compiled against PCBUSB v0.9 sources (PCAN-USB Pro FD CAN1).
 - Version 0.5 SR1 of June 28, 2020:
-  Compiled against PCBUSB v0.9 sources (<MacTypes.h>).
+  Compiled against PCBUSB v0.9 sources (<MacTypes.h>)
 - Version 0.5 of December 1, 2019:
   Reworked command-line option handling:
   --listen-only - monitor mode (transmitter is off)
   --list-boards - list all supported CAN interfaces
   --test boards - list all available CAN interfaces
-  Compiled against PCBUSB v0.8.1 sources
+  Compiled against PCBUSB v0.8.1 sources.
 - Version 0.4 of September 22, 2017:
-  Support of PCAN-USB FD interfaces
+  Support of PCAN-USB FD interfaces.
 - Version 0.3 of November 23, 2014:
-  Time-stamps are taken from CAN controller
+  Time-stamps are taken from CAN controller.
 - Version 0.2 of May 17, 2013:
   Initial revision
 - Version 0.1 of July 6, 2012:
diff --git a/Utilities/can_test/main.c b/Utilities/can_test/main.c
index 5aee1dd..deeee5f 100644
--- a/Utilities/can_test/main.c
+++ b/Utilities/can_test/main.c
@@ -7,7 +7,7 @@
  *  copyright :  (c) 2005-2012 by UV Software, Friedrichshafen
  *               (c) 2013-2025 by UV Software, Berlin
  *
- *  revision  :  $Rev: 2065 $ of $Date: 2024-12-30 16:48:19 +0100 (Mo, 30 Dez 2024) $
+ *  revision  :  $Rev: 2087 $ of $Date: 2025-03-01 12:36:40 +0100 (Sa, 01 Mär 2025) $
  * 
  *  author(s) :  Uwe Vogt, UV Software
  *
@@ -19,28 +19,28 @@
  *  CAN Tester (based on macOS Library for PCAN USB Interfaces)
  *
  *  (1) Standalone version with compiled PCBUSB sources
- * 
+ *
  *  This program is freeware without any warranty or support!
  *  Please note the copyright and license agreements.
  *
  *  Note: This version does not require the libPCBUSB to be installed.
  *
  *  (2) Open-source version with libPCBUSB support
- * 
- *  This program is free software: you can redistribute it and/or modify
+ *
+ *  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 2 of the License, or
+ *  the Free Software Foundation; either version 2 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/>.
  *
- *  Note:  The libPCBUSB is licensed under a freeware license without any
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, see <https://www.gnu.org/licenses/>.
+ *
+ *  Note: The libPCBUSB is licensed under a freeware license without any
  *  warranty or support.  The libPCBUSB is not part of this program.
  *  It can be downloaded from <https://www.mac-can.com/>.
  *
@@ -51,14 +51,14 @@
 #if (OPTION_PCBUSB_STANDALONE != 0)
 #define VERSION_MAJOR     0
 #define VERSION_MINOR     6
-#define VERSION_PATCH     1
+#define VERSION_PATCH     2
 #else
 #define VERSION_MAJOR     1
-#define VERSION_MINOR     0
-#define VERSION_PATCH     99
+#define VERSION_MINOR     1
+#define VERSION_PATCH     0
 #endif
 #define VERSION_BUILD     BUILD_NO
-#define VERSION_STRING    TOSTRING(VERSION_MAJOR)"." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
+#define VERSION_STRING    TOSTRING(VERSION_MAJOR) "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) " (" TOSTRING(BUILD_NO) ")"
 #if defined(__APPLE__)
 #define PLATFORM    "macOS"
 #elif defined(__linux__)
@@ -67,19 +67,16 @@
 #error Unsupported platform
 #endif
 #if defined(__APPLE__)
-static const char APPLICATION[] = "CAN Tester for PEAK-System PCAN USB Interfaces, Version "VERSION_STRING;
-#else
-static const char APPLICATION[] = "CAN Tester for PEAK-System PCAN Interfaces, Version "VERSION_STRING;
-#endif
-static const char COPYRIGHT[]   = "Copyright (c) 2007,2012-2025 by Uwe Vogt, UV Software, Berlin";
+static const char APPLICATION[] = "CAN Tester for PEAK-System PCAN USB Interfaces, Version " VERSION_STRING;
+static const char COPYRIGHT[]   = "Copyright (c) 2005-2010,2012-2025 by Uwe Vogt, UV Software, Berlin";
 #if (OPTION_PCBUSB_STANDALONE != 0)
 static const char WARRANTY[]    = "This program is freeware without any warranty or support!";
 static const char LICENSE[]     = "This program is freeware without any warranty or support!\n\n" \
                                   "Note: This program does not require the libPCBUSB to be installed.";
 #else
-static const char WARRANTY[]    = "CAN Tester comes with ABSOLUTELY NO WARRANTY; for details type `--version'.\n\n" \
+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.";
+                                  "under certain conditions; type `can_test --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 2 of the License, or\n" \
@@ -94,6 +91,21 @@ static const char LICENSE[]     = "This program is free software; you can redist
                                   "warranty or support.  The libPCBUSB is not part of this program.\n" \
                                   "It can be downloaded from <https://www.mac-can.com/>.";
 #endif
+#else
+static const char APPLICATION[] = "CAN Tester for PEAK-System PCAN Interfaces, Version " VERSION_STRING;
+static const char COPYRIGHT[]   = "Copyright (c) 2005-2010,2012-2025 by Uwe Vogt, UV Software, Berlin";
+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 `can_test --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 2 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.";
+#endif
 
 /*  -----------  includes  -----------------------------------------------
  */
@@ -139,6 +151,11 @@ static const char LICENSE[]     = "This program is free software; you can redist
 #define TxFRAMES  (2)
 #define TxRANDOM  (3)
 
+#define CODE_11BIT   0x000
+#define MASK_11BIT   0x7FF
+#define CODE_29BIT   0x00000000
+#define MASK_29BIT   0x1FFFFFFF
+
 
 /*  -----------  types  -----------------------------------------------------
  */
@@ -194,8 +211,8 @@ int main(int argc, char *argv[])
 {
     TPCANHandle channel = PCAN_USBBUS1;
     TPCANStatus status;
-
-    int opt;
+    UINT64 intarg;
+    int opt, i;
     int mode = RxMODE, m = 0;
     time_t txtime = 0; long txframes = 0;
     long  board = -1; int b;
@@ -203,6 +220,10 @@ int main(int argc, char *argv[])
     BYTE  listenonly = PCAN_PARAMETER_OFF; int lo = 0;
     BYTE  allow_sts = PCAN_PARAMETER_ON; int sf = 0;
     BYTE  allow_rtr = PCAN_PARAMETER_ON; int rf = 0;
+    DWORD std_code = CODE_11BIT; int sc = 0;
+    DWORD std_mask = MASK_11BIT; int sm = 0;
+    DWORD xtd_code = CODE_29BIT; int xc = 0;
+    DWORD xtd_mask = MASK_29BIT; int xm = 0;
     BYTE  trace = PCAN_PARAMETER_OFF; int ts = 0;
     long  baudrate = PCAN_BAUD_250K; int bd = 0;
     long  delay = 0; int t = 0;
@@ -215,6 +236,7 @@ int main(int argc, char *argv[])
     int   num_boards = 0;
     BYTE  buffer[256]; /* char *device, *firmware, *software, *library; */
     DWORD device_id = 8472;
+    UINT64 filter = 0U;
     /* Default Bit-rate */
     TPCANBitrateFD bitrate = "f_clock_mhz=80,nom_brp=2,nom_tseg1=127,nom_tseg2=32,nom_sjw=32,data_brp=2,data_tseg1=15,data_tseg2=4,data_sjw=4";
     long unsigned freq = 0; struct btr_bit_timing slow, fast;
@@ -224,14 +246,13 @@ int main(int argc, char *argv[])
         {"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'},
-        {"no-status-frames", no_argument, 0, 'S'},
+        {"no-status-frames", no_argument, 0, 'E'},
         {"no-remote-frames", no_argument, 0, 'R'},
-        // {"code", required_argument, 0, '1'},
-        // {"mask", required_argument, 0, '2'},
-        // {"xtd-code", required_argument, 0, '3'},
-        // {"xtd-mask", required_argument, 0, '4'},
+        {"code", required_argument, 0, '1'},
+        {"mask", required_argument, 0, '2'},
+        {"xtd-code", required_argument, 0, '3'},
+        {"xtd-mask", required_argument, 0, '4'},
         {"receive", no_argument, 0, 'r'},
         {"number", required_argument, 0, 'n'},
         {"stop", no_argument, 0, 's'},
@@ -243,7 +264,7 @@ int main(int argc, char *argv[])
         {"data", required_argument, 0, 'd'},
         {"dlc", required_argument, 0, 'd'},
         {"id", required_argument, 0, 'i'},
-        {"trace", required_argument, 0, 'y'},
+        {"trace", required_argument, 0, 'Y'},
         {"list-bitrates", optional_argument, 0, 'l'},
         {"list-boards", no_argument, 0, 'L'},
         {"test-boards", no_argument, 0, 'T'},
@@ -262,7 +283,7 @@ int main(int argc, char *argv[])
         return errno;
     }
     /* scan command-line */
-    while ((opt = getopt_long(argc, (char * const *)argv, "b:vm:rn:st:f:R:c:u:d:i:y:laLTvh", long_options, NULL)) != -1) {
+    while ((opt = getopt_long(argc, (char * const *)argv, "b:vm:rn:st:f:F:c:u:d:i:laLTvh", long_options, &i)) != -1) {
         switch (opt) {
         /* option '--baudrate=<baudrate>' (-b) */
         case 'b':
@@ -311,14 +332,15 @@ int main(int argc, char *argv[])
             }
             verbose = 1;
             break;
-        /* option '--mode=(2.0|FDF[+BRS])' (-m)*/
+        /* 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, "CAN2.0") || !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "2.0"))
+            if (!strcasecmp(optarg, "DEFAULT") || !strcasecmp(optarg, "CLASSIC") || !strcasecmp(optarg, "CLASSICAL") ||
+                !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "2.0") ||
+                !strcasecmp(optarg, "CANCC") || !strcasecmp(optarg, "CCF") || !strcasecmp(optarg, "CC"))
                 op_mode = PCAN_MESSAGE_STANDARD;
             else if (!strcasecmp(optarg, "CANFD") || !strcasecmp(optarg, "FDF") || !strcasecmp(optarg, "FD"))
                 op_mode = PCAN_MESSAGE_FD;
@@ -338,7 +360,7 @@ int main(int argc, char *argv[])
             listenonly = PCAN_PARAMETER_ON;
             break;
         /* option '--no-status-frames' */
-        case 'S':
+        case 'E':
             if (sf++) {
                 fprintf(stderr, "%s: duplicated option `--no-status-frames'\n", basename(argv[0]));
                 return 1;
@@ -353,6 +375,70 @@ int main(int argc, char *argv[])
             }
             allow_rtr = PCAN_PARAMETER_OFF;
             break;
+        /* option '--code=<11-bit-code>' */
+        case '1':
+            if (sc++) {
+                fprintf(stderr, "%s: duplicated option `--code'\n", basename(argv[0]));
+                return 1;
+            }
+            if (sscanf(optarg, "%" SCNx64, &intarg) != 1) {
+                fprintf(stderr, "%s: illegal argument for option `--code'\n", basename(argv[0]));
+                return 1;
+            }
+            if ((intarg & ~0x7FF) != 0) {
+                fprintf(stderr, "%s: illegal argument for option --code'\n", basename(argv[0]));
+                return 1;
+            }
+            std_code = (DWORD)intarg;
+            break;
+        /* option '--mask=<11-bit-mask>' */
+        case '2':
+            if (sm++) {
+                fprintf(stderr, "%s: duplicated option `--mask'\n", basename(argv[0]));
+                return 1;
+            }
+            if (sscanf(optarg, "%" SCNx64, &intarg) != 1) {
+                fprintf(stderr, "%s: illegal argument for option --mask'\n", basename(argv[0]));
+                return 1;
+            }
+            if ((intarg & ~0x7FF) != 0) {
+                fprintf(stderr, "%s: illegal argument for option --mask'\n", basename(argv[0]));
+                return 1;
+            }
+            std_mask = (DWORD)intarg;
+            break;
+        /* option '--xtd-code=<29-bit-code>' */
+        case '3':
+            if (xc++) {
+                fprintf(stderr, "%s: duplicated option `--xtd-code'\n", basename(argv[0]));
+                return 1;
+            }
+            if (sscanf(optarg, "%" SCNx64, &intarg) != 1) {
+                fprintf(stderr, "%s: illegal argument for option --xtd-code'\n", basename(argv[0]));
+                return 1;
+            }
+            if ((intarg & ~0x1FFFFFFF) != 0) {
+                fprintf(stderr, "%s: illegal argument for option --xtd-code'\n", basename(argv[0]));
+                return 1;
+            }
+            xtd_code = (DWORD)intarg;
+            break;
+        /* option '--xtd-mask=<29-bit-mask>' */
+        case '4':
+            if (xm++) {
+                fprintf(stderr, "%s: duplicated option `--xtd-mask'\n", basename(argv[0]));
+                return 1;
+            }
+            if (sscanf(optarg, "%" SCNx64, &intarg) != 1) {
+                fprintf(stderr, "%s: illegal argument for option --xtd-mask'\n", basename(argv[0]));
+                return 1;
+            }
+            if ((intarg & ~0x1FFFFFFF) != 0) {
+                fprintf(stderr, "%s: illegal argument for option --xtd-mask'\n", basename(argv[0]));
+                return 1;
+            }
+            xtd_mask = (DWORD)intarg;
+            break;
         case 'r':  /* option '--receive' (-r) */
             if (m++) {
                 fprintf(stderr, "%s: duplicated option `--receive' (%c)\n", basename(argv[0]), opt);
@@ -485,8 +571,8 @@ int main(int argc, char *argv[])
                 return 1;
             }
             break;
-        /* option '--trace=(ON|OFF)' (-y) */
-        case 'y':
+        /* option '--trace=(ON|OFF)' */
+        case 'Y':
             if (ts++) {
                 fprintf(stderr, "%s: duplicated option `--trace'\n", basename(argv[0]));
                 return 1;
@@ -500,17 +586,18 @@ int main(int argc, char *argv[])
                 return 1;
             }
             break;
-        /* option '--list-bitrates' */
+        /* option '--list-bitrates[=(2.0|FDF[+BRS])]' */
         case 'l':
             fprintf(stdout, "%s\n%s\n\n%s\n\n", APPLICATION, COPYRIGHT, WARRANTY);
             /* list bit-rates (depending on operation mode) */
             if (optarg != NULL) {
-                if (op != 0) {
+                if (op++) {
                     fprintf(stderr, "%s: option `--list-bitrates' - operation mode already set'\n", basename(argv[0]));
                     return 1;
                 }
-                if (!strcasecmp(optarg, "default") || !strcasecmp(optarg, "classic") ||
-                    !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "2.0"))
+                if (!strcasecmp(optarg, "DEFAULT") || !strcasecmp(optarg, "CLASSIC") || !strcasecmp(optarg, "CLASSICAL") ||
+                    !strcasecmp(optarg, "CAN2.0") || !strcasecmp(optarg, "CAN20") || !strcasecmp(optarg, "2.0") ||
+                    !strcasecmp(optarg, "CANCC") || !strcasecmp(optarg, "CCF") || !strcasecmp(optarg, "CC"))
                     op_mode = PCAN_MESSAGE_STANDARD;
                 else if (!strcasecmp(optarg, "CANFD") || !strcasecmp(optarg, "FDF") || !strcasecmp(optarg, "FD"))
                     op_mode = PCAN_MESSAGE_FD;
@@ -694,6 +781,24 @@ int main(int argc, char *argv[])
         (void)CAN_Uninitialize(channel);
         return (int)status;;
     }
+    if ((std_code != CODE_11BIT) || (std_mask != MASK_11BIT)) {
+        filter = ((UINT64)std_code << 32) | (UINT64)std_mask;
+        if ((status = CAN_SetValue(channel, PCAN_ACCEPTANCE_FILTER_11BIT, (void*)&filter, sizeof(filter))) != PCAN_ERROR_OK) {
+            fprintf(stdout, "FAILED!\n");
+            fprintf(stderr, "+++ error: CAN_SetValue PCAN-USB%u (PCAN_ACCEPTANCE_FILTER_11BIT=%"PRIX64") returned 0x%X\n", (channel - 0x50), filter, status);
+            (void)CAN_Uninitialize(channel);
+            return (int)status;;
+        }
+    }
+    if ((xtd_code != CODE_29BIT) || (xtd_mask != MASK_29BIT)) {
+        filter = ((UINT64)xtd_code << 32) | (UINT64)xtd_mask;
+        if ((status = CAN_SetValue(channel, PCAN_ACCEPTANCE_FILTER_29BIT, (void*)&filter, sizeof(filter))) != PCAN_ERROR_OK) {
+            fprintf(stdout, "FAILED!\n");
+            fprintf(stderr, "+++ error: CAN_SetValue PCAN-USB%u (PCAN_ACCEPTANCE_FILTER_29BIT=%"PRIX64") returned 0x%X\n", (channel - 0x50), filter, status);
+            (void)CAN_Uninitialize(channel);
+            return (int)status;;
+        }
+    }
     if (trace != PCAN_PARAMETER_OFF) {
         if (getcwd((char*)buffer, 256) == NULL) {
             fprintf(stdout, "FAILED!\n");
@@ -886,6 +991,7 @@ static uint64_t tx_random(TPCANHandle channel, BYTE mode, uint32_t can_id, uint8
 
     fprintf(stderr, "\nPress ^C to abort.\n");
     message.ID  = (DWORD)can_id;
+    message.LEN = (BYTE)dlc;
     message.MSGTYPE = (TPCANMessageType)mode;
     fprintf(stdout, "\nTransmitting message(s)...");
     fflush (stdout);
@@ -1201,6 +1307,7 @@ static uint64_t tx_random_fd(TPCANHandle channel, BYTE mode, uint32_t can_id, ui
 
     fprintf(stderr, "\nPress ^C to abort.\n");
     message.ID  = (DWORD)can_id;
+    message.DLC = (BYTE)dlc;
     message.MSGTYPE = (TPCANMessageType)mode;
     fprintf(stdout, "\nTransmitting message(s)...");
     fflush (stdout);
@@ -1495,18 +1602,18 @@ static void usage(FILE *stream, const char *program)
     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");
-    fprintf(stream, " -m, --mode=(2.0|FDF[+BRS])    CAN operation mode: CAN 2.0 or CAN FD format\n");
-    fprintf(stream, "     --listen-only             monitor mode (transmitter is off)\n");
+    fprintf(stream, " -m, --mode=(CCF|FDF[+BRS])    CAN operation mode: CAN CC or CAN FD\n");
+    fprintf(stream, "     --listen-only             monitor mode (listen-only mode)\n");
     fprintf(stream, "     --no-status-frames        suppress reception of status frames\n");
     fprintf(stream, "     --no-remote-frames        suppress reception of remote frames\n");
-    // fprintf(stream, "     --code=<id>               acceptance code for 11-bit IDs (default=0x%03X)\n", CODE_11BIT);
-    // fprintf(stream, "     --mask=<id>               acceptance mask for 11-bit IDs (default=0x%03X)\n", MASK_11BIT);
-    // fprintf(stream, "     --xtd-code=<id>           acceptance code for 29-bit IDs (default=0x%08X)\n", CODE_29BIT);
-    // fprintf(stream, "     --xtd-mask=<id>           acceptance mask for 29-bit IDs (default=0x%08X)\n", MASK_29BIT);
-    fprintf(stream, " -b, --baudrate=<baudrate>     CAN 2.0 bit timing in kbps (default=250)\n");
-    fprintf(stream, "     --bitrate=<bit-rate>      CAN FD bit rate (as a string)\n");
-    fprintf(stream, " -v, --verbose                 show detailed bit rate settings\n");
-    fprintf(stream, " -y, --trace=(ON|OFF)          write a trace file (default=OFF)\n");
+    fprintf(stream, "     --code=<id>               acceptance code for 11-bit IDs (default=0x%03X)\n", CODE_11BIT);
+    fprintf(stream, "     --mask=<id>               acceptance mask for 11-bit IDs (default=0x%03X)\n", MASK_11BIT);
+    fprintf(stream, "     --xtd-code=<id>           acceptance code for 29-bit IDs (default=0x%08X)\n", CODE_29BIT);
+    fprintf(stream, "     --xtd-mask=<id>           acceptance mask for 29-bit IDs (default=0x%08X)\n", MASK_29BIT);
+    fprintf(stream, " -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250)\n");
+    fprintf(stream, "     --bitrate=<bit-rate>      CAN bit-rate settings (as key/value list)\n");
+    fprintf(stream, " -v, --verbose                 show detailed bit-rate settings\n");
+    fprintf(stream, "     --trace=(ON|OFF)          write a trace file (default=OFF)\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");
@@ -1516,11 +1623,11 @@ static void usage(FILE *stream, const char *program)
     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");
-    fprintf(stream, " -m, --mode=(2.0|FDF[+BRS])    CAN operation mode: CAN 2.0 or CAN FD format\n");
-    fprintf(stream, " -b, --baudrate=<baudrate>     CAN 2.0 bit timing in kbps (default=250)\n");
-    fprintf(stream, "     --bitrate=<bit-rate>      CAN FD bit rate (as a string)\n");
-    fprintf(stream, " -v, --verbose                 show detailed bit rate settings\n");
-    fprintf(stream, " -y, --trace=(ON|OFF)          write a trace file (default=OFF)\n");
+    fprintf(stream, " -m, --mode=(CCF|FDF[+BRS])    CAN operation mode: CAN CC or CAN FD\n");
+    fprintf(stream, " -b, --baudrate=<baudrate>     CAN bit-timing in kbps (default=250)\n");
+    fprintf(stream, "     --bitrate=<bit-rate>      CAN bit-rate settings (as key/value list)\n");
+    fprintf(stream, " -v, --verbose                 show detailed bit-rate settings\n");
+    fprintf(stream, "     --trace=(ON|OFF)          write a trace file (default=OFF)\n");
     fprintf(stream, "Other options:\n");
     fprintf(stream, "     --list-bitrates[=<mode>]  list standard bit-rate settings and exit\n");
     fprintf(stream, " -L, --list-boards             list all supported CAN interfaces and exit\n");
diff --git a/Utilities/Linux/LICENSE.lgpl b/Utilities/include/linux/pcanbasic/LICENSE.lgpl
similarity index 100%
rename from Utilities/Linux/LICENSE.lgpl
rename to Utilities/include/linux/pcanbasic/LICENSE.lgpl
diff --git a/Utilities/Linux/PCANBasic.h b/Utilities/include/linux/pcanbasic/PCANBasic.h
similarity index 100%
rename from Utilities/Linux/PCANBasic.h
rename to Utilities/include/linux/pcanbasic/PCANBasic.h
diff --git a/Utilities/Linux/README.txt b/Utilities/include/linux/pcanbasic/README.txt
similarity index 100%
rename from Utilities/Linux/README.txt
rename to Utilities/include/linux/pcanbasic/README.txt
diff --git a/Utilities/macOS/LICENSE b/Utilities/include/mac/pcbusb/LICENSE
similarity index 100%
rename from Utilities/macOS/LICENSE
rename to Utilities/include/mac/pcbusb/LICENSE
diff --git a/Utilities/macOS/PCBUSB.h b/Utilities/include/mac/pcbusb/PCBUSB.h
similarity index 100%
rename from Utilities/macOS/PCBUSB.h
rename to Utilities/include/mac/pcbusb/PCBUSB.h
diff --git a/Utilities/macOS/README b/Utilities/include/mac/pcbusb/README
similarity index 100%
rename from Utilities/macOS/README
rename to Utilities/include/mac/pcbusb/README
diff --git a/Utilities/macOS/PCBUSB.c b/Utilities/misc/PCBUSB.c
similarity index 100%
rename from Utilities/macOS/PCBUSB.c
rename to Utilities/misc/PCBUSB.c