From 307c7c5902636729924b9e100bedac2e7ec57cfc Mon Sep 17 00:00:00 2001 From: Uwe Vogt Date: Mon, 8 Apr 2024 09:28:55 +0200 Subject: [PATCH] Update CAN API V3 sources to rev. 1268 Relates to [CANAPI-80] --- Sources/CANAPI/CANAPI.h | 15 +++++---------- Sources/CANAPI/README.md | 4 ++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Sources/CANAPI/CANAPI.h b/Sources/CANAPI/CANAPI.h index c9b984c..4cfce01 100644 --- a/Sources/CANAPI/CANAPI.h +++ b/Sources/CANAPI/CANAPI.h @@ -73,9 +73,9 @@ /// zero to compile your program with the CAN API source files or to /// link your program with the static library at compile-time. /// -/// \author $Author: haumea $ +/// \author $Author: quaoar $ // -/// \version $Rev: 1260 $ +/// \version $Rev: 1268 $ // /// \defgroup can_api CAN Interface API, Version 3 /// \{ @@ -227,21 +227,16 @@ class CANCPP CCanApi { static bool GetFirstChannel(SChannelInfo &info, void *param = NULL); #endif - /// \brief query channel information of the first CAN interface in the + /// \brief query channel information of the next CAN interface in the /// list of CAN interfaces, if any. // - /// \param[in] library - library id of the CAN interface list, or -1 for all vendors /// \param[out] info - the channel information of the next entry in the list /// \param[out] param - pointer to channel-specific parameters // /// \returns true if channel information have been successfully read, or /// false on error. // -#if (OPTION_CANAPI_LIBRARY != 0) - static bool GetNextChannel(int32_t library, SChannelInfo &info, void *param = NULL); -#else - static bool GetNextChannel(SChannelInfo &info, void *param = NULL); -#endif + static bool GetNextChannel(SChannelInfo &info, void *param = NULL); /// \brief probes if the CAN interface (hardware and driver) given by /// the argument [ 'library' and ] 'channel' is present, @@ -520,4 +515,4 @@ class CANCPP CCanApi { /// \} #endif // CANAPI_H_INCLUDED /// \} -// $Id: CANAPI.h 1260 2024-03-24 15:16:47Z haumea $ Copyright (c) UV Software // +// $Id: CANAPI.h 1268 2024-04-08 07:19:23Z quaoar $ Copyright (c) UV Software // diff --git a/Sources/CANAPI/README.md b/Sources/CANAPI/README.md index 5512ad9..efb0e4b 100644 --- a/Sources/CANAPI/README.md +++ b/Sources/CANAPI/README.md @@ -1,9 +1,9 @@ ### CAN Interface API, Version 3 -_Copyright © 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)_ \ +_Copyright © 2004-2024 Uwe Vogt, UV Software, Berlin (info@uv-software.com)_ \ _All rights reserved._ -Version $Rev: 1260 $ +Version $Rev: 1268 $ # A CAN Interface Wrapper Specification