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/CLoadPort.cpp | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index 7cc6006..9fe24b5 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -363,14 +363,15 @@
// 模拟测试
+ /*
if (m_nIndex == 0) {
static int ii = 0;
ii++;
if (ii == 50) {
char szBuffer[64] = {0};
- CStep* pStep = getStepWithName(STEP_EQ_PORT1_INUSE);
+ CStep* pStep = getStepWithName(STEP_EQ_PORT1_BLOCKED);
CPortStatusReport portStatusReport;
- portStatusReport.setPortStatus(PORT_INUSE);
+ portStatusReport.setPortStatus(PORT_BLOCKED);
portStatusReport.setJobExistenceSlot(0xf);
portStatusReport.setCassetteId("CID1001");
int nRet = portStatusReport.serialize(szBuffer, 64);
@@ -382,15 +383,16 @@
ii++;
if (ii == 55) {
char szBuffer[64] = { 0 };
- CStep* pStep = getStepWithName(STEP_EQ_PORT2_INUSE);
+ CStep* pStep = getStepWithName(STEP_EQ_PORT2_BLOCKED);
CPortStatusReport portStatusReport;
- portStatusReport.setPortStatus(PORT_INUSE);
+ portStatusReport.setPortStatus(PORT_BLOCKED);
portStatusReport.setJobExistenceSlot(0xff );
portStatusReport.setCassetteId("CID1004");
int nRet = portStatusReport.serialize(szBuffer, 64);
decodePortStatusReport(pStep, szBuffer, 64);
}
}
+ */
}
void CLoadPort::serialize(CArchive& ar)
@@ -1235,7 +1237,7 @@
char szBuffer[64];
for (int i = 0; i < SLOT_MAX; i++) {
if (!m_slot[i].isEnable()) continue;
- if (!(map >> i) & 1) continue;
+ if (((map >> i) & 1) == 0) continue;
CJobDataS js;
js.setCassetteSequenceNo(getNextCassetteSequenceNo());
--
Gitblit v1.9.3