Merge pull request #6 from mac-can/development

Release candidate 1 for version 1.0 patch 1

.github/workflows/msbuild-x64.yml

@@ -37,5 +37,4 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       # Add additional options to the MSBuild command line here (like platform or verbosity level).
       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-      #run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
-      run: ${{env.SOLUTION_FILE_PATH}}\x64_build.bat NOVARS NOTRIAL
+      run: ${{env.SOLUTION_FILE_PATH}}\x64_build.bat NOVARS NOTRIAL NODEBUG

Library/Makefile

@@ -51,7 +51,7 @@ current_OS := $(patsubst MSYS%,MinGW,$(current_OS))
 
 MAJOR = 1
 MINOR = 0
-PATCH = 0
+PATCH = 1
 
 ifeq ($(PATCH),0)
 VERSION = $(MAJOR).$(MINOR)

Library/uvslcan.vcxproj

@@ -278,7 +278,7 @@
     <ClInclude Include="..\Sources\slcan.h" />
     <ClInclude Include=".\Sources\framework.h" />
     <ClInclude Include=".\Sources\pch.h" />
-    <ClInclude Include=".\Sources\resource.h" />
+    <ClInclude Include=".\resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Sources\buffer_w.c">

Library/uvslcan.vcxproj.filters

@@ -42,7 +42,7 @@
     <ClInclude Include="..\Sources\slcan.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include=".\Sources\resource.h">
+    <ClInclude Include=".\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

README.md

