From 331f447bb0e5eccf0b3161ab287c1372b14b8480 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 08 八月 2025 11:53:58 +0800
Subject: [PATCH] 1.增加千传计数,保存计数，重启软件时恢复； 2.千传测试模式，打印相关日志，方便后期提取，用于统计； 3.千传模式时烘烤两腔体都要进入； 4.千传模式时，Fliper到Bonder修改为用手臂2取料； 5.修复千传模式不计运行时的问题； 6.千传模式，最后收料强制放入第一层； 6.修复Buf， 当任务未生成（在符合条件后仍有1秒间隙）而机器单元发送FetchOutJob时，数据检验失败的问题，增加Sleep, 缩小间隙；
---
SourceCode/Bond/Servo/CEquipment.cpp | 122 ++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 19 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 9b3ea67..7560957 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -7,26 +7,11 @@
#include "Servo.h"
-#define CHECK_READ_STEP_SIGNAL(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_SIGNAL(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 {
CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
{
+ m_bEnable = TRUE;
m_listener = { };
m_alive = { FALSE, 0, FALSE };
m_bCimState = FALSE;
@@ -70,6 +55,16 @@
m_outputPins.clear();
DeleteCriticalSection(&m_criticalSection);
+ }
+
+ void CEquipment::SetEnable(BOOL bEnable)
+ {
+ m_bEnable = bEnable;
+ }
+
+ BOOL CEquipment::IsEnabled() const
+ {
+ return m_bEnable;
}
void CEquipment::setListener(EquipmentListener listener)
@@ -530,8 +525,12 @@
// EQ Job Event
CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS1, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS2, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS3, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS4, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS1, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS2, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS3, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS4, pszData, size);
// Store Job Report #1~15
CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT1, pszData, size);
@@ -1275,6 +1274,12 @@
if (m_slot[i].isLock()) continue;
if (!m_slot[i].isEmpty()) continue;
+ int lsPath = m_slot[i].getLinkSignalPath();
+ if (!m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignalToDownstream[lsPath][SIGNAL_INTERLOCK]
+ || !m_bLinkSignalToDownstream[lsPath][SIGNAL_RECEIVE_ABLE]) continue;
+
MaterialsType slotType = m_slot[i].getType();
if (type == MaterialsType::G1 && slotType == MaterialsType::G2) continue;
if (type == MaterialsType::G2 && slotType == MaterialsType::G1) continue;
@@ -1285,6 +1290,21 @@
}
return nullptr;
+ }
+
+ CSlot* CEquipment::isSlotAvailable(unsigned int slot)
+ {
+ if (slot >= 8) return nullptr;
+ if (!m_slot[slot].isEnable()) return nullptr;
+ if (m_slot[slot].isLock()) return nullptr;
+ if (!m_slot[slot].isEmpty()) return nullptr;
+ int lsPath = m_slot[slot].getLinkSignalPath();
+ if (!m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignalToDownstream[lsPath][SIGNAL_INTERLOCK]
+ || !m_bLinkSignalToDownstream[lsPath][SIGNAL_RECEIVE_ABLE]) return nullptr;
+
+ return &m_slot[slot];
}
CSlot* CEquipment::getNonEmptySlot(MaterialsType putSlotType)
@@ -1313,6 +1333,8 @@
CGlass* pGlass = (CGlass*)m_slot[i].getContext();
if (!isSlotProcessed(i)) continue;
if (pGlass == nullptr) continue;
+ if (!pGlass->isScheduledForProcessing()) continue;
+ if(pGlass->getInspResult(m_nID, 0) == InspResult::Fail) continue;
int lsPath = m_slot[i].getLinkSignalPath();
if(!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
|| m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
@@ -1352,6 +1374,43 @@
return &m_slot[i];
}
}
+ }
+
+ return nullptr;
+ }
+
+ CSlot* CEquipment::getProcessedSlotCt(unsigned int slot)
+ {
+ if (slot >= 8) return nullptr;
+ if (!m_slot[slot].isEnable()) return nullptr;
+ if (m_slot[slot].isLock()) return nullptr;
+ CGlass* pGlass = (CGlass*)m_slot[slot].getContext();
+ if (pGlass == nullptr) return nullptr;
+ int lsPath = m_slot[slot].getLinkSignalPath();
+ if (!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignalToUpstream[lsPath][SIGNAL_INTERLOCK]
+ || !m_bLinkSignalToUpstream[lsPath][SIGNAL_SEND_ABLE]) return nullptr;
+
+ return &m_slot[slot];
+ }
+
+ CSlot* CEquipment::getInspFailSlot()
+ {
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].isLock()) continue;
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass == nullptr) continue;
+ if (!pGlass->isScheduledForProcessing()) continue;
+ if (pGlass->getInspResult(m_nID, 0) != InspResult::Fail) continue;
+ int lsPath = m_slot[i].getLinkSignalPath();
+ if (!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignalToUpstream[lsPath][SIGNAL_INTERLOCK]
+ || !m_bLinkSignalToUpstream[lsPath][SIGNAL_SEND_ABLE]) continue;
+
+ return &m_slot[i];
}
return nullptr;
@@ -1397,6 +1456,10 @@
if (pSlot == nullptr) return -1;
pSlot->setContext(nullptr);
+ if (m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, EDCC_FETCHOUT_JOB);
+ }
+
return 0;
}
@@ -1619,7 +1682,7 @@
index += sizeof(short);
CToolUnits::convertString(&pszData[index], 128 * 2, strPanelJudgeData);
index += 128 * 2;
- CToolUnits::convertString(&pszData[index], 256 * 2, strPanelJudgeData);
+ CToolUnits::convertString(&pszData[index], 256 * 2, strPanelGradeData);
index += 256 * 2;
@@ -1634,6 +1697,15 @@
pStep->addAttribute(new CAttribute("PanelGradeData",
strPanelGradeData.c_str(), "", weight++));
+
+ // 更新检测结果
+ CGlass* pGlass = getGlassWithCassette(cassetteNo, jobSequenceNo);
+ if (pGlass == nullptr) {
+ LOGE("<CEquipment-%s>更新Panel Data失败，找不到对应的Glass.cassetteNo=%d, jobSequenceNo=%d",
+ getName().c_str(), cassetteNo, jobSequenceNo);
+ return -1;
+ }
+ pGlass->setInspResult(m_nID, 0, judgeStringToInspResult(strPanelJudgeData));
return 0;
}
@@ -1918,14 +1990,14 @@
*/
int CEquipment::onSendAble(int port)
{
- LOGI("<CEquipment-%s>onSendAble.port:%d", m_strName.c_str(), port);
+ // LOGI("<CEquipment-%s>onSendAble.port:%d", m_strName.c_str(), port);
return 0;
}
int CEquipment::onReceiveAble(int port)
{
- LOGI("<CEquipment-%s>onReceiveAble.port:%d", m_strName.c_str(), port);
+ // LOGI("<CEquipment-%s>onReceiveAble.port:%d", m_strName.c_str(), port);
return 0;
}
@@ -1974,4 +2046,16 @@
);
}
}
+
+ InspResult CEquipment::judgeStringToInspResult(std::string& strJudge)
+ {
+ if (strJudge.compare("N") == 0) {
+ return InspResult::Fail;
+ }
+ if (strJudge.compare("G") == 0) {
+ return InspResult::Pass;
+ }
+
+ return InspResult::NotInspected;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3