From 48d848201d91187c21d015ed54c0e5e81ceb2c66 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 15 五月 2025 08:45:35 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/Servo/CBonder.cpp | 121 +++++++++++++++++++++++++++++++++++++++
1 files changed, 119 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 0167d1c..16f2d39 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -6,6 +6,7 @@
CBonder::CBonder() : CEquipment()
{
m_nIndex = 0;
+ m_bPermittedStore = FALSE;
}
CBonder::~CBonder()
@@ -88,10 +89,25 @@
{
// eq process
+ // 使用CEqReadStep替换CEqProcessStep
+ /*
CEqProcessStep* pStep = new CEqProcessStep();
pStep->setName(STEP_PROCESS);
pStep->setWriteSignalDev(m_nIndex == 0 ? 0x347 : 0x647);
pStep->setProcessDev(m_nIndex == 0 ? 0xab55 : 0xeb55);
+ if (addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ */
+ CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0xab55 : 0xeb55), 538 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodeProcessDataReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_PROCESS);
+ pStep->setWriteSignalDev((m_nIndex == 0 ? 0x347 : 0x647));
if (addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
delete pStep;
}
@@ -235,6 +251,55 @@
}
}
+ // 使用CEqReadStep替换CEqJobEventStep
+ {
+ // Received Job Report Upstream #1~9
+ char szBuffer[256];
+ for (int i = 0; i < 9; i++) {
+ CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x8c90 : 0xcc90) + 320 * i, 320 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
+ if (port > 0) {
+ decodeReceivedJobReport((CStep*)pFrom, port, pszData, size);
+ }
+ }
+ return -1;
+ });
+ sprintf_s(szBuffer, "%s%d", STEP_EQ_RECEIVED_JOB_UPSn, i + 1);
+ pStep->setName(szBuffer);
+ pStep->setProp("Port", (void*)(__int64)(i + 1));
+ pStep->setWriteSignalDev((m_nIndex == 0 ? 0x300 : 0x600) + i);
+ if (addStep(STEP_ID_RECIVE_JOB_UPS1 + i, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ }
+ {
+ // Sent Out Job Report Downstream #1~9
+ char szBuffer[256];
+ for (int i = 0; i < 9; i++) {
+ CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x8000 : 0xc000) + 320 * i, 320 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
+ if (port > 0) {
+ decodeReceivedJobReport((CStep*)pFrom, port, pszData, size);
+ }
+ }
+ return -1;
+ });
+ sprintf_s(szBuffer, "%s%d", STEP_EQ_SENT_OUT_JOB_DOWNSn, i + 1);
+ pStep->setName(szBuffer);
+ pStep->setProp("Port", (void*)(__int64)(i + 1));
+ pStep->setWriteSignalDev((m_nIndex == 0 ? 0x30a : 0x60a) + i);
+ if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS1 + i, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ }
+
+ /*
{
CEqJobEventStep* pStep = new CEqJobEventStep();
pStep->setName(STEP_EQ_RECEIVED_JOB_UPS1);
@@ -271,6 +336,7 @@
delete pStep;
}
}
+ */
{
// Fetched Out Job Report #1~15
@@ -281,7 +347,7 @@
if (code == ROK && pszData != nullptr && size > 0) {
int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
if (port > 0) {
- decodeFetchedOutJobReport(port, pszData, size);
+ decodeFetchedOutJobReport((CStep*)pFrom, port, pszData, size);
}
}
return -1;
@@ -305,7 +371,7 @@
if (code == ROK && pszData != nullptr && size > 0) {
int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
if (port > 0) {
- decodeStoredJobReport(port, pszData, size);
+ decodeStoredJobReport((CStep*)pFrom, port, pszData, size);
}
}
return -1;
@@ -360,4 +426,55 @@
{
return m_nIndex;
}
+
+ int CBonder::onReceivedJob(int port, CJobDataS* pJobDataS)
+ {
+ m_bPermittedStore = FALSE;
+ Lock();
+ size_t size = m_glassList.size();
+ if (size == 0) {
+ m_bPermittedStore = TRUE;
+ }
+ else if (size == 1) {
+ CGlass* pGlass = m_glassList.front();
+ if ( (pGlass->getType() == MaterialsType::G1 && pJobDataS->getMaterialsType() == (int)MaterialsType::G2)
+ || (pGlass->getType() == MaterialsType::G2 && pJobDataS->getMaterialsType() == (int)MaterialsType::G1)) {
+ m_bPermittedStore = TRUE;
+ }
+ }
+ Unlock();
+
+ if (m_bPermittedStore) {
+ return CEquipment::onReceivedJob(port, pJobDataS);
+ }
+ else {
+ return -1;
+ }
+ }
+
+ int CBonder::onSentOutJob(int port, CJobDataS* pJobDataS)
+ {
+ CEquipment::onSentOutJob(port, pJobDataS);
+
+ return 0;
+ }
+
+ int CBonder::onProcessData(CProcessData* pProcessData)
+ {
+ CEquipment::onProcessData(pProcessData);
+
+
+ return 0;
+ }
+
+ // Bonder检查腔体玻璃信息，如腔体为空可进G1或G2，
+ // 如腔体只有一片G1，可进G2，如腔体只有一片G2, 可进G1
+ // 其它情况不可进片
+ int CBonder::storedJob(CJobDataB* pJobDataB)
+ {
+ if (!m_bPermittedStore)
+ return -1;
+
+ return CEquipment::storedJob(pJobDataB);
+ }
}
--
Gitblit v1.9.3