Jelajahi Sumber

#IQRV #comment GPIO&高拍仪root上送

80374374 2 tahun lalu
induk
melakukan
1f6e052935
2 mengubah file dengan 3 tambahan dan 8 penghapusan
  1. 1 1
      Module/mod_HSPScanner/HSPScannerFSM.cpp
  2. 2 7
      Module/mod_gpio/mod_gpio.cpp

+ 1 - 1
Module/mod_HSPScanner/HSPScannerFSM.cpp

@@ -155,7 +155,7 @@ ErrorCodeEnum CHSPScannerFSM::OnInit()
 	if (erroCode == Error_Succeed) {
 		if (Error_Succeed == (erroCode = TryToOpenDevice())) {
 			m_eDevStatus = DEVICE_STATUS_NORMAL;
-			ToLogRootINIInfoOnce();
+			ToLogRootINIInfo();
 			ToLogWarnInfoAboutTerm();
 			return erroCode;
 		}

+ 2 - 7
Module/mod_gpio/mod_gpio.cpp

@@ -371,12 +371,14 @@ ErrorCodeEnum CGpioEntity::Initial()
         initParam.dwBaudRate = baudRate;
         err = m_hDevHelper->DevOpen(initParam);
         if (err == Error_Succeed) {
+			ToLogRootINIInfo();
 			ZeroMemory(m_devCatInfo.szModel, sizeof(m_devCatInfo.szModel));
 			ZeroMemory(m_devCatInfo.szType, sizeof(m_devCatInfo.szType));
 			ZeroMemory(m_devCatInfo.szVendor, sizeof(m_devCatInfo.szVendor));
             err = m_hDevHelper->GetDevCategory(m_devCatInfo);
             if (err == Error_Succeed) {
                 m_adapterInfo.FulfillCategoryInfo(m_devCatInfo);
+				ToLogWarnInfoAboutTerm(m_adapterInfo);
             } else {
                 DevErrorInfo devErrInfo;
                 ZeroMemory(&devErrInfo, sizeof(devErrInfo));
@@ -432,13 +434,6 @@ ErrorCodeEnum CGpioEntity::Initial()
     m_moveDisappearTimes = m_moveHoldTimes;
     m_eMachineType = SP::Module::Comm::GetTerminalMachineInfo(this).type;
     DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("machine type: %s", SP::Module::Comm::Type2Str(m_eMachineType));
-
-	if (m_FirstStart) {
-		m_FirstStart = FALSE;
-        ToLogRootINIInfo();
-		ToLogWarnInfoAboutTerm(m_adapterInfo);
-	}
-
     return err;
 }
 void CGpioEntity::OnLog(const CAutoArray<CUUID>& SubIDs, const CUUID nLogID, const LogTypeEnum eLogType, const SeverityLevelEnum eLevel,