From daf053dfd30a3c20524d92290be9d3dc2ac599ec Mon Sep 17 00:00:00 2001
From: LWQ <1806950222@qq.com>
Date: 星期三, 30 七月 2025 19:27:02 +0800
Subject: [PATCH] 1.修复：区分测量精度及研磨量距离单像素精度功能 2.修改：上传到CIM的数据
---
ENRIT/InterfaceManager.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/ENRIT/InterfaceManager.cpp b/ENRIT/InterfaceManager.cpp
index 82d1f40..88c1837 100644
--- a/ENRIT/InterfaceManager.cpp
+++ b/ENRIT/InterfaceManager.cpp
@@ -838,13 +838,63 @@
g_pLog->DisplayMessage(_T("write PLC Result Data : Resut %d,1_L_Theat %d,1_S_Theat %d,2_L_Theat %d,2_S_Theat %d,pResult[10]:%d"),pResult[0],pResult[1],pResult[2],pResult[3],pResult[4], pResult[10]);
INS_PROFILE_RESULT_INFO *pProfileResult = m_GlassData.GetProfileResultInfo();
-
+
for(int i=0;i<MAX_PROFILE_SETTING_COUNT;i++)
{
- pProfileResult->nProfileData[i] = pHistory.nProfileDiff[i];
+ /*pProfileResult->nProfileData[i] = pHistory.nProfileDiff[i];
pProfileResult->nChamferUp[i] = pHistory.nChamferThickUp[i];
- pProfileResult->nChamferDn[i] = pHistory.nChamferThickDn[i];
+ pProfileResult->nChamferDn[i] = pHistory.nChamferThickDn[i];*/
+ //上报测量精度及研磨量数据到CIM
+ if (i<10)
+ {
+ pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[1];
+ pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[1];
+ pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[1];
+ }
+ if (i<23&&i>=10)
+ {
+ pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[2];
+ pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[2];
+ pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[2];
+ }if (i<33&&i>=23)
+ {
+ pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[3];
+ pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[3];
+ pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[3];
+ }if (i<46&&i>=33)
+ {
+ pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[0];
+ pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[0];
+ pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[0];
+ }if (i<59&&i>=46)
+ {
+ pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[4];
+ pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[4];
+ pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[4];
+ }
+ if (i<64&&i>=59)
+ {
+ pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[5];
+ pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[5];
+ pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[5];
+ }if (i<69&&i>=64)
+ {
+ pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[7];
+ pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[7];
+ pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[7];
+ }if (i<74&&i>=69)
+ {
+ pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[6];
+ pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[6];
+ pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[6];
+ }if (i<79&&i>=74)
+ {
+ pProfileResult->nProfileData[i] = pHistory.nAVGProfileDiff[8];
+ pProfileResult->nChamferUp[i] = pHistory.nAVGChamferThickUp[8];
+ pProfileResult->nChamferDn[i] = pHistory.nAVGChamferThickDn[8];
+ }
}
+
m_pControlInterface->SendCIMData((short*)pProfileResult,PLC_ADDR_PROFILE_JUDEMENT,MAX_PROFILE_SETTING_COUNT*3);
--
Gitblit v1.9.3