From f77e8008cac062596058fca2aeddda62b80bedbf Mon Sep 17 00:00:00 2001
From: kojingeun <diteam.co.kr>
Date: 금, 14 7월 2023 17:03:10 +0900
Subject: [PATCH] Merge branch 'feature/#4517_CF_AOI_Review_결과_파일_찾기_실패_개선' into develop
---
ReviewSystem/CHMotorControls/MotorControl.cpp | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/ReviewSystem/CHMotorControls/MotorControl.cpp b/ReviewSystem/CHMotorControls/MotorControl.cpp
index 3be3b86..ee07ab9 100644
--- a/ReviewSystem/CHMotorControls/MotorControl.cpp
+++ b/ReviewSystem/CHMotorControls/MotorControl.cpp
@@ -103,27 +103,27 @@
if (m_nAxisCount<1) return;
//Alive
- if (ReadAddressValue(50, m_nMotorAlive))
- {
- if (m_nMotorAlivePrev != m_nMotorAlive)
- {
- dwLastAliveTick = GetTickCount();
- }
- m_nAutoEnablePrev = m_nAutoEnable;
-
- if (GetTickCount() - dwLastAliveTick >15000 && dwLastAliveTick != 0)
- {
- m_pMC2P->IMC2P_SendMotorAliveErrorAlram();
- m_pMC2P->IMC2P_DisplayMessage(m_nIndex, _T("Motor Alive Error!"));
- dwLastAliveTick = GetTickCount();
- }
- }
- else
- {
- m_pMC2P->IMC2P_SendMotorAliveErrorAlram();
- m_pMC2P->IMC2P_DisplayMessage(m_nIndex, _T("Motor Alive Read Fail!"));
- dwLastAliveTick = GetTickCount();
- }
+// if (ReadAddressValue(50, m_nMotorAlive))
+// {
+// if (m_nMotorAlivePrev != m_nMotorAlive)
+// {
+// dwLastAliveTick = GetTickCount();
+// }
+// m_nAutoEnablePrev = m_nAutoEnable;
+//
+// if (GetTickCount() - dwLastAliveTick >15000 && dwLastAliveTick != 0)
+// {
+// m_pMC2P->IMC2P_SendMotorAliveErrorAlram();
+// m_pMC2P->IMC2P_DisplayMessage(m_nIndex, _T("Motor Alive Error!"));
+// dwLastAliveTick = GetTickCount();
+// }
+// }
+// else
+// {
+// m_pMC2P->IMC2P_SendMotorAliveErrorAlram();
+// m_pMC2P->IMC2P_DisplayMessage(m_nIndex, _T("Motor Alive Read Fail!"));
+// dwLastAliveTick = GetTickCount();
+// }
// auto enable
const CMotorCommonAddr *pAddr = m_ControlInfo.GetMotorCommonAddr();
--
Gitblit v1.9.3