@@ -119,8 +119,9 @@ The documentation of the SLCAN protocol can be found on [Lawicel CANUSB product
 
 ### Dual-License
 
-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.
+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 these portions of this work in whole or in part.
 
 `SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later`
 

Sources/buffer.c

@@ -5,8 +5,10 @@
  *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'buffer'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -49,4 +51,4 @@
 #include "buffer_p.c"
 #endif
 
-/* $Id: buffer.c 802 2024-03-24 17:11:20Z haumea $  Copyright (c) UV Software */
+/* $Id: buffer.c 811 2024-04-18 14:03:48Z quaoar $  Copyright (c) UV Software */

Sources/buffer.h

@@ -5,8 +5,10 @@
  *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'buffer'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -51,9 +53,9 @@
  *               A consumer thread waits until data has been written into the
  *               buffer and reads them, or returns when a time-out occurs.
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: quaoar $
  *
- *  @version     $Rev: 802 $
+ *  @version     $Rev: 811 $
  *
  *  @defgroup    buffer Waitable Buffer
  *  @{

Sources/buffer_p.c

@@ -5,8 +5,10 @@
  *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'buffer'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -49,9 +51,9 @@
  *
  *  @remarks     POSIX compatible variant (e.g. Linux, macOS)
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: quaoar $
  *
- *  @version     $Rev: 802 $
+ *  @version     $Rev: 811 $
  *
  *  @addtogroup  buffer
  *  @{

Sources/buffer_w.c

@@ -5,8 +5,10 @@
  *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'buffer'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -49,9 +51,9 @@
  *
  *  @remarks     Windows compatible variant (_WIN32 and _WIN64)
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: quaoar $
  *
- *  @version     $Rev: 802 $
+ *  @version     $Rev: 811 $
  *
  *  @addtogroup  buffer
  *  @{

Sources/logger.c

@@ -2,11 +2,13 @@
 /*
  *  Software for Industrial Communication, Motion Control and Automation
  *
- *  Copyright (c) 2016-2024 Uwe Vogt, UV Software, Berlin ([email protected])
+ *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'logger'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -49,4 +51,4 @@
 #include "logger_p.c"
 #endif
 
- /* $Id: logger.c 802 2024-03-24 17:11:20Z haumea $  Copyright (c) UV Software */
+ /* $Id: logger.c 811 2024-04-18 14:03:48Z quaoar $  Copyright (c) UV Software */

Sources/logger.h

@@ -2,11 +2,13 @@
 /*
  *  Software for Industrial Communication, Motion Control and Automation
  *
- *  Copyright (c) 2016-2024 Uwe Vogt, UV Software, Berlin ([email protected])
+ *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'logger'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -47,9 +49,9 @@
  *
  *  @brief       Writing log messages into an ASCII file.
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: quaoar $
  *
- *  @version     $Rev: 804 $
+ *  @version     $Rev: 811 $
  *
  *  @defgroup    logger Logging into a file
  *  @{

Sources/logger_p.c

@@ -2,11 +2,13 @@
 /*
  *  Software for Industrial Communication, Motion Control and Automation
  *
- *  Copyright (c) 2016-2024 Uwe Vogt, UV Software, Berlin ([email protected])
+ *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'logger'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -49,9 +51,9 @@
  *
  *  @remarks     POSIX compatible variant (e.g. Linux, macOS)
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: quaoar $
  *
- *  @version     $Rev: 802 $
+ *  @version     $Rev: 811 $
  *
  *  @addtogroup  logger
  *  @{

Sources/logger_w.c

@@ -2,11 +2,13 @@
 /*
  *  Software for Industrial Communication, Motion Control and Automation
  *
- *  Copyright (c) 2016-2024 Uwe Vogt, UV Software, Berlin ([email protected])
+ *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'logger'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -51,7 +53,7 @@
  *
  *  @author      $Author: quaoar $
  *
- *  @version     $Rev: 809 $
+ *  @version     $Rev: 811 $
  *
  *  @addtogroup  logger
  *  @{

Sources/queue.c

@@ -5,8 +5,10 @@
  *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'queue'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -49,4 +51,4 @@
 #include "queue_p.c"
 #endif
 
-/* $Id: queue.c 802 2024-03-24 17:11:20Z haumea $  Copyright (c) UV Software */
+/* $Id: queue.c 811 2024-04-18 14:03:48Z quaoar $  Copyright (c) UV Software */

Sources/queue.h

@@ -5,8 +5,10 @@
  *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'queue'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -54,9 +56,9 @@
  *
  *  @note        When the queue is full no further data element will be enqueued.
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: quaoar $
  *
- *  @version     $Rev: 802 $
+ *  @version     $Rev: 811 $
  *
  *  @defgroup    queue Waitable Queue
  *  @{

Sources/queue_p.c

@@ -5,8 +5,10 @@
  *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'queue'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -49,9 +51,9 @@
  *
  *  @remarks     POSIX compatible variant (e.g. Linux, macOS)
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: quaoar $
  *
- *  @version     $Rev: 802 $
+ *  @version     $Rev: 811 $
  *
  *  @addtogroup  queue
  *  @{

Sources/queue_w.c

@@ -5,8 +5,10 @@
  *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'queue'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -49,9 +51,9 @@
  *
  *  @remarks     Windows compatible variant (_WIN32 and _WIN64)
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: quaoar $
  *
- *  @version     $Rev: 802 $
+ *  @version     $Rev: 811 $
  *
  *  @addtogroup  queue
  *  @{

Sources/serial.c

@@ -5,8 +5,10 @@
  *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'serial'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -49,4 +51,4 @@
 #include "serial_p.c"
 #endif
 
-/* $Id: serial.c 802 2024-03-24 17:11:20Z haumea $  Copyright (c) UV Software */
+/* $Id: serial.c 811 2024-04-18 14:03:48Z quaoar $  Copyright (c) UV Software */

Sources/serial.h

@@ -5,8 +5,10 @@
  *  Copyright (c) 2002-2024 Uwe Vogt, UV Software, Berlin ([email protected])
  *  All rights reserved.
  *
- *  This module is dual-licensed under the BSD 2-Clause "Simplified" License and
- *  under the GNU General Public License v3.0 (or any later version).
+ *  Module 'serial'
+ *
+ *  This module 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 module.
  *
  *  BSD 2-Clause "Simplified" License:
@@ -47,9 +49,9 @@
  *
  *  @brief       Serial data transmission.
  *
- *  @author      $Author: haumea $
+ *  @author      $Author: quaoar $
  *
- *  @version     $Rev: 803 $
+ *  @version     $Rev: 811 $
  *
  *  @defgroup    serial Serial Data Transmission
  *  @{