Skip to content

Commit 513f1b9

Browse files
authored
Merge pull request #22 from mac-can/development
Release candidate 1 for version 0.4
2 parents b3ab49a + db13aa0 commit 513f1b9

File tree

134 files changed

+6024
-5977
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+6024
-5977
lines changed

Deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### macOS® Wrapper Library for PCAN-USB Interfaces from PEAK-System
22

3-
_Copyright © 2005-2010, 2012-2024 Uwe Vogt, UV Software, Berlin (info@mac-can.com)_ \
3+
_Copyright © 2005-2010, 2012-2025 Uwe Vogt, UV Software, Berlin (info@mac-can.com)_ \
44
_All rights reserved._
55

66
# Deployment
@@ -106,7 +106,7 @@ _All rights reserved._
106106
- Change-log: list all major changes, e.g. from commit comments
107107
- Assets: drag and drop the artifacts archive (see above)
108108
3. Click on `Publish release`.
109-
4. That´s all folks!
109+
4. That's all folks!
110110

111111
## Announce the new Release
112112

Doxygen/Doxyfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ PROJECT_NAME = PCBUSB-Wrapper
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = v0.3
41+
PROJECT_NUMBER = v0.4
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a
4545
# quick idea about the purpose of the project. Keep the description short.
4646

47-
PROJECT_BRIEF = "macOS® Wrapper Library for PCAN-USB Interfaces from PEAK-System"
47+
PROJECT_BRIEF = "macOS® Wrapper Library for PCAN USB Interfaces from PEAK-System"
4848

4949
# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
5050
# in the documentation. The maximum height of the logo should not exceed 55

Examples/Python/CANAPI.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
#
33
# CAN Interface API, Version 3 (Python Wrapper)
44
#
5-
# Copyright (c) 2005-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
5+
# Copyright (c) 2005-2025 Uwe Vogt, UV Software, Berlin (info@uv-software.com)
66
# All rights reserved.
77
#
88
# This file is part of CAN API V3.
99
#
1010
# CAN API V3 is dual-licensed under the BSD 2-Clause "Simplified" License and
11-
# under the GNU General Public License v3.0 (or any later version). You can
11+
# under the GNU General Public License v2.0 (or any later version). You can
1212
# choose between one of them if you use CAN API V3 in whole or in part.
1313
#
14-
# BSD 2-Clause Simplified License:
14+
# (1) BSD 2-Clause "Simplified" License
15+
#
1516
# Redistribution and use in source and binary forms, with or without
1617
# modification, are permitted provided that the following conditions are met:
1718
# 1. Redistributions of source code must retain the above copyright notice, this
@@ -31,19 +32,20 @@
3132
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3233
# OF CAN API V3, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3334
#
34-
# GNU General Public License v3.0 or later:
35-
# CAN API V3 is free software: you can redistribute it and/or modify
35+
# (2) GNU General Public License v2.0 or later
36+
#
37+
# CAN API V3 is free software; you can redistribute it and/or modify
3638
# it under the terms of the GNU General Public License as published by
37-
# the Free Software Foundation, either version 3 of the License, or
39+
# the Free Software Foundation; either version 2 of the License, or
3840
# (at your option) any later version.
3941
#
4042
# CAN API V3 is distributed in the hope that it will be useful,
4143
# but WITHOUT ANY WARRANTY; without even the implied warranty of
4244
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4345
# GNU General Public License for more details.
4446
#
45-
# You should have received a copy of the GNU General Public License
46-
# along with CAN API V3. If not, see <https://www.gnu.org/licenses/>.
47+
# You should have received a copy of the GNU General Public License along
48+
# with CAN API V3; if not, see <https://www.gnu.org/licenses/>.
4749
#
4850
"""
4951
CAN API V3 Python Wrapper for generic CAN Interfaces.
@@ -54,7 +56,7 @@
5456
5557
$Author: quaoar $
5658
57-
$Rev: 1278 $
59+
$Rev: 1408 $
5860
"""
5961
from ctypes import *
6062
import platform
@@ -916,5 +918,5 @@ def len2dlc(length):
916918
# have a great time
917919
print('Bye, bye!')
918920

919-
# * $Id: CANAPI.py 1278 2024-04-23 08:34:36Z quaoar $ *** (c) UV Software, Berlin ***
921+
# * $Id: CANAPI.py 1408 2025-01-16 20:34:17Z quaoar $ *** (c) UV Software, Berlin ***
920922
#

LICENSE.BSD-2-Clause

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 2-Clause License
22

3-
Copyright (c) 2021, Uwe Vogt, UV Software
3+
Copyright (c) 2012-2025, Uwe Vogt, UV Software
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

LICENSE.GPL-2.0-or-later

Lines changed: 338 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)