From 3f000671e15acd2de87c8588d7f09c0dc103bd7b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 08 九月 2025 13:56:23 +0800
Subject: [PATCH] 1.SVData获取和解释，待测试；
---
SourceCode/Bond/Servo/CEquipment.cpp | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index ab62475..e9eee92 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -490,6 +490,9 @@
// process data report
CHECK_READ_STEP_SIGNAL(STEP_ID_PROCESS_DATA_REPORT, pszData, size);
+ // FAC Data report
+ CHECK_READ_STEP_SIGNAL(STEP_ID_FAC_DATA_REPORT, pszData, size);
+
// 配方改变
CHECK_READ_STEP_SIGNAL(STEP_ID_CURRENT_RECIPE_CHANGE_REPORT, pszData, size);
@@ -1773,21 +1776,14 @@
int CEquipment::decodeFacDataReport(CStep* pStep, const char* pszData, size_t size)
{
- int index = 0;
- std::string strSvTimeRecord, strSvData;
- CToolUnits::convertString(&pszData[index], 8 * 2, strSvTimeRecord);
- index += 128 * 2;
- CToolUnits::convertString(&pszData[index], 100 * 2, strSvData);
- index += 256 * 2;
+ CSVData svData;
+ int nRet = svData.unserialize(&pszData[0], (int)size);
+ if (nRet < 0) return nRet;
+ m_svDatas.push_back(svData);
-
- // 缓存Attribute，用于调试时显示信息
- unsigned int weight = 201;
- pStep->addAttribute(new CAttribute("SV Time Record",
- strSvTimeRecord.c_str(), "", weight++));
- pStep->addAttribute(new CAttribute("SV Data",
- strSvData.c_str(), "", weight++));
-
+ if (m_listener.onSVDataReport != nullptr) {
+ m_listener.onSVDataReport(this, &svData);
+ }
return 0;
}
@@ -1861,6 +1857,9 @@
if (m_processState != PROCESS_STATE::Processing) {
+ Lock();
+ m_svDatas.clear();
+ Unlock();
setProcessState(PROCESS_STATE::Processing);
}
@@ -2153,4 +2152,26 @@
return 0;
};
+
+ void CEquipment::addFacDataReportStep(int dataDev, int writeSignalDev, int port)
+ {
+ CEqReadStep* pStep = new CEqReadStep(dataDev, 133 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodeFacDataReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_EQ_FAC_DATA_REPORT);
+ pStep->setProp("Port", (void*)port);
+ pStep->setWriteSignalDev(writeSignalDev);
+ if (addStep(STEP_ID_FAC_DATA_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ std::vector<SERVO::CSVData>& CEquipment::getSVDatas()
+ {
+ return m_svDatas;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3