From 576e5fc2d2db7d106dc264c685d5a59849082d1f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 17:41:52 +0800
Subject: [PATCH] 1. 添加JOB Data交互
---
SourceCode/Bond/Servo/CEquipment.cpp | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index ea36b48..225c835 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -581,6 +581,15 @@
// Indexer Operation Mode Change
CHECK_WRITE_STEP_SIGNAL(STEP_ID_IN_OP_CMD_REPLY, pszData, size);
+
+ // Panel Data Report
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PANEL_DATA_REPORT, pszData, size);
+
+ // Panel Data Request
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PANEL_DATA_REQUEST, pszData, size);
+
+ // Job Data Request
+ CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_DATA_REQUEST, pszData, size);
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -1585,7 +1594,7 @@
return 0;
}
- int CEquipment::decodePanelDataRequest(CStep* pStep, const char* pszData, size_t size)
+ int CEquipment::decodeJobDataRequest(CStep* pStep, const char* pszData, size_t size)
{
int index = 0;
short cassetteSequenceNo, jobSequenceNo;
@@ -1593,24 +1602,9 @@
index += sizeof(short);
memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
index += sizeof(short);
+ cassetteSequenceNo = 4000;
+ jobSequenceNo = 1;
-
- // efme， 获取数据后返回
- // Cassette Sequence No 1W
- // Job Sequence No 1W
- // Job DataS 256W
- char szBuffer[1024];
- index = 0;
- memcpy(&szBuffer[index], &cassetteSequenceNo, sizeof(short));
- index += sizeof(short);
- memcpy(&szBuffer[index], &jobSequenceNo, sizeof(short));
- index += sizeof(short);
-
- CJobDataS* pJobDataS = getJobDataSWithCassette(cassetteSequenceNo, jobSequenceNo);
- if (pJobDataS != nullptr) {
- index += pJobDataS->serialize(&szBuffer[index], 1024 - sizeof(short) - sizeof(short));
- ((CEqReadStep*)pStep)->setReturnData(szBuffer, index);
- }
// 缓存Attribute，用于调试时显示信息
--
Gitblit v1.9.3