#IQRV #comment [Vendor] cw/2021.0527.01

DevAdapter/CMakeLists.txt

@@ -142,7 +142,7 @@ if(DEVADAPTER_USING_CONAN)
     set(KEBA_CONAN_LIB_NAME keba/2021.0625.01@LR04.02_VendorLib/testing)
 	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0629.01@LR04.02_VendorLib/testing)
 	set(GRG_CONAN_LIB_NAME grg/2021.0622.01@LR04.02_VendorLib/testing)
-	set(CW_CONAN_LIB_NAME cw/2021.0524.01@LR04.02_VendorLib/testing)
+	set(CW_CONAN_LIB_NAME cw/2021.0527.01@LR04.02_VendorLib/testing)
     set(GWI_CONAN_LIB_NAME gwi/2021.0625.02@LR04.02_VendorLib/testing)
 endif(DEVADAPTER_USING_CONAN)
  

DevAdapter/cw/hspscanner.1.1/hspscannerimpl.cpp

@@ -44,6 +44,11 @@ ErrorCodeEnum HSPSClassImpl::DevOpen()
         HSPSCall = (pHSPSCall)dlsym(hlib, "HSPSCall");
     }
     Sleep(200);
+    if (m_hThreadID == 0)
+    {
+        m_bThreadExit = false;
+        StartTimer();
+    }
 
     int iRet = 0;
     if (HSPSCall("H 0 0", 0, iRet) < 0)
@@ -59,11 +64,6 @@ ErrorCodeEnum HSPSClassImpl::DevOpen()
 
     if (iRet == 0)
         m_bIsOpen = true;
-    if (m_hThreadID == 0)
-    {
-        m_bThreadExit = false;
-        StartIn();
-    }
     return GetErrorInfo(iRet, "DevOpen");
 }
 
@@ -395,7 +395,7 @@ void    HSPSClassImpl::ThreadRun()
     }
 }
 
-void	HSPSClassImpl::StartIn()
+void	HSPSClassImpl::StartTimer()
 {
     pthread_attr_t	attr;
     pthread_attr_init(&attr);

DevAdapter/cw/hspscanner.1.1/hspscannerimpl.h

@@ -98,7 +98,7 @@ public:
     pthread_t       m_hThreadID;
     static void*	Proc(void* inPara);
     bool            m_bThreadExit;
-    void			StartIn();
+    void			StartTimer();
     void            CloseThread(pthread_t& h);
 
     pHSPSCall       HSPSCall;

DevAdapter/cw/ups.1.1/deviceconnect.cpp

@@ -5,7 +5,7 @@
 DeviceConnect::DeviceConnect()
 {
     m_pSerial = new SSerial();
-    m_pSerial->SetCtrl(8,1,Parity_NO, Flow_DSR);
+//    m_pSerial->SetCtrl(8,1,Parity_NO, Flow_XONOFF);
 }
 
 DeviceConnect::~DeviceConnect()
@@ -118,7 +118,7 @@ int DeviceConnect::Execute(BYTE* pData, int iLength, BYTE* pOut, int* pOutLen, i
     memcpy(sData, pData, iLength);
     sData[iLength] = CalBcc(sData, iLength);
     iLength++;
-
+    Sleep(200);//串口流控有问题，目前采用延时解决
     int iSend = m_pSerial->Send((const char*)sData, iLength, iTimeOut);
     if (iSend < iLength)
         return UPS_TIMEOUT;
@@ -143,7 +143,7 @@ int DeviceConnect::Execute(BYTE* pData, int iLength, int iTimeOut)
     memcpy(sData, pData, iLength);
     sData[iLength] = CalBcc(sData, iLength);
     iLength++;
-
+    Sleep(200);//串口流控有问题，目前采用延时解决
     int iSend = m_pSerial->Send((const char*)sData, iLength, iTimeOut);
     if (iSend < iLength)    return UPS_TIMEOUT;
 

DevAdapter/cw/ups.1.1/deviceconnect.h

@@ -33,8 +33,8 @@ public:
 protected:
     SSerial*    m_pSerial;
     BYTE    CalBcc(BYTE* pData, BYTE iCount);
-    int     Execute(BYTE* pData, int iLength, BYTE* pOut, int* pOutLen, int iTimeOut = 300);
-    int     Execute(BYTE* pData, int iLength, int iTimeOut = 300);
+    int     Execute(BYTE* pData, int iLength, BYTE* pOut, int* pOutLen, int iTimeOut = 1200);
+    int     Execute(BYTE* pData, int iLength, int iTimeOut = 1200);
 
 };