modify zlg/2 openchannel 1st is can_index

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[]) {
-    can_index = 0;
-    device_index = channel;
+    can_index = channel;
+    device_index = 0;
     device_type = 0;
     if (argc > 1) {
-        can_index = *(UINT*)argv[1];
+        device_index = *(UINT*)argv[1];
     }
     if (argc > 0) {
         device_type = *(UINT*)argv[0];

CANZLG.h

@@ -18,15 +18,15 @@ class CANZLG : public CANBase {
     CANZLG();
     ~CANZLG();
     /**
-     * @param channel Indicates device_index
+     * @param channel Indicates can_index
      * @param type Indicates device_type
      * @see <controlcan.h>
      */
     CANStatus OpenChannel(int channel, CANRate baudRate, int type = 0) override;
 
     /**
-     * @param channel Indicates device_index
-     * @param argv Indicates device_type, can_index.
+     * @param channel Indicates can_index
+     * @param argv Indicates device_type, device_index.
      * Default 0.
      * @see <controlcan.h>
      */

CANZLG2.cpp

@@ -12,11 +12,11 @@ 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 = channel;
+    UINT can_index = channel;
+    UINT device_index = 0;
     UINT device_type = 0;
     if (argc > 1) {
-        can_index = *(UINT*)argv[1];
+        device_index = *(UINT*)argv[1];
     }
     if (argc > 0) {
         device_type = *(UINT*)argv[0];

CANZLG2.h

@@ -1,9 +1,9 @@
 #pragma once
 #ifndef __CANBase_ZLG2_H
 #define __CANBase_ZLG2_H
-#include "CANBase.h"
-#include <thread>
 #include <zlgcan/zlgcan.h>
+#include <thread>
+#include "CANBase.h"
 namespace ZCANBus {
 class CANZLG2 : public CANBase {
    private:
@@ -16,17 +16,17 @@ class CANZLG2 : public CANBase {
     CANZLG2();
     ~CANZLG2();
     /**
-     * @param channel Indicates device_index
+     * @param channel Indicates can_index
      * @param type Indicates device_type
-     * @see <zlgcan.h> 
+     * @see <zlgcan.h>
      */
     CANStatus OpenChannel(int channel, CANRate baudRate, int type = 0) override;
 
     /**
-     * @param channel Indicates device_index
-     * @param argv Indicates device_type, can_index.
+     * @param channel Indicates can_index
+     * @param argv Indicates device_type, device_index.
      * Default 0.
-     * @see <zlgcan.h> 
+     * @see <zlgcan.h>
      */
     CANStatus OpenChannel(int channel, CANRate baudRate, int argc,
                           char* argv[]) override;

CMakeLists.txt

@@ -3,13 +3,21 @@ project(ZCANBus)
 
 set(CMAKE_CXX_STANDARD 11)
 
-# set(USE_PEAK true)
+# set(PEAK_WANTED true)
 
-# set(USE_KVASER true)
+# set(KVASER_WANTED true)
 
-# set(USE_ZLG true)
+# set(ZLG_WANTED true)
 
-# set(USE_ZLG2 true)
+# set(ZLG2_WANTED true)
+
+# set(PEAK_UNWANTED true)
+
+# set(KVASER_UNWANTED true)
+
+# set(ZLG_UNWANTED true)
+
+# set(ZLG2_UNWANTED true)
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
   set(_COMPILER_ARCHITECTURE x64)
@@ -22,10 +30,31 @@ set(CAN_FILE CANHandler.cpp)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 
-find_package(Peak)
-find_package(Kvaser)
-find_package(ZLG)
-find_package(ZLG2)
+if(PEAK_WANTED)
+set(PEAK_REQUIRED REQUIRED)
+endif()
+if(KVASER_WANTED)
+set(KVASER_REQUIRED REQUIRED)
+endif()
+if(ZLG_WANTED)
+set(ZLG_REQUIRED REQUIRED)
+endif()
+if(ZLG2_WANTED)
+set(ZLG2_REQUIRED REQUIRED)
+endif()
+
+if(NOT PEAK_UNWANTED)
+find_package(Peak ${PEAK_REQUIRED})
+endif()
+if(NOT KVASER_UNWANTED)
+find_package(Kvaser ${KVASER_REQUIRED})
+endif()
+if(NOT ZLG_UNWANTED)
+find_package(ZLG ${ZLG_REQUIRED})
+endif()
+if(NOT ZLG2_UNWANTED)
+find_package(ZLG2 ${ZLG2_REQUIRED})
+endif()
 
 if(Peak_FOUND)
 add_definitions(-DUSE_PEAK)
@@ -59,5 +88,5 @@ if(CMAKE_HOST_UNIX)
   link_libraries(pthread)
 endif(CMAKE_HOST_UNIX)
 
-set(CMAKE_DEBUG_POSTFIX _d)
+# set(CMAKE_DEBUG_POSTFIX _d)
 add_library(${PROJECT_NAME} ${CAN_FILE})

FindZLG.cmake

@@ -3,7 +3,7 @@ find_path(ZLG_INCLUDE_DIR controlcan.h PATH_SUFFIXES ZLG)
 find_library(ZLG_LIBS NAMES usbcan PATH_SUFFIXES MS x64 x86 win32)
 elseif(CMAKE_HOST_UNIX)
 find_path(ZLG_INCLUDE_DIR NAMES controlcan.h PATH_SUFFIXES ZLG)
-find_library(ZLG_LIBS NAMES usbcan)
+find_library(ZLG_LIBS NAMES usbcan controlcan)
 else()
 message(FATAL_ERROR "Unsupported OS " ${CMAKE_SYSTEM_NAME})
 endif(CMAKE_HOST_WIN32)