修改注释和ZLG

Author: ChenSZ

CANZLG.cpp

@@ -12,11 +12,11 @@ CANStatus CANZLG::OpenChannel(int channel, CANRate baudRate, int type) {
 
 CANStatus CANZLG::OpenChannel(int channel, CANRate baudRate, int argc,
                               char* argv[]) {
-    if (argc > 2) {
-        can_index = *(UINT*)argv[2];
-    }
+    can_index = 0;
+    device_index = channel;
+    device_type = 0;
     if (argc > 1) {
-        device_index = *(UINT*)argv[1];
+        can_index = *(UINT*)argv[1];
     }
     if (argc > 0) {
         device_type = *(UINT*)argv[0];

CANZLG.h

@@ -18,17 +18,17 @@ class CANZLG : public CANBase {
     CANZLG();
     ~CANZLG();
     /**
-     * @param channel
-     * @param type Indicates HwType
-     * @see <PCANBasic.h> CAN_Initialize
+     * @param channel Indicates device_index
+     * @param type Indicates device_type
+     * @see <controlcan.h>
      */
     CANStatus OpenChannel(int channel, CANRate baudRate, int type = 0) override;
 
     /**
-     * @param channel
-     * @param argv Indicates HwType, IOPort, Interrupt in CAN_Initialize.
+     * @param channel Indicates device_index
+     * @param argv Indicates device_type, can_index.
      * Default 0.
-     * @see <PCANBasic.h> CAN_Initialize
+     * @see <controlcan.h>
      */
     CANStatus OpenChannel(int channel, CANRate baudRate, int argc,
                           char* argv[]) override;

CANZLG2.cpp

@@ -13,13 +13,10 @@ CANStatus CANZLG2::OpenChannel(int channel, CANRate baudRate, int type) {
 CANStatus CANZLG2::OpenChannel(int channel, CANRate baudRate, int argc,
                                char* argv[]) {
     UINT can_index = 0;
-    UINT device_index = 0;
+    UINT device_index = channel;
     UINT device_type = 0;
-    if (argc > 2) {
-        can_index = *(UINT*)argv[2];
-    }
     if (argc > 1) {
-        device_index = *(UINT*)argv[1];
+        can_index = *(UINT*)argv[1];
     }
     if (argc > 0) {
         device_type = *(UINT*)argv[0];

CANZLG2.h

@@ -16,17 +16,17 @@ class CANZLG2 : public CANBase {
     CANZLG2();
     ~CANZLG2();
     /**
-     * @param channel
-     * @param type Indicates HwType
-     * @see <PCANBasic.h> CAN_Initialize
+     * @param channel Indicates device_index
+     * @param type Indicates device_type
+     * @see <zlgcan.h> 
      */
     CANStatus OpenChannel(int channel, CANRate baudRate, int type = 0) override;
 
     /**
-     * @param channel
-     * @param argv Indicates HwType, IOPort, Interrupt in CAN_Initialize.
+     * @param channel Indicates device_index
+     * @param argv Indicates device_type, can_index.
      * Default 0.
-     * @see <PCANBasic.h> CAN_Initialize
+     * @see <zlgcan.h> 
      */
     CANStatus OpenChannel(int channel, CANRate baudRate, int argc,
                           char* argv[]) override;

CMakeLists.txt

@@ -20,91 +20,39 @@ if(MSVC)
 endif()
 set(CAN_FILE CANHandler.cpp)
 
-if(CMAKE_HOST_WIN32)
-find_path(Peak_INCLUDE_DIR NAMES PCANBasic.h PATH ${CMAKE_CURRENT_SOURCE_DIR}/include/peak)
-find_library(Peak_LIBRARY NAMES PCANBasic PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib/MS ${CMAKE_CURRENT_SOURCE_DIR}/lib/x64)
-find_path(Kvaser_INCLUDE_DIR canlib.h PATH ${CMAKE_CURRENT_SOURCE_DIR}/include/kvaser)
-find_library(Kvaser_LIBRARY NAMES canlib32 PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib/MS ${CMAKE_CURRENT_SOURCE_DIR}/lib/x64)
-elseif(CMAKE_HOST_UNIX)
-if(CMAKE_HOST_APPLE)
-find_path(Peak_INCLUDE_DIR NAMES PCBUSB.h PATH /usr/include /usr/local/include)
-find_library(Peak_LIBRARY NAMES PCBUSB PATH /usr/lib /usr/local/lib)
-else()
-find_path(Peak_INCLUDE_DIR NAMES PCANBasic.h PATH /usr/include /usr/local/include)
-find_library(Peak_LIBRARY NAMES pcanbasic PATH /usr/lib /usr/local/lib)
-endif(CMAKE_HOST_APPLE)
-find_path(Kvaser_INCLUDE_DIR NAMES canlib.h PATH /usr/include /usr/local/include)
-find_library(Kvaser_LIBRARY NAMES canlib PATH /usr/lib /usr/local/lib)
-find_path(ZLG_INCLUDE_DIR NAMES controlcan.h PATH /usr/include /usr/local/include)
-find_library(ZLG_LIBRARY NAMES usbcan PATH /usr/lib /usr/local/lib)
-find_path(ZLG2_INCLUDE_DIR NAMES zlgcan.h PATH /usr/include /usr/local/include)
-find_library(ZLG2_LIBRARY NAMES usbcan-* PATH /usr/lib /usr/local/lib)
-else()
-message(FATAL_ERROR "Unsupported OS " ${CMAKE_SYSTEM_NAME})
-endif(CMAKE_HOST_WIN32)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 
-if(Peak_INCLUDE_DIR AND Peak_LIBRARY)
-set(Peak_FOUND TRUE)
-message(STATUS "Found Peak")
-else()
-if(USE_PEAK)
-message(FATAL_ERROR "Not found Peak")
-endif()
-endif()
-
-if(Kvaser_INCLUDE_DIR AND Kvaser_LIBRARY)
-set(Kvaser_FOUND TRUE)
-message(STATUS "Found Kvaser")
-else()
-if(USE_KVASER)
-message(FATAL_ERROR "Not found Kvaser")
-endif()
-endif()
-
-if(ZLG_INCLUDE_DIR AND ZLG_LIBRARY)
-set(ZLG_FOUND TRUE)
-message(STATUS "Found ZLG")
-else()
-if(USE_ZLG)
-message(FATAL_ERROR "Not found ZLG")
-endif()
-endif()
-
-if(ZLG2_INCLUDE_DIR AND ZLG2_LIBRARY)
-set(ZLG2_FOUND TRUE)
-message(STATUS "Found ZLG2")
-else()
-if(USE_ZLG)
-message(FATAL_ERROR "Not found ZLG2")
-endif()
-endif()
+find_package(Peak)
+find_package(Kvaser)
+find_package(ZLG)
+find_package(ZLG2)
 
 if(Peak_FOUND)
 add_definitions(-DUSE_PEAK)
 list(APPEND CAN_FILE CANPeak.cpp)
-include_directories(${PEAK_INCLUDE_DIR})
-link_libraries(${PEAK_LIBRARY})
+include_directories(${Peak_INCLUDE_DIR})
+link_libraries(${Peak_LIBS})
 endif()
 
 if(Kvaser_FOUND)
 add_definitions(-DUSE_KVASER)
 list(APPEND CAN_FILE CANKvaser.cpp)
 include_directories(${Kvaser_INCLUDE_DIR})
-link_libraries(${Kvaser_LIBRARY})
+link_libraries(${Kvaser_LIBS})
 endif()
 
 if(ZLG_FOUND)
 add_definitions(-DUSE_ZLG)
 list(APPEND CAN_FILE CANZLG.cpp)
 include_directories(${ZLG_INCLUDE_DIR})
-link_libraries(${ZLG_LIBRARY})
+link_libraries(${ZLG_LIBS})
 endif()
 
 if(ZLG2_FOUND)
 add_definitions(-DUSE_ZLG2)
 list(APPEND CAN_FILE CANZLG2.cpp)
 include_directories(${ZLG2_INCLUDE_DIR})
-link_libraries(${ZLG2_LIBRARY})
+link_libraries(${ZLG2_LIBS})
 endif()
 
 if(CMAKE_HOST_UNIX)

FindKvaser.cmake

@@ -0,0 +1,22 @@
+if(CMAKE_HOST_WIN32)
+find_path(Kvaser_INCLUDE_DIR canlib.h PATH_SUFFIXES kvaser)
+find_library(Kvaser_LIBS NAMES canlib32 PATH_SUFFIXES MS x64 x86 win32)
+elseif(CMAKE_HOST_UNIX)
+find_path(Kvaser_INCLUDE_DIR NAMES canlib.h PATH_SUFFIXES kvaser)
+find_library(Kvaser_LIBS NAMES canlib)
+else()
+message(FATAL_ERROR "Unsupported OS " ${CMAKE_SYSTEM_NAME})
+endif(CMAKE_HOST_WIN32)
+if(Kvaser_INCLUDE_DIR AND Kvaser_LIBS)
+set(Kvaser_FOUND TRUE)
+message(STATUS "Found Kvaser")
+else()
+unset(Kvaser_FOUND)
+unset(Kvaser_INCLUDE_DIR)
+unset(Kvaser_LIBS)
+if(Kvaser_FIND_REQUIRED)
+message(FATAL_ERROR  "Not found Kvaser")
+else()
+message(WARNING "Not found Kvaser")
+endif()
+endif()

FindPeak.cmake

@@ -0,0 +1,25 @@
+if(CMAKE_HOST_WIN32)
+    find_path(Peak_INCLUDE_DIR NAMES PCANBasic.h PATH_SUFFIXES peak)
+    find_library(Peak_LIBS NAMES PCANBasic PATH_SUFFIXES MS x64 x86 win32)
+elseif(CMAKE_HOST_UNIX)
+    if(CMAKE_HOST_APPLE)
+        find_path(Peak_INCLUDE_DIR NAMES PCBUSB.h PATH_SUFFIXES peak)
+        find_library(Peak_LIBS NAMES PCBUSB)
+    else()
+        find_path(Peak_INCLUDE_DIR NAMES PCANBasic.h PATH_SUFFIXES peak)
+        find_library(Peak_LIBS NAMES pcanbasic)
+    endif(CMAKE_HOST_APPLE)
+endif(CMAKE_HOST_WIN32)
+if(Peak_INCLUDE_DIR AND Peak_LIBS)
+    set(Peak_FOUND TRUE)
+    message(STATUS "Found Peak")
+else()
+    unset(Peak_FOUND)
+    unset(Peak_INCLUDE_DIR)
+    unset(Peak_LIBS)
+    if(Peak_FIND_REQUIRED)
+    message(FATAL_ERROR  "Not found Peak")
+    else()
+    message(WARNING "Not found Peak")
+    endif()
+endif()

FindZLG.cmake

@@ -0,0 +1,22 @@
+if(CMAKE_HOST_WIN32)
+find_path(ZLG_INCLUDE_DIR controlcan.h PATH_SUFFIXES ZLG)
+find_library(ZLG_LIBS NAMES canlib32 PATH_SUFFIXES MS x64)
+elseif(CMAKE_HOST_UNIX)
+find_path(ZLG_INCLUDE_DIR NAMES controlcan.h PATH_SUFFIXES ZLG)
+find_library(ZLG_LIBS NAMES usbcan)
+else()
+message(FATAL_ERROR "Unsupported OS " ${CMAKE_SYSTEM_NAME})
+endif(CMAKE_HOST_WIN32)
+if(ZLG_INCLUDE_DIR AND ZLG_LIBS)
+set(ZLG_FOUND TRUE)
+message(STATUS "Found ZLG")
+else()
+unset(ZLG_FOUND)
+set(ZLG_INCLUDE_DIR)
+set(ZLG_LIBS)
+if(ZLG_FIND_REQUIRED)
+message(FATAL_ERROR  "Not found ZLG")
+else()
+message(WARNING "Not found ZLG")
+endif()
+endif()

FindZLG2.cmake

@@ -0,0 +1,22 @@
+if(CMAKE_HOST_WIN32)
+find_path(ZLG2_INCLUDE_DIR zlgcan.h PATH_SUFFIXES ZLG)
+find_library(ZLG2_LIBS NAMES usbcan-* PATH_SUFFIXES MS x64 x86 win32)
+elseif(CMAKE_HOST_UNIX)
+find_path(ZLG2_INCLUDE_DIR NAMES zlgcan.h PATH_SUFFIXES ZLG)
+find_library(ZLG2_LIBS NAMES usbcan-*)
+else()
+message(FATAL_ERROR "Unsupported OS " ${CMAKE_SYSTEM_NAME})
+endif(CMAKE_HOST_WIN32)
+if(ZLG2_INCLUDE_DIR AND ZLG2_LIBS)
+set(ZLG2_FOUND TRUE)
+message(STATUS "Found ZLG2")
+else()
+unset(ZLG2_FOUND)
+unset(ZLG2_INCLUDE_DIR)
+unset(ZLG2_LIBS)
+if(ZLG2_FIND_REQUIRED)
+message(FATAL_ERROR  "Not found ZLG2")
+else()
+message(WARNING "Not found ZLG2")
+endif()
+endif()