From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipment.cpp | 107 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 96 insertions(+), 11 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 8d8582d..ab62475 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -496,6 +496,11 @@
// 主配方上报
CHECK_READ_STEP_SIGNAL(STEP_ID_MASTER_RECIPE_LIST_REPORT, pszData, size);
+ // 配方参数
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_RECIPE_PARAMETER_CMD_REPLY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_RECIPE_PARAMETER_REPORT, pszData, size);
+
+
// CIM Mode
CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIMMODE_CHANGED_CMD_REPLY, pszData, size);
@@ -811,6 +816,16 @@
CRecipeList* CEquipment::getRecipeList(int unitNo)
{
return m_recipesManager.getRecipeList(unitNo);
+ }
+
+ bool CEquipment::saveRecipeList(int unitNo, std::string& strFilepath)
+ {
+ return m_recipesManager.saveRecipeList(unitNo, strFilepath);
+ }
+
+ bool CEquipment::readRecipeList(int unitNo, std::string& strFilepath)
+ {
+ return m_recipesManager.readRecipeList(unitNo, strFilepath);
}
int CEquipment::recvIntent(CPin* pPin, CIntent* pIntent)
@@ -1189,28 +1204,39 @@
return 0;
}
- int CEquipment::recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo)
+ int CEquipment::recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo, ONSYNCINGSTATECHANGED block)
{
- SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_MASTER_RECIPE_LIST_REQ);
+ LOGI("<CEquipment-%s>正在请求单元<%d>主配参数列表", m_strName.c_str(), unitNo);
+ m_recipesManager.setOnSyncingStateChanged(block);
+ if (m_recipesManager.syncing() != 0) {
+ return -2;
+ }
+
+ SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_RECIPE_PARAMETER_REQ);
if (pStep == nullptr) {
return -1;
}
- LOGI("<CEquipment-%s>正在请求单元<%d>主配方列表", m_strName.c_str(), unitNo);
- if (m_recipesManager.syncing() != 0) {
- return -2;
- }
- pStep->writeShort(unitNo, [&, unitNo](int code) -> int {
+ char szBuffer[14 * 2] = {0};
+ int index = 0;
+ memcpy(&szBuffer[index], &masterRecipeId, sizeof(short));
+ index += sizeof(short);
+ memcpy(&szBuffer[index], &localRecipeId, sizeof(short));
+ index += sizeof(short);
+ memcpy(&szBuffer[index], &unitNo, sizeof(short));
+
+ pStep->writeDataEx(szBuffer, 14 * 2, [&, unitNo](int code) -> int {
if (code == WOK) {
- LOGI("<CEquipment-%s>请求单元<%d>主配方列表成功，正在等待数据.", m_strName.c_str(), unitNo);
+ LOGI("<CEquipment-%s>请求单元<%d>主配方参数列表成功，正在等待数据.", m_strName.c_str(), unitNo);
}
else {
m_recipesManager.syncFailed();
- LOGI("<CEquipment-%s>请求单元<%d>主配方列表失败，code:%d", m_strName.c_str(), unitNo, code);
+ LOGI("<CEquipment-%s>请求单元<%d>主配方参数列表失败，code:%d", m_strName.c_str(), unitNo, code);
}
return 0;
- });
+ });
+
return 0;
}
@@ -1454,6 +1480,13 @@
return TRUE;
}
+ BOOL CEquipment::slotHasGlass(int slotIndex/* = 0*/)
+ {
+ ASSERT(slotIndex < 8);
+ CGlass* pGlass = (CGlass*)m_slot[slotIndex].getContext();
+ return (pGlass != nullptr);
+ }
+
int CEquipment::removeGlass(int slotNo)
{
CSlot* pSlot = nullptr;
@@ -1494,6 +1527,24 @@
CAttributeVector& attrubutes = pStep->attributeVector();
processData.getAttributeVector(attrubutes, weight);
onProcessData(&processData);
+
+
+
+ // 找到玻璃，关联数据
+ CGlass* pGlass = this->getGlassWithCassette(processData.getCassetteSequenceNo(),
+ processData.getJobSequenceNo());
+ if (pGlass == nullptr) {
+ LOGE("<CEquipment-%s>找不到对应Glass, 关联工艺参数失败。", this->getName().c_str(),
+ processData.getCassetteSequenceNo(),
+ processData.getJobSequenceNo());
+ return -1;
+ }
+
+ auto rawData = processData.getParamsRawData();
+ std::vector<CParam> params;
+ this->parsingParams((const char*)rawData.data(), rawData.size(), params);
+ pGlass->addParams(params);
+
return nRet;
}
@@ -1726,7 +1777,7 @@
std::string strSvTimeRecord, strSvData;
CToolUnits::convertString(&pszData[index], 8 * 2, strSvTimeRecord);
index += 128 * 2;
- CToolUnits::convertString(&pszData[index], 640 * 2, strSvData);
+ CToolUnits::convertString(&pszData[index], 100 * 2, strSvData);
index += 256 * 2;
@@ -2068,4 +2119,38 @@
return InspResult::NotInspected;
}
+
+ float CEquipment::toFloat(const char* pszAddr)
+ {
+ BYTE szBuffer[4];
+ szBuffer[0] = pszAddr[0];
+ szBuffer[1] = pszAddr[1];
+ szBuffer[2] = pszAddr[2];
+ szBuffer[3] = pszAddr[3];
+ float f = 0.0;
+ memcpy(&f, szBuffer, 4);
+
+ return f;
+ }
+
+ int CEquipment::parsingParams(const char* pszData, size_t size, std::string& strOut)
+ {
+ std::vector<CParam> params;
+ int nRet = parsingParams(pszData, size, params);
+ if (nRet <= 0) return nRet;
+
+ char szBuffer[256];
+ for (auto p : params) {
+ if(!strOut.empty()) strOut.append(",");
+ if (p.getValueType() == PVT_INT) {
+ sprintf_s(szBuffer, 256, "%s:%d", p.getName().c_str(), p.getIntValue());
+ }
+ else if (p.getValueType() == PVT_DOUBLE) {
+ sprintf_s(szBuffer, 256, "%s:%f", p.getName().c_str(), p.getDoubleValue());
+ }
+ strOut.append(szBuffer);
+ }
+
+ return 0;
+ };
}
\ No newline at end of file
--
Gitblit v1.9.3