Skip to content
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
4 changes: 2 additions & 2 deletions Deployment.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 (info@uv-software.de)_ \
_Copyright © 2005-2025 Uwe Vogt, UV Software, Berlin (info@uv-software.com)_ \
_All rights reserved._

# Deployment
Expand Down Expand Up @@ -104,7 +104,7 @@ _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!

## Announce the new Release

Expand Down
2 changes: 1 addition & 1 deletion Doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ PROJECT_NAME = PCANBasic-Wrapper
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = v0.5
PROJECT_NUMBER = v0.6

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
11 changes: 9 additions & 2 deletions Examples/C++/can_recv.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
//
// 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
Expand All @@ -22,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 = {};
Expand Down Expand Up @@ -65,10 +71,11 @@ 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;
Expand Down
8 changes: 7 additions & 1 deletion Examples/C++/can_send.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
//
// 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
Expand All @@ -21,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;
Expand Down
22 changes: 12 additions & 10 deletions Examples/Python/CANAPI.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
#
# CAN Interface API, Version 3 (Python Wrapper)
#
# Copyright (c) 2005-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
# Copyright (c) 2005-2025 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
# under the GNU General Public License v2.0 (or any later version). You can
# choose between one of them if you use CAN API V3 in whole or in part.
#
# BSD 2-Clause Simplified License:
# (1) 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
Expand All @@ -31,19 +32,20 @@
# 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
# (2) GNU General Public License v2.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
# the Free Software Foundation; either version 2 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/>.
# 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/>.
#
"""
CAN API V3 Python Wrapper for generic CAN Interfaces.
Expand All @@ -54,7 +56,7 @@

$Author: quaoar $

$Rev: 1278 $
$Rev: 1408 $
"""
from ctypes import *
import platform
Expand Down Expand Up @@ -916,5 +918,5 @@ def len2dlc(length):
# have a great time
print('Bye, bye!')

# * $Id: CANAPI.py 1278 2024-04-23 08:34:36Z quaoar $ *** (c) UV Software, Berlin ***
# * $Id: CANAPI.py 1408 2025-01-16 20:34:17Z quaoar $ *** (c) UV Software, Berlin ***
#
2 changes: 1 addition & 1 deletion LICENSE.BSD-2-Clause
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 2-Clause License

Copyright (c) 2021, Uwe Vogt, UV Software
Copyright (c) 2005-2025, Uwe Vogt, UV Software
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
Loading
Loading