Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release candidate 2 for version 0.5.1 #22

Merged
merged 8 commits into from
Jun 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Add MSBuild to PATH
uses: microsoft/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions Deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ _All rights reserved._
- 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`.
4. That's all folks!
4. That´s all folks!

### Announcement
## Announce the new Release

1. Create a new post with the change-log in the `mac-can.github.io` repo.
2. Update the PCANBasic-Wrapper page in the `mac-can.github.io` repo.
Expand Down
2 changes: 1 addition & 1 deletion Doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ PROJECT_BRIEF = "CAN API V3 Wrapper Library for PEAK-System PCAN Interf
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory.

PROJECT_LOGO = C:/Projekte/CAN/DRV/Drivers/PeakCANBasic/Doxygen/logo.png
PROJECT_LOGO = ./logo.png

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### CAN API V3 Wrapper Library for PEAK-System PCAN® Interfaces (Windows®)

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

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

Expand Down Expand Up @@ -126,7 +126,7 @@ Type `can_test /?` to display all program options.

### Development Environment

- Microsoft Visual Studio Community 2022 (Version 17.9.5)
- Microsoft Visual Studio Community 2022 (Version 17.10.1)

### Required PCANBasic DLL

Expand All @@ -146,7 +146,7 @@ For a list of known bugs and caveats see tab [Issues](https://github.com/uv-soft

### PCANBasic DLL for Windows®

The PCANBasic DLL can be downloaded form [PEAK-System](https://www.peak-system.com/) website. \
The PCANBasic DLL can be downloaded from [PEAK-System](https://www.peak-system.com/) website. \
Please note the copyright and license agreements.

### Wrapper Library for macOS® and Linux®
Expand All @@ -163,8 +163,6 @@ Except where otherwise noted, this work is dual-licensed under the terms of the
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`

### Trademarks

Windows is a registered trademark of Microsoft Corporation in the United States and/or other countries. \
Expand Down
2 changes: 1 addition & 1 deletion Sources/PeakCAN.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
/// \}

/// \name PeakCAN API
/// \brief CAN API V3 driver for PEAK-System PCAN-Basic interfaces
/// \brief CAN API V3 driver for PEAK-System PCAN interfaces
/// \note See CCanApi for a description of the overridden methods
/// \{
class CANCPP CPeakCAN : public CCanApi {
Expand Down
2 changes: 1 addition & 1 deletion Sources/PeakCAN_Defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ extern "C" {
#define PCAN_LIB_MIN_MAJOR 8U
#define PCAN_LIB_MIN_MINOR 0U
#else
#error Platform not supported
#error Platform not supported
#endif
/** @} */

Expand Down
Loading
Loading