From adf46e4da2f53d171cc5a0e95340d751ebacf763 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 14:25:31 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CLoadPort.cpp | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index 5ac81cb..c6591e7 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -12,6 +12,14 @@
} \
}
+#define CHECK_WRITE_STEP_SIGNAL2(addr, data, size) { \
+ BOOL bFlag = isBitOn(data, size, addr); \
+ SERVO::CStep* pStep = getStep(addr); \
+ if (pStep != nullptr) { \
+ ((CWriteStep*)pStep)->onRecvSignal(bFlag ? addr : 0); \
+ } \
+}
+
namespace SERVO {
CLoadPort::CLoadPort() : CEquipment()
{
@@ -300,7 +308,7 @@
pStep->setName(pszName[m_nIndex]);
pStep->setWriteSignalDev(0x128 + m_nIndex);
pStep->setDataDev(dev[m_nIndex]);
- if (addStep(STEP_ID_PROT1_TYPE_AUTO_CHANGE_REPLY + m_nIndex, pStep) != 0) {
+ if (addStep(STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY + m_nIndex, pStep) != 0) {
delete pStep;
}
}
@@ -867,12 +875,12 @@
static int cassetteTypeReply[] = { STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT2_CASSETTE_TYPE_CHANGE_REPLY,
STEP_ID_PROT3_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT4_CASSETTE_TYPE_CHANGE_REPLY };
- CHECK_READ_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
}
int CLoadPort::decodePortStatusReport(CStep* pStep, const char* pszData, size_t size)
@@ -1144,16 +1152,14 @@
{
char szBuffer[64];
for (const auto& slot : config.vecSlot) {
- if (!slot.isEnabled) continue;
-
int nSlotIndex = slot.nSlotID - 1;
if (nSlotIndex < 0 || nSlotIndex >= SLOT_MAX) {
continue;
}
-
- m_slot[nSlotIndex].enable();
-
- if (!m_slot[nSlotIndex].isEnable()) continue;
+ if (!slot.isEnabled) {
+ m_slot[nSlotIndex].setContext(nullptr);
+ continue;
+ }
CJobDataS js;
js.setCassetteSequenceNo(getNextCassetteSequenceNo());
--
Gitblit v1.9.3