From c3f30f69f3da4e4ed018ba0307e64e327915d4ca Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 22 七月 2025 13:41:24 +0800
Subject: [PATCH] 1. PPID配方绑定界面优化，动态控件获取窗口画笔
---
SourceCode/Bond/Servo/CLoadPort.cpp | 92 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 35 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index aa096e3..ee5a8d1 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -2,23 +2,8 @@
#include "CLoadPort.h"
#include "CGlassPool.h"
#include "Servo.h"
+#include "ServoCommo.h"
-
-#define CHECK_READ_STEP_SIGNAL2(addr, data, size) { \
- BOOL bFlag = isBitOn(data, size, addr); \
- SERVO::CStep* pStep = getStep(addr); \
- if (pStep != nullptr) { \
- ((CReadStep*)pStep)->onReadSignal(bFlag ? addr : 0); \
- } \
-}
-
-#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()
@@ -429,15 +414,18 @@
SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getCassetteCtrlCmdStep();
ASSERT(pStep);
- ASSERT(jobExistenceSize == 12);
- ASSERT(pJobDataA);
-
char szBuffer[1024] = { 0 };
memcpy(&szBuffer[0], &cmd, sizeof(short));
- memcpy(&szBuffer[2], jobExistence, sizeof(short) * jobExistenceSize);
+ if (jobExistence != nullptr && jobExistenceSize == 12) {
+ memcpy(&szBuffer[2], jobExistence, sizeof(short) * jobExistenceSize);
+ }
+
memcpy(&szBuffer[26], &slotProcess, sizeof(short));
memcpy(&szBuffer[36], &jopCount, sizeof(short));
- int nLen = pJobDataA->serialize(&szBuffer[38], 1024 - 38);
+ if (pJobDataA != nullptr) {
+ pJobDataA->serialize(&szBuffer[38], 1024 - 38);
+ }
+
return pStep->writeDataEx(szBuffer, 352 * 2, onWritedBlock);
}
@@ -860,12 +848,12 @@
static int autoType[] = { STEP_ID_PORT1_TYPE_AUTO_CHANGE, STEP_ID_PORT2_TYPE_AUTO_CHANGE,
STEP_ID_PORT3_TYPE_AUTO_CHANGE, STEP_ID_PORT4_TYPE_AUTO_CHANGE };
- CHECK_READ_STEP_SIGNAL2(type[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(mode[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(cassetteType[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(transferMode[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(enable[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(autoType[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(type[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(mode[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(cassetteType[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(transferMode[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(enable[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(autoType[m_nIndex], pszData, size);
static int typeReply[] = { STEP_ID_PROT1_TYPE_CHANGE_REPLY, STEP_ID_PROT2_TYPE_CHANGE_REPLY,
@@ -881,12 +869,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_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);
+ CHECK_WRITE_STEP_SIGNAL(typeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(modeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(transferModeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(enableModeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(typeAutoReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(cassetteTypeReply[m_nIndex], pszData, size);
}
int CLoadPort::decodePortStatusReport(CStep* pStep, const char* pszData, size_t size)
@@ -895,6 +883,25 @@
int nRet = portStatusReport.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
m_portStatusReport.copyEx(portStatusReport);
+
+
+ // 当port状态为InUse, 比较map
+ if (m_portStatusReport.getPortStatus() == PORT_INUSE) {
+ short scanMap = m_portStatusReport.getJobExistenceSlot();
+ short downMap = getCassetteMap();
+ if (scanMap == downMap) {
+ this->sendCassetteCtrlCmd(5, nullptr, 0, 0, 0, nullptr, nullptr);
+ }
+ else {
+ this->sendCassetteCtrlCmd(10, nullptr, 0, 0, 0, nullptr, nullptr);
+
+ // 抛出到应用层做提示
+ if (m_listener.onMapMismatch != nullptr) {
+ m_listener.onMapMismatch(this, scanMap, downMap);
+ }
+ }
+ }
+
// 缓存Attribute，用于调试时显示信息
@@ -909,6 +916,8 @@
LOGI("<CCassetteTranserStateStep>InUse<JobExistenceSlot:%d>",
m_portStatusReport.getJobExistenceSlot());
}
+
+
return nRet;
}
@@ -1117,6 +1126,18 @@
m_bAutoChangeEnable = bEnable;
}
+ short CLoadPort::getCassetteMap()
+ {
+ short map = 0;
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].getContext() == nullptr) continue;
+ map |= (1 << i);
+ }
+
+ return map;
+ }
+
/*
* 生成测试用的玻璃列表
*/
@@ -1132,18 +1153,18 @@
char szBuffer[64];
- for (int i = 0; i < 1; i++) {
+ for (int i = 0; i < SLOT_MAX; i++) {
if (!m_slot[i].isEnable()) continue;
CJobDataS js;
js.setCassetteSequenceNo(getNextCassetteSequenceNo());
js.setJobSequenceNo(m_slot[i].getNo());
sprintf_s(szBuffer, 64, "%05d%05d", js.getCassetteSequenceNo(), js.getJobSequenceNo());
- //js.setGlass1Id(szBuffer);
js.setJobType(1);
js.setMaterialsType((int)type);
CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+ pGlass->setOriginPort(m_nIndex, i);
pGlass->addPath(m_nID, 0);
pGlass->processEnd(m_nID, 0);
pGlass->setID(szBuffer);
@@ -1182,6 +1203,7 @@
js.setGlass1Id(szBuffer);
CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+ pGlass->setOriginPort(m_nIndex, nSlotIndex);
pGlass->addPath(m_nID, 0);
pGlass->processEnd(m_nID, 0);
pGlass->setID(szBuffer);
--
Gitblit v1.9.3