Skip to content

Commit de11394

Browse files
authored
Merge pull request #22 from uv-software/development
Release candidate 2 for version 0.5.1
2 parents 56b1ea5 + 113f56f commit de11394

27 files changed

+1112
-550
lines changed

.github/workflows/msbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: windows-latest
2929

3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232

3333
- name: Add MSBuild to PATH
3434
uses: microsoft/[email protected]

Deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ _All rights reserved._
104104
- Change-log: list all major changes, e.g. from commit comments
105105
- Assets: drag and drop the artifacts archive (see above)
106106
3. Click on `Publish release`.
107-
4. That's all folks!
107+
4. That´s all folks!
108108

109-
### Announcement
109+
## Announce the new Release
110110

111111
1. Create a new post with the change-log in the `mac-can.github.io` repo.
112112
2. Update the PCANBasic-Wrapper page in the `mac-can.github.io` repo.

Doxygen/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ PROJECT_BRIEF = "CAN API V3 Wrapper Library for PEAK-System PCAN Interf
6161
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
6262
# the logo to the output directory.
6363

64-
PROJECT_LOGO = C:/Projekte/CAN/DRV/Drivers/PeakCANBasic/Doxygen/logo.png
64+
PROJECT_LOGO = ./logo.png
6565

6666
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
6767
# into which the generated documentation will be written. If a relative path is

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### CAN API V3 Wrapper Library for PEAK-System PCAN® Interfaces (Windows®)
22

3-
_Copyright © 2005-2024 Uwe Vogt, UV Software, Berlin ([email protected])_
3+
_Copyright © 2005-2024 Uwe Vogt, UV Software, Berlin ([email protected])_
44

55
![MSBuild](https://github.com/uv-software/PCANBasic-Wrapper/actions/workflows/msbuild.yml/badge.svg)
66

@@ -126,7 +126,7 @@ Type `can_test /?` to display all program options.
126126
127127
### Development Environment
128128
129-
- Microsoft Visual Studio Community 2022 (Version 17.9.5)
129+
- Microsoft Visual Studio Community 2022 (Version 17.10.1)
130130
131131
### Required PCANBasic DLL
132132
@@ -146,7 +146,7 @@ For a list of known bugs and caveats see tab [Issues](https://github.com/uv-soft
146146
147147
### PCANBasic DLL for Windows®
148148
149-
The PCANBasic DLL can be downloaded form [PEAK-System](https://www.peak-system.com/) website. \
149+
The PCANBasic DLL can be downloaded from [PEAK-System](https://www.peak-system.com/) website. \
150150
Please note the copyright and license agreements.
151151
152152
### Wrapper Library for macOS® and Linux®
@@ -163,8 +163,6 @@ Except where otherwise noted, this work is dual-licensed under the terms of the
163163
and under the terms of the GNU General Public License v3.0 (or any later version).
164164
You can choose between one of them if you use these portions of this work in whole or in part.
165165
166-
`SPDX-License-Identifier: BSD-2-Clause OR GPL-3.0-or-later`
167-
168166
### Trademarks
169167
170168
Windows is a registered trademark of Microsoft Corporation in the United States and/or other countries. \

Sources/PeakCAN.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
/// \}
6767

6868
/// \name PeakCAN API
69-
/// \brief CAN API V3 driver for PEAK-System PCAN-Basic interfaces
69+
/// \brief CAN API V3 driver for PEAK-System PCAN interfaces
7070
/// \note See CCanApi for a description of the overridden methods
7171
/// \{
7272
class CANCPP CPeakCAN : public CCanApi {

Sources/PeakCAN_Defines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ extern "C" {
178178
#define PCAN_LIB_MIN_MAJOR 8U
179179
#define PCAN_LIB_MIN_MINOR 0U
180180
#else
181-
#error Platform not supported
181+
#error Platform not supported
182182
#endif
183183
/** @} */
184184

0 commit comments

Comments
 (0)